From c9842e5aad5d45039dd0dfea2889a5a6d25ca1d4 Mon Sep 17 00:00:00 2001 From: "Carl J. Bialorucki" Date: Tue, 29 Jul 2025 13:57:12 -0600 Subject: [PATCH] Move /sdk/include/reactos/wine to /sdk/include/wine, reorder global includes, remove unneeded includes (#8258) - Move sdk\include\reactos\wine to sdk\include\wine - Reorder the directories in include_directories() to be closer to alphabetical. This should make it easier to determine what global include directories can be removed in the future. --- CMakeLists.txt | 26 ++++++++----------- base/applications/charmap_new/CMakeLists.txt | 2 +- base/applications/rapps/CMakeLists.txt | 2 +- base/applications/wordpad/CMakeLists.txt | 2 -- base/services/rpcss/CMakeLists.txt | 4 +-- base/shell/cmd/CMakeLists.txt | 1 - base/system/expand/CMakeLists.txt | 1 - dll/cpl/usrmgr/CMakeLists.txt | 2 +- dll/directx/wine/amstream/CMakeLists.txt | 2 -- .../wine/d3dcompiler_43/CMakeLists.txt | 2 -- dll/directx/wine/dplay/CMakeLists.txt | 1 - dll/win32/actxprxy/CMakeLists.txt | 1 - dll/win32/avicap32/CMakeLists.txt | 2 +- dll/win32/cryptui/CMakeLists.txt | 2 -- dll/win32/dbghelp/CMakeLists.txt | 2 +- dll/win32/dwmapi/CMakeLists.txt | 2 -- dll/win32/fltlib/CMakeLists.txt | 2 +- dll/win32/getuname/CMakeLists.txt | 1 - dll/win32/imagehlp/CMakeLists.txt | 2 +- dll/win32/iphlpapi/CMakeLists.txt | 2 +- dll/win32/jscript/CMakeLists.txt | 1 - dll/win32/kernelbase/CMakeLists.txt | 2 +- dll/win32/kernelbase/wine/CMakeLists.txt | 2 +- dll/win32/mapi32/CMakeLists.txt | 2 +- dll/win32/mcicda/CMakeLists.txt | 2 +- dll/win32/msacm32.drv/CMakeLists.txt | 1 - dll/win32/msi/CMakeLists.txt | 1 - dll/win32/mspatcha/CMakeLists.txt | 1 - dll/win32/mswsock/CMakeLists.txt | 1 - dll/win32/riched20/CMakeLists.txt | 1 - dll/win32/samlib/CMakeLists.txt | 2 +- dll/win32/setupapi/CMakeLists.txt | 2 +- dll/win32/shdoclc/CMakeLists.txt | 1 - dll/win32/shdocvw/CMakeLists.txt | 2 +- dll/win32/shlwapi/CMakeLists.txt | 2 +- dll/win32/t2embed/CMakeLists.txt | 1 - dll/win32/uxtheme/CMakeLists.txt | 1 - dll/win32/version/CMakeLists.txt | 1 - dll/win32/wbemprox/CMakeLists.txt | 2 +- dll/win32/winmm/CMakeLists.txt | 2 +- dll/win32/winsta/CMakeLists.txt | 2 +- dll/win32/wtsapi32/CMakeLists.txt | 1 - .../rostests/apitests/browseui/CMakeLists.txt | 2 +- .../rostests/apitests/imm32/CMakeLists.txt | 2 -- .../winetests/advapi32/CMakeLists.txt | 2 +- .../rostests/winetests/imm32/CMakeLists.txt | 1 - .../winetests/kernel32/CMakeLists.txt | 2 +- .../winetests/localspl/CMakeLists.txt | 2 +- .../rostests/winetests/localui/CMakeLists.txt | 2 +- .../rostests/winetests/ntdll/CMakeLists.txt | 2 +- .../winetests/oleaut32/CMakeLists.txt | 1 - .../rostests/winetests/oledlg/CMakeLists.txt | 1 - .../rostests/winetests/quartz/CMakeLists.txt | 2 -- .../rostests/winetests/ws2_32/CMakeLists.txt | 2 +- sdk/cmake/set_wine_module.cmake | 8 +++--- sdk/include/CMakeLists.txt | 8 ++++++ sdk/include/host/wine/list.h | 2 +- sdk/include/host/wine/mscvpdb.h | 2 +- sdk/include/host/wine/port.h | 2 +- sdk/include/host/wine/rbtree.h | 2 +- sdk/include/host/wine/rpcfc.h | 2 +- sdk/include/host/wine/wpp.h | 2 +- sdk/include/reactos/CMakeLists.txt | 1 - sdk/include/{reactos => }/wine/CMakeLists.txt | 0 sdk/include/{reactos => }/wine/alloca.h | 0 sdk/include/{reactos => }/wine/asm.h | 0 sdk/include/{reactos => }/wine/atlbase.h | 0 sdk/include/{reactos => }/wine/atlcom.h | 0 sdk/include/{reactos => }/wine/atlwin.h | 0 sdk/include/{reactos => }/wine/commctrl.h | 0 sdk/include/{reactos => }/wine/config.h | 0 sdk/include/{reactos => }/wine/dcetypes.idl | 0 sdk/include/{reactos => }/wine/ddk/compstui.h | 0 sdk/include/{reactos => }/wine/ddk/ntddcdvd.h | 0 sdk/include/{reactos => }/wine/ddk/winddiui.h | 0 sdk/include/{reactos => }/wine/ddk/winsplp.h | 0 sdk/include/{reactos => }/wine/debug.h | 0 sdk/include/{reactos => }/wine/dplaysp.h | 0 sdk/include/{reactos => }/wine/dxdiag.h | 0 sdk/include/{reactos => }/wine/epm.idl | 0 sdk/include/{reactos => }/wine/exception.h | 0 sdk/include/{reactos => }/wine/fil_data.idl | 0 sdk/include/{reactos => }/wine/guiddef.h | 0 sdk/include/{reactos => }/wine/heap.h | 0 sdk/include/{reactos => }/wine/http.h | 0 sdk/include/{reactos => }/wine/irot.idl | 0 sdk/include/{reactos => }/wine/itss.idl | 0 sdk/include/{reactos => }/wine/library.h | 0 sdk/include/{reactos => }/wine/list.h | 0 sdk/include/{reactos => }/wine/msacmdrv.h | 0 sdk/include/{reactos => }/wine/mscvpdb.h | 0 sdk/include/{reactos => }/wine/msvcrt/fcntl.h | 0 sdk/include/{reactos => }/wine/port.h | 0 sdk/include/{reactos => }/wine/rbtree.h | 0 sdk/include/{reactos => }/wine/regex.h | 0 sdk/include/{reactos => }/wine/rpcfc.h | 0 sdk/include/{reactos => }/wine/rpcss_shared.h | 0 sdk/include/{reactos => }/wine/strmbase.h | 0 sdk/include/{reactos => }/wine/test.h | 0 sdk/include/{reactos => }/wine/typeof.h | 0 sdk/include/{reactos => }/wine/unicode.h | 0 sdk/include/{reactos => }/wine/wgl.h | 0 sdk/include/{reactos => }/wine/wgl_driver.h | 0 sdk/include/{reactos => }/wine/wglext.h | 0 sdk/include/{reactos => }/wine/winbase16.h | 0 sdk/include/{reactos => }/wine/windef16.h | 0 .../{reactos => }/wine/wine_common_ver.rc | 0 sdk/include/{reactos => }/wine/wined3d.h | 0 sdk/include/{reactos => }/wine/wingdi16.h | 0 sdk/include/{reactos => }/wine/winioctl.h | 0 sdk/include/{reactos => }/wine/winsock16.h | 0 sdk/include/{reactos => }/wine/winternl.h | 0 sdk/include/{reactos => }/wine/wownt32.h | 0 sdk/include/{reactos => }/wine/wpp.h | 0 sdk/lib/3rdparty/libwine/CMakeLists.txt | 5 ++-- sdk/lib/3rdparty/libwine/debug.c | 13 +--------- sdk/lib/3rdparty/strmbase/CMakeLists.txt | 5 +--- sdk/lib/3rdparty/strmbase/dllfunc.c | 2 +- sdk/lib/3rdparty/strmbase/transform.c | 2 +- sdk/lib/crt/wine/wine.cmake | 2 +- sdk/lib/rtl/CMakeLists.txt | 2 -- sdk/tools/wpp/CMakeLists.txt | 2 +- win32ss/gdi/gdi32/wine/CMakeLists.txt | 2 +- win32ss/user/imm32/CMakeLists.txt | 2 +- win32ss/user/user32/CMakeLists.txt | 2 +- 125 files changed, 69 insertions(+), 114 deletions(-) create mode 100644 sdk/include/CMakeLists.txt rename sdk/include/{reactos => }/wine/CMakeLists.txt (100%) rename sdk/include/{reactos => }/wine/alloca.h (100%) rename sdk/include/{reactos => }/wine/asm.h (100%) rename sdk/include/{reactos => }/wine/atlbase.h (100%) rename sdk/include/{reactos => }/wine/atlcom.h (100%) rename sdk/include/{reactos => }/wine/atlwin.h (100%) rename sdk/include/{reactos => }/wine/commctrl.h (100%) rename sdk/include/{reactos => }/wine/config.h (100%) rename sdk/include/{reactos => }/wine/dcetypes.idl (100%) rename sdk/include/{reactos => }/wine/ddk/compstui.h (100%) rename sdk/include/{reactos => }/wine/ddk/ntddcdvd.h (100%) rename sdk/include/{reactos => }/wine/ddk/winddiui.h (100%) rename sdk/include/{reactos => }/wine/ddk/winsplp.h (100%) rename sdk/include/{reactos => }/wine/debug.h (100%) rename sdk/include/{reactos => }/wine/dplaysp.h (100%) rename sdk/include/{reactos => }/wine/dxdiag.h (100%) rename sdk/include/{reactos => }/wine/epm.idl (100%) rename sdk/include/{reactos => }/wine/exception.h (100%) rename sdk/include/{reactos => }/wine/fil_data.idl (100%) rename sdk/include/{reactos => }/wine/guiddef.h (100%) rename sdk/include/{reactos => }/wine/heap.h (100%) rename sdk/include/{reactos => }/wine/http.h (100%) rename sdk/include/{reactos => }/wine/irot.idl (100%) rename sdk/include/{reactos => }/wine/itss.idl (100%) rename sdk/include/{reactos => }/wine/library.h (100%) rename sdk/include/{reactos => }/wine/list.h (100%) rename sdk/include/{reactos => }/wine/msacmdrv.h (100%) rename sdk/include/{reactos => }/wine/mscvpdb.h (100%) rename sdk/include/{reactos => }/wine/msvcrt/fcntl.h (100%) rename sdk/include/{reactos => }/wine/port.h (100%) rename sdk/include/{reactos => }/wine/rbtree.h (100%) rename sdk/include/{reactos => }/wine/regex.h (100%) rename sdk/include/{reactos => }/wine/rpcfc.h (100%) rename sdk/include/{reactos => }/wine/rpcss_shared.h (100%) rename sdk/include/{reactos => }/wine/strmbase.h (100%) rename sdk/include/{reactos => }/wine/test.h (100%) rename sdk/include/{reactos => }/wine/typeof.h (100%) rename sdk/include/{reactos => }/wine/unicode.h (100%) rename sdk/include/{reactos => }/wine/wgl.h (100%) rename sdk/include/{reactos => }/wine/wgl_driver.h (100%) rename sdk/include/{reactos => }/wine/wglext.h (100%) rename sdk/include/{reactos => }/wine/winbase16.h (100%) rename sdk/include/{reactos => }/wine/windef16.h (100%) rename sdk/include/{reactos => }/wine/wine_common_ver.rc (100%) rename sdk/include/{reactos => }/wine/wined3d.h (100%) rename sdk/include/{reactos => }/wine/wingdi16.h (100%) rename sdk/include/{reactos => }/wine/winioctl.h (100%) rename sdk/include/{reactos => }/wine/winsock16.h (100%) rename sdk/include/{reactos => }/wine/winternl.h (100%) rename sdk/include/{reactos => }/wine/wownt32.h (100%) rename sdk/include/{reactos => }/wine/wpp.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12443da29f1..2ea20aea00e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -320,22 +320,23 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to include_directories( sdk/include + sdk/include/crt + sdk/include/ddk + sdk/include/ndk sdk/include/psdk - sdk/include/dxsdk + sdk/include/reactos + sdk/include/reactos/libs + sdk/include/vcruntime sdk/include/winrt ${REACTOS_BINARY_DIR}/sdk/include ${REACTOS_BINARY_DIR}/sdk/include/psdk - ${REACTOS_BINARY_DIR}/sdk/include/dxsdk ${REACTOS_BINARY_DIR}/sdk/include/ddk + ${REACTOS_BINARY_DIR}/sdk/include/dxsdk ${REACTOS_BINARY_DIR}/sdk/include/reactos ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc - sdk/include/crt - sdk/include/vcruntime - sdk/include/ddk - sdk/include/ndk - sdk/include/reactos - sdk/include/reactos/libs - sdk/lib/pseh/include) + sdk/include/dxsdk + sdk/lib/pseh/include + ) if(ARCH STREQUAL "arm") include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm) @@ -343,12 +344,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to add_dependency_header() - add_subdirectory(sdk/include/ndk/tests) - add_subdirectory(sdk/include/xdk) - add_subdirectory(sdk/include/psdk) - add_subdirectory(sdk/include/dxsdk) - add_subdirectory(sdk/include/reactos) - add_subdirectory(sdk/include/asm) + add_subdirectory(sdk/include) if(ARCH MATCHES "64$") include(sdk/cmake/baseaddress64.cmake) diff --git a/base/applications/charmap_new/CMakeLists.txt b/base/applications/charmap_new/CMakeLists.txt index c9198f5f9b1..50b7a48998e 100644 --- a/base/applications/charmap_new/CMakeLists.txt +++ b/base/applications/charmap_new/CMakeLists.txt @@ -13,7 +13,7 @@ add_library(charmap MODULE charmap.rc) set_module_type(charmap win32gui UNICODE) -target_link_libraries(charmap uuid wine cpprt atl_classes) +target_link_libraries(charmap uuid cpprt atl_classes) set_target_cpp_properties(charmap WITH_EXCEPTIONS WITH_RTTI) add_importlibs(charmap advapi32 user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll) add_pch(charmap precomp.h SOURCE) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index b53f91087af..dc082c60803 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -49,7 +49,7 @@ file(GLOB_RECURSE rapps_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) -target_link_libraries(rapps conutils ${PSEH_LIB} uuid wine cpprt atl_classes minizip zlib) +target_link_libraries(rapps conutils ${PSEH_LIB} uuid cpprt atl_classes minizip zlib) add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi gdiplus msvcrt kernel32 ntdll) add_pch(rapps include/rapps.h SOURCE) add_dependencies(rapps rappsmsg) diff --git a/base/applications/wordpad/CMakeLists.txt b/base/applications/wordpad/CMakeLists.txt index 6d007eafa85..04269758981 100644 --- a/base/applications/wordpad/CMakeLists.txt +++ b/base/applications/wordpad/CMakeLists.txt @@ -1,8 +1,6 @@ remove_definitions(-D_WIN32_IE=0x600) - add_definitions(-D__ROS_LONG64__) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) list(APPEND SOURCE olecallback.c diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index a8141072143..008b3e309cb 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -1,7 +1,7 @@ add_rpc_files(server - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/epm.idl - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/irot.idl) + ${REACTOS_SOURCE_DIR}/sdk/include/wine/epm.idl + ${REACTOS_SOURCE_DIR}/sdk/include/wine/irot.idl) list(APPEND SOURCE diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt index c911bd33888..991bb758c8f 100644 --- a/base/shell/cmd/CMakeLists.txt +++ b/base/shell/cmd/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) list(APPEND SOURCE diff --git a/base/system/expand/CMakeLists.txt b/base/system/expand/CMakeLists.txt index 112b66c624b..826d64e6c29 100644 --- a/base/system/expand/CMakeLists.txt +++ b/base/system/expand/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(expand expand.c expand.rc) set_module_type(expand win32cui) add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll) diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt index 4606e8a1eff..6cb9d3079f9 100644 --- a/dll/cpl/usrmgr/CMakeLists.txt +++ b/dll/cpl/usrmgr/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) spec2def(usrmgr.cpl usrmgr.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/amstream/CMakeLists.txt b/dll/directx/wine/amstream/CMakeLists.txt index 45fd90c3285..8042ef92fb9 100644 --- a/dll/directx/wine/amstream/CMakeLists.txt +++ b/dll/directx/wine/amstream/CMakeLists.txt @@ -1,7 +1,5 @@ add_definitions(-D__WINESRC__) - -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(amstream.dll amstream.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index 210bc3340a9..eb8c09c5b32 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -4,8 +4,6 @@ add_definitions( -D__ROS_LONG64__ -Dstrcasecmp=_stricmp -DDIRECT3D_VERSION=0x0900) - -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/directx/wine/dplay/CMakeLists.txt b/dll/directx/wine/dplay/CMakeLists.txt index fe71c25dd87..ccc359074de 100644 --- a/dll/directx/wine/dplay/CMakeLists.txt +++ b/dll/directx/wine/dplay/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(dplay.dll dplay.spec) add_library(dplay MODULE diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt index 22442e70e0d..0e79b77a30a 100644 --- a/dll/win32/actxprxy/CMakeLists.txt +++ b/dll/win32/actxprxy/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION) spec2def(actxprxy.dll actxprxy.spec) diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt index 75720e4e95e..41f5d89b908 100644 --- a/dll/win32/avicap32/CMakeLists.txt +++ b/dll/win32/avicap32/CMakeLists.txt @@ -1,7 +1,7 @@ spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) add_library(avicap32 MODULE avicap32.c diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt index ea6501c2989..37d5bb503e0 100644 --- a/dll/win32/cryptui/CMakeLists.txt +++ b/dll/win32/cryptui/CMakeLists.txt @@ -2,8 +2,6 @@ add_definitions( -D_WINE -D__ROS_LONG64__) - -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index 6f2e8fc19d0..2a95dafa1b6 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -31,7 +31,7 @@ else() -D_IMAGEHLP_SOURCE_) include_directories( - BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB) diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt index 2c5eb4f0eca..f2684faf486 100644 --- a/dll/win32/dwmapi/CMakeLists.txt +++ b/dll/win32/dwmapi/CMakeLists.txt @@ -1,7 +1,5 @@ add_definitions(-D__WINESRC__) - -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(dwmapi.dll dwmapi.spec) list(APPEND SOURCE diff --git a/dll/win32/fltlib/CMakeLists.txt b/dll/win32/fltlib/CMakeLists.txt index 6c65cd3ae5c..c138c74dfe1 100644 --- a/dll/win32/fltlib/CMakeLists.txt +++ b/dll/win32/fltlib/CMakeLists.txt @@ -4,7 +4,7 @@ spec2def(fltlib.dll fltlib.spec ADD_IMPORTLIB) include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/fltmgr - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine includes) list(APPEND SOURCE diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt index 121c5d02998..a0ea525d38c 100644 --- a/dll/win32/getuname/CMakeLists.txt +++ b/dll/win32/getuname/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(getuname.dll getuname.spec ADD_IMPORTLIB) add_library(getuname MODULE diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt index 717ebf7b504..1ca061585fe 100644 --- a/dll/win32/imagehlp/CMakeLists.txt +++ b/dll/win32/imagehlp/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-D_IMAGEHLP_SOURCE_) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt index 4bd60a87ca0..cb058313b69 100644 --- a/dll/win32/iphlpapi/CMakeLists.txt +++ b/dll/win32/iphlpapi/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include ${REACTOS_SOURCE_DIR}/sdk/lib/tdilib) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index 4f4f9c6b09b..c536ca7daf6 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D__ROS_LONG64__ -D_USE_MATH_DEFINES) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(jscript.dll jscript.spec) list(APPEND SOURCE diff --git a/dll/win32/kernelbase/CMakeLists.txt b/dll/win32/kernelbase/CMakeLists.txt index f6a635981c9..2003de4f6f8 100644 --- a/dll/win32/kernelbase/CMakeLists.txt +++ b/dll/win32/kernelbase/CMakeLists.txt @@ -8,7 +8,7 @@ add_definitions( -D__ROS_LONG64__ -D_KERNELBASE_) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) #add_subdirectory(wine) # TODO: ReactOS Isn't ready for Kernelbase.dll diff --git a/dll/win32/kernelbase/wine/CMakeLists.txt b/dll/win32/kernelbase/wine/CMakeLists.txt index 8a9361c8465..624e440460c 100644 --- a/dll/win32/kernelbase/wine/CMakeLists.txt +++ b/dll/win32/kernelbase/wine/CMakeLists.txt @@ -9,7 +9,7 @@ add_definitions( -Dswprintf=_swprintf -D_KERNELBASE_) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt index 35ba1de4594..66a7082357f 100644 --- a/dll/win32/mapi32/CMakeLists.txt +++ b/dll/win32/mapi32/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) spec2def(mapi32.dll mapi32.spec) list(APPEND SOURCE diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt index 17db5b84874..9919faee1da 100644 --- a/dll/win32/mcicda/CMakeLists.txt +++ b/dll/win32/mcicda/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine) spec2def(mcicda.dll mcicda.spec) list(APPEND SOURCE diff --git a/dll/win32/msacm32.drv/CMakeLists.txt b/dll/win32/msacm32.drv/CMakeLists.txt index 3964c916267..62d197c19e7 100644 --- a/dll/win32/msacm32.drv/CMakeLists.txt +++ b/dll/win32/msacm32.drv/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(msacm32.drv msacm32.drv.spec) add_library(msacm32.drv MODULE diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 82874b70b46..e1c6bde4787 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -2,7 +2,6 @@ remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS) add_definitions(-D_WIN32_WINNT=0x600) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_definitions(-D__WINESRC__ -D__ROS_LONG64__ -DMSIRUNMODE=MSIRUNMODE_T) spec2def(msi.dll msi.spec ADD_IMPORTLIB) generate_idl_iids(msiserver.idl) diff --git a/dll/win32/mspatcha/CMakeLists.txt b/dll/win32/mspatcha/CMakeLists.txt index 129eebdca55..932910b5b8e 100644 --- a/dll/win32/mspatcha/CMakeLists.txt +++ b/dll/win32/mspatcha/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_definitions(-D__WINESRC__) spec2def(mspatcha.dll mspatcha.spec ADD_IMPORTLIB) diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt index 1950ca8192c..643ca7a3197 100644 --- a/dll/win32/mswsock/CMakeLists.txt +++ b/dll/win32/mswsock/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DLE) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(mswsock.dll mswsock.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt index 719b54aa16e..9ff318b9089 100644 --- a/dll/win32/riched20/CMakeLists.txt +++ b/dll/win32/riched20/CMakeLists.txt @@ -1,6 +1,5 @@ remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(riched20.dll riched20.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt index 7cf73e25389..eceb0efaa84 100644 --- a/dll/win32/samlib/CMakeLists.txt +++ b/dll/win32/samlib/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + ${REACTOS_SOURCE_DIR}/sdk/include/wine) add_definitions(-D__WINESRC__) spec2def(samlib.dll samlib.spec ADD_IMPORTLIB) diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt index 70063512fff..55ab2325724 100644 --- a/dll/win32/setupapi/CMakeLists.txt +++ b/dll/win32/setupapi/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/dll/win32/shdoclc/CMakeLists.txt b/dll/win32/shdoclc/CMakeLists.txt index 2e5415585a6..9ca7ce7ab4d 100644 --- a/dll/win32/shdoclc/CMakeLists.txt +++ b/dll/win32/shdoclc/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(shdoclc.dll shdoclc.spec) add_library(shdoclc MODULE diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 6d178708672..782c6beb16b 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(shdocvw MODULE ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) target_include_directories(shdocvw BEFORE PRIVATE - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine ) set_module_type(shdocvw win32dll UNICODE) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index 6bd20ce40d9..3ae16a5531d 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -40,7 +40,7 @@ add_library(shlwapi MODULE # our C++ atlbase.h conflicts with the one from wine, so only use wine includes for C # Unfortunately, we can't use different includes for C & C++ in VS generator, so use an object library to achieve this target_include_directories(shlwapi BEFORE PRIVATE - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine ${REACTOS_SOURCE_DIR}/sdk/lib/atl) add_library(shlwapi_autocomp OBJECT autocomp.cpp) diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt index ecb40360c9f..0d62bc17600 100644 --- a/dll/win32/t2embed/CMakeLists.txt +++ b/dll/win32/t2embed/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(t2embed.dll t2embed.spec) list(APPEND SOURCE diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index e8ea352e7a2..375c1ac3a82 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_definitions(-D__WINESRC__ -D__ROS_LONG64__) if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt index 4b2fb4d00da..02fba3e915c 100644 --- a/dll/win32/version/CMakeLists.txt +++ b/dll/win32/version/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(version.dll version.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt index 7b69cd71f8c..d167042267f 100644 --- a/dll/win32/wbemprox/CMakeLists.txt +++ b/dll/win32/wbemprox/CMakeLists.txt @@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__ -D__ROS_LONG64__) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) spec2def(wbemprox.dll wbemprox.spec) list(APPEND SOURCE diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index 5605be65dda..c4363e20f32 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions(-D_WINE) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) spec2def(winmm.dll winmm.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt index 75769aab709..ab98f2c7c0b 100644 --- a/dll/win32/winsta/CMakeLists.txt +++ b/dll/win32/winsta/CMakeLists.txt @@ -1,7 +1,7 @@ spec2def(winsta.dll winsta.spec) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) list(APPEND SOURCE logon.c diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt index 18b97c1ebfd..be6e536e66b 100644 --- a/dll/win32/wtsapi32/CMakeLists.txt +++ b/dll/win32/wtsapi32/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(wtsapi32.dll wtsapi32.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/modules/rostests/apitests/browseui/CMakeLists.txt b/modules/rostests/apitests/browseui/CMakeLists.txt index c325bf3d423..3306ee7b3b6 100644 --- a/modules/rostests/apitests/browseui/CMakeLists.txt +++ b/modules/rostests/apitests/browseui/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND SOURCE add_executable(browseui_apitest ${SOURCE}) -target_link_libraries(browseui_apitest uuid wine cpprt atl_classes) +target_link_libraries(browseui_apitest uuid cpprt atl_classes) set_target_cpp_properties(browseui_apitest WITH_EXCEPTIONS WITH_RTTI) set_module_type(browseui_apitest win32cui) add_importlibs(browseui_apitest advapi32 shell32 ole32 shlwapi msvcrt user32 kernel32 ntdll) diff --git a/modules/rostests/apitests/imm32/CMakeLists.txt b/modules/rostests/apitests/imm32/CMakeLists.txt index 6af5bb17cda..c2b94a68dd2 100644 --- a/modules/rostests/apitests/imm32/CMakeLists.txt +++ b/modules/rostests/apitests/imm32/CMakeLists.txt @@ -1,6 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) - list(APPEND SOURCE clientimc.c himc.c diff --git a/modules/rostests/winetests/advapi32/CMakeLists.txt b/modules/rostests/winetests/advapi32/CMakeLists.txt index c6b8953189a..bae7f85501a 100644 --- a/modules/rostests/winetests/advapi32/CMakeLists.txt +++ b/modules/rostests/winetests/advapi32/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) list(APPEND SOURCE cred.c diff --git a/modules/rostests/winetests/imm32/CMakeLists.txt b/modules/rostests/winetests/imm32/CMakeLists.txt index 972f443ffe2..b2f70c96478 100644 --- a/modules/rostests/winetests/imm32/CMakeLists.txt +++ b/modules/rostests/winetests/imm32/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(imm32_winetest imm32.c testlist.c) set_module_type(imm32_winetest win32cui) add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32) diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index 29646c7c9b4..32aaa4e0a93 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x601) diff --git a/modules/rostests/winetests/localspl/CMakeLists.txt b/modules/rostests/winetests/localspl/CMakeLists.txt index 975a6c2ecb7..d4a0c7ecce1 100644 --- a/modules/rostests/winetests/localspl/CMakeLists.txt +++ b/modules/rostests/winetests/localspl/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine) add_executable(localspl_winetest localmon.c testlist.c) set_module_type(localspl_winetest win32cui) add_importlibs(localspl_winetest advapi32 msvcrt kernel32) diff --git a/modules/rostests/winetests/localui/CMakeLists.txt b/modules/rostests/winetests/localui/CMakeLists.txt index 93a95863c58..d7647770aba 100644 --- a/modules/rostests/winetests/localui/CMakeLists.txt +++ b/modules/rostests/winetests/localui/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine) add_executable(localui_winetest localui.c testlist.c) set_module_type(localui_winetest win32cui) add_importlibs(localui_winetest winspool msvcrt kernel32) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index dbcf2116039..3a2d7c8c0ae 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) add_definitions(-D__WINESRC__ -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE diff --git a/modules/rostests/winetests/oleaut32/CMakeLists.txt b/modules/rostests/winetests/oleaut32/CMakeLists.txt index 38ed3958cd0..74d155ece22 100644 --- a/modules/rostests/winetests/oleaut32/CMakeLists.txt +++ b/modules/rostests/winetests/oleaut32/CMakeLists.txt @@ -7,7 +7,6 @@ add_definitions( -Dstrcasecmp=_stricmp ) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_typelib(test_reg.idl test_tlb.idl tmarshal.idl) add_idl_Headers(oleaut32_idlheaders test_reg.idl test_tlb.idl tmarshal.idl) generate_idl_iids(test_reg.idl test_tlb.idl tmarshal.idl) diff --git a/modules/rostests/winetests/oledlg/CMakeLists.txt b/modules/rostests/winetests/oledlg/CMakeLists.txt index 83e2ad777ee..2736e809913 100644 --- a/modules/rostests/winetests/oledlg/CMakeLists.txt +++ b/modules/rostests/winetests/oledlg/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DUSE_WINE_TODOS) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(oledlg_winetest main.c testlist.c) set_module_type(oledlg_winetest win32cui) add_importlibs(oledlg_winetest oledlg ole32 user32 msvcrt kernel32) diff --git a/modules/rostests/winetests/quartz/CMakeLists.txt b/modules/rostests/winetests/quartz/CMakeLists.txt index d74b8c5a6c3..6a12885cccb 100644 --- a/modules/rostests/winetests/quartz/CMakeLists.txt +++ b/modules/rostests/winetests/quartz/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) - list(APPEND SOURCE avisplitter.c dsoundrender.c diff --git a/modules/rostests/winetests/ws2_32/CMakeLists.txt b/modules/rostests/winetests/ws2_32/CMakeLists.txt index 092a51e63ed..cbf30cf3156 100644 --- a/modules/rostests/winetests/ws2_32/CMakeLists.txt +++ b/modules/rostests/winetests/ws2_32/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) diff --git a/sdk/cmake/set_wine_module.cmake b/sdk/cmake/set_wine_module.cmake index b2de459878b..60928edc27e 100644 --- a/sdk/cmake/set_wine_module.cmake +++ b/sdk/cmake/set_wine_module.cmake @@ -3,14 +3,14 @@ function(set_wine_module TARGET) include_directories(BEFORE - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine - ${REACTOS_BINARY_DIR}/sdk/include/reactos/wine) + ${REACTOS_SOURCE_DIR}/sdk/include/wine + ${REACTOS_BINARY_DIR}/sdk/include/wine) endfunction() # FIXME: Replace this call with set_wine_module function(set_wine_module_FIXME TARGET) include_directories(BEFORE - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine - ${REACTOS_BINARY_DIR}/sdk/include/reactos/wine) + ${REACTOS_SOURCE_DIR}/sdk/include/wine + ${REACTOS_BINARY_DIR}/sdk/include/wine) target_compile_definitions(${TARGET} PRIVATE __WINESRC__) endfunction() diff --git a/sdk/include/CMakeLists.txt b/sdk/include/CMakeLists.txt new file mode 100644 index 00000000000..766014adc29 --- /dev/null +++ b/sdk/include/CMakeLists.txt @@ -0,0 +1,8 @@ + +add_subdirectory(asm) +add_subdirectory(dxsdk) +add_subdirectory(ndk/tests) +add_subdirectory(psdk) +add_subdirectory(reactos) +add_subdirectory(wine) +add_subdirectory(xdk) diff --git a/sdk/include/host/wine/list.h b/sdk/include/host/wine/list.h index 92cea5bec87..790195fea0d 100644 --- a/sdk/include/host/wine/list.h +++ b/sdk/include/host/wine/list.h @@ -1 +1 @@ -#include "../../reactos/wine/list.h" +#include "../../wine/list.h" diff --git a/sdk/include/host/wine/mscvpdb.h b/sdk/include/host/wine/mscvpdb.h index 531c640f0fc..1ed0eb0c56b 100644 --- a/sdk/include/host/wine/mscvpdb.h +++ b/sdk/include/host/wine/mscvpdb.h @@ -1 +1 @@ -#include "../../reactos/wine/mscvpdb.h" +#include "../../wine/mscvpdb.h" diff --git a/sdk/include/host/wine/port.h b/sdk/include/host/wine/port.h index b5e4bc32be7..81d622d7469 100644 --- a/sdk/include/host/wine/port.h +++ b/sdk/include/host/wine/port.h @@ -1 +1 @@ -#include "../../reactos/wine/port.h" +#include "../../wine/port.h" diff --git a/sdk/include/host/wine/rbtree.h b/sdk/include/host/wine/rbtree.h index d6b34a35712..1559a57a339 100644 --- a/sdk/include/host/wine/rbtree.h +++ b/sdk/include/host/wine/rbtree.h @@ -1,2 +1,2 @@ #include -#include "../../reactos/wine/rbtree.h" +#include "../../wine/rbtree.h" diff --git a/sdk/include/host/wine/rpcfc.h b/sdk/include/host/wine/rpcfc.h index 5f63c64169b..615283e70d5 100644 --- a/sdk/include/host/wine/rpcfc.h +++ b/sdk/include/host/wine/rpcfc.h @@ -1 +1 @@ -#include "../../reactos/wine/rpcfc.h" +#include "../../wine/rpcfc.h" diff --git a/sdk/include/host/wine/wpp.h b/sdk/include/host/wine/wpp.h index ca21eea866c..61eb66fdf06 100644 --- a/sdk/include/host/wine/wpp.h +++ b/sdk/include/host/wine/wpp.h @@ -1 +1 @@ -#include "../../reactos/wine/wpp.h" +#include "../../wine/wpp.h" diff --git a/sdk/include/reactos/CMakeLists.txt b/sdk/include/reactos/CMakeLists.txt index aeb83a59233..e8d30de02fd 100644 --- a/sdk/include/reactos/CMakeLists.txt +++ b/sdk/include/reactos/CMakeLists.txt @@ -1,5 +1,4 @@ -add_subdirectory(wine) add_subdirectory(mc) add_definitions(-D_MIDL_USE_GUIDDEF_) diff --git a/sdk/include/reactos/wine/CMakeLists.txt b/sdk/include/wine/CMakeLists.txt similarity index 100% rename from sdk/include/reactos/wine/CMakeLists.txt rename to sdk/include/wine/CMakeLists.txt diff --git a/sdk/include/reactos/wine/alloca.h b/sdk/include/wine/alloca.h similarity index 100% rename from sdk/include/reactos/wine/alloca.h rename to sdk/include/wine/alloca.h diff --git a/sdk/include/reactos/wine/asm.h b/sdk/include/wine/asm.h similarity index 100% rename from sdk/include/reactos/wine/asm.h rename to sdk/include/wine/asm.h diff --git a/sdk/include/reactos/wine/atlbase.h b/sdk/include/wine/atlbase.h similarity index 100% rename from sdk/include/reactos/wine/atlbase.h rename to sdk/include/wine/atlbase.h diff --git a/sdk/include/reactos/wine/atlcom.h b/sdk/include/wine/atlcom.h similarity index 100% rename from sdk/include/reactos/wine/atlcom.h rename to sdk/include/wine/atlcom.h diff --git a/sdk/include/reactos/wine/atlwin.h b/sdk/include/wine/atlwin.h similarity index 100% rename from sdk/include/reactos/wine/atlwin.h rename to sdk/include/wine/atlwin.h diff --git a/sdk/include/reactos/wine/commctrl.h b/sdk/include/wine/commctrl.h similarity index 100% rename from sdk/include/reactos/wine/commctrl.h rename to sdk/include/wine/commctrl.h diff --git a/sdk/include/reactos/wine/config.h b/sdk/include/wine/config.h similarity index 100% rename from sdk/include/reactos/wine/config.h rename to sdk/include/wine/config.h diff --git a/sdk/include/reactos/wine/dcetypes.idl b/sdk/include/wine/dcetypes.idl similarity index 100% rename from sdk/include/reactos/wine/dcetypes.idl rename to sdk/include/wine/dcetypes.idl diff --git a/sdk/include/reactos/wine/ddk/compstui.h b/sdk/include/wine/ddk/compstui.h similarity index 100% rename from sdk/include/reactos/wine/ddk/compstui.h rename to sdk/include/wine/ddk/compstui.h diff --git a/sdk/include/reactos/wine/ddk/ntddcdvd.h b/sdk/include/wine/ddk/ntddcdvd.h similarity index 100% rename from sdk/include/reactos/wine/ddk/ntddcdvd.h rename to sdk/include/wine/ddk/ntddcdvd.h diff --git a/sdk/include/reactos/wine/ddk/winddiui.h b/sdk/include/wine/ddk/winddiui.h similarity index 100% rename from sdk/include/reactos/wine/ddk/winddiui.h rename to sdk/include/wine/ddk/winddiui.h diff --git a/sdk/include/reactos/wine/ddk/winsplp.h b/sdk/include/wine/ddk/winsplp.h similarity index 100% rename from sdk/include/reactos/wine/ddk/winsplp.h rename to sdk/include/wine/ddk/winsplp.h diff --git a/sdk/include/reactos/wine/debug.h b/sdk/include/wine/debug.h similarity index 100% rename from sdk/include/reactos/wine/debug.h rename to sdk/include/wine/debug.h diff --git a/sdk/include/reactos/wine/dplaysp.h b/sdk/include/wine/dplaysp.h similarity index 100% rename from sdk/include/reactos/wine/dplaysp.h rename to sdk/include/wine/dplaysp.h diff --git a/sdk/include/reactos/wine/dxdiag.h b/sdk/include/wine/dxdiag.h similarity index 100% rename from sdk/include/reactos/wine/dxdiag.h rename to sdk/include/wine/dxdiag.h diff --git a/sdk/include/reactos/wine/epm.idl b/sdk/include/wine/epm.idl similarity index 100% rename from sdk/include/reactos/wine/epm.idl rename to sdk/include/wine/epm.idl diff --git a/sdk/include/reactos/wine/exception.h b/sdk/include/wine/exception.h similarity index 100% rename from sdk/include/reactos/wine/exception.h rename to sdk/include/wine/exception.h diff --git a/sdk/include/reactos/wine/fil_data.idl b/sdk/include/wine/fil_data.idl similarity index 100% rename from sdk/include/reactos/wine/fil_data.idl rename to sdk/include/wine/fil_data.idl diff --git a/sdk/include/reactos/wine/guiddef.h b/sdk/include/wine/guiddef.h similarity index 100% rename from sdk/include/reactos/wine/guiddef.h rename to sdk/include/wine/guiddef.h diff --git a/sdk/include/reactos/wine/heap.h b/sdk/include/wine/heap.h similarity index 100% rename from sdk/include/reactos/wine/heap.h rename to sdk/include/wine/heap.h diff --git a/sdk/include/reactos/wine/http.h b/sdk/include/wine/http.h similarity index 100% rename from sdk/include/reactos/wine/http.h rename to sdk/include/wine/http.h diff --git a/sdk/include/reactos/wine/irot.idl b/sdk/include/wine/irot.idl similarity index 100% rename from sdk/include/reactos/wine/irot.idl rename to sdk/include/wine/irot.idl diff --git a/sdk/include/reactos/wine/itss.idl b/sdk/include/wine/itss.idl similarity index 100% rename from sdk/include/reactos/wine/itss.idl rename to sdk/include/wine/itss.idl diff --git a/sdk/include/reactos/wine/library.h b/sdk/include/wine/library.h similarity index 100% rename from sdk/include/reactos/wine/library.h rename to sdk/include/wine/library.h diff --git a/sdk/include/reactos/wine/list.h b/sdk/include/wine/list.h similarity index 100% rename from sdk/include/reactos/wine/list.h rename to sdk/include/wine/list.h diff --git a/sdk/include/reactos/wine/msacmdrv.h b/sdk/include/wine/msacmdrv.h similarity index 100% rename from sdk/include/reactos/wine/msacmdrv.h rename to sdk/include/wine/msacmdrv.h diff --git a/sdk/include/reactos/wine/mscvpdb.h b/sdk/include/wine/mscvpdb.h similarity index 100% rename from sdk/include/reactos/wine/mscvpdb.h rename to sdk/include/wine/mscvpdb.h diff --git a/sdk/include/reactos/wine/msvcrt/fcntl.h b/sdk/include/wine/msvcrt/fcntl.h similarity index 100% rename from sdk/include/reactos/wine/msvcrt/fcntl.h rename to sdk/include/wine/msvcrt/fcntl.h diff --git a/sdk/include/reactos/wine/port.h b/sdk/include/wine/port.h similarity index 100% rename from sdk/include/reactos/wine/port.h rename to sdk/include/wine/port.h diff --git a/sdk/include/reactos/wine/rbtree.h b/sdk/include/wine/rbtree.h similarity index 100% rename from sdk/include/reactos/wine/rbtree.h rename to sdk/include/wine/rbtree.h diff --git a/sdk/include/reactos/wine/regex.h b/sdk/include/wine/regex.h similarity index 100% rename from sdk/include/reactos/wine/regex.h rename to sdk/include/wine/regex.h diff --git a/sdk/include/reactos/wine/rpcfc.h b/sdk/include/wine/rpcfc.h similarity index 100% rename from sdk/include/reactos/wine/rpcfc.h rename to sdk/include/wine/rpcfc.h diff --git a/sdk/include/reactos/wine/rpcss_shared.h b/sdk/include/wine/rpcss_shared.h similarity index 100% rename from sdk/include/reactos/wine/rpcss_shared.h rename to sdk/include/wine/rpcss_shared.h diff --git a/sdk/include/reactos/wine/strmbase.h b/sdk/include/wine/strmbase.h similarity index 100% rename from sdk/include/reactos/wine/strmbase.h rename to sdk/include/wine/strmbase.h diff --git a/sdk/include/reactos/wine/test.h b/sdk/include/wine/test.h similarity index 100% rename from sdk/include/reactos/wine/test.h rename to sdk/include/wine/test.h diff --git a/sdk/include/reactos/wine/typeof.h b/sdk/include/wine/typeof.h similarity index 100% rename from sdk/include/reactos/wine/typeof.h rename to sdk/include/wine/typeof.h diff --git a/sdk/include/reactos/wine/unicode.h b/sdk/include/wine/unicode.h similarity index 100% rename from sdk/include/reactos/wine/unicode.h rename to sdk/include/wine/unicode.h diff --git a/sdk/include/reactos/wine/wgl.h b/sdk/include/wine/wgl.h similarity index 100% rename from sdk/include/reactos/wine/wgl.h rename to sdk/include/wine/wgl.h diff --git a/sdk/include/reactos/wine/wgl_driver.h b/sdk/include/wine/wgl_driver.h similarity index 100% rename from sdk/include/reactos/wine/wgl_driver.h rename to sdk/include/wine/wgl_driver.h diff --git a/sdk/include/reactos/wine/wglext.h b/sdk/include/wine/wglext.h similarity index 100% rename from sdk/include/reactos/wine/wglext.h rename to sdk/include/wine/wglext.h diff --git a/sdk/include/reactos/wine/winbase16.h b/sdk/include/wine/winbase16.h similarity index 100% rename from sdk/include/reactos/wine/winbase16.h rename to sdk/include/wine/winbase16.h diff --git a/sdk/include/reactos/wine/windef16.h b/sdk/include/wine/windef16.h similarity index 100% rename from sdk/include/reactos/wine/windef16.h rename to sdk/include/wine/windef16.h diff --git a/sdk/include/reactos/wine/wine_common_ver.rc b/sdk/include/wine/wine_common_ver.rc similarity index 100% rename from sdk/include/reactos/wine/wine_common_ver.rc rename to sdk/include/wine/wine_common_ver.rc diff --git a/sdk/include/reactos/wine/wined3d.h b/sdk/include/wine/wined3d.h similarity index 100% rename from sdk/include/reactos/wine/wined3d.h rename to sdk/include/wine/wined3d.h diff --git a/sdk/include/reactos/wine/wingdi16.h b/sdk/include/wine/wingdi16.h similarity index 100% rename from sdk/include/reactos/wine/wingdi16.h rename to sdk/include/wine/wingdi16.h diff --git a/sdk/include/reactos/wine/winioctl.h b/sdk/include/wine/winioctl.h similarity index 100% rename from sdk/include/reactos/wine/winioctl.h rename to sdk/include/wine/winioctl.h diff --git a/sdk/include/reactos/wine/winsock16.h b/sdk/include/wine/winsock16.h similarity index 100% rename from sdk/include/reactos/wine/winsock16.h rename to sdk/include/wine/winsock16.h diff --git a/sdk/include/reactos/wine/winternl.h b/sdk/include/wine/winternl.h similarity index 100% rename from sdk/include/reactos/wine/winternl.h rename to sdk/include/wine/winternl.h diff --git a/sdk/include/reactos/wine/wownt32.h b/sdk/include/wine/wownt32.h similarity index 100% rename from sdk/include/reactos/wine/wownt32.h rename to sdk/include/wine/wownt32.h diff --git a/sdk/include/reactos/wine/wpp.h b/sdk/include/wine/wpp.h similarity index 100% rename from sdk/include/reactos/wine/wpp.h rename to sdk/include/wine/wpp.h diff --git a/sdk/lib/3rdparty/libwine/CMakeLists.txt b/sdk/lib/3rdparty/libwine/CMakeLists.txt index 4bd0ef625c2..014ce9d242c 100644 --- a/sdk/lib/3rdparty/libwine/CMakeLists.txt +++ b/sdk/lib/3rdparty/libwine/CMakeLists.txt @@ -1,6 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) - list(APPEND SOURCE config.c debug_ros.c @@ -17,11 +15,14 @@ list(APPEND SOURCE add_library(wine ${SOURCE}) add_dependencies(wine psdk) target_compile_definitions(wine PRIVATE __WINESRC__ _WINE) +target_include_directories(wine BEFORE PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/wine) add_library(wineldr loader.c) add_dependencies(wineldr xdk) target_compile_definitions(wineldr PRIVATE __WINESRC__) +target_include_directories(wineldr BEFORE PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/wine) add_library(wine_dll_register dll_register.c ${SOURCE}) add_dependencies(wine_dll_register psdk) target_compile_definitions(wine_dll_register PRIVATE __WINESRC__ _WINE) +target_include_directories(wine_dll_register BEFORE PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/wine) diff --git a/sdk/lib/3rdparty/libwine/debug.c b/sdk/lib/3rdparty/libwine/debug.c index b4814e63698..f272bd1814a 100644 --- a/sdk/lib/3rdparty/libwine/debug.c +++ b/sdk/lib/3rdparty/libwine/debug.c @@ -32,22 +32,11 @@ #include "wine/debug.h" #include "wine/library.h" -#include -#include +#include "winternl.h" WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(tid); -ULONG -NTAPI -vDbgPrintExWithPrefix( - IN LPCSTR Prefix, - IN ULONG ComponentId, - IN ULONG Level, - IN LPCSTR Format, - IN va_list ap); - - static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; #define MAX_DEBUG_OPTIONS 256 diff --git a/sdk/lib/3rdparty/strmbase/CMakeLists.txt b/sdk/lib/3rdparty/strmbase/CMakeLists.txt index efc95b8ba93..1c447fd378b 100644 --- a/sdk/lib/3rdparty/strmbase/CMakeLists.txt +++ b/sdk/lib/3rdparty/strmbase/CMakeLists.txt @@ -1,9 +1,6 @@ remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) -add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) - -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600 -D__WINESRC__) list(APPEND SOURCE audio.c diff --git a/sdk/lib/3rdparty/strmbase/dllfunc.c b/sdk/lib/3rdparty/strmbase/dllfunc.c index 195a4097ee9..3232800e28d 100644 --- a/sdk/lib/3rdparty/strmbase/dllfunc.c +++ b/sdk/lib/3rdparty/strmbase/dllfunc.c @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include "wine/config.h" #include #include diff --git a/sdk/lib/3rdparty/strmbase/transform.c b/sdk/lib/3rdparty/strmbase/transform.c index accb4f1702d..d1b61a5b9a4 100644 --- a/sdk/lib/3rdparty/strmbase/transform.c +++ b/sdk/lib/3rdparty/strmbase/transform.c @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include "wine/config.h" #include #define COBJMACROS diff --git a/sdk/lib/crt/wine/wine.cmake b/sdk/lib/crt/wine/wine.cmake index f279fe8bc72..70d3eb0ac4a 100644 --- a/sdk/lib/crt/wine/wine.cmake +++ b/sdk/lib/crt/wine/wine.cmake @@ -28,6 +28,6 @@ elseif(ARCH STREQUAL "arm64") endif() # includes for wine code -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine) #set_source_files_properties(${CRT_WINE_SOURCE} PROPERTIES INCLUDE_DIRECTORIES) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 31839377f03..9548596df68 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -13,8 +13,6 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options(-Wno-missing-braces) endif() -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) - list(APPEND RTL_WINE_SOURCE actctx.c timerqueue.c diff --git a/sdk/tools/wpp/CMakeLists.txt b/sdk/tools/wpp/CMakeLists.txt index 7802b8debeb..8722016491d 100644 --- a/sdk/tools/wpp/CMakeLists.txt +++ b/sdk/tools/wpp/CMakeLists.txt @@ -32,7 +32,7 @@ if(CMAKE_CROSSCOMPILING) -Dstrtoll=_strtoi64 -Dopen=_open -Dclose=_close) - include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine) endif() FLEX_TARGET(pp_scanner ppl.l ${CMAKE_CURRENT_BINARY_DIR}/ppl.yy.c) diff --git a/win32ss/gdi/gdi32/wine/CMakeLists.txt b/win32ss/gdi/gdi32/wine/CMakeLists.txt index 387b224e4c8..62ae7a72c15 100644 --- a/win32ss/gdi/gdi32/wine/CMakeLists.txt +++ b/win32ss/gdi/gdi32/wine/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine ${REACTOS_SOURCE_DIR}/win32ss/include ../include .) diff --git a/win32ss/user/imm32/CMakeLists.txt b/win32ss/user/imm32/CMakeLists.txt index 1ac821559a0..bd52ed0e6fe 100644 --- a/win32ss/user/imm32/CMakeLists.txt +++ b/win32ss/user/imm32/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine ${REACTOS_SOURCE_DIR}/win32ss/include) spec2def(imm32.dll imm32.spec ADD_IMPORTLIB) diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt index bb9513dfdbe..084df2155b0 100644 --- a/win32ss/user/user32/CMakeLists.txt +++ b/win32ss/user/user32/CMakeLists.txt @@ -4,7 +4,7 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB) include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys include - ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/sdk/include/wine ${REACTOS_SOURCE_DIR}/win32ss/include ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libpng)