From bed6d009634fea3851eccf0e9536cb480b3ef8ce Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 1 Oct 2017 17:41:11 +0000
Subject: [PATCH] [WIN32U] Rename win32kdll to win32u, which is the "official"
 name on Windows 10

svn path=/trunk/; revision=76026
---
 rostests/apitests/CMakeLists.txt                   |  2 +-
 rostests/apitests/win32kdll/CMakeLists.txt         |  6 ------
 .../win32kdll/win32kdll_2k3sp2/CMakeLists.txt      | 11 -----------
 .../win32kdll/win32kdll_2ksp4/CMakeLists.txt       | 11 -----------
 .../win32kdll/win32kdll_ros/CMakeLists.txt         | 14 --------------
 .../win32kdll/win32kdll_vista/CMakeLists.txt       | 11 -----------
 .../win32kdll/win32kdll_xpsp2/CMakeLists.txt       | 11 -----------
 rostests/apitests/win32nt/CMakeLists.txt           |  2 +-
 rostests/apitests/win32u/CMakeLists.txt            |  6 ++++++
 .../apitests/win32u/win32u_2k3sp2/CMakeLists.txt   | 11 +++++++++++
 .../win32u_2k3sp2}/main.c                          |  0
 .../win32u_2k3sp2}/sys-stubs.S                     |  0
 .../win32u_2k3sp2}/win32ksvc-2k3sp2.h              |  0
 .../win32u_2k3sp2/win32u_2k3sp2.spec}              |  0
 .../apitests/win32u/win32u_2ksp4/CMakeLists.txt    | 11 +++++++++++
 .../win32kdll_2ksp4 => win32u/win32u_2ksp4}/main.c |  0
 .../win32u_2ksp4/win32u_2ksp4.S}                   |  0
 .../win32u_2ksp4/win32u_2ksp4.def}                 |  0
 .../win32u_2ksp4/win32u_2ksp4.spec}                |  0
 rostests/apitests/win32u/win32u_ros/CMakeLists.txt | 14 ++++++++++++++
 .../win32kdll_ros => win32u/win32u_ros}/main.c     |  0
 .../win32u_ros}/sys-stubs.S                        |  0
 .../win32u_ros}/win32ksvc-ros.h                    |  0
 .../win32u_ros/win32u_ros.spec}                    |  0
 .../apitests/win32u/win32u_vista/CMakeLists.txt    | 11 +++++++++++
 .../win32kdll_vista => win32u/win32u_vista}/main.c |  0
 .../win32u_vista/win32u_vista.S}                   |  0
 .../win32u_vista/win32u_vista.def}                 |  0
 .../win32u_vista/win32u_vista.spec}                |  0
 .../apitests/win32u/win32u_xpsp2/CMakeLists.txt    | 11 +++++++++++
 .../win32kdll_xpsp2 => win32u/win32u_xpsp2}/main.c |  0
 .../win32u_xpsp2}/sys-stubs.S                      |  0
 .../win32u_xpsp2}/win32ksvc-xp.h                   |  0
 .../win32u_xpsp2/win32u_xpsp2.spec}                |  0
 34 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 rostests/apitests/win32kdll/CMakeLists.txt
 delete mode 100644 rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt
 delete mode 100644 rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt
 delete mode 100644 rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt
 delete mode 100644 rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt
 delete mode 100644 rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt
 create mode 100644 rostests/apitests/win32u/CMakeLists.txt
 create mode 100644 rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt
 rename rostests/apitests/{win32kdll/win32kdll_2k3sp2 => win32u/win32u_2k3sp2}/main.c (100%)
 rename rostests/apitests/{win32kdll/win32kdll_2k3sp2 => win32u/win32u_2k3sp2}/sys-stubs.S (100%)
 rename rostests/apitests/{win32kdll/win32kdll_2k3sp2 => win32u/win32u_2k3sp2}/win32ksvc-2k3sp2.h (100%)
 rename rostests/apitests/{win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec => win32u/win32u_2k3sp2/win32u_2k3sp2.spec} (100%)
 create mode 100644 rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt
 rename rostests/apitests/{win32kdll/win32kdll_2ksp4 => win32u/win32u_2ksp4}/main.c (100%)
 rename rostests/apitests/{win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.S => win32u/win32u_2ksp4/win32u_2ksp4.S} (100%)
 rename rostests/apitests/{win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.def => win32u/win32u_2ksp4/win32u_2ksp4.def} (100%)
 rename rostests/apitests/{win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.spec => win32u/win32u_2ksp4/win32u_2ksp4.spec} (100%)
 create mode 100644 rostests/apitests/win32u/win32u_ros/CMakeLists.txt
 rename rostests/apitests/{win32kdll/win32kdll_ros => win32u/win32u_ros}/main.c (100%)
 rename rostests/apitests/{win32kdll/win32kdll_ros => win32u/win32u_ros}/sys-stubs.S (100%)
 rename rostests/apitests/{win32kdll/win32kdll_ros => win32u/win32u_ros}/win32ksvc-ros.h (100%)
 rename rostests/apitests/{win32kdll/win32kdll_ros/win32kdll_ros.spec => win32u/win32u_ros/win32u_ros.spec} (100%)
 create mode 100644 rostests/apitests/win32u/win32u_vista/CMakeLists.txt
 rename rostests/apitests/{win32kdll/win32kdll_vista => win32u/win32u_vista}/main.c (100%)
 rename rostests/apitests/{win32kdll/win32kdll_vista/win32kdll_vista.S => win32u/win32u_vista/win32u_vista.S} (100%)
 rename rostests/apitests/{win32kdll/win32kdll_vista/win32kdll_vista.def => win32u/win32u_vista/win32u_vista.def} (100%)
 rename rostests/apitests/{win32kdll/win32kdll_vista/win32kdll_vista.spec => win32u/win32u_vista/win32u_vista.spec} (100%)
 create mode 100644 rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
 rename rostests/apitests/{win32kdll/win32kdll_xpsp2 => win32u/win32u_xpsp2}/main.c (100%)
 rename rostests/apitests/{win32kdll/win32kdll_xpsp2 => win32u/win32u_xpsp2}/sys-stubs.S (100%)
 rename rostests/apitests/{win32kdll/win32kdll_xpsp2 => win32u/win32u_xpsp2}/win32ksvc-xp.h (100%)
 rename rostests/apitests/{win32kdll/win32kdll_xpsp2/win32kdll_xpsp2.spec => win32u/win32u_xpsp2/win32u_xpsp2.spec} (100%)

diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt
index f9fd5d25dc7..6b6149ce35d 100644
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@@ -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
index f4a2622c753..00000000000
--- a/rostests/apitests/win32kdll/CMakeLists.txt
+++ /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
index 947f6fcd5be..00000000000
--- a/rostests/apitests/win32kdll/win32kdll_2k3sp2/CMakeLists.txt
+++ /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
index 44872f5ad22..00000000000
--- a/rostests/apitests/win32kdll/win32kdll_2ksp4/CMakeLists.txt
+++ /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
index 55f71e285aa..00000000000
--- a/rostests/apitests/win32kdll/win32kdll_ros/CMakeLists.txt
+++ /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
index 4891f698f4a..00000000000
--- a/rostests/apitests/win32kdll/win32kdll_vista/CMakeLists.txt
+++ /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
index ca90a913afc..00000000000
--- a/rostests/apitests/win32kdll/win32kdll_xpsp2/CMakeLists.txt
+++ /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)
diff --git a/rostests/apitests/win32nt/CMakeLists.txt b/rostests/apitests/win32nt/CMakeLists.txt
index 63a5fc25512..a3ffa1ccbff 100644
--- a/rostests/apitests/win32nt/CMakeLists.txt
+++ b/rostests/apitests/win32nt/CMakeLists.txt
@@ -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
index 00000000000..af69093560b
--- /dev/null
+++ b/rostests/apitests/win32u/CMakeLists.txt
@@ -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
index 00000000000..66c3ec8cd26
--- /dev/null
+++ b/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt
@@ -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/win32kdll/win32kdll_2k3sp2/main.c b/rostests/apitests/win32u/win32u_2k3sp2/main.c
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2k3sp2/main.c
rename to rostests/apitests/win32u/win32u_2k3sp2/main.c
diff --git a/rostests/apitests/win32kdll/win32kdll_2k3sp2/sys-stubs.S b/rostests/apitests/win32u/win32u_2k3sp2/sys-stubs.S
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2k3sp2/sys-stubs.S
rename to rostests/apitests/win32u/win32u_2k3sp2/sys-stubs.S
diff --git a/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h b/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2.h
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h
rename to rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2.h
diff --git a/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec b/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec
rename to rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec
diff --git a/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt b/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt
new file mode 100644
index 00000000000..bdc681aec2e
--- /dev/null
+++ b/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt
@@ -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/win32kdll/win32kdll_2ksp4/main.c b/rostests/apitests/win32u/win32u_2ksp4/main.c
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2ksp4/main.c
rename to rostests/apitests/win32u/win32u_2ksp4/main.c
diff --git a/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.S b/rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.S
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.S
rename to rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.S
diff --git a/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.def b/rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.def
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.def
rename to rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.def
diff --git a/rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.spec b/rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.spec
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_2ksp4/win32kdll_2ksp4.spec
rename to rostests/apitests/win32u/win32u_2ksp4/win32u_2ksp4.spec
diff --git a/rostests/apitests/win32u/win32u_ros/CMakeLists.txt b/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
new file mode 100644
index 00000000000..15e8d2a2e5d
--- /dev/null
+++ b/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
@@ -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/win32kdll/win32kdll_ros/main.c b/rostests/apitests/win32u/win32u_ros/main.c
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_ros/main.c
rename to rostests/apitests/win32u/win32u_ros/main.c
diff --git a/rostests/apitests/win32kdll/win32kdll_ros/sys-stubs.S b/rostests/apitests/win32u/win32u_ros/sys-stubs.S
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_ros/sys-stubs.S
rename to rostests/apitests/win32u/win32u_ros/sys-stubs.S
diff --git a/rostests/apitests/win32kdll/win32kdll_ros/win32ksvc-ros.h b/rostests/apitests/win32u/win32u_ros/win32ksvc-ros.h
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_ros/win32ksvc-ros.h
rename to rostests/apitests/win32u/win32u_ros/win32ksvc-ros.h
diff --git a/rostests/apitests/win32kdll/win32kdll_ros/win32kdll_ros.spec b/rostests/apitests/win32u/win32u_ros/win32u_ros.spec
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_ros/win32kdll_ros.spec
rename to rostests/apitests/win32u/win32u_ros/win32u_ros.spec
diff --git a/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/rostests/apitests/win32u/win32u_vista/CMakeLists.txt
new file mode 100644
index 00000000000..10360658041
--- /dev/null
+++ b/rostests/apitests/win32u/win32u_vista/CMakeLists.txt
@@ -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/win32kdll/win32kdll_vista/main.c b/rostests/apitests/win32u/win32u_vista/main.c
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_vista/main.c
rename to rostests/apitests/win32u/win32u_vista/main.c
diff --git a/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.S b/rostests/apitests/win32u/win32u_vista/win32u_vista.S
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.S
rename to rostests/apitests/win32u/win32u_vista/win32u_vista.S
diff --git a/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.def b/rostests/apitests/win32u/win32u_vista/win32u_vista.def
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.def
rename to rostests/apitests/win32u/win32u_vista/win32u_vista.def
diff --git a/rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.spec b/rostests/apitests/win32u/win32u_vista/win32u_vista.spec
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_vista/win32kdll_vista.spec
rename to rostests/apitests/win32u/win32u_vista/win32u_vista.spec
diff --git a/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
new file mode 100644
index 00000000000..0c3b536c751
--- /dev/null
+++ b/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt
@@ -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)
diff --git a/rostests/apitests/win32kdll/win32kdll_xpsp2/main.c b/rostests/apitests/win32u/win32u_xpsp2/main.c
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_xpsp2/main.c
rename to rostests/apitests/win32u/win32u_xpsp2/main.c
diff --git a/rostests/apitests/win32kdll/win32kdll_xpsp2/sys-stubs.S b/rostests/apitests/win32u/win32u_xpsp2/sys-stubs.S
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_xpsp2/sys-stubs.S
rename to rostests/apitests/win32u/win32u_xpsp2/sys-stubs.S
diff --git a/rostests/apitests/win32kdll/win32kdll_xpsp2/win32ksvc-xp.h b/rostests/apitests/win32u/win32u_xpsp2/win32ksvc-xp.h
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_xpsp2/win32ksvc-xp.h
rename to rostests/apitests/win32u/win32u_xpsp2/win32ksvc-xp.h
diff --git a/rostests/apitests/win32kdll/win32kdll_xpsp2/win32kdll_xpsp2.spec b/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec
similarity index 100%
rename from rostests/apitests/win32kdll/win32kdll_xpsp2/win32kdll_xpsp2.spec
rename to rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec