[WIN32U] Move windows specific test dlls into win32nt folder

2026-06-03 01:41:13 +08:00 · 2025-12-04 09:47:01 +02:00
parent 13a982966f
commit cba420df3b
20 changed files with 4 additions and 5 deletions
--- a/modules/rostests/apitests/CMakeLists.txt
+++ b/modules/rostests/apitests/CMakeLists.txt
@@ -64,7 +64,6 @@ add_subdirectory(utildll)
 add_subdirectory(uxtheme)
 add_subdirectory(version)
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_subdirectory(win32u)
    add_subdirectory(win32nt)
 endif()
 add_subdirectory(winhttp)
--- a/modules/rostests/apitests/win32nt/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/CMakeLists.txt
@@ -1,4 +1,8 @@

+add_subdirectory(win32u_xpsp2)
+add_subdirectory(win32u_2k3sp2)
+add_subdirectory(win32u_vista)
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/win32ss/include ../gditools)

--- a/modules/rostests/apitests/win32nt/win32u_2k3sp2/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/win32u_2k3sp2/CMakeLists.txt
--- a/modules/rostests/apitests/win32nt/win32u_2k3sp2/main.c
+++ b/modules/rostests/apitests/win32nt/win32u_2k3sp2/main.c
--- a/modules/rostests/apitests/win32nt/win32u_2k3sp2/sys-stubs.S
+++ b/modules/rostests/apitests/win32nt/win32u_2k3sp2/sys-stubs.S
--- a/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2-64.h
+++ b/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2-64.h
--- a/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2.h
+++ b/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2.h
--- a/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32u_2k3sp2.spec
+++ b/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32u_2k3sp2.spec
--- a/modules/rostests/apitests/win32nt/win32u_vista/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/win32u_vista/CMakeLists.txt
--- a/modules/rostests/apitests/win32nt/win32u_vista/main.c
+++ b/modules/rostests/apitests/win32nt/win32u_vista/main.c
--- a/modules/rostests/apitests/win32nt/win32u_vista/sys-stubs.S
+++ b/modules/rostests/apitests/win32nt/win32u_vista/sys-stubs.S
--- a/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc32.h
+++ b/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc32.h
--- a/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc64.h
+++ b/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc64.h
--- a/modules/rostests/apitests/win32nt/win32u_vista/win32u_vista.spec
+++ b/modules/rostests/apitests/win32nt/win32u_vista/win32u_vista.spec
--- a/modules/rostests/apitests/win32nt/win32u_xpsp2/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/win32u_xpsp2/CMakeLists.txt
--- a/modules/rostests/apitests/win32nt/win32u_xpsp2/main.c
+++ b/modules/rostests/apitests/win32nt/win32u_xpsp2/main.c
--- a/modules/rostests/apitests/win32nt/win32u_xpsp2/sys-stubs.S
+++ b/modules/rostests/apitests/win32nt/win32u_xpsp2/sys-stubs.S
--- a/modules/rostests/apitests/win32nt/win32u_xpsp2/win32ksvc-xp.h
+++ b/modules/rostests/apitests/win32nt/win32u_xpsp2/win32ksvc-xp.h
--- a/modules/rostests/apitests/win32nt/win32u_xpsp2/win32u_xpsp2.spec
+++ b/modules/rostests/apitests/win32nt/win32u_xpsp2/win32u_xpsp2.spec
--- a/modules/rostests/apitests/win32u/CMakeLists.txt
+++ b/modules/rostests/apitests/win32u/CMakeLists.txt
@@ -1,4 +0,0 @@
-
-add_subdirectory(win32u_xpsp2)
-add_subdirectory(win32u_2k3sp2)
-add_subdirectory(win32u_vista)