From 13a982966f0b502c2289ee48d8cdb1aa1a7ae285 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 4 Dec 2025 09:27:43 +0200
Subject: [PATCH] [WIN32U] Move reactos win32u.dll from rostests to win32ss

---
 modules/rostests/apitests/win32u/CMakeLists.txt           | 1 -
 win32ss/CMakeLists.txt                                    | 1 +
 .../win32u/win32u_ros => win32ss/win32u}/CMakeLists.txt   | 8 ++++----
 .../apitests/win32u/win32u_ros => win32ss/win32u}/main.c  | 0
 .../win32u/win32u_ros => win32ss/win32u}/sys-stubs.S      | 0
 .../win32u_ros.spec => win32ss/win32u/win32u.spec         | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename {modules/rostests/apitests/win32u/win32u_ros => win32ss/win32u}/CMakeLists.txt (63%)
 rename {modules/rostests/apitests/win32u/win32u_ros => win32ss/win32u}/main.c (100%)
 rename {modules/rostests/apitests/win32u/win32u_ros => win32ss/win32u}/sys-stubs.S (100%)
 rename modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec => win32ss/win32u/win32u.spec (99%)

diff --git a/modules/rostests/apitests/win32u/CMakeLists.txt b/modules/rostests/apitests/win32u/CMakeLists.txt
index 4e7df254374..cbee7a23e19 100644
--- a/modules/rostests/apitests/win32u/CMakeLists.txt
+++ b/modules/rostests/apitests/win32u/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-add_subdirectory(win32u_ros)
 add_subdirectory(win32u_xpsp2)
 add_subdirectory(win32u_2k3sp2)
 add_subdirectory(win32u_vista)
diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt
index 4d5cb058fee..d82cc51e31c 100644
--- a/win32ss/CMakeLists.txt
+++ b/win32ss/CMakeLists.txt
@@ -22,6 +22,7 @@ add_subdirectory(user/imm32)
 add_subdirectory(user/user32)
 add_subdirectory(user/user32_vista)
 add_subdirectory(user/winsrv)
+add_subdirectory(win32u)
 
 spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
 
diff --git a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt b/win32ss/win32u/CMakeLists.txt
similarity index 63%
rename from modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
rename to win32ss/win32u/CMakeLists.txt
index 38bf98e2d50..a64aa550ebe 100644
--- a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt
+++ b/win32ss/win32u/CMakeLists.txt
@@ -1,17 +1,17 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/win32ss)
 
-spec2def(win32u.dll win32u_ros.spec ADD_IMPORTLIB)
-add_asm_files(win32u_ros_asm sys-stubs.S)
+spec2def(win32u.dll win32u.spec ADD_IMPORTLIB)
+add_asm_files(win32u_asm sys-stubs.S)
 
 add_library(win32u MODULE
     main.c
-    ${win32u_ros_asm}
+    ${win32u_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/win32u.def)
 
 set_module_type(win32u module)
 add_dependencies(win32u psdk)
-add_rostests_file(TARGET win32u)
+add_cd_file(TARGET win32u DESTINATION reactos/system32 FOR all)
 
 if (STACK_PROTECTOR)
     target_compile_options(win32u PRIVATE -fno-stack-protector)
diff --git a/modules/rostests/apitests/win32u/win32u_ros/main.c b/win32ss/win32u/main.c
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_ros/main.c
rename to win32ss/win32u/main.c
diff --git a/modules/rostests/apitests/win32u/win32u_ros/sys-stubs.S b/win32ss/win32u/sys-stubs.S
similarity index 100%
rename from modules/rostests/apitests/win32u/win32u_ros/sys-stubs.S
rename to win32ss/win32u/sys-stubs.S
diff --git a/modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec b/win32ss/win32u/win32u.spec
similarity index 99%
rename from modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec
rename to win32ss/win32u/win32u.spec
index d307cec4ac0..0e4e66f5c65 100644
--- a/modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec
+++ b/win32ss/win32u/win32u.spec
@@ -519,7 +519,7 @@
 @ stdcall NtUserSetCursor(ptr)
 @ stdcall NtUserSetCursorContents(ptr ptr)
 @ stdcall NtUserSetCursorIconData(ptr ptr ptr ptr)
-@ stdcall NtUserSetDbgTag(long long)
+@ stdcall -dbg NtUserSetDbgTag(long long)
 @ stdcall NtUserSetFocus(ptr)
 @ stdcall NtUserSetImeHotKey(long long long long long)
 @ stdcall NtUserSetImeInfoEx(long)
@@ -537,7 +537,7 @@
 @ stdcall NtUserSetParent(ptr ptr)
 @ stdcall NtUserSetProcessWindowStation(ptr)
 @ stdcall NtUserSetProp(ptr long ptr)
-#@ stdcall NtUserSetRipFlags(long long)
+#@ stdcall -dbg NtUserSetRipFlags(long long)
 @ stdcall NtUserSetScrollInfo(ptr long ptr long)
 @ stdcall NtUserSetShellWindowEx(ptr ptr)
 @ stdcall NtUserSetSysColors(long ptr ptr long)