[WIN32U] Rename win32kdll to win32u, which is the "official" name on Windows 10
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Sun, 1 Oct 2017 17:41:11 +0000 (17:41 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Sun, 1 Oct 2017 17:41:11 +0000 (17:41 +0000)
svn path=/trunk/; revision=76026

34 files changed:
rostests/apitests/CMakeLists.txt
rostests/apitests/win32kdll/CMakeLists.txt [deleted file]
rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt [deleted file]
rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt [deleted file]
rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt [deleted file]
rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt [deleted file]
rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt [deleted file]
rostests/apitests/win32nt/CMakeLists.txt
rostests/apitests/win32u/CMakeLists.txt [new file with mode: 0644]
rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt [new file with mode: 0644]
rostests/apitests/win32u/win32u_2k3sp2/main.c [moved from rostests/apitests/win32kdll/win32kdll_2k3sp2/main.c with 100% similarity]
rostests/apitests/win32u/win32u_2k3sp2/sys-stubs.S [moved from rostests/apitests/win32kdll/win32kdll_2k3sp2/sys-stubs.S with 100% similarity]
rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2.h [moved from rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h with 100% similarity]
rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec [moved from rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec with 100% similarity]
rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt [new file with mode: 0644]
rostests/apitests/win32u/win32u_2ksp4/main.c [moved from rostests/apitests/win32kdll/win32kdll_2ksp4/main.c with 100% similarity]
rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.S [moved from rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.S with 100% similarity]
rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.def [moved from rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.def with 100% similarity]
rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.spec [moved from rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.spec with 100% similarity]
rostests/apitests/win32u/win32u_ros/CMakeLists.txt [new file with mode: 0644]
rostests/apitests/win32u/win32u_ros/main.c [moved from rostests/apitests/win32kdll/win32kdll_ros/main.c with 100% similarity]
rostests/apitests/win32u/win32u_ros/sys-stubs.S [moved from rostests/apitests/win32kdll/win32kdll_ros/sys-stubs.S with 100% similarity]
rostests/apitests/win32u/win32u_ros/win32ksvc-ros.h [moved from rostests/apitests/win32kdll/win32kdll_ros/win32ksvc-ros.h with 100% similarity]
rostests/apitests/win32u/win32u_ros/win32u_ros.spec [moved from rostests/apitests/win32kdll/win32kdll_ros/win32kdll_ros.spec with 100% similarity]
rostests/apitests/win32u/win32u_vista/CMakeLists.txt [new file with mode: 0644]
rostests/apitests/win32u/win32u_vista/main.c [moved from rostests/apitests/win32kdll/win32kdll_vista/main.c with 100% similarity]
rostests/apitests/win32u/win32u_vista/win32u_vista.S [moved from rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.S with 100% similarity]
rostests/apitests/win32u/win32u_vista/win32u_vista.def [moved from rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.def with 100% similarity]
rostests/apitests/win32u/win32u_vista/win32u_vista.spec [moved from rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.spec with 100% similarity]
rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt [new file with mode: 0644]
rostests/apitests/win32u/win32u_xpsp2/main.c [moved from rostests/apitests/win32kdll/win32kdll_xpsp2/main.c with 100% similarity]
rostests/apitests/win32u/win32u_xpsp2/sys-stubs.S [moved from rostests/apitests/win32kdll/win32kdll_xpsp2/sys-stubs.S with 100% similarity]
rostests/apitests/win32u/win32u_xpsp2/win32ksvc-xp.h [moved from rostests/apitests/win32kdll/win32kdll_xpsp2/win32ksvc-xp.h with 100% similarity]
rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec [moved from rostests/apitests/win32kdll/win32kdll_xpsp2/win32kdll_xpsp2.spec with 100% similarity]

index f9fd5d2..6b6149c 100644 (file)
@@ -37,7 +37,7 @@ add_subdirectory(user32_dynamic)
 add_subdirectory(userenv)
 add_subdirectory(uxtheme)
 if(NOT ARCH STREQUAL "amd64" AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_subdirectory(win32kdll)
+    add_subdirectory(win32u)
     add_subdirectory(win32nt)
 endif()
 add_subdirectory(winhttp)
diff --git a/rostests/apitests/win32kdll/CMakeLists.txt b/rostests/apitests/win32kdll/CMakeLists.txt
deleted file mode 100644 (file)
index f4a2622..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-add_subdirectory(win32kdll_ros)
-add_subdirectory(win32kdll_xpsp2)
-#add_subdirectory(win32kdll_2ksp4)
-add_subdirectory(win32kdll_2k3sp2)
-#add_subdirectory(win32kdll_vista)
diff --git a/rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt b/rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt
deleted file mode 100644 (file)
index 947f6fc..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-spec2def(win32kdll_2k3sp2.dll win32kdll_2k3sp2.spec ADD_IMPORTLIB)
-add_asm_files(win32kdll_2k3sp2_asm sys-stubs.S)
-
-add_library(win32kdll_2k3sp2 SHARED
-    main.c
-    ${win32kdll_2k3sp2_asm}
-    ${CMAKE_CURRENT_BINARY_DIR}/win32kdll_2k3sp2.def)
-
-set_module_type(win32kdll_2k3sp2 module)
-add_dependencies(win32kdll_2k3sp2 psdk)
diff --git a/rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt b/rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt
deleted file mode 100644 (file)
index 44872f5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-spec2def(win32kdll_2ksp4.dll win32kdll_2ksp4.spec)
-add_asm_files(win32kdll_2ksp4_asm win32kdll_2ksp4.S)
-
-add_library(win32kdll_2ksp4 SHARED 
-    main.c 
-    ${win32kdll_2ksp4_asm}
-    ${CMAKE_CURRENT_BINARY_DIR}/win32kdll_2ksp4.def)
-
-set_module_type(win32kdll_2ksp4 module)
-add_dependencies(win32kdll_2ksp4 psdk)
diff --git a/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt b/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt
deleted file mode 100644 (file)
index 55f71e2..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-include_directories(${REACTOS_SOURCE_DIR}/win32ss)
-
-spec2def(win32kdll.dll win32kdll_ros.spec ADD_IMPORTLIB)
-add_asm_files(win32kdll_ros_asm sys-stubs.S)
-
-add_library(win32kdll SHARED 
-    main.c
-    ${win32kdll_ros_asm}
-    ${CMAKE_CURRENT_BINARY_DIR}/win32kdll.def)
-
-set_module_type(win32kdll module)
-add_dependencies(win32kdll psdk)
-add_rostests_file(TARGET win32kdll)
diff --git a/rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt b/rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt
deleted file mode 100644 (file)
index 4891f69..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-spec2def(win32kdll_vista.spec win32kdll_vista.spec ADD_IMPORTLIB)
-add_asm_files(win32kdll_vista_asm win32kdll_vista.S)
-
-add_library(win32kdll_vista SHARED
-    main.c
-    ${win32kdll_vista_asm}
-    ${CMAKE_CURRENT_BINARY_DIR}/win32kdll_vista.def)
-
-set_module_type(win32kdll_vista module)
-add_dependencies(win32kdll_vista psdk)
diff --git a/rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt b/rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt
deleted file mode 100644 (file)
index ca90a91..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-spec2def(win32kdll_xpsp2.dll win32kdll_xpsp2.spec ADD_IMPORTLIB)
-add_asm_files(win32kdll_xpsp2_asm sys-stubs.S)
-
-add_library(win32kdll_xpsp2 SHARED 
-    main.c
-    ${win32kdll_xpsp2_asm}
-    ${CMAKE_CURRENT_BINARY_DIR}/win32kdll_xpsp2.def)
-
-set_module_type(win32kdll_xpsp2 module)
-add_dependencies(win32kdll_xpsp2 psdk)
index 63a5fc2..a3ffa1c 100644 (file)
@@ -68,7 +68,7 @@ add_executable(win32knt_apitest ${SOURCE})
 target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools)
 set_module_type(win32knt_apitest win32cui)
 add_importlibs(win32knt_apitest
-    win32kdll # win32kdll_2ksp4 win32kdll_xpsp2 win32kdll_2k3sp2 win32kdll_vista
+    win32u # win32u_2ksp4 win32u_xpsp2 win32u_2k3sp2 win32u_vista
     gdi32
     user32
     shell32
diff --git a/rostests/apitests/win32u/CMakeLists.txt b/rostests/apitests/win32u/CMakeLists.txt
new file mode 100644 (file)
index 0000000..af69093
--- /dev/null
@@ -0,0 +1,6 @@
+
+add_subdirectory(win32u_ros)
+add_subdirectory(win32u_xpsp2)
+#add_subdirectory(win32u_2ksp4)
+add_subdirectory(win32u_2k3sp2)
+#add_subdirectory(win32u_vista)
diff --git a/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt
new file mode 100644 (file)
index 0000000..66c3ec8
--- /dev/null
@@ -0,0 +1,11 @@
+
+spec2def(win32u_2k3sp2.dll win32u_2k3sp2.spec ADD_IMPORTLIB)
+add_asm_files(win32u_2k3sp2_asm sys-stubs.S)
+
+add_library(win32u_2k3sp2 SHARED
+    main.c
+    ${win32u_2k3sp2_asm}
+    ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def)
+
+set_module_type(win32u_2k3sp2 module)
+add_dependencies(win32u_2k3sp2 psdk)
diff --git a/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt b/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt
new file mode 100644 (file)
index 0000000..bdc681a
--- /dev/null
@@ -0,0 +1,11 @@
+
+spec2def(win32u_2ksp4.dll win32u_2ksp4.spec)
+add_asm_files(win32u_2ksp4_asm win32u_2ksp4.S)
+
+add_library(win32u_2ksp4 SHARED 
+    main.c 
+    ${win32ku_2ksp4_asm}
+    ${CMAKE_CURRENT_BINARY_DIR}/win32u_2ksp4.def)
+
+set_module_type(win32u_2ksp4 module)
+add_dependencies(win32u_2ksp4 psdk)
diff --git a/rostests/apitests/win32u/win32u_ros/CMakeLists.txt b/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
new file mode 100644 (file)
index 0000000..15e8d2a
--- /dev/null
@@ -0,0 +1,14 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/win32ss)
+
+spec2def(win32u.dll win32u_ros.spec ADD_IMPORTLIB)
+add_asm_files(win32u_ros_asm sys-stubs.S)
+
+add_library(win32u SHARED 
+    main.c
+    ${win32u_ros_asm}
+    ${CMAKE_CURRENT_BINARY_DIR}/win32u.def)
+
+set_module_type(win32u module)
+add_dependencies(win32u psdk)
+add_rostests_file(TARGET win32u)
diff --git a/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/rostests/apitests/win32u/win32u_vista/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1036065
--- /dev/null
@@ -0,0 +1,11 @@
+
+spec2def(win32u_vista.spec win32u_vista.spec ADD_IMPORTLIB)
+add_asm_files(win32u_vista_asm win32u_vista.S)
+
+add_library(win32u_vista SHARED
+    main.c
+    ${win32u_vista_asm}
+    ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def)
+
+set_module_type(win32u_vista module)
+add_dependencies(win32u_vista psdk)
diff --git a/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0c3b536
--- /dev/null
@@ -0,0 +1,11 @@
+
+spec2def(win32u_xpsp2.dll win32u_xpsp2.spec ADD_IMPORTLIB)
+add_asm_files(win32u_xpsp2_asm sys-stubs.S)
+
+add_library(win32u_xpsp2 SHARED 
+    main.c
+    ${win32u_xpsp2_asm}
+    ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def)
+
+set_module_type(win32u_xpsp2 module)
+add_dependencies(win32u_xpsp2 psdk)