include: Add support for defining Win32 types as 'long' where possible.

Add -DWINE_NO_LONG_TYPES to modules that still have compilation warnings with long types. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-01-21 18:28:43 +01:00 · 2022-01-21 18:28:43 +01:00 · f0cd33c69e
parent baebd3c14f
commit f0cd33c69e
749 changed files with 755 additions and 128 deletions
--- a/dlls/acledit/Makefile.in
+++ b/dlls/acledit/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = acledit.dll

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/aclui/Makefile.in
+++ b/dlls/aclui/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = aclui.dll
 IMPORTLIB = aclui
 IMPORTS   = comctl32 user32 advapi32 gdi32
--- a/dlls/activeds/Makefile.in
+++ b/dlls/activeds/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = activeds.dll
 IMPORTLIB = activeds
 IMPORTS   = advapi32 ole32 oleaut32 uuid
--- a/dlls/activeds/tests/Makefile.in
+++ b/dlls/activeds/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = activeds.dll
 IMPORTS   = ole32 oleaut32 activeds

--- a/dlls/actxprxy/Makefile.in
+++ b/dlls/actxprxy/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = actxprxy.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4

--- a/dlls/adsldp/Makefile.in
+++ b/dlls/adsldp/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = adsldp.dll
 IMPORTS   = ole32 oleaut32 secur32 activeds uuid
 DELAYIMPORTS = netapi32 wldap32
--- a/dlls/adsldp/tests/Makefile.in
+++ b/dlls/adsldp/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = adsldp.dll
 IMPORTS   = ole32 oleaut32 secur32 advapi32 activeds uuid

--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_ADVAPI32_
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ADVAPI32_
 MODULE    = advapi32.dll
 IMPORTLIB = advapi32
 IMPORTS   = kernelbase sechost msvcrt
--- a/dlls/advapi32/tests/Makefile.in
+++ b/dlls/advapi32/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = advapi32.dll
 IMPORTS   = ole32 advapi32

--- a/dlls/advpack/Makefile.in
+++ b/dlls/advpack/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = advpack.dll
 IMPORTLIB = advpack
 IMPORTS   = ole32 setupapi version advapi32
--- a/dlls/advpack/tests/Makefile.in
+++ b/dlls/advpack/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = advpack.dll
 IMPORTS   = cabinet advapi32 advpack

--- a/dlls/amsi/Makefile.in
+++ b/dlls/amsi/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = amsi.dll

 C_SRCS = \
--- a/dlls/amstream/Makefile.in
+++ b/dlls/amstream/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = amstream.dll
 IMPORTS   = strmiids strmbase uuid ole32 advapi32 ddraw

--- a/dlls/amstream/tests/Makefile.in
+++ b/dlls/amstream/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = amstream.dll
 IMPORTS   = strmbase strmiids uuid ddraw ole32 user32

--- a/dlls/apphelp/Makefile.in
+++ b/dlls/apphelp/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = apphelp.dll

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/apphelp/tests/Makefile.in
+++ b/dlls/apphelp/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = apphelp.dll
 IMPORTS   = ole32

--- a/dlls/appwiz.cpl/Makefile.in
+++ b/dlls/appwiz.cpl/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = appwiz.cpl
 IMPORTS   = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt kernelbase
 DELAYIMPORTS = msi
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@ -1,7 +1,7 @@
 MODULE    = atl.dll
 IMPORTLIB = atl
 IMPORTS   = uuid oleaut32 ole32 user32 gdi32 advapi32 shlwapi
-EXTRADEFS = -D_ATL_VER=_ATL_VER_30
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ATL_VER=_ATL_VER_30

 C_SRCS = \
 	atl.c \
--- a/dlls/atl/tests/Makefile.in
+++ b/dlls/atl/tests/Makefile.in
@ -1,6 +1,6 @@
 TESTDLL   = atl.dll
 IMPORTS   = uuid atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
-EXTRADEFS = -D_ATL_VER=_ATL_VER_30
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ATL_VER=_ATL_VER_30

 C_SRCS = \
 	atl_ax.c \
--- a/dlls/atl100/Makefile.in
+++ b/dlls/atl100/Makefile.in
@ -1,7 +1,7 @@
 MODULE    = atl100.dll
 IMPORTLIB = atl100
 IMPORTS   = uuid ole32 oleaut32 user32 gdi32 advapi32 shlwapi
-EXTRADEFS = -D_ATL_VER=_ATL_VER_100
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ATL_VER=_ATL_VER_100
 PARENTSRC = ../atl

 C_SRCS = \
--- a/dlls/atl100/tests/Makefile.in
+++ b/dlls/atl100/tests/Makefile.in
@ -1,6 +1,6 @@
 TESTDLL   = atl100.dll
 IMPORTS   = uuid atl100 oleaut32 ole32 advapi32 user32
-EXTRADEFS = -D_ATL_VER=_ATL_VER_100
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ATL_VER=_ATL_VER_100

 C_SRCS = \
 	atl.c
--- a/dlls/atl110/Makefile.in
+++ b/dlls/atl110/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = atl110.dll
 IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32 uuid shlwapi
-EXTRADEFS = -D_ATL_VER=_ATL_VER_110
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ATL_VER=_ATL_VER_110
 PARENTSRC = ../atl

 C_SRCS = \
--- a/dlls/atl80/Makefile.in
+++ b/dlls/atl80/Makefile.in
@ -1,7 +1,7 @@
 MODULE    = atl80.dll
 IMPORTLIB = atl80
 IMPORTS   = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi
-EXTRADEFS = -D_ATL_VER=_ATL_VER_80
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ATL_VER=_ATL_VER_80
 PARENTSRC = ../atl

 C_SRCS = \
--- a/dlls/atl90/Makefile.in
+++ b/dlls/atl90/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = atl90.dll
 IMPORTS   = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi
-EXTRADEFS = -D_ATL_VER=_ATL_VER_90
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_ATL_VER=_ATL_VER_90
 PARENTSRC = ../atl

 C_SRCS = \
--- a/dlls/atlthunk/tests/Makefile.in
+++ b/dlls/atlthunk/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = atlthunk.dll
 IMPORTS   = atlthunk

--- a/dlls/authz/Makefile.in
+++ b/dlls/authz/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = authz.dll

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/avicap32/Makefile.in
+++ b/dlls/avicap32/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = avicap32.dll
 UNIXLIB   = avicap32.so
 IMPORTLIB = avicap32
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = avifil32.dll
 IMPORTLIB = avifil32
 IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
--- a/dlls/avifil32/tests/Makefile.in
+++ b/dlls/avifil32/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = avifil32.dll
 IMPORTS   = avifil32 ole32

--- a/dlls/bcrypt/Makefile.in
+++ b/dlls/bcrypt/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = bcrypt.dll
 IMPORTS   = advapi32
 IMPORTLIB = bcrypt
--- a/dlls/bcrypt/tests/Makefile.in
+++ b/dlls/bcrypt/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL  = bcrypt.dll
 IMPORTS  = bcrypt user32 advapi32

--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = browseui.dll
 IMPORTS   = uuid ole32 comctl32 user32 advapi32

--- a/dlls/browseui/tests/Makefile.in
+++ b/dlls/browseui/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = browseui.dll
 IMPORTS   = ole32

--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cabinet.dll
 IMPORTLIB = cabinet
 IMPORTS   = $(ZLIB_PE_LIBS)
--- a/dlls/cabinet/tests/Makefile.in
+++ b/dlls/cabinet/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = cabinet.dll
 IMPORTS   = cabinet

--- a/dlls/capi2032/Makefile.in
+++ b/dlls/capi2032/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = capi2032.dll
 UNIXLIB   = capi2032.so
 IMPORTLIB = capi2032
--- a/dlls/cards/Makefile.in
+++ b/dlls/cards/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cards.dll
 IMPORTLIB = cards
 IMPORTS   = user32 gdi32
--- a/dlls/clusapi/Makefile.in
+++ b/dlls/clusapi/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = clusapi.dll
 IMPORTLIB = clusapi

--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = combase.dll
 IMPORTLIB = combase
 IMPORTS   = advapi32 ole32 user32 gdi32 uuid rpcrt4
--- a/dlls/combase/tests/Makefile.in
+++ b/dlls/combase/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = combase.dll
 IMPORTS   = combase

--- a/dlls/comcat/tests/Makefile.in
+++ b/dlls/comcat/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = comcat.dll
 IMPORTS   = ole32 advapi32

--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_COMCTL32_
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_COMCTL32_
 MODULE    = comctl32.dll
 IMPORTLIB = comctl32
 IMPORTS   = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase
--- a/dlls/comctl32/tests/Makefile.in
+++ b/dlls/comctl32/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = comctl32.dll
 IMPORTS   = ole32 user32 gdi32 advapi32

--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = comdlg32.dll
 IMPORTLIB = comdlg32
 IMPORTS   = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32
--- a/dlls/comdlg32/tests/Makefile.in
+++ b/dlls/comdlg32/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = comdlg32.dll
 IMPORTS   = uuid shell32 ole32 comdlg32 winspool user32 gdi32

--- a/dlls/commdlg.dll16/Makefile.in
+++ b/dlls/commdlg.dll16/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = commdlg.dll16
 IMPORTS   = comdlg32 user32 gdi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,comdlg32.dll
--- a/dlls/compobj.dll16/Makefile.in
+++ b/dlls/compobj.dll16/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = compobj.dll16
 IMPORTS   = uuid ole32 advapi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll
--- a/dlls/comsvcs/Makefile.in
+++ b/dlls/comsvcs/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = comsvcs.dll
 IMPORTLIB = comsvcs
 IMPORTS   = ole32 uuid
--- a/dlls/comsvcs/tests/Makefile.in
+++ b/dlls/comsvcs/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = comsvcs.dll
 IMPORTS   = uuid oleaut32 ole32

--- a/dlls/concrt140/Makefile.in
+++ b/dlls/concrt140/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE = concrt140.dll
 PARENTSRC = ../msvcrt

--- a/dlls/concrt140/tests/Makefile.in
+++ b/dlls/concrt140/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = concrt140.dll

 C_SRCS = \
--- a/dlls/credui/Makefile.in
+++ b/dlls/credui/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = credui.dll
 IMPORTLIB = credui
 IMPORTS   = comctl32 user32 advapi32
--- a/dlls/credui/tests/Makefile.in
+++ b/dlls/credui/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = credui.dll
 IMPORTS   = credui

--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_CRTDLL -D_CRTIMP=
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTDLL -D_CRTIMP=
 MODULE    = crtdll.dll
 IMPORTS   = ntdll
 DELAYIMPORTS = advapi32 user32
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@ -1,4 +1,4 @@
-EXTRADEFS = -D_CRYPT32_
+EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRYPT32_
 MODULE    = crypt32.dll
 UNIXLIB   = crypt32.so
 IMPORTLIB = crypt32
--- a/dlls/crypt32/tests/Makefile.in
+++ b/dlls/crypt32/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = crypt32.dll
 IMPORTS   = crypt32 advapi32 user32 shlwapi shell32 bcrypt

--- a/dlls/cryptdlg/Makefile.in
+++ b/dlls/cryptdlg/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cryptdlg.dll
 IMPORTS   = cryptui crypt32 wintrust user32 advapi32

--- a/dlls/cryptnet/Makefile.in
+++ b/dlls/cryptnet/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cryptnet.dll
 IMPORTLIB = cryptnet
 IMPORTS   = crypt32 shell32 ole32
--- a/dlls/cryptnet/tests/Makefile.in
+++ b/dlls/cryptnet/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = cryptnet.dll
 IMPORTS   = cryptnet crypt32

--- a/dlls/cryptui/Makefile.in
+++ b/dlls/cryptui/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = cryptui.dll
 IMPORTS   = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32
 DELAYIMPORTS = wintrust urlmon
--- a/dlls/cryptui/tests/Makefile.in
+++ b/dlls/cryptui/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = cryptui.dll
 IMPORTS   = cryptui crypt32 user32

--- a/dlls/ctapi32/Makefile.in
+++ b/dlls/ctapi32/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ctapi32.dll
 UNIXLIB   = ctapi32.so
 IMPORTS   = advapi32
--- a/dlls/d2d1/Makefile.in
+++ b/dlls/d2d1/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d2d1.dll
 IMPORTLIB = d2d1
 IMPORTS   = d3d10_1 dxguid uuid gdi32 user32 advapi32
--- a/dlls/d2d1/tests/Makefile.in
+++ b/dlls/d2d1/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = d2d1.dll
 IMPORTS   = d2d1 d3d10_1 d3d11 dwrite dxguid uuid user32 advapi32 ole32 gdi32

--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@ -1,7 +1,7 @@
 MODULE    = d3d10.dll
 IMPORTLIB = d3d10
 IMPORTS   = uuid d3d10core d3dcompiler dxgi
-EXTRADEFS = -DD3D_COMPILER_VERSION=0
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0
 PARENTSRC = ../d3dcompiler_43

 C_SRCS = \
--- a/dlls/d3d10/tests/Makefile.in
+++ b/dlls/d3d10/tests/Makefile.in
@ -1,6 +1,6 @@
 TESTDLL   = d3d10.dll
 IMPORTS   = d3d10
-EXTRADEFS = -DD3D_COMPILER_VERSION=0
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0
 PARENTSRC = ../../d3dcompiler_43/tests

 C_SRCS = \
--- a/dlls/d3d10_1/Makefile.in
+++ b/dlls/d3d10_1/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3d10_1.dll
 IMPORTLIB = d3d10_1
 IMPORTS   = dxguid d3d10core dxgi
--- a/dlls/d3d10_1/tests/Makefile.in
+++ b/dlls/d3d10_1/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = d3d10_1.dll
 IMPORTS = d3d10_1 user32

--- a/dlls/d3d10core/Makefile.in
+++ b/dlls/d3d10core/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3d10core.dll
 IMPORTLIB = d3d10core
 IMPORTS   = d3d11 dxgi
--- a/dlls/d3d10core/tests/Makefile.in
+++ b/dlls/d3d10core/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = d3d10core.dll
 IMPORTS   = d3d10 dxgi user32

--- a/dlls/d3d11/Makefile.in
+++ b/dlls/d3d11/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3d11.dll
 IMPORTLIB = d3d11
 IMPORTS   = dxguid uuid dxgi wined3d
--- a/dlls/d3d11/tests/Makefile.in
+++ b/dlls/d3d11/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = d3d11.dll
 IMPORTS = d3d11 dxgi user32 gdi32

--- a/dlls/d3d12/Makefile.in
+++ b/dlls/d3d12/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3d12.dll
 IMPORTLIB = d3d12
 IMPORTS   = dxgi dxguid gdi32 user32 uuid win32u
--- a/dlls/d3d12/tests/Makefile.in
+++ b/dlls/d3d12/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = d3d12.dll
 IMPORTS = d3d12 dxgi user32

--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3d8.dll
 IMPORTLIB = d3d8
 IMPORTS   = dxguid uuid wined3d
--- a/dlls/d3d8/tests/Makefile.in
+++ b/dlls/d3d8/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = d3d8.dll
 IMPORTS   = d3d8 user32 gdi32

--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3d9.dll
 IMPORTLIB = d3d9
 IMPORTS   = dxguid uuid wined3d
--- a/dlls/d3d9/tests/Makefile.in
+++ b/dlls/d3d9/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = d3d9.dll
 IMPORTS   = d3d9 user32 gdi32

--- a/dlls/d3dcompiler_33/Makefile.in
+++ b/dlls/d3dcompiler_33/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_33.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=33
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=33
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_34/Makefile.in
+++ b/dlls/d3dcompiler_34/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_34.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=34
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=34
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_35/Makefile.in
+++ b/dlls/d3dcompiler_35/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_35.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=35
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=35
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_36/Makefile.in
+++ b/dlls/d3dcompiler_36/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_36.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=36
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=36
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_37/Makefile.in
+++ b/dlls/d3dcompiler_37/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_37.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=37
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=37
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_38/Makefile.in
+++ b/dlls/d3dcompiler_38/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_38.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=38
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=38
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_39/Makefile.in
+++ b/dlls/d3dcompiler_39/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_39.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=39
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=39
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_40/Makefile.in
+++ b/dlls/d3dcompiler_40/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_40.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=40
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=40
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_41/Makefile.in
+++ b/dlls/d3dcompiler_41/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_41.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=41
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=41
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_42/Makefile.in
+++ b/dlls/d3dcompiler_42/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_42.dll
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=42
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=42
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_43/Makefile.in
+++ b/dlls/d3dcompiler_43/Makefile.in
@ -1,6 +1,6 @@
 MODULE    = d3dcompiler_43.dll
 IMPORTLIB = d3dcompiler_43
-EXTRADEFS = -DD3D_COMPILER_VERSION=43
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43

 EXTRADLLFLAGS = -Wb,--prefer-native

--- a/dlls/d3dcompiler_43/tests/Makefile.in
+++ b/dlls/d3dcompiler_43/tests/Makefile.in
@ -1,6 +1,6 @@
 TESTDLL   = d3dcompiler_43.dll
 IMPORTS   = d3d9 user32 d3dcompiler_43
-EXTRADEFS = -DD3D_COMPILER_VERSION=43
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43

 C_SRCS = \
 	asm.c \
--- a/dlls/d3dcompiler_46/Makefile.in
+++ b/dlls/d3dcompiler_46/Makefile.in
@ -1,7 +1,7 @@
 MODULE    = d3dcompiler_46.dll
 IMPORTLIB = d3dcompiler_46
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=46
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_46/tests/Makefile.in
+++ b/dlls/d3dcompiler_46/tests/Makefile.in
@ -1,6 +1,6 @@
 TESTDLL   = d3dcompiler_46.dll
 IMPORTS   = d3d9 user32 d3dcompiler_46
-EXTRADEFS = -DD3D_COMPILER_VERSION=46
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46
 PARENTSRC = ../../d3dcompiler_43/tests

 C_SRCS = \
--- a/dlls/d3dcompiler_47/Makefile.in
+++ b/dlls/d3dcompiler_47/Makefile.in
@ -1,7 +1,7 @@
 MODULE    = d3dcompiler_47.dll
 IMPORTLIB = d3dcompiler
 IMPORTS   = dxguid uuid
-EXTRADEFS = -DD3D_COMPILER_VERSION=47
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47
 PARENTSRC = ../d3dcompiler_43

 EXTRADLLFLAGS = -Wb,--prefer-native
--- a/dlls/d3dcompiler_47/tests/Makefile.in
+++ b/dlls/d3dcompiler_47/tests/Makefile.in
@ -1,6 +1,6 @@
 TESTDLL   = d3dcompiler_47.dll
 IMPORTS   = d3d9 user32 d3dcompiler
-EXTRADEFS = -DD3D_COMPILER_VERSION=47
+EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47
 PARENTSRC = ../../d3dcompiler_43/tests

 C_SRCS = \
--- a/dlls/d3drm/Makefile.in
+++ b/dlls/d3drm/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3drm.dll
 IMPORTLIB = d3drm
 IMPORTS   = d3dxof ddraw
--- a/dlls/d3drm/tests/Makefile.in
+++ b/dlls/d3drm/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = d3drm.dll
 IMPORTS   = dxguid uuid d3drm ddraw user32

--- a/dlls/d3dx10_34/tests/Makefile.in
+++ b/dlls/d3dx10_34/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_34.dll
 IMPORTS = d3dx10_34 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests
--- a/dlls/d3dx10_35/tests/Makefile.in
+++ b/dlls/d3dx10_35/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_35.dll
 IMPORTS = d3dx10_35 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests
--- a/dlls/d3dx10_36/tests/Makefile.in
+++ b/dlls/d3dx10_36/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_36.dll
 IMPORTS = d3dx10_36 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests
--- a/dlls/d3dx10_37/tests/Makefile.in
+++ b/dlls/d3dx10_37/tests/Makefile.in
@ -1,3 +1,4 @@
+EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = d3dx10_37.dll
 IMPORTS = d3dx10_37 ole32 gdi32
 PARENTSRC = ../../d3dx10_43/tests
--- a/Show More
+++ b/Show More