https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ed186763268516b2c44de...
commit 5ed186763268516b2c44de5c8ee7b65affa53a4c Author: Hervé Poussineau hpoussin@reactos.org AuthorDate: Thu Mar 26 14:40:39 2020 +0100 Commit: Hervé Poussineau hpoussin@reactos.org CommitDate: Thu Mar 26 16:39:16 2020 +0100
[CMAKE] Add some -D__ROS_LONG64__ to please gcc x64
We can now pass a UINT* to a function wanting a DWORD* --- dll/directx/wine/d3d8/CMakeLists.txt | 1 + dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 1 + dll/directx/wine/d3dx9_36/d3dx9.cmake | 1 + dll/directx/wine/ddraw/CMakeLists.txt | 1 + dll/directx/wine/wined3d/CMakeLists.txt | 1 + dll/win32/comctl32/CMakeLists.txt | 1 + dll/win32/crypt32/CMakeLists.txt | 1 + dll/win32/gdiplus/CMakeLists.txt | 1 + dll/win32/inetmib1/CMakeLists.txt | 2 +- dll/win32/itss/CMakeLists.txt | 2 +- dll/win32/jscript/CMakeLists.txt | 1 + dll/win32/mshtml/CMakeLists.txt | 1 + dll/win32/msi/CMakeLists.txt | 2 +- dll/win32/msxml3/CMakeLists.txt | 1 + dll/win32/ole32/CMakeLists.txt | 1 + dll/win32/oleaut32/CMakeLists.txt | 1 + dll/win32/riched20/CMakeLists.txt | 2 +- dll/win32/scrrun/CMakeLists.txt | 2 +- dll/win32/uxtheme/CMakeLists.txt | 2 +- dll/win32/vbscript/CMakeLists.txt | 2 +- dll/win32/wbemprox/CMakeLists.txt | 2 +- dll/win32/windowscodecs/CMakeLists.txt | 1 + 22 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt index d3d49e2e76d..98a24bbc5e6 100644 --- a/dll/directx/wine/d3d8/CMakeLists.txt +++ b/dll/directx/wine/d3d8/CMakeLists.txt @@ -1,6 +1,7 @@
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index a036c7ea3e6..c651fb51b02 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -1,6 +1,7 @@
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DDIRECT3D_VERSION=0x0900)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/directx/wine/d3dx9_36/d3dx9.cmake b/dll/directx/wine/d3dx9_36/d3dx9.cmake index 900a8bfe887..80fb5d807ab 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9.cmake +++ b/dll/directx/wine/d3dx9_36/d3dx9.cmake @@ -32,6 +32,7 @@ function(add_d3dx9_target __version) ${CMAKE_CURRENT_BINARY_DIR}/${module}_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/${module}.def)
+ add_definitions(-D__ROS_LONG64__) set_module_type(${module} win32dll) add_dependencies(${module} d3d_idl_headers) target_link_libraries(${module} dxguid wine) diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt index 03029bdc8f9..cd501d5d19b 100644 --- a/dll/directx/wine/ddraw/CMakeLists.txt +++ b/dll/directx/wine/ddraw/CMakeLists.txt @@ -1,6 +1,7 @@
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 29b337e3bd1..e00033ea397 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -3,6 +3,7 @@ add_definitions( -D__WINESRC__ -D_USE_MATH_DEFINES -DUSE_WIN32_OPENGL + -D__ROS_LONG64__ -Dcopysignf=_copysignf)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index f6f22daa569..b47f7646bee 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -2,6 +2,7 @@ add_definitions( -D__WINESRC__ -D_WINE + -D__ROS_LONG64__ -D_COMCTL32_)
remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index b00ef45ed70..5c2a93cb9cc 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_WINE -D_CRYPT32_)
diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index 172089123a4..11fe7ee2eed 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -1,6 +1,7 @@
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_USE_MATH_DEFINES)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt index 08c1b0a83fb..85bbeea6d88 100644 --- a/dll/win32/inetmib1/CMakeLists.txt +++ b/dll/win32/inetmib1/CMakeLists.txt @@ -1,5 +1,5 @@
-add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(inetmib1.dll inetmib1.spec)
diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt index 63cefe61bfc..92a01fe9b32 100644 --- a/dll/win32/itss/CMakeLists.txt +++ b/dll/win32/itss/CMakeLists.txt @@ -1,5 +1,5 @@
-add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(itss.dll itss.spec)
diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index 826800bacf9..b6f5c42be10 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -1,6 +1,7 @@
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_USE_MATH_DEFINES)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 08e23da71b4..05ad532c9fb 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DCOM_NO_WINDOWS_H)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index e4f586db632..10306ca814a 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) +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/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index e61ac57f6cd..3cb5997af3b 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -1,6 +1,7 @@
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -D_WINE -DLIBXML_STATIC -DCOM_NO_WINDOWS_H) diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt index c0b2f2007a2..6ef97f4402b 100644 --- a/dll/win32/ole32/CMakeLists.txt +++ b/dll/win32/ole32/CMakeLists.txt @@ -5,6 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ -D_OLE32_ + -D__ROS_LONG64__ -DCOM_NO_WINDOWS_H -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt index 30a18b9baa7..6a1523077ba 100644 --- a/dll/win32/oleaut32/CMakeLists.txt +++ b/dll/win32/oleaut32/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DCOM_NO_WINDOWS_H -D_OLEAUT32_ -DPROXY_DELEGATION diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt index 11e185983e6..b61a49dfa06 100644 --- a/dll/win32/riched20/CMakeLists.txt +++ b/dll/win32/riched20/CMakeLists.txt @@ -1,5 +1,5 @@
-add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(riched20.dll riched20.spec ADD_IMPORTLIB)
diff --git a/dll/win32/scrrun/CMakeLists.txt b/dll/win32/scrrun/CMakeLists.txt index 791cb93bb65..7dbc453faa8 100644 --- a/dll/win32/scrrun/CMakeLists.txt +++ b/dll/win32/scrrun/CMakeLists.txt @@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) spec2def(scrrun.dll scrrun.spec) add_idl_headers(scrrun_idlheader scrrun.idl) add_typelib(scrrun.idl) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index 80d31bf44c7..37fefc5b7fa 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) spec2def(uxtheme.dll uxtheme.spec ADD_IMPORTLIB)
list(APPEND SOURCE diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt index b95e66abae6..63b97198d87 100644 --- a/dll/win32/vbscript/CMakeLists.txt +++ b/dll/win32/vbscript/CMakeLists.txt @@ -1,5 +1,5 @@
-add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(vbscript.dll vbscript.spec)
diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt index 3f48d3e6d5c..5d477dfe45d 100644 --- a/dll/win32/wbemprox/CMakeLists.txt +++ b/dll/win32/wbemprox/CMakeLists.txt @@ -2,7 +2,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -D__ROS_LONG64__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(wbemprox.dll wbemprox.spec)
diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index 611334ac2d5..e17a657c213 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -1,6 +1,7 @@
add_definitions( -D__WINESRC__ + -D__ROS_LONG64__ -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL)
-
Hervé Poussineau