[WIN32U] Move reactos win32u.dll from rostests to win32ss

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)

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)
 

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)

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)