diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 18db2787417..eb1cd324b0a 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -64,7 +64,7 @@ add_subdirectory(utildll) add_subdirectory(uxtheme) add_subdirectory(version) if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") - add_subdirectory(win32nt) + add_subdirectory(win32u) endif() add_subdirectory(winhttp) add_subdirectory(wininet) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32u/CMakeLists.txt similarity index 87% rename from modules/rostests/apitests/win32nt/CMakeLists.txt rename to modules/rostests/apitests/win32u/CMakeLists.txt index 8b6d2484ef9..30022bf7872 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/CMakeLists.txt @@ -77,15 +77,15 @@ list(APPEND SOURCE list(APPEND PCH_SKIP_SOURCE testlist.c) -add_executable(win32knt_apitest +add_executable(win32u_apitest ${SOURCE} ${PCH_SKIP_SOURCE} dlihook.c win32knt.rc) -target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools) -set_module_type(win32knt_apitest win32cui) -add_importlibs(win32knt_apitest +target_link_libraries(win32u_apitest ${PSEH_LIB} gditools) +set_module_type(win32u_apitest win32cui) +add_importlibs(win32u_apitest gdi32 user32 shell32 @@ -93,7 +93,7 @@ add_importlibs(win32knt_apitest msvcrt kernel32 ntdll) -add_delay_importlibs(win32knt_apitest win32u imm32) -add_dependencies(win32knt_apitest xdk) -add_pch(win32knt_apitest win32nt.h "${PCH_SKIP_SOURCE}") -add_rostests_file(TARGET win32knt_apitest) +add_delay_importlibs(win32u_apitest win32u imm32) +add_dependencies(win32u_apitest xdk) +add_pch(win32u_apitest win32nt.h "${PCH_SKIP_SOURCE}") +add_rostests_file(TARGET win32u_apitest) diff --git a/modules/rostests/apitests/win32nt/dlihook.c b/modules/rostests/apitests/win32u/dlihook.c similarity index 100% rename from modules/rostests/apitests/win32nt/dlihook.c rename to modules/rostests/apitests/win32u/dlihook.c diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c b/modules/rostests/apitests/win32u/ntdd/NtGdiDdCreateDirectDrawObject.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c rename to modules/rostests/apitests/win32u/ntdd/NtGdiDdCreateDirectDrawObject.c diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c b/modules/rostests/apitests/win32u/ntdd/NtGdiDdDeleteDirectDrawObject.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c rename to modules/rostests/apitests/win32u/ntdd/NtGdiDdDeleteDirectDrawObject.c diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32u/ntdd/NtGdiDdQueryDirectDrawObject.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c rename to modules/rostests/apitests/win32u/ntdd/NtGdiDdQueryDirectDrawObject.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiArcInternal.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiArcInternal.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiBitBlt.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiBitBlt.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiCombineRgn.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiCombineRgn.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiCreateBitmap.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiCreateBitmap.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiCreateCompatibleBitmap.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiCreateCompatibleBitmap.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiCreateCompatibleDC.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiCreateCompatibleDC.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiCreateDIBSection.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiCreateDIBSection.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiDeleteObjectApp.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiDeleteObjectApp.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiDoPalette.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiDoPalette.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiEngCreatePalette.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiEngCreatePalette.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiEnumFontOpen.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiEnumFontOpen.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiExcludeClipRect.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiExcludeClipRect.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiExtSelectClipRgn.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiExtSelectClipRgn.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiExtTextOutW.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiExtTextOutW.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiFlushUserBatch.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiFlushUserBatch.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiGetBitmapBits.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiGetBitmapBits.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiGetDIBits.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiGetDIBits.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiGetFontResourceInfoInternalW.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiGetFontResourceInfoInternalW.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiGetRandomRgn.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiGetRandomRgn.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiGetStockObject.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiGetStockObject.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiIntersectClipRect.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiIntersectClipRect.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiOffsetClipRgn.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiOffsetClipRgn.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiPolyPolyDraw.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiPolyPolyDraw.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiRestoreDC.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiRestoreDC.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiSaveDC.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiSaveDC.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiSelectBitmap.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiSelectBitmap.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiSelectBrush.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiSelectBrush.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiSelectFont.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiSelectFont.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiSelectPen.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiSelectPen.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiSetBitmapBits.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiSetBitmapBits.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiSetDIBitsToDeviceInternal.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiSetDIBitsToDeviceInternal.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c b/modules/rostests/apitests/win32u/ntgdi/NtGdiTransformPoints.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c rename to modules/rostests/apitests/win32u/ntgdi/NtGdiTransformPoints.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c b/modules/rostests/apitests/win32u/ntuser/NtUserCallHwnd.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCallHwnd.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c b/modules/rostests/apitests/win32u/ntuser/NtUserCallHwndLock.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCallHwndLock.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c b/modules/rostests/apitests/win32u/ntuser/NtUserCallHwndOpt.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCallHwndOpt.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c b/modules/rostests/apitests/win32u/ntuser/NtUserCallHwndParam.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCallHwndParam.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c b/modules/rostests/apitests/win32u/ntuser/NtUserCallHwndParamLock.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCallHwndParamLock.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c b/modules/rostests/apitests/win32u/ntuser/NtUserCallNoParam.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCallNoParam.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c b/modules/rostests/apitests/win32u/ntuser/NtUserCallOneParam.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCallOneParam.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c b/modules/rostests/apitests/win32u/ntuser/NtUserCountClipboardFormats.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCountClipboardFormats.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c b/modules/rostests/apitests/win32u/ntuser/NtUserCreateWindowEx.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c rename to modules/rostests/apitests/win32u/ntuser/NtUserCreateWindowEx.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c b/modules/rostests/apitests/win32u/ntuser/NtUserEnumDisplayMonitors.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c rename to modules/rostests/apitests/win32u/ntuser/NtUserEnumDisplayMonitors.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c b/modules/rostests/apitests/win32u/ntuser/NtUserEnumDisplaySettings.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c rename to modules/rostests/apitests/win32u/ntuser/NtUserEnumDisplaySettings.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c b/modules/rostests/apitests/win32u/ntuser/NtUserFindExistingCursorIcon.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c rename to modules/rostests/apitests/win32u/ntuser/NtUserFindExistingCursorIcon.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c b/modules/rostests/apitests/win32u/ntuser/NtUserGetAsyncKeyState.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c rename to modules/rostests/apitests/win32u/ntuser/NtUserGetAsyncKeyState.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c b/modules/rostests/apitests/win32u/ntuser/NtUserGetClassInfo.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c rename to modules/rostests/apitests/win32u/ntuser/NtUserGetClassInfo.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c b/modules/rostests/apitests/win32u/ntuser/NtUserGetIconInfo.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c rename to modules/rostests/apitests/win32u/ntuser/NtUserGetIconInfo.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32u/ntuser/NtUserGetKeyboardLayoutName.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c rename to modules/rostests/apitests/win32u/ntuser/NtUserGetKeyboardLayoutName.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c b/modules/rostests/apitests/win32u/ntuser/NtUserGetThreadState.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c rename to modules/rostests/apitests/win32u/ntuser/NtUserGetThreadState.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c b/modules/rostests/apitests/win32u/ntuser/NtUserGetTitleBarInfo.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c rename to modules/rostests/apitests/win32u/ntuser/NtUserGetTitleBarInfo.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c b/modules/rostests/apitests/win32u/ntuser/NtUserProcessConnect.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c rename to modules/rostests/apitests/win32u/ntuser/NtUserProcessConnect.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c b/modules/rostests/apitests/win32u/ntuser/NtUserRedrawWindow.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c rename to modules/rostests/apitests/win32u/ntuser/NtUserRedrawWindow.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c b/modules/rostests/apitests/win32u/ntuser/NtUserScrollDC.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c rename to modules/rostests/apitests/win32u/ntuser/NtUserScrollDC.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c b/modules/rostests/apitests/win32u/ntuser/NtUserSelectPalette.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c rename to modules/rostests/apitests/win32u/ntuser/NtUserSelectPalette.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c b/modules/rostests/apitests/win32u/ntuser/NtUserSetTimer.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c rename to modules/rostests/apitests/win32u/ntuser/NtUserSetTimer.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32u/ntuser/NtUserSystemParametersInfo.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c rename to modules/rostests/apitests/win32u/ntuser/NtUserSystemParametersInfo.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c b/modules/rostests/apitests/win32u/ntuser/NtUserToUnicodeEx.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c rename to modules/rostests/apitests/win32u/ntuser/NtUserToUnicodeEx.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c b/modules/rostests/apitests/win32u/ntuser/NtUserUpdatePerUserSystemParameters.c similarity index 100% rename from modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c rename to modules/rostests/apitests/win32u/ntuser/NtUserUpdatePerUserSystemParameters.c diff --git a/modules/rostests/apitests/win32nt/osver.c b/modules/rostests/apitests/win32u/osver.c similarity index 100% rename from modules/rostests/apitests/win32nt/osver.c rename to modules/rostests/apitests/win32u/osver.c diff --git a/modules/rostests/apitests/win32nt/resource.h b/modules/rostests/apitests/win32u/resource.h similarity index 100% rename from modules/rostests/apitests/win32nt/resource.h rename to modules/rostests/apitests/win32u/resource.h diff --git a/modules/rostests/apitests/win32nt/resource/system.ico b/modules/rostests/apitests/win32u/resource/system.ico similarity index 100% rename from modules/rostests/apitests/win32nt/resource/system.ico rename to modules/rostests/apitests/win32u/resource/system.ico diff --git a/modules/rostests/apitests/win32nt/testlist.c b/modules/rostests/apitests/win32u/testlist.c similarity index 100% rename from modules/rostests/apitests/win32nt/testlist.c rename to modules/rostests/apitests/win32u/testlist.c diff --git a/modules/rostests/apitests/win32nt/w32knapi.c b/modules/rostests/apitests/win32u/w32knapi.c similarity index 100% rename from modules/rostests/apitests/win32nt/w32knapi.c rename to modules/rostests/apitests/win32u/w32knapi.c diff --git a/modules/rostests/apitests/win32nt/w32knapi.h b/modules/rostests/apitests/win32u/w32knapi.h similarity index 100% rename from modules/rostests/apitests/win32nt/w32knapi.h rename to modules/rostests/apitests/win32u/w32knapi.h diff --git a/modules/rostests/apitests/win32nt/win32knt.rc b/modules/rostests/apitests/win32u/win32knt.rc similarity index 100% rename from modules/rostests/apitests/win32nt/win32knt.rc rename to modules/rostests/apitests/win32u/win32knt.rc diff --git a/modules/rostests/apitests/win32nt/win32nt.h b/modules/rostests/apitests/win32u/win32nt.h similarity index 100% rename from modules/rostests/apitests/win32nt/win32nt.h rename to modules/rostests/apitests/win32u/win32nt.h diff --git a/modules/rostests/apitests/win32nt/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_2k3sp2/CMakeLists.txt rename to modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt diff --git a/modules/rostests/apitests/win32nt/win32u_2k3sp2/main.c b/modules/rostests/apitests/win32u/win32u_2k3sp2/main.c similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_2k3sp2/main.c rename to modules/rostests/apitests/win32u/win32u_2k3sp2/main.c diff --git a/modules/rostests/apitests/win32nt/win32u_2k3sp2/sys-stubs.S b/modules/rostests/apitests/win32u/win32u_2k3sp2/sys-stubs.S similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_2k3sp2/sys-stubs.S rename to modules/rostests/apitests/win32u/win32u_2k3sp2/sys-stubs.S diff --git a/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2-64.h b/modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2-64.h similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2-64.h rename to modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2-64.h diff --git a/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2.h b/modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2.h similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_2k3sp2/win32ksvc-2k3sp2.h rename to modules/rostests/apitests/win32u/win32u_2k3sp2/win32ksvc-2k3sp2.h diff --git a/modules/rostests/apitests/win32nt/win32u_2k3sp2/win32u_2k3sp2.spec b/modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_2k3sp2/win32u_2k3sp2.spec rename to modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec diff --git a/modules/rostests/apitests/win32nt/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_vista/CMakeLists.txt rename to modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt diff --git a/modules/rostests/apitests/win32nt/win32u_vista/main.c b/modules/rostests/apitests/win32u/win32u_vista/main.c similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_vista/main.c rename to modules/rostests/apitests/win32u/win32u_vista/main.c diff --git a/modules/rostests/apitests/win32nt/win32u_vista/sys-stubs.S b/modules/rostests/apitests/win32u/win32u_vista/sys-stubs.S similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_vista/sys-stubs.S rename to modules/rostests/apitests/win32u/win32u_vista/sys-stubs.S diff --git a/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc32.h b/modules/rostests/apitests/win32u/win32u_vista/w32ksvc32.h similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_vista/w32ksvc32.h rename to modules/rostests/apitests/win32u/win32u_vista/w32ksvc32.h diff --git a/modules/rostests/apitests/win32nt/win32u_vista/w32ksvc64.h b/modules/rostests/apitests/win32u/win32u_vista/w32ksvc64.h similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_vista/w32ksvc64.h rename to modules/rostests/apitests/win32u/win32u_vista/w32ksvc64.h diff --git a/modules/rostests/apitests/win32nt/win32u_vista/win32u_vista.spec b/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_vista/win32u_vista.spec rename to modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec diff --git a/modules/rostests/apitests/win32nt/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_xpsp2/CMakeLists.txt rename to modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt diff --git a/modules/rostests/apitests/win32nt/win32u_xpsp2/main.c b/modules/rostests/apitests/win32u/win32u_xpsp2/main.c similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_xpsp2/main.c rename to modules/rostests/apitests/win32u/win32u_xpsp2/main.c diff --git a/modules/rostests/apitests/win32nt/win32u_xpsp2/sys-stubs.S b/modules/rostests/apitests/win32u/win32u_xpsp2/sys-stubs.S similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_xpsp2/sys-stubs.S rename to modules/rostests/apitests/win32u/win32u_xpsp2/sys-stubs.S diff --git a/modules/rostests/apitests/win32nt/win32u_xpsp2/win32ksvc-xp.h b/modules/rostests/apitests/win32u/win32u_xpsp2/win32ksvc-xp.h similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_xpsp2/win32ksvc-xp.h rename to modules/rostests/apitests/win32u/win32u_xpsp2/win32ksvc-xp.h diff --git a/modules/rostests/apitests/win32nt/win32u_xpsp2/win32u_xpsp2.spec b/modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec similarity index 100% rename from modules/rostests/apitests/win32nt/win32u_xpsp2/win32u_xpsp2.spec rename to modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec