diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in index ca2c27e3528..f117462a5ea 100644 --- 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 diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index a4879f54c4b..133e31f7487 100644 --- 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 diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index b9fbdfeca82..0ab8281c1f2 100644 --- 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 diff --git a/dlls/activeds/tests/Makefile.in b/dlls/activeds/tests/Makefile.in index 25ae2a9bfd2..340336d4c0a 100644 --- 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 diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index a4618bd560f..bdb4fcb1ecb 100644 --- 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 diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 89b6b903013..b2809938021 100644 --- 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 diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 26b937aa684..78a0fff0f40 100644 --- 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 diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index f791e497a74..5653db884b3 100644 --- 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 diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 2e9b007a91f..6a5a28d5df7 100644 --- 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 diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in index 2f699a37112..75c30428d20 100644 --- 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 diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in index 9c1fecebe9a..12e2d344dc3 100644 --- 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 diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in index 213d3e06ce9..b8be934b68a 100644 --- a/dlls/amsi/Makefile.in +++ b/dlls/amsi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = amsi.dll C_SRCS = \ diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 35356a06a8c..debfcecd182 100644 --- 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 diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index eb756ddf39d..4c09b3a2e22 100644 --- 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 diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in index 4803e1d3dd4..68186b5f98a 100644 --- 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 diff --git a/dlls/apphelp/tests/Makefile.in b/dlls/apphelp/tests/Makefile.in index 2a05c019955..a1f28608371 100644 --- 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 diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 91af64cceec..1ba9760d41a 100644 --- 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 diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 826a5bf7d25..45542c823d4 100644 --- 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 \ diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in index aee6cfd92d8..11af85f23a2 100644 --- 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 \ diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 719afe04911..5b54fb17186 100644 --- 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 = \ diff --git a/dlls/atl100/tests/Makefile.in b/dlls/atl100/tests/Makefile.in index 61ebeb32c6c..eebf4ce5c75 100644 --- 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 diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index 49ba9338125..40cee573b13 100644 --- 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 = \ diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index b3a5a9cc681..e404158c543 100644 --- 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 = \ diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index d3aebe6883f..6e1b4485e9d 100644 --- 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 = \ diff --git a/dlls/atlthunk/tests/Makefile.in b/dlls/atlthunk/tests/Makefile.in index 9da3a9696ad..1927af38900 100644 --- 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 diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in index c80b4d1df32..97cde7085f8 100644 --- 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 diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index 9281990e211..b640349b57d 100644 --- 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 diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 4030514d95c..3424ae7fd75 100644 --- 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 diff --git a/dlls/avifil32/tests/Makefile.in b/dlls/avifil32/tests/Makefile.in index dad7974456e..1472a12f69b 100644 --- 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 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 9f3510361c4..3396c872df9 100644 --- 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 diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in index 1bf7d2c48f1..70ce1a6a925 100644 --- 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 diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 6c14ace37cf..1f2521aa853 100644 --- 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 diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in index 70de3ab4785..61c86018ab2 100644 --- 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 diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in index 4ee406480ac..eb45aae8df7 100644 --- 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) diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in index f301617473d..0a1f708ad22 100644 --- 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 diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in index 9e9ba285498..cf9bf97ce5c 100644 --- 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 diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in index 395b15018ad..7a6f14dda06 100644 --- 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 diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in index 01451a1d743..9514378e663 100644 --- a/dlls/clusapi/Makefile.in +++ b/dlls/clusapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = clusapi.dll IMPORTLIB = clusapi diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 987616773dd..da83ab6154c 100644 --- 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 diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in index 1c3d77725b3..b98b0e37c6a 100644 --- 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 diff --git a/dlls/comcat/tests/Makefile.in b/dlls/comcat/tests/Makefile.in index 51e92329a05..905bb1dcd0c 100644 --- 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 diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index c0272f2d7d4..6c27e4c628a 100644 --- 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 diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 4669efcf2b5..79d7485de73 100644 --- 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 diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index f919a266a07..959f4bac63c 100644 --- 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 diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index 96c53ae25aa..451f9e54275 100644 --- 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 diff --git a/dlls/commdlg.dll16/Makefile.in b/dlls/commdlg.dll16/Makefile.in index 69731147d07..1b2e19d09e3 100644 --- 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 diff --git a/dlls/compobj.dll16/Makefile.in b/dlls/compobj.dll16/Makefile.in index 5b11e840c7f..8ab9d824683 100644 --- 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 diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 22090938b52..5eede59d5b6 100644 --- 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 diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in index 1d9146ba5b6..a0b9b4ebfca 100644 --- 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 diff --git a/dlls/concrt140/Makefile.in b/dlls/concrt140/Makefile.in index aac1ed7b34a..3b74c2e5b4b 100644 --- a/dlls/concrt140/Makefile.in +++ b/dlls/concrt140/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = concrt140.dll PARENTSRC = ../msvcrt diff --git a/dlls/concrt140/tests/Makefile.in b/dlls/concrt140/tests/Makefile.in index e36fc37eb86..4578fb62eb2 100644 --- 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 = \ diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index 149f6ddbbee..e8b3d407fa7 100644 --- 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 diff --git a/dlls/credui/tests/Makefile.in b/dlls/credui/tests/Makefile.in index 4442837ed11..b2a8c778df4 100644 --- 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 diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index ffdbb2ab7a1..619fd59c5c4 100644 --- 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 diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 996044bbc37..f4e2fcbce67 100644 --- 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 diff --git a/dlls/crypt32/tests/Makefile.in b/dlls/crypt32/tests/Makefile.in index 339cff30e0f..3a227243221 100644 --- 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 diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index b9fccf2e31e..7aaf4b90ff4 100644 --- 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 diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index 8b13861da1e..f394b0c1f79 100644 --- 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 diff --git a/dlls/cryptnet/tests/Makefile.in b/dlls/cryptnet/tests/Makefile.in index b2b27717678..c2e80bd5478 100644 --- 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 diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index 9e2031dc17b..60b38f058e1 100644 --- 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 diff --git a/dlls/cryptui/tests/Makefile.in b/dlls/cryptui/tests/Makefile.in index 27dbbd8b140..5fc63e0e4a5 100644 --- 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 diff --git a/dlls/ctapi32/Makefile.in b/dlls/ctapi32/Makefile.in index fa13d24540c..69e8728873b 100644 --- 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 diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 413571338ba..bb9e44caba0 100644 --- 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 diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in index 5eeb815e07f..cd8701395b2 100644 --- 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 diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 1b869f47f6c..38d2055ecd9 100644 --- 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 = \ diff --git a/dlls/d3d10/tests/Makefile.in b/dlls/d3d10/tests/Makefile.in index e3849ec634b..ed342153184 100644 --- 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 = \ diff --git a/dlls/d3d10_1/Makefile.in b/dlls/d3d10_1/Makefile.in index 50ae0383b92..a3bb6a183bb 100644 --- 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 diff --git a/dlls/d3d10_1/tests/Makefile.in b/dlls/d3d10_1/tests/Makefile.in index 256bb407d41..97eaf324ff7 100644 --- 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 diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 9fe4ac96a78..9a828f17c03 100644 --- 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 diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 313a042b246..c65e6e8cafa 100644 --- 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 diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index 5a56faec523..9e0da6dd07c 100644 --- 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 diff --git a/dlls/d3d11/tests/Makefile.in b/dlls/d3d11/tests/Makefile.in index 9612bb36374..8dbe849673a 100644 --- 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 diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 64930ac442e..50f292c0c9b 100644 --- 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 diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in index b3406f9e6c1..ad0eff48cf7 100644 --- 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 diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index 542a052512f..29ef6585b57 100644 --- 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 diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 9b288b967a9..39b7e8021a7 100644 --- 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 diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in index 1c05f5a3129..dc2b9704eed 100644 --- 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 diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index f6f52ba7d2d..fc0f45c3237 100644 --- 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 diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index 7130fb48376..c14c691bcd3 100644 --- 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 diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index e4dfc72cae8..9f861992476 100644 --- 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 diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 56c87186c2e..775ba345800 100644 --- 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 diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index f23ac2cb990..9ca476790d4 100644 --- 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 diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index 331f5f5f068..a7d001d0f7c 100644 --- 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 diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index b34c2322aae..7c4e49b6911 100644 --- 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 diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index cf4dc2cdd83..92b8053ea54 100644 --- 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 diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index c8d415baf83..8e98ae6bfc6 100644 --- 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 diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 2fa69b5a18d..43c5672c90b 100644 --- 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 diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index d821b888bde..e550851fcfd 100644 --- 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 diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index b527f1681d7..aff97a6d3e8 100644 --- 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 diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 6584ae92bea..1d59b23cbdb 100644 --- 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 \ diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 066bd6fdd1c..b3bdcb6a630 100644 --- 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 diff --git a/dlls/d3dcompiler_46/tests/Makefile.in b/dlls/d3dcompiler_46/tests/Makefile.in index 7d2b899c0eb..c2effd862cf 100644 --- 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 = \ diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index 379f0aa4b3a..b19b6d5fe39 100644 --- 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 diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index 6e40550e777..14732c65fd7 100644 --- 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 = \ diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in index 8daaa426c8f..701375ec4f0 100644 --- 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 diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 4b39989531c..ec4a030e949 100644 --- 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 diff --git a/dlls/d3dx10_34/tests/Makefile.in b/dlls/d3dx10_34/tests/Makefile.in index 9d07ee26b9a..77795f87885 100644 --- 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 diff --git a/dlls/d3dx10_35/tests/Makefile.in b/dlls/d3dx10_35/tests/Makefile.in index 8f08bb1ca6a..95777543e56 100644 --- 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 diff --git a/dlls/d3dx10_36/tests/Makefile.in b/dlls/d3dx10_36/tests/Makefile.in index 22e9a91f581..d2cd9c02350 100644 --- 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 diff --git a/dlls/d3dx10_37/tests/Makefile.in b/dlls/d3dx10_37/tests/Makefile.in index 271d0722f48..505f85d0c4b 100644 --- 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 diff --git a/dlls/d3dx10_38/tests/Makefile.in b/dlls/d3dx10_38/tests/Makefile.in index 9e911457c81..b5da90a2f97 100644 --- a/dlls/d3dx10_38/tests/Makefile.in +++ b/dlls/d3dx10_38/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_38.dll IMPORTS = d3dx10_38 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_39/tests/Makefile.in b/dlls/d3dx10_39/tests/Makefile.in index d4554399554..63190f1e090 100644 --- a/dlls/d3dx10_39/tests/Makefile.in +++ b/dlls/d3dx10_39/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_39.dll IMPORTS = d3dx10_39 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_40/tests/Makefile.in b/dlls/d3dx10_40/tests/Makefile.in index ba566ff908d..669ef97d4f7 100644 --- a/dlls/d3dx10_40/tests/Makefile.in +++ b/dlls/d3dx10_40/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_40.dll IMPORTS = d3dx10_40 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_41/tests/Makefile.in b/dlls/d3dx10_41/tests/Makefile.in index bde10a26ea7..85204bc4f2a 100644 --- a/dlls/d3dx10_41/tests/Makefile.in +++ b/dlls/d3dx10_41/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_41.dll IMPORTS = d3dx10_41 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_42/tests/Makefile.in b/dlls/d3dx10_42/tests/Makefile.in index c3965b7c3f2..8936c5859e7 100644 --- a/dlls/d3dx10_42/tests/Makefile.in +++ b/dlls/d3dx10_42/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_42.dll IMPORTS = d3dx10_42 ole32 gdi32 PARENTSRC = ../../d3dx10_43/tests diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 0fab62f4834..67cf4863b0f 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 IMPORTS = d3d10_1 d3dcompiler dxguid uuid gdi32 diff --git a/dlls/d3dx10_43/tests/Makefile.in b/dlls/d3dx10_43/tests/Makefile.in index 7498e73e4bc..5cef10c80ff 100644 --- a/dlls/d3dx10_43/tests/Makefile.in +++ b/dlls/d3dx10_43/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx10_43.dll IMPORTS = d3dx10 ole32 gdi32 diff --git a/dlls/d3dx11_42/tests/Makefile.in b/dlls/d3dx11_42/tests/Makefile.in index 660f6d947cc..a4ea6f1a027 100644 --- a/dlls/d3dx11_42/tests/Makefile.in +++ b/dlls/d3dx11_42/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx11_42.dll IMPORTS = d3dx11_42 PARENTSRC = ../../d3dx11_43/tests diff --git a/dlls/d3dx11_43/tests/Makefile.in b/dlls/d3dx11_43/tests/Makefile.in index 6e522df66fb..11bb7763a01 100644 --- a/dlls/d3dx11_43/tests/Makefile.in +++ b/dlls/d3dx11_43/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx11_43.dll IMPORTS = d3dx11 diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index b43941c1942..0d9b21b61bc 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=24 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=24 MODULE = d3dx9_24.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index 9718cdea10b..11db983f118 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=25 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=25 MODULE = d3dx9_25.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index 5984411d137..64cd1d94b1f 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=26 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=26 MODULE = d3dx9_26.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index 5484aebd010..367b64aa9b8 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=27 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=27 MODULE = d3dx9_27.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index 14ea545fe3e..57335e06477 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=28 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=28 MODULE = d3dx9_28.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index 796d905b86f..a2728c4317c 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=29 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=29 MODULE = d3dx9_29.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index 36493d996b9..bc7cb7574a7 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=30 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=30 MODULE = d3dx9_30.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index 9bbce4d35fd..a31a3de6f1f 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=31 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=31 MODULE = d3dx9_31.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index 208a0718b42..85e401069cf 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=32 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=32 MODULE = d3dx9_32.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 8b636303015..5f90b08265d 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=33 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=33 MODULE = d3dx9_33.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index 31a698532a0..8c9fd380f26 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=34 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=34 MODULE = d3dx9_34.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index d1c02bd9564..57bd49b9cf6 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=35 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=35 MODULE = d3dx9_35.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 88778b301ca..0b5891c23c5 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=36 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=36 MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index bc5cfc36653..ad0bfbe90be 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dx9_36.dll IMPORTS = d3dx9 d3d9 user32 gdi32 diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index f9a0d4085a8..a1fcc43af9a 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=37 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=37 MODULE = d3dx9_37.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index 2814a4686f9..29d8865b792 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=38 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=38 MODULE = d3dx9_38.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index 61c44debd2f..a63a2288b55 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=39 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=39 MODULE = d3dx9_39.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index c1e8f15edab..263ad5b3769 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=40 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=40 MODULE = d3dx9_40.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index 132a6971639..a12e639a6ec 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=41 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=41 MODULE = d3dx9_41.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index 305cb9b34f5..f98ef0d6256 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=42 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=42 MODULE = d3dx9_42.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index bcf41038c2c..86c6a8c51d2 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DD3DX_SDK_VERSION=43 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3DX_SDK_VERSION=43 MODULE = d3dx9_43.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index 93032adbb3f..8171b57421d 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3dxof.dll IMPORTLIB = d3dxof IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/d3dxof/tests/Makefile.in b/dlls/d3dxof/tests/Makefile.in index 5144ff63b97..eecca6f9d8c 100644 --- a/dlls/d3dxof/tests/Makefile.in +++ b/dlls/d3dxof/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = d3dxof.dll IMPORTS = d3dxof diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in index 007258ed236..bc6e4b04132 100644 --- a/dlls/davclnt/Makefile.in +++ b/dlls/davclnt/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = davclnt.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/dbgeng/Makefile.in b/dlls/dbgeng/Makefile.in index c2639c5d222..dc00f025e7c 100644 --- a/dlls/dbgeng/Makefile.in +++ b/dlls/dbgeng/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dbgeng.dll IMPORTLIB = dbgeng DELAYIMPORTS = version diff --git a/dlls/dbgeng/tests/Makefile.in b/dlls/dbgeng/tests/Makefile.in index 26006e9546b..8ffef052654 100644 --- a/dlls/dbgeng/tests/Makefile.in +++ b/dlls/dbgeng/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dbgeng.dll IMPORTS = dbgeng diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 22be2612eeb..abb440ffbe6 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -2,7 +2,7 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp IMPORTS = $(ZLIB_PE_LIBS) EXTRAINCL = $(ZLIB_PE_CFLAGS) -EXTRADEFS = -D_IMAGEHLP_SOURCE_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_ DELAYIMPORTS = version C_SRCS = \ diff --git a/dlls/dbghelp/tests/Makefile.in b/dlls/dbghelp/tests/Makefile.in index 31e5b01e8a8..408431fb516 100644 --- a/dlls/dbghelp/tests/Makefile.in +++ b/dlls/dbghelp/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dbghelp.dll IMPORTS = dbghelp diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 5106834dec8..960b7185c5d 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ddraw.dll IMPORTLIB = ddraw IMPORTS = dxguid uuid wined3d user32 gdi32 advapi32 diff --git a/dlls/ddraw/tests/Makefile.in b/dlls/ddraw/tests/Makefile.in index a3d0ce5cf12..6316bf91892 100644 --- a/dlls/ddraw/tests/Makefile.in +++ b/dlls/ddraw/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ddraw.dll IMPORTS = ddraw user32 gdi32 ole32 diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in index 0d67f9eb07e..1f467777c7b 100644 --- a/dlls/ddrawex/Makefile.in +++ b/dlls/ddrawex/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ddrawex.dll IMPORTS = dxguid uuid ddraw ole32 advapi32 diff --git a/dlls/ddrawex/tests/Makefile.in b/dlls/ddrawex/tests/Makefile.in index ecb57137763..7c05ef9464c 100644 --- a/dlls/ddrawex/tests/Makefile.in +++ b/dlls/ddrawex/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ddrawex.dll IMPORTS = user32 gdi32 diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index 16ae8e1abfa..c1a88ac8e4e 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = devenum.dll IMPORTS = dmoguids strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo DELAYIMPORTS = msvfw32 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 2d6ec2d87ea..762c007deee 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = devenum.dll IMPORTS = advapi32 dsound msdmo msvfw32 oleaut32 ole32 winmm diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in index 989264d8b43..34add6620d1 100644 --- a/dlls/dhcpcsvc/Makefile.in +++ b/dlls/dhcpcsvc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dhcpcsvc.dll DELAYIMPORTS = iphlpapi IMPORTLIB = dhcpcsvc diff --git a/dlls/dhcpcsvc/tests/Makefile.in b/dlls/dhcpcsvc/tests/Makefile.in index 47440eb2cd4..1f1e6acb7ce 100644 --- a/dlls/dhcpcsvc/tests/Makefile.in +++ b/dlls/dhcpcsvc/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dhcpcsvc.dll IMPORTS = dhcpcsvc iphlpapi diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index 02556ba89e0..6abaee48a2e 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dhtmled.ocx IMPORTS = uuid ole32 oleaut32 user32 gdi32 diff --git a/dlls/difxapi/Makefile.in b/dlls/difxapi/Makefile.in index 3f61fd319ff..7ca39d4e8ca 100644 --- a/dlls/difxapi/Makefile.in +++ b/dlls/difxapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = difxapi.dll C_SRCS = \ diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index e1dd52cf67d..eef71920e5b 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,7 +1,7 @@ MODULE = dinput.dll IMPORTLIB = dinput IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi -EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DDIRECTINPUT_VERSION=0x0700 C_SRCS = \ ansi.c \ diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 44ea9d340bb..00295fed60f 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dinput.dll IMPORTS = dinput dinput8 ole32 version user32 advapi32 hid uuid crypt32 newdev setupapi wintrust winmm diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 164f2458da7..fa7e20d0628 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,7 +1,7 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi -EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DDIRECTINPUT_VERSION=0x0800 PARENTSRC = ../dinput C_SRCS = \ diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in index a258835e3ab..f33edbe6e8d 100644 --- a/dlls/directmanipulation/Makefile.in +++ b/dlls/directmanipulation/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = directmanipulation.dll IMPORTS = uuid diff --git a/dlls/directmanipulation/tests/Makefile.in b/dlls/directmanipulation/tests/Makefile.in index 29ec0db511a..6fa94fa3cc6 100644 --- a/dlls/directmanipulation/tests/Makefile.in +++ b/dlls/directmanipulation/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = directmanipulation.dll IMPORTS = uuid ole32 diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in index 98a05926727..a40e2b49215 100644 --- a/dlls/dispex/Makefile.in +++ b/dlls/dispex/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dispex.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 diff --git a/dlls/dispex/tests/Makefile.in b/dlls/dispex/tests/Makefile.in index e5ed0baf687..ff65a40cbb0 100644 --- a/dlls/dispex/tests/Makefile.in +++ b/dlls/dispex/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dispex.dll IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 6fa1502f6b0..36488c03b99 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmband.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmband/tests/Makefile.in b/dlls/dmband/tests/Makefile.in index ddce98f1085..201ecc98c97 100644 --- a/dlls/dmband/tests/Makefile.in +++ b/dlls/dmband/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmband.dll IMPORTS = oleaut32 ole32 uuid diff --git a/dlls/dmcompos/Makefile.in b/dlls/dmcompos/Makefile.in index d1e9b5e5b45..2f511a8568c 100644 --- a/dlls/dmcompos/Makefile.in +++ b/dlls/dmcompos/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmcompos.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmcompos/tests/Makefile.in b/dlls/dmcompos/tests/Makefile.in index b794d4d48e0..4253494b8ec 100644 --- a/dlls/dmcompos/tests/Makefile.in +++ b/dlls/dmcompos/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmcompos.dll IMPORTS = ole32 diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index 51d1492585f..4098a2c9fdb 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmime.dll IMPORTS = dxguid uuid dsound ole32 user32 advapi32 diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index f4c47038e54..f2c93bb1a68 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmime.dll IMPORTS = user32 ole32 dsound diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in index 4aa80c6dfb3..880f2bfc02a 100644 --- a/dlls/dmloader/Makefile.in +++ b/dlls/dmloader/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmloader.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmloader/tests/Makefile.in b/dlls/dmloader/tests/Makefile.in index d8be1bce3e4..8eef83551d4 100644 --- a/dlls/dmloader/tests/Makefile.in +++ b/dlls/dmloader/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmloader.dll IMPORTS = ole32 diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in index 55107e116c9..9544d88dacc 100644 --- a/dlls/dmscript/Makefile.in +++ b/dlls/dmscript/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmscript.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmscript/tests/Makefile.in b/dlls/dmscript/tests/Makefile.in index a4b246d0931..5cc5553e2ca 100644 --- a/dlls/dmscript/tests/Makefile.in +++ b/dlls/dmscript/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmscript.dll IMPORTS = ole32 diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in index a95a524d473..8067d5e4675 100644 --- a/dlls/dmstyle/Makefile.in +++ b/dlls/dmstyle/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmstyle.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmstyle/tests/Makefile.in b/dlls/dmstyle/tests/Makefile.in index ec8b0636014..a98f5dd6c27 100644 --- a/dlls/dmstyle/tests/Makefile.in +++ b/dlls/dmstyle/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmstyle.dll IMPORTS = ole32 diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in index 276597db5ad..870f93d39f2 100644 --- a/dlls/dmsynth/Makefile.in +++ b/dlls/dmsynth/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmsynth.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmsynth/tests/Makefile.in b/dlls/dmsynth/tests/Makefile.in index 5f2fce7b8b1..b082aa5dcc5 100644 --- a/dlls/dmsynth/tests/Makefile.in +++ b/dlls/dmsynth/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmsynth.dll IMPORTS = oleaut32 ole32 uuid diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index a8955a2ab42..45826765239 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmusic.dll IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm diff --git a/dlls/dmusic/tests/Makefile.in b/dlls/dmusic/tests/Makefile.in index 2f8d6a8654c..091204f16f6 100644 --- a/dlls/dmusic/tests/Makefile.in +++ b/dlls/dmusic/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmusic.dll IMPORTS = oleaut32 ole32 uuid user32 dsound diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index b7785e5ebeb..1e280745bd0 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dnsapi.dll UNIXLIB = dnsapi.so IMPORTLIB = dnsapi diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 3f8c424b4f7..8764aebeaf9 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dnsapi.dll IMPORTS = dnsapi ws2_32 iphlpapi diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 8d41fdbad9e..1a8f6c0bd8f 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dplayx.dll IMPORTLIB = dplayx IMPORTS = dxguid uuid winmm ole32 user32 advapi32 diff --git a/dlls/dplayx/tests/Makefile.in b/dlls/dplayx/tests/Makefile.in index b55ec38acc9..7295078c722 100644 --- a/dlls/dplayx/tests/Makefile.in +++ b/dlls/dplayx/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dplayx.dll IMPORTS = ole32 oleaut32 version advapi32 diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 541e104c64a..15277d61b3f 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpnet.dll IMPORTLIB = dpnet IMPORTS = dxguid uuid ole32 advapi32 ws2_32 diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 62ef3f7c47c..2bef531a9ca 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dpnet.dll IMPORTS = dxguid uuid dpnet ole32 oleaut32 version advapi32 diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index 7767d141fa8..a3d85b093c6 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpvoice.dll IMPORTS = dxguid uuid diff --git a/dlls/dpvoice/tests/Makefile.in b/dlls/dpvoice/tests/Makefile.in index 04b3a5c0b5b..05e4c8b66fd 100644 --- a/dlls/dpvoice/tests/Makefile.in +++ b/dlls/dpvoice/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dpvoice.dll IMPORTS = uuid dpnet ole32 user32 diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 18b5581a696..0a478358e74 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpwsockx.dll IMPORTS = dxguid ws2_32 diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index a3dd1ad11e9..38bd6a7ad0f 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsdmo.dll IMPORTS = dmoguids strmiids uuid diff --git a/dlls/dsdmo/tests/Makefile.in b/dlls/dsdmo/tests/Makefile.in index 67378635f3c..38e1247d726 100644 --- a/dlls/dsdmo/tests/Makefile.in +++ b/dlls/dsdmo/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dsdmo.dll IMPORTS = dmoguids uuid msdmo ole32 diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index 6cb653fdfa0..b06d3b673c8 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsound.dll IMPORTLIB = dsound IMPORTS = dxguid uuid winmm ole32 advapi32 user32 diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in index 234b49b1bba..cc39c4bda22 100644 --- a/dlls/dsound/tests/Makefile.in +++ b/dlls/dsound/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dsound.dll IMPORTS = dmoguids dsound msdmo ole32 version user32 diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 611e6011575..757d62b006b 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsquery.dll IMPORTS = uuid diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 909f2e3010c..42859c9ab3c 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dssenh.dll IMPORTS = bcrypt crypt32 advapi32 diff --git a/dlls/dssenh/tests/Makefile.in b/dlls/dssenh/tests/Makefile.in index d8c2f1f1429..2631c252ea9 100644 --- a/dlls/dssenh/tests/Makefile.in +++ b/dlls/dssenh/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dssenh.dll IMPORTS = advapi32 diff --git a/dlls/dsuiext/Makefile.in b/dlls/dsuiext/Makefile.in index d3d663bf0c3..da0ee1f37b2 100644 --- a/dlls/dsuiext/Makefile.in +++ b/dlls/dsuiext/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dsuiext.dll IMPORTS = ole32 uuid diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index 9a08518397b..f047d3bf7df 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dswave.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dswave/tests/Makefile.in b/dlls/dswave/tests/Makefile.in index 0745348860d..0eb00e401f6 100644 --- a/dlls/dswave/tests/Makefile.in +++ b/dlls/dswave/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dswave.dll IMPORTS = ole32 diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index e63dbc2ea00..4891fab88b1 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dwmapi.dll IMPORTLIB = dwmapi diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in index 6c6130401d6..8821fb5b0fb 100644 --- a/dlls/dwmapi/tests/Makefile.in +++ b/dlls/dwmapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dwmapi.dll IMPORTS = dwmapi diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index f5332cea713..ec7e5b401c2 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dwrite.dll IMPORTLIB = dwrite UNIXLIB = dwrite.so diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index 7fbf9e36c7e..3df59bf08b3 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dwrite.dll IMPORTS = dwrite gdi32 user32 diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 127981e8183..218b77f9ff5 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxdiagn.dll IMPORTS = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32 diff --git a/dlls/dxdiagn/tests/Makefile.in b/dlls/dxdiagn/tests/Makefile.in index 04437c5e7bd..1deee3a846c 100644 --- a/dlls/dxdiagn/tests/Makefile.in +++ b/dlls/dxdiagn/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dxdiagn.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 3a28d0462de..111d756b635 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxgi.dll IMPORTLIB = dxgi IMPORTS = gdi32 dxguid uuid wined3d user32 win32u diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 1c99d70957d..3bbece2d0a1 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dxgi.dll IMPORTS = d3d10_1 dxgi user32 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index 8f7a62bb902..66add06535b 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxva2.dll IMPORTS = uuid ole32 IMPORTLIB = dxva2 diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in index ccd03940a24..03e8afa3191 100644 --- a/dlls/dxva2/tests/Makefile.in +++ b/dlls/dxva2/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dxva2.dll IMPORTS = dxva2 user32 d3d9 ole32 diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index d5d78252113..2d86885d650 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = evr.dll IMPORTLIB = evr IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index c5db2226ebc..b8980a3f397 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = evr.dll IMPORTS = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 18d054c7fad..e37e3353ca8 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = explorerframe.dll IMPORTS = uuid ole32 comctl32 shell32 user32 diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in index ede5443bcd1..34ddfb11449 100644 --- a/dlls/explorerframe/tests/Makefile.in +++ b/dlls/explorerframe/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = explorerframe.dll IMPORTS = uuid shell32 ole32 user32 diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index 9e054425781..b28485eb9d8 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = faultrep.dll IMPORTLIB = faultrep IMPORTS = advapi32 diff --git a/dlls/faultrep/tests/Makefile.in b/dlls/faultrep/tests/Makefile.in index 404bd4d7d3f..202dd0571ba 100644 --- a/dlls/faultrep/tests/Makefile.in +++ b/dlls/faultrep/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = faultrep.dll IMPORTS = faultrep advapi32 diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in index d969421644a..f7281c69c9d 100644 --- a/dlls/fltlib/Makefile.in +++ b/dlls/fltlib/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fltlib.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/fntcache/Makefile.in b/dlls/fntcache/Makefile.in index dbc72506fe3..d87c7c2d4ea 100644 --- a/dlls/fntcache/Makefile.in +++ b/dlls/fntcache/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fntcache.dll IMPORTS = advapi32 diff --git a/dlls/fontsub/Makefile.in b/dlls/fontsub/Makefile.in index 338af096ccb..1c4a4c47481 100644 --- a/dlls/fontsub/Makefile.in +++ b/dlls/fontsub/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fontsub.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 093b64c0d32..71d3166500e 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fusion.dll IMPORTS = bcrypt dbghelp shlwapi version user32 diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in index 02a6ae3970f..ff4792cc9e5 100644 --- a/dlls/fusion/tests/Makefile.in +++ b/dlls/fusion/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = fusion.dll IMPORTS = user32 diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index b541ae9470b..1edc4213a6e 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gameux.dll IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in index 7b3f2f9cd19..5ae792525f9 100644 --- a/dlls/gameux/tests/Makefile.in +++ b/dlls/gameux/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = gameux.dll IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 shell32 diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in index 21850e2e660..25a39a42cf0 100644 --- a/dlls/gdi.exe16/Makefile.in +++ b/dlls/gdi.exe16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gdi.exe16 IMPORTS = user32 advapi32 gdi32 win32u diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 3e0495f877b..381b2b9a87f 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_GDI32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 win32u diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 3eb478ff765..c693ca4117f 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = gdi32.dll IMPORTS = setupapi user32 gdi32 advapi32 diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index c87ec5ba827..da0e8751c88 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gdiplus.dll IMPORTLIB = gdiplus IMPORTS = uuid shlwapi ole32 oleaut32 user32 gdi32 diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index ef3f26d9082..6b6033d8676 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = gdiplus.dll IMPORTS = gdiplus ole32 user32 gdi32 diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index bff1ac48133..c1f6978947f 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = gphoto2.ds UNIXLIB = gphoto2.so IMPORTS = $(JPEG_PE_LIBS) comctl32 user32 gdi32 advapi32 diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index 63211a18d7d..aa3f1ff023a 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hal.dll IMPORTLIB = hal IMPORTS = ntoskrnl diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index ef1876648c9..11dbc80e939 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hhctrl.ocx IMPORTLIB = htmlhelp IMPORTS = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in index 8bad2ec00de..177a1a0c3e7 100644 --- a/dlls/hid/Makefile.in +++ b/dlls/hid/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hid.dll IMPORTLIB = hid diff --git a/dlls/hid/tests/Makefile.in b/dlls/hid/tests/Makefile.in index 6bf377350c8..2a732990d7b 100644 --- a/dlls/hid/tests/Makefile.in +++ b/dlls/hid/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = hid.dll IMPORTS = hid setupapi diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index 25a0396dabe..08b0762ac38 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hidclass.sys IMPORTLIB = hidclass IMPORTS = hal ntoskrnl user32 hidparse diff --git a/dlls/hidparse.sys/Makefile.in b/dlls/hidparse.sys/Makefile.in index 1e4261b8973..082c80e53e4 100644 --- a/dlls/hidparse.sys/Makefile.in +++ b/dlls/hidparse.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hidparse.sys IMPORTLIB = hidparse IMPORTS = ntoskrnl diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in index 4aeb7619911..1c42ad5fded 100644 --- a/dlls/hlink/Makefile.in +++ b/dlls/hlink/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hlink.dll IMPORTLIB = hlink IMPORTS = uuid shell32 ole32 advapi32 diff --git a/dlls/hlink/tests/Makefile.in b/dlls/hlink/tests/Makefile.in index f5344d6f2d7..03a6534f891 100644 --- a/dlls/hlink/tests/Makefile.in +++ b/dlls/hlink/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = hlink.dll IMPORTS = hlink ole32 diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 0a4cb8dd334..3bc329cd7f1 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = hnetcfg.dll IMPORTS = oleaut32 ole32 advapi32 mpr uuid diff --git a/dlls/hnetcfg/tests/Makefile.in b/dlls/hnetcfg/tests/Makefile.in index 922370ae5e3..c02bef9ea54 100644 --- a/dlls/hnetcfg/tests/Makefile.in +++ b/dlls/hnetcfg/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = hnetcfg.dll IMPORTS = ole32 uuid oleaut32 advapi32 mpr diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in index b79f11cf930..b8740120e84 100644 --- a/dlls/http.sys/Makefile.in +++ b/dlls/http.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = http.sys IMPORTS = ntoskrnl ws2_32 diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in index 94020e9c17e..ea9c4223059 100644 --- a/dlls/httpapi/Makefile.in +++ b/dlls/httpapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = httpapi.dll IMPORTLIB = httpapi IMPORTS = advapi32 diff --git a/dlls/httpapi/tests/Makefile.in b/dlls/httpapi/tests/Makefile.in index 20210a34510..7a078277448 100644 --- a/dlls/httpapi/tests/Makefile.in +++ b/dlls/httpapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = httpapi.dll IMPORTS = httpapi ws2_32 diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 77254521fae..835935c1162 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = iccvid.dll IMPORTS = user32 diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 4b1005da8cf..caf8a5d84c0 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ieframe.dll IMPORTLIB = ieframe IMPORTS = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in index b2ea9a26054..de5da8a28cd 100644 --- a/dlls/ieframe/tests/Makefile.in +++ b/dlls/ieframe/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ieframe.dll IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 diff --git a/dlls/ifsmgr.vxd/Makefile.in b/dlls/ifsmgr.vxd/Makefile.in index 65c6be21036..302778577e2 100644 --- a/dlls/ifsmgr.vxd/Makefile.in +++ b/dlls/ifsmgr.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ifsmgr.vxd IMPORTS = kernel diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in index ff982fd138e..e01f5494653 100644 --- a/dlls/imaadp32.acm/Makefile.in +++ b/dlls/imaadp32.acm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = imaadp32.acm IMPORTS = winmm user32 diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index e8958d9fc62..555bc47f879 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_IMAGEHLP_SOURCE_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_ MODULE = imagehlp.dll IMPORTLIB = imagehlp IMPORTS = dbghelp diff --git a/dlls/imagehlp/tests/Makefile.in b/dlls/imagehlp/tests/Makefile.in index 1a5c393add5..57ef2867985 100644 --- a/dlls/imagehlp/tests/Makefile.in +++ b/dlls/imagehlp/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = imagehlp.dll IMPORTS = imagehlp psapi diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 214b2b753d4..71a092f179c 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = imm32.dll IMPORTLIB = imm32 IMPORTS = user32 gdi32 advapi32 diff --git a/dlls/imm32/tests/Makefile.in b/dlls/imm32/tests/Makefile.in index d0881429e34..d3edbd75fa5 100644 --- a/dlls/imm32/tests/Makefile.in +++ b/dlls/imm32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = imm32.dll IMPORTS = imm32 ole32 user32 diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index 079f3128297..8a728ca86e7 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inetcomm.dll IMPORTLIB = inetcomm IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in index 5a5b16d538d..e885e62943f 100644 --- a/dlls/inetcomm/tests/Makefile.in +++ b/dlls/inetcomm/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = inetcomm.dll IMPORTS = inetcomm urlmon oleaut32 ole32 diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 6f6df61dfa3..40e416eec2c 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in index 25391ff2624..5bfdf5fe769 100644 --- a/dlls/inetmib1/Makefile.in +++ b/dlls/inetmib1/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inetmib1.dll IMPORTS = snmpapi DELAYIMPORTS = iphlpapi diff --git a/dlls/inetmib1/tests/Makefile.in b/dlls/inetmib1/tests/Makefile.in index 9229fb660a8..82417f742ce 100644 --- a/dlls/inetmib1/tests/Makefile.in +++ b/dlls/inetmib1/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = inetmib1.dll IMPORTS = snmpapi diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index d70e2fa52fe..2e7b3b4762d 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = infosoft.dll IMPORTS = uuid advapi32 diff --git a/dlls/infosoft/tests/Makefile.in b/dlls/infosoft/tests/Makefile.in index 971d67b9f48..037957adef9 100644 --- a/dlls/infosoft/tests/Makefile.in +++ b/dlls/infosoft/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = infosoft.dll IMPORTS = ole32 diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 0217203791a..f4b1d4b915f 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index d01c764c61f..7119450e76c 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid diff --git a/dlls/iphlpapi/tests/Makefile.in b/dlls/iphlpapi/tests/Makefile.in index d8131013546..6d95690a72e 100644 --- a/dlls/iphlpapi/tests/Makefile.in +++ b/dlls/iphlpapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = iphlpapi.dll IMPORTS = iphlpapi diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 2d34b74ed78..c12ead3faec 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = itss.dll IMPORTS = uuid urlmon shlwapi ole32 diff --git a/dlls/itss/tests/Makefile.in b/dlls/itss/tests/Makefile.in index c1e9a192a2e..8f2fd415e5c 100644 --- a/dlls/itss/tests/Makefile.in +++ b/dlls/itss/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = itss.dll IMPORTS = ole32 diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in index d9b2aff3724..265f9e6add8 100644 --- a/dlls/joy.cpl/Makefile.in +++ b/dlls/joy.cpl/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = joy.cpl IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3e019201eb8..45d9856035e 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = jscript.dll IMPORTS = oleaut32 ole32 user32 advapi32 diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in index a4493d6ed89..3be4e342885 100644 --- a/dlls/jscript/tests/Makefile.in +++ b/dlls/jscript/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = jscript.dll IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in index 07f1fb53bc9..6345c9a2d74 100644 --- a/dlls/jsproxy/Makefile.in +++ b/dlls/jsproxy/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = jsproxy.dll IMPORTS = uuid oleaut32 ole32 ws2_32 IMPORTLIB = jsproxy diff --git a/dlls/jsproxy/tests/Makefile.in b/dlls/jsproxy/tests/Makefile.in index 356947694d3..216fbb34cd9 100644 --- a/dlls/jsproxy/tests/Makefile.in +++ b/dlls/jsproxy/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = jsproxy.dll IMPORTS = jsproxy diff --git a/dlls/kerberos/Makefile.in b/dlls/kerberos/Makefile.in index 8dcd4f9c7da..91d40a2f0b0 100644 --- a/dlls/kerberos/Makefile.in +++ b/dlls/kerberos/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = kerberos.dll UNIXLIB = kerberos.so EXTRAINCL = $(KRB5_CFLAGS) $(GSSAPI_CFLAGS) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 7e68a950b71..1b876fd65b9 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_KERNEL32_ -D_NORMALIZE_ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = kernelbase ntdll winecrt0 diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..db106ab9fc9 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = kernel32.dll IMPORTS = user32 advapi32 diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index ddd301d5e65..c9b5d94c700 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINBASEAPI= +EXTRADEFS = -DWINE_NO_LONG_TYPES -DWINBASEAPI= MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in index 675054c753d..d75392c8665 100644 --- a/dlls/kernelbase/tests/Makefile.in +++ b/dlls/kernelbase/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = kernelbase.dll C_SRCS = \ diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in index 75f561c1d4b..83ae0ea97c3 100644 --- a/dlls/krnl386.exe16/Makefile.in +++ b/dlls/krnl386.exe16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = krnl386.exe16 IMPORTLIB = kernel DELAYIMPORTS = user32 diff --git a/dlls/ktmw32/Makefile.in b/dlls/ktmw32/Makefile.in index b0517f09193..73f80aef0cf 100644 --- a/dlls/ktmw32/Makefile.in +++ b/dlls/ktmw32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ktmw32.dll C_SRCS = \ diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in index 451794b2624..781dfb27ddd 100644 --- a/dlls/l3codeca.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = l3codeca.acm IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index ab1d5a79d64..e3f68084d10 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = localspl.dll IMPORTS = spoolss user32 advapi32 diff --git a/dlls/localspl/tests/Makefile.in b/dlls/localspl/tests/Makefile.in index 2c2785fae16..916a661a67b 100644 --- a/dlls/localspl/tests/Makefile.in +++ b/dlls/localspl/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = localspl.dll IMPORTS = advapi32 diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index eb4273f8d93..71135130da1 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = localui.dll IMPORTS = winspool user32 diff --git a/dlls/localui/tests/Makefile.in b/dlls/localui/tests/Makefile.in index 8f5cb77f291..9e4afd20e09 100644 --- a/dlls/localui/tests/Makefile.in +++ b/dlls/localui/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = localui.dll IMPORTS = winspool diff --git a/dlls/lz32/tests/Makefile.in b/dlls/lz32/tests/Makefile.in index 27e7c57c546..9bb8a580efe 100644 --- a/dlls/lz32/tests/Makefile.in +++ b/dlls/lz32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = lz32.dll IMPORTS = lz32 diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 3811fd1904b..c6bc57f0ad8 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mapi32.dll IMPORTLIB = mapi32 IMPORTS = uuid shlwapi shell32 user32 advapi32 diff --git a/dlls/mapi32/tests/Makefile.in b/dlls/mapi32/tests/Makefile.in index 62d86765529..78cb762ec94 100644 --- a/dlls/mapi32/tests/Makefile.in +++ b/dlls/mapi32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mapi32.dll IMPORTS = advapi32 diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index e7fe6ba5760..6a165050f2b 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 diff --git a/dlls/mcicda/Makefile.in b/dlls/mcicda/Makefile.in index fad06893dc1..39e15b9a0ef 100644 --- a/dlls/mcicda/Makefile.in +++ b/dlls/mcicda/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mcicda.dll IMPORTS = winmm user32 diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index 4aa7e113cd5..45bb1c7a518 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciqtz32.dll IMPORTS = strmiids oleaut32 ole32 winmm user32 gdi32 diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in index 161a3deb994..8495d02cca6 100644 --- a/dlls/mciseq/Makefile.in +++ b/dlls/mciseq/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciseq.dll IMPORTS = winmm user32 diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in index 7df953858a3..8f1e01e7542 100644 --- a/dlls/mciwave/Makefile.in +++ b/dlls/mciwave/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciwave.dll IMPORTS = winmm user32 diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 36727d4d4e3..cbb41fb8d74 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mf.dll IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index 0b89107e1b4..da9882fb7db 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mf.dll IMPORTS = mf mfplat mfuuid ole32 user32 propsys diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index a0e944c0633..e410f31a99b 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfmediaengine.dll IMPORTS = oleaut32 ole32 mfplat mf mfuuid dxguid uuid diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index 421b75587a0..d8331277412 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfmediaengine.dll IMPORTS = ole32 mfplat oleaut32 mfuuid uuid diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 9f0595fc543..79af7650de6 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfplat.dll IMPORTLIB = mfplat IMPORTS = advapi32 ole32 mfuuid propsys rtworkq diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index ae9cc378933..d5ef14e88f0 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfplat.dll IMPORTS = ole32 mfplat user32 d3d9 dxva2 mfuuid propsys uuid strmiids diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 4d465fbec39..509208234c0 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfplay.dll IMPORTLIB = mfplay IMPORTS = mfplat mf ole32 user32 uuid mfuuid strmiids diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index 4eabb5ae0ab..06f77c94fec 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfplay.dll IMPORTS = mfplay user32 uuid mfuuid diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 440d5ba96cd..31c2c5a39c1 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite IMPORTS = mfuuid uuid mfplat ole32 diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in index c7476c14c6b..52f738897d3 100644 --- a/dlls/mfreadwrite/tests/Makefile.in +++ b/dlls/mfreadwrite/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfreadwrite.dll IMPORTS = ole32 user32 d3d9 dxva2 mfplat mfreadwrite mfuuid diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in index c0e66f4341e..d02c7eca7b3 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = midimap.dll IMPORTS = winmm user32 advapi32 diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index abee2a2d8b5..4c9ab1df594 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mlang.dll IMPORTLIB = mlang IMPORTS = uuid ole32 gdi32 advapi32 diff --git a/dlls/mlang/tests/Makefile.in b/dlls/mlang/tests/Makefile.in index 21ec4b2465f..ab72ea8a987 100644 --- a/dlls/mlang/tests/Makefile.in +++ b/dlls/mlang/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mlang.dll IMPORTS = mlang oleaut32 ole32 user32 gdi32 diff --git a/dlls/mmcndmgr/tests/Makefile.in b/dlls/mmcndmgr/tests/Makefile.in index 22d79ebb65b..3e595d6fe4a 100644 --- a/dlls/mmcndmgr/tests/Makefile.in +++ b/dlls/mmcndmgr/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mmcndmgr.dll IMPORTS = ole32 shlwapi uuid diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index b60372b812b..d61fce75a0e 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index dd180a253b9..183c9f36588 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mmdevapi.dll IMPORTS = ole32 version user32 advapi32 winmm diff --git a/dlls/mmdevldr.vxd/Makefile.in b/dlls/mmdevldr.vxd/Makefile.in index 096ae7c598d..934a68048d1 100644 --- a/dlls/mmdevldr.vxd/Makefile.in +++ b/dlls/mmdevldr.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmdevldr.vxd C_SRCS = \ diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in index 1eb0ce98c1d..9723d4d821d 100644 --- a/dlls/mmsystem.dll16/Makefile.in +++ b/dlls/mmsystem.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmsystem.dll16 IMPORTS = winmm user32 diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in index ccbfdba36e4..f076568c1c8 100644 --- a/dlls/monodebg.vxd/Makefile.in +++ b/dlls/monodebg.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = monodebg.vxd C_SRCS = \ diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 612ac71f869..66918d3a750 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mountmgr.sys UNIXLIB = mountmgr.so IMPORTS = uuid advapi32 ntoskrnl diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index dabbb1dfeae..4220efc3171 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mp3dmod.dll IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in index f5d54e48533..701b2987c32 100644 --- a/dlls/mp3dmod/tests/Makefile.in +++ b/dlls/mp3dmod/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mp3dmod.dll IMPORTS = dmoguids msdmo ole32 strmiids uuid wmcodecdspuuid diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index 8a74786cd22..f7e3b9edb39 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mpr.dll IMPORTLIB = mpr IMPORTS = user32 advapi32 diff --git a/dlls/mpr/tests/Makefile.in b/dlls/mpr/tests/Makefile.in index c3282546e84..47107b49d1b 100644 --- a/dlls/mpr/tests/Makefile.in +++ b/dlls/mpr/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mpr.dll IMPORTS = mpr diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index c97e316deb5..fe164b39429 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mprapi.dll IMPORTLIB = mprapi diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in index dccaf17c721..c4991005de1 100644 --- a/dlls/msacm.dll16/Makefile.in +++ b/dlls/msacm.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm.dll16 IMPORTS = msacm32 EXTRADLLFLAGS = -m16 -Wb,--main-module,msacm32.dll diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in index ec343b0e272..5d622d58221 100644 --- a/dlls/msacm32.drv/Makefile.in +++ b/dlls/msacm32.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm32.drv IMPORTS = msacm32 winmm user32 diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index be2136d78f7..a6da7428749 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm32.dll IMPORTLIB = msacm32 IMPORTS = winmm user32 advapi32 diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in index dba7cfee3da..d4fff0512b3 100644 --- a/dlls/msacm32/tests/Makefile.in +++ b/dlls/msacm32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msacm32.dll IMPORTS = msacm32 winmm diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 9c1fba502c5..b95e974e8d1 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msado15.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/msado15/tests/Makefile.in b/dlls/msado15/tests/Makefile.in index a97f3dd4339..3a27f0cbd89 100644 --- a/dlls/msado15/tests/Makefile.in +++ b/dlls/msado15/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msado15.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/msadp32.acm/Makefile.in b/dlls/msadp32.acm/Makefile.in index 6828872bc68..1f50f9e5673 100644 --- a/dlls/msadp32.acm/Makefile.in +++ b/dlls/msadp32.acm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msadp32.acm IMPORTS = winmm user32 diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in index 6d55907cff2..afdfa2657ee 100644 --- a/dlls/msasn1/Makefile.in +++ b/dlls/msasn1/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msasn1.dll IMPORTLIB = msasn1 diff --git a/dlls/msasn1/tests/Makefile.in b/dlls/msasn1/tests/Makefile.in index 395ef933c0d..bbab55b525b 100644 --- a/dlls/msasn1/tests/Makefile.in +++ b/dlls/msasn1/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msasn1.dll IMPORTS = msasn1 diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index d57cc54e3c6..f28f90327f4 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = $(LCMS2_PE_LIBS) shlwapi advapi32 diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index 2d229c049ab..e9ff9724e2f 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscms.dll IMPORTS = advapi32 diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 95639bd0fc4..05f14aa2462 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mscoree.dll IMPORTS = dbghelp uuid shell32 advapi32 ole32 oleaut32 shlwapi diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 7dcd5b64113..cb4ef4421b2 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscoree.dll IMPORTS = ole32 shlwapi uuid shell32 advapi32 diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 3e04f7b6cbf..0726f92e60f 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msctf.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in index 4f699af8e27..8c946a93527 100644 --- a/dlls/msctf/tests/Makefile.in +++ b/dlls/msctf/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msctf.dll IMPORTS = ole32 user32 advapi32 diff --git a/dlls/msctfmonitor/Makefile.in b/dlls/msctfmonitor/Makefile.in index dd58e9fb0f6..356f0ca1ce1 100644 --- a/dlls/msctfmonitor/Makefile.in +++ b/dlls/msctfmonitor/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msctfmonitor.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 14bef85fa9f..777767ed964 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msdaps.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 EXTRAIDLFLAGS = --win32-align=2 diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index 0f5453131f6..3e9c482dbd3 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msdasql.dll IMPORTS = uuid ole32 oleaut32 odbc32 diff --git a/dlls/msdasql/tests/Makefile.in b/dlls/msdasql/tests/Makefile.in index 314238660e2..2b911ed9716 100644 --- a/dlls/msdasql/tests/Makefile.in +++ b/dlls/msdasql/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msdasql.dll IMPORTS = uuid oleaut32 ole32 odbccp32 diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index 566461e00bf..ed4bcfae6f0 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msdmo.dll IMPORTLIB = msdmo IMPORTS = dmoguids uuid ole32 user32 advapi32 diff --git a/dlls/msdmo/tests/Makefile.in b/dlls/msdmo/tests/Makefile.in index 22a8e359643..2a9a1d779c6 100644 --- a/dlls/msdmo/tests/Makefile.in +++ b/dlls/msdmo/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msdmo.dll IMPORTS = advapi32 dmoguids msdmo uuid diff --git a/dlls/msftedit/tests/Makefile.in b/dlls/msftedit/tests/Makefile.in index 99cc46a0076..6609c363f22 100644 --- a/dlls/msftedit/tests/Makefile.in +++ b/dlls/msftedit/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msftedit.dll IMPORTS = ole32 oleaut32 user32 diff --git a/dlls/msg711.acm/Makefile.in b/dlls/msg711.acm/Makefile.in index baf8627a0a4..c90b9badbaa 100644 --- a/dlls/msg711.acm/Makefile.in +++ b/dlls/msg711.acm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msg711.acm IMPORTS = winmm user32 diff --git a/dlls/msgsm32.acm/Makefile.in b/dlls/msgsm32.acm/Makefile.in index 41bd1703abf..a72f7880fce 100644 --- a/dlls/msgsm32.acm/Makefile.in +++ b/dlls/msgsm32.acm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msgsm32.acm IMPORTS = $(GSM_PE_LIBS) winmm user32 EXTRAINCL = $(GSM_PE_CFLAGS) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 14e992a6593..aef53bffa27 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index fac78316986..395a484118f 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mshtml.dll IMPORTS = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32 C_SRCS = \ diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 7140e5a3308..3a1b1827456 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32 diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 5c99e67a68a..3970a211d77 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msi.dll IMPORTS = secur32 cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32 diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in index d04285aebd6..99040bd9245 100644 --- a/dlls/msident/Makefile.in +++ b/dlls/msident/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msident.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index c76c274969c..e79334679a3 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msimtf.dll IMPORTS = uuid imm32 diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in index 3bad02a186a..c36535ca8aa 100644 --- a/dlls/msisip/Makefile.in +++ b/dlls/msisip/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msisip.dll IMPORTS = crypt32 ole32 diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index e67f0e73061..7e0ff3918a8 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msnet32.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index 89d6367b39d..7c09b4c17c3 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mspatcha.dll IMPORTLIB = mspatcha diff --git a/dlls/mspatcha/tests/Makefile.in b/dlls/mspatcha/tests/Makefile.in index ef1d19271c7..917dd733c5e 100644 --- a/dlls/mspatcha/tests/Makefile.in +++ b/dlls/mspatcha/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mspatcha.dll IMPORTS = mspatcha diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 6368cd8673d..50b73374ca6 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msrle32.dll IMPORTS = winmm user32 diff --git a/dlls/msrle32/tests/Makefile.in b/dlls/msrle32/tests/Makefile.in index 5fe929a6ded..b0d99b5de8f 100644 --- a/dlls/msrle32/tests/Makefile.in +++ b/dlls/msrle32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msrle32.dll IMPORTS = msvfw32 diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 36950fd53cc..ca4b7d0dde6 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msscript.ocx RC_SRCS = msscript.rc IDL_SRCS = msscript.idl diff --git a/dlls/msscript.ocx/tests/Makefile.in b/dlls/msscript.ocx/tests/Makefile.in index cc62590133a..83648fbc429 100644 --- a/dlls/msscript.ocx/tests/Makefile.in +++ b/dlls/msscript.ocx/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msscript.ocx IMPORTS = user32 gdi32 ole32 oleaut32 advapi32 diff --git a/dlls/mssign32/Makefile.in b/dlls/mssign32/Makefile.in index d3fdd1568e0..567bf57c8ec 100644 --- a/dlls/mssign32/Makefile.in +++ b/dlls/mssign32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mssign32.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 086d3c0c5ab..0db016ead8a 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mstask.dll IMPORTS = rpcrt4 ole32 oleaut32 diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in index ad5d7d683fa..daaf63abdef 100644 --- a/dlls/mstask/tests/Makefile.in +++ b/dlls/mstask/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mstask.dll IMPORTS = ole32 user32 diff --git a/dlls/msv1_0/Makefile.in b/dlls/msv1_0/Makefile.in index 439d74d7bb9..8367caede9c 100644 --- a/dlls/msv1_0/Makefile.in +++ b/dlls/msv1_0/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msv1_0.dll UNIXLIB = msv1_0.so IMPORTS = netapi32 advapi32 diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index 2e3e3edc9ea..995d890493b 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcirt.dll -EXTRADEFS = -D_MSVCIRT +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCIRT PARENTSRC = ../msvcp90 IMPORTS = msvcrt diff --git a/dlls/msvcirt/tests/Makefile.in b/dlls/msvcirt/tests/Makefile.in index 340d2e00996..3bbb592aa6f 100644 --- a/dlls/msvcirt/tests/Makefile.in +++ b/dlls/msvcirt/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcirt.dll C_SRCS = msvcirt.c diff --git a/dlls/msvcp100/Makefile.in b/dlls/msvcp100/Makefile.in index 43416c92ad2..35602aa4096 100644 --- a/dlls/msvcp100/Makefile.in +++ b/dlls/msvcp100/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp100.dll IMPORTS = msvcr100 -EXTRADEFS = -D_MSVCP_VER=100 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=100 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp110/Makefile.in b/dlls/msvcp110/Makefile.in index b2814b35cc3..8046916629d 100644 --- a/dlls/msvcp110/Makefile.in +++ b/dlls/msvcp110/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp110.dll IMPORTS = msvcr110 -EXTRADEFS = -D_MSVCP_VER=110 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=110 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp120/Makefile.in b/dlls/msvcp120/Makefile.in index 605dcfe4988..896efa40f18 100644 --- a/dlls/msvcp120/Makefile.in +++ b/dlls/msvcp120/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp120.dll IMPORTS = msvcr120 -EXTRADEFS = -D_MSVCP_VER=120 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=120 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp120/tests/Makefile.in b/dlls/msvcp120/tests/Makefile.in index 088a2164148..705652c3712 100644 --- a/dlls/msvcp120/tests/Makefile.in +++ b/dlls/msvcp120/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp120.dll C_SRCS = \ diff --git a/dlls/msvcp140/Makefile.in b/dlls/msvcp140/Makefile.in index eb0c8c3ef39..d26db254d76 100644 --- a/dlls/msvcp140/Makefile.in +++ b/dlls/msvcp140/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp140.dll -EXTRADEFS = -D_MSVCP_VER=140 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=140 PARENTSRC = ../msvcp90 IMPORTLIB = msvcp140 diff --git a/dlls/msvcp140/tests/Makefile.in b/dlls/msvcp140/tests/Makefile.in index aa82d0cba06..4c4f7688109 100644 --- a/dlls/msvcp140/tests/Makefile.in +++ b/dlls/msvcp140/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp140.dll C_SRCS = \ diff --git a/dlls/msvcp140_atomic_wait/tests/Makefile.in b/dlls/msvcp140_atomic_wait/tests/Makefile.in index 7f58d06d8f3..30f1c7c2f88 100644 --- a/dlls/msvcp140_atomic_wait/tests/Makefile.in +++ b/dlls/msvcp140_atomic_wait/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp140_atomic_wait.dll C_SRCS = \ diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index 90dc3c03ff1..6c3626ee470 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp60.dll -EXTRADEFS = -D_MSVCP_VER=60 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 IMPORTS = msvcrt diff --git a/dlls/msvcp70/Makefile.in b/dlls/msvcp70/Makefile.in index 36ba70b761b..0f402323581 100644 --- a/dlls/msvcp70/Makefile.in +++ b/dlls/msvcp70/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp70.dll IMPORTS = msvcr70 -EXTRADEFS = -D_MSVCP_VER=70 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=70 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index dfa0a2b23d5..d84b2c1c24d 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp71.dll IMPORTS = msvcr71 -EXTRADEFS = -D_MSVCP_VER=71 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=71 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp80/Makefile.in b/dlls/msvcp80/Makefile.in index c541c1b0d11..1cc21b853ab 100644 --- a/dlls/msvcp80/Makefile.in +++ b/dlls/msvcp80/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp80.dll IMPORTS = msvcr80 -EXTRADEFS = -D_MSVCP_VER=80 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=80 PARENTSRC = ../msvcp90 C_SRCS = \ diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index 5d812db58d9..0d06a710d29 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvcp90.dll IMPORTS = msvcr90 -EXTRADEFS = -D_MSVCP_VER=90 +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=90 C_SRCS = \ details.c \ diff --git a/dlls/msvcp90/tests/Makefile.in b/dlls/msvcp90/tests/Makefile.in index 3dfaf0b303e..ad6f6a0ecf0 100644 --- a/dlls/msvcp90/tests/Makefile.in +++ b/dlls/msvcp90/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp90.dll C_SRCS = \ diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index a48ae314257..94962b962f3 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcr100.dll IMPORTLIB = msvcr100 IMPORTS = ntdll diff --git a/dlls/msvcr100/tests/Makefile.in b/dlls/msvcr100/tests/Makefile.in index a7652df38d2..bcb6d6fd13c 100644 --- a/dlls/msvcr100/tests/Makefile.in +++ b/dlls/msvcr100/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcr100.dll C_SRCS = \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 26db1d46f7a..7d5ec65444a 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcr110.dll IMPORTLIB = msvcr110 IMPORTS = ntdll diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index d2957c2f1d3..c4cbb9ab5c2 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcr120.dll IMPORTLIB = msvcr120 IMPORTS = ntdll diff --git a/dlls/msvcr120/tests/Makefile.in b/dlls/msvcr120/tests/Makefile.in index 9898cbae117..d68249f9f79 100644 --- a/dlls/msvcr120/tests/Makefile.in +++ b/dlls/msvcr120/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcr120.dll C_SRCS = \ diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index 4383c5ccb87..ac08107c04e 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcr70.dll IMPORTLIB = msvcr70 IMPORTS = ntdll diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index 5a83c81c547..d0d265ef344 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcr71.dll IMPORTLIB = msvcr71 IMPORTS = ntdll diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 2153949b41e..b9cb3fd88d8 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcr80.dll IMPORTLIB = msvcr80 IMPORTS = ntdll diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 96176a12553..876553d6c02 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcr90.dll IMPORTLIB = msvcr90 IMPORTS = ntdll diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in index 9db8275e020..9da4bd99c4f 100644 --- a/dlls/msvcr90/tests/Makefile.in +++ b/dlls/msvcr90/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcr90.dll C_SRCS = \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index e8a510d9937..d6aa44dd7ce 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcrt.dll IMPORTLIB = msvcrt IMPORTS = ntdll diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 1db6da2a0ad..4e29f2e85fe 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcrt.dll IMPORTS = advapi32 diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index bd4f78729d0..7f9151d4c3a 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = msvcrtd.dll IMPORTLIB = msvcrtd IMPORTS = ntdll diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in index d72b1d6a16d..e518e950905 100644 --- a/dlls/msvcrtd/tests/Makefile.in +++ b/dlls/msvcrtd/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcrtd.dll C_SRCS = \ diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 9247fb8b2cc..5eea0657dec 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msvfw32.dll IMPORTLIB = msvfw32 IMPORTS = winmm version comctl32 user32 gdi32 advapi32 diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in index 01d83acb105..66d8ed3089b 100644 --- a/dlls/msvfw32/tests/Makefile.in +++ b/dlls/msvfw32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvfw32.dll IMPORTS = msvfw32 advapi32 gdi32 user32 diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 2fc8f907541..6b57d14b734 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msvidc32.dll IMPORTS = user32 diff --git a/dlls/msvideo.dll16/Makefile.in b/dlls/msvideo.dll16/Makefile.in index 5f7a9a4c33d..dfc900f8cb5 100644 --- a/dlls/msvideo.dll16/Makefile.in +++ b/dlls/msvideo.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msvideo.dll16 IMPORTS = msvfw32 version advapi32 user32 diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 2bf789732da..7e3eccc0139 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msxml3.dll IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS) diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index bc1f051b091..821a4cd62db 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msxml3.dll IMPORTS = oleaut32 ole32 user32 shlwapi diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index a00072dc88b..b8c7b6e242c 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ncrypt.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in index 6a335119b62..31c2c4a2cba 100644 --- a/dlls/nddeapi/Makefile.in +++ b/dlls/nddeapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nddeapi.dll IMPORTLIB = nddeapi diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index baeae05d5c4..5d1d7973155 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ndis.sys IMPORTS = advapi32 ntoskrnl iphlpapi diff --git a/dlls/ndis.sys/tests/Makefile.in b/dlls/ndis.sys/tests/Makefile.in index 8544dfdff2f..f7073072fbf 100644 --- a/dlls/ndis.sys/tests/Makefile.in +++ b/dlls/ndis.sys/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ndis.sys IMPORTS = iphlpapi advapi32 ole32 diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 1f97d9797b9..91e7049617f 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SVRAPI_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SVRAPI_ MODULE = netapi32.dll UNIXLIB = netapi32.so IMPORTLIB = netapi32 diff --git a/dlls/netapi32/tests/Makefile.in b/dlls/netapi32/tests/Makefile.in index 3ca81e6e2bc..a41e57406e8 100644 --- a/dlls/netapi32/tests/Makefile.in +++ b/dlls/netapi32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netapi32.dll IMPORTS = advapi32 netapi32 diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 7d4b3b5a203..127110f8b05 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netcfgx.dll IMPORTS = uuid diff --git a/dlls/netcfgx/tests/Makefile.in b/dlls/netcfgx/tests/Makefile.in index 699af30f213..3caf6c9da7a 100644 --- a/dlls/netcfgx/tests/Makefile.in +++ b/dlls/netcfgx/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netcfgx.dll IMPORTS = uuid ole32 diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in index 1cbac91c037..c8ddc1fb066 100644 --- a/dlls/netio.sys/Makefile.in +++ b/dlls/netio.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netio.sys IMPORTLIB = netio IMPORTS = ntoskrnl ws2_32 diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index c491c483c3a..ebb644c0b4f 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netprofm.dll IMPORTS = iphlpapi diff --git a/dlls/netprofm/tests/Makefile.in b/dlls/netprofm/tests/Makefile.in index 3b5be5c5453..1b40b618f04 100644 --- a/dlls/netprofm/tests/Makefile.in +++ b/dlls/netprofm/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netprofm.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index c447a388614..25f2fea0518 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = newdev.dll IMPORTLIB = newdev IMPORTS = setupapi diff --git a/dlls/ninput/tests/Makefile.in b/dlls/ninput/tests/Makefile.in index 9c0b44fa17d..6ff69c9ba4f 100644 --- a/dlls/ninput/tests/Makefile.in +++ b/dlls/ninput/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ninput.dll IMPORTS = ninput diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 2d3d98f69d0..8fac9224923 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nsi.dll IMPORTLIB = nsi diff --git a/dlls/nsi/tests/Makefile.in b/dlls/nsi/tests/Makefile.in index 98129935198..f43da86076c 100644 --- a/dlls/nsi/tests/Makefile.in +++ b/dlls/nsi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = nsi.dll IMPORTS = nsi uuid iphlpapi diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index 87f7e165ef4..3b83a4ddaac 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nsiproxy.sys UNIXLIB = nsiproxy.so IMPORTS = ntoskrnl diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 185bc563e68..9cf9b0979f4 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI= MODULE = ntdll.dll UNIXLIB = ntdll.so IMPORTLIB = ntdll diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 90deb5865f8..7e0272498fa 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntdll.dll IMPORTS = user32 advapi32 diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index 263b0d45333..350a1e2aa5b 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 diff --git a/dlls/ntdsapi/tests/Makefile.in b/dlls/ntdsapi/tests/Makefile.in index 5a895e3b682..83373504312 100644 --- a/dlls/ntdsapi/tests/Makefile.in +++ b/dlls/ntdsapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntdsapi.dll IMPORTS = ntdsapi diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index e7b070bb750..1bbe6f2615f 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 hal msvcrt diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index ab1db85adbb..052a8618a81 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index 2ca355140d9..bdfe69a69e6 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntprint.dll IMPORTS = winspool diff --git a/dlls/ntprint/tests/Makefile.in b/dlls/ntprint/tests/Makefile.in index 0c1793fe9e8..94a1d9192c6 100644 --- a/dlls/ntprint/tests/Makefile.in +++ b/dlls/ntprint/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntprint.dll C_SRCS = \ diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index def7b4b5d67..75ac6d1f309 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbc32.dll UNIXLIB = odbc32.so IMPORTLIB = odbc32 diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in index 77308270728..ec36870b114 100644 --- a/dlls/odbccp32/Makefile.in +++ b/dlls/odbccp32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbccp32.dll IMPORTLIB = odbccp32 IMPORTS = uuid advapi32 diff --git a/dlls/odbccp32/tests/Makefile.in b/dlls/odbccp32/tests/Makefile.in index c65292e12d2..683633fb58a 100644 --- a/dlls/odbccp32/tests/Makefile.in +++ b/dlls/odbccp32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = odbccp32.dll IMPORTS = odbccp32 advapi32 diff --git a/dlls/ole2.dll16/Makefile.in b/dlls/ole2.dll16/Makefile.in index bb9fa89fd69..1003f29c589 100644 --- a/dlls/ole2.dll16/Makefile.in +++ b/dlls/ole2.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ole2.dll16 IMPORTS = uuid ole32 user32 gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in index 86100fe146a..c1dbbea0df7 100644 --- a/dlls/ole2disp.dll16/Makefile.in +++ b/dlls/ole2disp.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ole2disp.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 340ffdbded2..e0e4bc74c1f 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -2,7 +2,7 @@ MODULE = ole32.dll IMPORTLIB = ole32 IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase DELAYIMPORTS = oleaut32 -EXTRADEFS = -D_OLE32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLE32_ C_SRCS = \ antimoniker.c \ diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index 17710fb9a9a..2cc40927a5d 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ole32.dll IMPORTS = oleaut32 ole32 user32 uuid gdi32 advapi32 diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 331229f2d4e..629e9ae57f6 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = oleacc.dll IMPORTLIB = oleacc IMPORTS = uuid oleaut32 ole32 user32 rpcrt4 diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in index 7773ba911e3..c9cddafd3eb 100644 --- a/dlls/oleacc/tests/Makefile.in +++ b/dlls/oleacc/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = oleacc.dll IMPORTS = ole32 oleacc oleaut32 user32 diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index a7dea7a37c7..d9e7c7df332 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -2,7 +2,7 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs -EXTRADEFS = -D_OLEAUT32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLEAUT32_ C_SRCS = \ connpt.c \ diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in index 098ea9deef7..780a068ede4 100644 --- a/dlls/oleaut32/tests/Makefile.in +++ b/dlls/oleaut32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = oleaut32.dll IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in index 40a2446b61e..deb080b7282 100644 --- a/dlls/olecli.dll16/Makefile.in +++ b/dlls/olecli.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olecli.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in index 0eca46ff269..54dc54d02ac 100644 --- a/dlls/olecli32/Makefile.in +++ b/dlls/olecli32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olecli32.dll IMPORTLIB = olecli32 IMPORTS = ole32 gdi32 diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 58e8f7b519d..ec07aa6d656 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = oledb32.dll IMPORTS = uuid oleaut32 ole32 comctl32 user32 advapi32 diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index 1a4e07ead1e..7ac8f242fc2 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = oledb32.dll IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 4a16469a456..1d1113a7876 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = oledlg.dll IMPORTLIB = oledlg IMPORTS = ole32 comdlg32 user32 advapi32 diff --git a/dlls/oledlg/tests/Makefile.in b/dlls/oledlg/tests/Makefile.in index 5c6227bb59d..10f77e8042e 100644 --- a/dlls/oledlg/tests/Makefile.in +++ b/dlls/oledlg/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = oledlg.dll IMPORTS = oledlg ole32 user32 diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in index d894b588007..49c07bdcc76 100644 --- a/dlls/olesvr.dll16/Makefile.in +++ b/dlls/olesvr.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olesvr.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in index 0cea1ad4654..5efc297a7aa 100644 --- a/dlls/olesvr32/Makefile.in +++ b/dlls/olesvr32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olesvr32.dll IMPORTLIB = olesvr32 diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 0867b1bd882..99145d4cc7e 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = opcservices.dll IMPORTS = $(ZLIB_PE_LIBS) uuid ole32 advapi32 urlmon xmllite oleaut32 EXTRAINCL = $(ZLIB_PE_CFLAGS) diff --git a/dlls/opcservices/tests/Makefile.in b/dlls/opcservices/tests/Makefile.in index 4fa222e9273..c121c34e398 100644 --- a/dlls/opcservices/tests/Makefile.in +++ b/dlls/opcservices/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = opcservices.dll IMPORTS = ole32 urlmon oleaut32 diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index fc27b481df3..37986c7a33e 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,5 +1,5 @@ MODULE = opengl32.dll -EXTRADEFS = -D_OPENGL32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OPENGL32_ IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 win32u DELAYIMPORTS = glu32 diff --git a/dlls/opengl32/tests/Makefile.in b/dlls/opengl32/tests/Makefile.in index 792c9d0fe78..222fd4c8654 100644 --- a/dlls/opengl32/tests/Makefile.in +++ b/dlls/opengl32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = opengl32.dll IMPORTS = opengl32 user32 gdi32 diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in index a2b2daa0cea..f539cb6f095 100644 --- a/dlls/packager/Makefile.in +++ b/dlls/packager/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = packager.dll IMPORTS = uuid shell32 shlwapi user32 diff --git a/dlls/packager/tests/Makefile.in b/dlls/packager/tests/Makefile.in index 9988caad906..afab992cdb2 100644 --- a/dlls/packager/tests/Makefile.in +++ b/dlls/packager/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = packager.dll IMPORTS = ole32 diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index a56b9d6e4fc..f98fb916646 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pdh.dll IMPORTLIB = pdh diff --git a/dlls/pdh/tests/Makefile.in b/dlls/pdh/tests/Makefile.in index cb50923565b..ed1eea6c004 100644 --- a/dlls/pdh/tests/Makefile.in +++ b/dlls/pdh/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = pdh.dll IMPORTS = pdh diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index e51fc62e7c0..b2e59f6032f 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = powrprof.dll IMPORTLIB = powrprof IMPORTS = advapi32 diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index c504f190b2f..eb1dbf899dc 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = printui.dll IMPORTS = shell32 diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 77eaf354224..7c581662357 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = prntvpt.dll IMPORTLIB = prntvpt IMPORTS = winspool ole32 oleaut32 diff --git a/dlls/prntvpt/tests/Makefile.in b/dlls/prntvpt/tests/Makefile.in index 692a134d016..659a25a064c 100644 --- a/dlls/prntvpt/tests/Makefile.in +++ b/dlls/prntvpt/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = prntvpt.dll IMPORTS = prntvpt winspool ole32 diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 166b7751d6e..71fd29a0dfe 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid diff --git a/dlls/propsys/tests/Makefile.in b/dlls/propsys/tests/Makefile.in index 19e30afde77..7b233cf640e 100644 --- a/dlls/propsys/tests/Makefile.in +++ b/dlls/propsys/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = propsys.dll IMPORTS = propsys ole32 oleaut32 diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index d085953f6ca..5351ab507dc 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = psapi.dll IMPORTS = psapi user32 diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index 62d06a759b4..bc92381f7bf 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pstorec.dll IMPORTS = uuid diff --git a/dlls/pstorec/tests/Makefile.in b/dlls/pstorec/tests/Makefile.in index 2287f0f4c70..eb6c02a5291 100644 --- a/dlls/pstorec/tests/Makefile.in +++ b/dlls/pstorec/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = pstorec.dll C_SRCS = \ diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index ee8fd0451e1..d82abfeea7d 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qasf.dll IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32 diff --git a/dlls/qasf/tests/Makefile.in b/dlls/qasf/tests/Makefile.in index 4b8d40671fb..76cf1d73298 100644 --- a/dlls/qasf/tests/Makefile.in +++ b/dlls/qasf/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qasf.dll IMPORTS = strmbase dmoguids strmiids uuid msdmo ole32 diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index b61a4a05ab2..634bcca2ff4 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qcap.dll UNIXLIB = qcap.so IMPORTS = strmbase strmiids uuid ole32 oleaut32 diff --git a/dlls/qcap/tests/Makefile.in b/dlls/qcap/tests/Makefile.in index 6e2fb2d4d2a..3fc00bf05ff 100644 --- a/dlls/qcap/tests/Makefile.in +++ b/dlls/qcap/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qcap.dll IMPORTS = strmbase strmiids uuid oleaut32 ole32 advapi32 msvfw32 diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index 4c2266d633a..826d5dbe639 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qdvd.dll IMPORTS = strmbase strmiids uuid ole32 diff --git a/dlls/qdvd/tests/Makefile.in b/dlls/qdvd/tests/Makefile.in index fdd769b73e0..c94ea074c07 100644 --- a/dlls/qdvd/tests/Makefile.in +++ b/dlls/qdvd/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qdvd.dll IMPORTS = strmiids uuid ole32 diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index f9b6f5c3ed9..7b0eea3c592 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qedit.dll IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32 diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in index a1020f5052d..0b028674090 100644 --- a/dlls/qedit/tests/Makefile.in +++ b/dlls/qedit/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qedit.dll IMPORTS = strmbase strmiids uuid oleaut32 ole32 diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 21d2328e2f0..1e23b75c30d 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qmgr.dll IMPORTS = uuid winhttp ole32 advapi32 diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 2bf92a94019..19dcab624aa 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qmgr.dll IMPORTS = uuid ole32 shlwapi user32 diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index e7e1b43da79..81db98e639d 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = quartz.dll IMPORTLIB = quartz IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 423abc78ef6..a47eec8bfd2 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = quartz.dll IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid winmm diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 8cdeb9c9765..71352a5ff0f 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = query.dll IMPORTS = uuid diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index fee5602d7ba..b75cbb05423 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qwave.dll IMPORTLIB = qwave diff --git a/dlls/qwave/tests/Makefile.in b/dlls/qwave/tests/Makefile.in index 713909ba191..999c26f693f 100644 --- a/dlls/qwave/tests/Makefile.in +++ b/dlls/qwave/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qwave.dll IMPORTS = qwave diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index ff7e71042f9..e1d31e8c405 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rasapi32.dll IMPORTLIB = rasapi32 diff --git a/dlls/rasapi32/tests/Makefile.in b/dlls/rasapi32/tests/Makefile.in index 64d91ee7359..8e49604cf41 100644 --- a/dlls/rasapi32/tests/Makefile.in +++ b/dlls/rasapi32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rasapi32.dll C_SRCS = \ diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index b64ee554690..8d6dde5dcd0 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = riched20.dll IMPORTLIB = riched20 IMPORTS = uuid usp10 ole32 oleaut32 imm32 user32 gdi32 diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index 34c00afa7cb..77416f1a9f2 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = riched20.dll IMPORTS = ole32 oleaut32 user32 gdi32 diff --git a/dlls/riched32/tests/Makefile.in b/dlls/riched32/tests/Makefile.in index c73defc11d0..d74a1b1682f 100644 --- a/dlls/riched32/tests/Makefile.in +++ b/dlls/riched32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = riched32.dll IMPORTS = ole32 user32 diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 2aa2a5376aa..1ad225735d2 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_RPCRT4_ -DMSWMSG +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_RPCRT4_ -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 1e7276c893a..195c6cd2909 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = rpcrt4.dll IMPORTS = oleaut32 ole32 rpcrt4 secur32 advapi32 EXTRAIDLFLAGS = --prefix-server=s_ -EXTRADEFS = -DPROXY_DELEGATION +EXTRADEFS = -DWINE_NO_LONG_TYPES -DPROXY_DELEGATION server_EXTRAIDLFLAGS = -Os --prefix-client=mixed_ server_interp_EXTRAIDLFLAGS = -Oicf --prefix-client=interp_ diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 9997752ad3f..36120f2074b 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rsaenh.dll IMPORTLIB = rsaenh IMPORTS = bcrypt crypt32 advapi32 diff --git a/dlls/rsaenh/tests/Makefile.in b/dlls/rsaenh/tests/Makefile.in index 91f2d28ef6d..641a3fff080 100644 --- a/dlls/rsaenh/tests/Makefile.in +++ b/dlls/rsaenh/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rsaenh.dll IMPORTS = advapi32 diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in index 8e9610ee5c9..9770a4b3408 100644 --- a/dlls/rstrtmgr/Makefile.in +++ b/dlls/rstrtmgr/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rstrtmgr.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index d55efc11cfb..ac39ee054aa 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rtutils.dll IMPORTLIB = rtutils diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in index 46268866ddb..d5aa5ec0d0f 100644 --- a/dlls/rtworkq/Makefile.in +++ b/dlls/rtworkq/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rtworkq.dll IMPORTLIB = rtworkq IMPORTS = ole32 diff --git a/dlls/rtworkq/tests/Makefile.in b/dlls/rtworkq/tests/Makefile.in index 8354cd810d1..7a2f6db51c7 100644 --- a/dlls/rtworkq/tests/Makefile.in +++ b/dlls/rtworkq/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = rtworkq.dll IMPORTS = rtworkq ole32 diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 59ceeda3fac..9c4931a0b54 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sane.ds UNIXLIB = sane.so IMPORTS = comctl32 user32 gdi32 diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index e0f9a8cdd07..e61773fb12a 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sapi.dll IMPORTS = uuid ole32 user32 advapi32 diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in index 75c70d072d8..4e59710b172 100644 --- a/dlls/sapi/tests/Makefile.in +++ b/dlls/sapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = sapi.dll IMPORTS = ole32 user32 advapi32 diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index 84c4480cf2d..7493cf9dd5b 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schannel.dll IMPORTS = secur32 diff --git a/dlls/schannel/tests/Makefile.in b/dlls/schannel/tests/Makefile.in index ca82dccfd9b..ee755457e98 100644 --- a/dlls/schannel/tests/Makefile.in +++ b/dlls/schannel/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schannel.dll C_SRCS = \ diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 021cae468a6..321e3bfccab 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schedsvc.dll IMPORTS = rpcrt4 advapi32 ole32 diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index b8e7448bb76..8f328a94a82 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schedsvc.dll IMPORTS = rpcrt4 ole32 diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in index ad21234f065..8b641129688 100644 --- a/dlls/scrobj/Makefile.in +++ b/dlls/scrobj/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = scrobj.dll IMPORTS = uuid urlmon ole32 oleaut32 xmllite advapi32 diff --git a/dlls/scrobj/tests/Makefile.in b/dlls/scrobj/tests/Makefile.in index 4e517caefe6..52bd20da04f 100644 --- a/dlls/scrobj/tests/Makefile.in +++ b/dlls/scrobj/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = scrobj.dll IMPORTS = oleaut32 ole32 advapi32 uuid diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index 31ef016f48e..c0beae245ef 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = scrrun.dll IMPORTS = uuid oleaut32 version advapi32 diff --git a/dlls/scrrun/tests/Makefile.in b/dlls/scrrun/tests/Makefile.in index e9eccb686d2..88f08303eee 100644 --- a/dlls/scrrun/tests/Makefile.in +++ b/dlls/scrrun/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = scrrun.dll IMPORTS = ole32 shlwapi uuid oleaut32 user32 diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index f930088d3a7..0bcace7b9c7 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sechost.dll IMPORTLIB = sechost IMPORTS = kernelbase diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 5b71cd82417..e4c6927656a 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = secur32.dll IMPORTLIB = secur32 UNIXLIB = secur32.so diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in index 089d1c3117b..c659759c8cb 100644 --- a/dlls/secur32/tests/Makefile.in +++ b/dlls/secur32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = secur32.dll IMPORTS = secur32 crypt32 advapi32 ws2_32 diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 6c22afda68e..c7a03a98d93 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = serialui.dll IMPORTS = user32 advapi32 diff --git a/dlls/serialui/tests/Makefile.in b/dlls/serialui/tests/Makefile.in index 63f553cae11..d1dad8ef186 100644 --- a/dlls/serialui/tests/Makefile.in +++ b/dlls/serialui/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = serialui.dll C_SRCS = \ diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index d1b647cd5e5..f37ec8402cb 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SETUPAPI_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid version advapi32 rpcrt4 kernelbase diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index df7c6687875..438a2e09bcc 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = setupapi.dll IMPORTS = advapi32 cabinet ole32 setupapi shell32 uuid user32 diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in index d7d6555baf0..3d7de3d3dff 100644 --- a/dlls/setupx.dll16/Makefile.in +++ b/dlls/setupx.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = setupx.dll16 IMPORTS = setupapi user32 advapi32 diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index e3e727fc262..5488245195f 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sfc_os.dll IMPORTLIB = sfc_os diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index 7c4d161a558..084ff0d87c7 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = shcore.dll IMPORTLIB = shcore IMPORTS = user32 gdi32 ole32 advapi32 diff --git a/dlls/shcore/tests/Makefile.in b/dlls/shcore/tests/Makefile.in index 4f537fa3874..f20c27aae2d 100644 --- a/dlls/shcore/tests/Makefile.in +++ b/dlls/shcore/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = shcore.dll IMPORTS = advapi32 diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 30b0a1a299c..88b5340abda 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHDOCVW_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32 diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 4c415363e2d..7fb0f544025 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = shdocvw.dll IMPORTS = shell32 ole32 oleaut32 advapi32 diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in index dad637e6081..f781f87b521 100644 --- a/dlls/shell.dll16/Makefile.in +++ b/dlls/shell.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = shell.dll16 IMPORTS = shell32 user32 gdi32 advapi32 diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index eeb6cd63d60..e31c165ccff 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHELL32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 08a7d3af3a6..9abd0d1e353 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = shell32.dll IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 070dc232cee..56474e1da18 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHLWAPI_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHLWAPI_ MODULE = shlwapi.dll IMPORTLIB = shlwapi IMPORTS = uuid shcore user32 gdi32 advapi32 kernelbase diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 450a3955489..5c026fd6e5d 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = shlwapi.dll IMPORTS = shlwapi shell32 mlang oleaut32 ole32 user32 advapi32 diff --git a/dlls/slc/tests/Makefile.in b/dlls/slc/tests/Makefile.in index 51b648cb854..86f77823a71 100644 --- a/dlls/slc/tests/Makefile.in +++ b/dlls/slc/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = slc.dll IMPORTS = slc diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index eaee9374cfe..ea92b1d6bf3 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = snmpapi.dll IMPORTLIB = snmpapi diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in index 8e9b04bfa83..8aa1117c905 100644 --- a/dlls/sound.drv16/Makefile.in +++ b/dlls/sound.drv16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sound.drv16 EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index d09836cbae6..a9a9ef8b723 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool diff --git a/dlls/spoolss/tests/Makefile.in b/dlls/spoolss/tests/Makefile.in index f54fe5937c1..992090c3745 100644 --- a/dlls/spoolss/tests/Makefile.in +++ b/dlls/spoolss/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = spoolss.dll C_SRCS = \ diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in index 1cd222f6175..4d31f9dc923 100644 --- a/dlls/sppc/Makefile.in +++ b/dlls/sppc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sppc.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index f6e542c64d5..162205a5bf6 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sti.dll IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in index a6735dd09e6..0c14e735f0a 100644 --- a/dlls/sti/tests/Makefile.in +++ b/dlls/sti/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = sti.dll IMPORTS = uuid ole32 diff --git a/dlls/storage.dll16/Makefile.in b/dlls/storage.dll16/Makefile.in index f390aca7dd9..69a06475c55 100644 --- a/dlls/storage.dll16/Makefile.in +++ b/dlls/storage.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = storage.dll16 IMPORTS = uuid ole32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in index 0c93384c33e..76731e716d6 100644 --- a/dlls/stress.dll16/Makefile.in +++ b/dlls/stress.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = stress.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 867ea270f3d..27a5c58bdd0 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in index e271d7df7f2..fde478921c0 100644 --- a/dlls/sxs/tests/Makefile.in +++ b/dlls/sxs/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = sxs.dll IMPORTS = sxs shlwapi diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index afda2511913..d9fc7e97bf6 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = t2embed.dll IMPORTLIB = t2embed IMPORTS = gdi32 advapi32 diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in index c4f49a3f6ca..69d91384869 100644 --- a/dlls/t2embed/tests/Makefile.in +++ b/dlls/t2embed/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = t2embed.dll IMPORTS = user32 gdi32 t2embed diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in index e8c5e58cee0..51af8215c28 100644 --- a/dlls/tapi32/Makefile.in +++ b/dlls/tapi32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = tapi32.dll IMPORTLIB = tapi32 IMPORTS = advapi32 diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in index 126eed1c85c..6c420bf270f 100644 --- a/dlls/tapi32/tests/Makefile.in +++ b/dlls/tapi32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = tapi32.dll IMPORTS = tapi32 diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 4634c5bbe84..517b4d38c4a 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = taskschd.dll IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 diff --git a/dlls/taskschd/tests/Makefile.in b/dlls/taskschd/tests/Makefile.in index 63424dab5b0..6d4878ab30d 100644 --- a/dlls/taskschd/tests/Makefile.in +++ b/dlls/taskschd/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = taskschd.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 64d0de31528..7e39aa9c7cb 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = toolhelp.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index 633355f93ec..bef639c0a98 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = traffic.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index c82b5a74453..8919b82000a 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = twain_32.dll IMPORTS = user32 diff --git a/dlls/twain_32/tests/Makefile.in b/dlls/twain_32/tests/Makefile.in index c8853713e60..4945fef23be 100644 --- a/dlls/twain_32/tests/Makefile.in +++ b/dlls/twain_32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = twain_32.dll IMPORTS = user32 gdi32 diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in index b4d39ee6601..06adb35b296 100644 --- a/dlls/typelib.dll16/Makefile.in +++ b/dlls/typelib.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = typelib.dll16 IMPORTS = oleaut32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index bf7f62ada8a..e7d9951575e 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_CRTIMP= +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_CRTIMP= MODULE = ucrtbase.dll IMPORTLIB = ucrtbase IMPORTS = ntdll diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 4df5684290c..5c345e6a0f3 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = ucrtbase.dll IMPORTS = ucrtbase -EXTRADEFS = -fno-builtin +EXTRADEFS = -DWINE_NO_LONG_TYPES -fno-builtin SOURCES = \ cpp.c \ diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index e632e19bd7c..cac37bf3c79 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uianimation.dll IMPORTS = uuid diff --git a/dlls/uianimation/tests/Makefile.in b/dlls/uianimation/tests/Makefile.in index ec1118c2fcd..340034a0ddb 100644 --- a/dlls/uianimation/tests/Makefile.in +++ b/dlls/uianimation/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = uianimation.dll IMPORTS = ole32 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index f0973fdec4c..919314c16d9 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore IMPORTS = uuid ole32 oleaut32 user32 diff --git a/dlls/uiautomationcore/tests/Makefile.in b/dlls/uiautomationcore/tests/Makefile.in index fbd53507fbe..a81a8ec9eae 100644 --- a/dlls/uiautomationcore/tests/Makefile.in +++ b/dlls/uiautomationcore/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = uiautomationcore.dll IMPORTS = uiautomationcore user32 ole32 oleaut32 diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index 0b9724d87a9..19753ea19ed 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiribbon.dll IMPORTS = uuid ole32 diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 141d0c65655..44798189827 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index f95e7972829..f24a365382f 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -1,7 +1,7 @@ MODULE = urlmon.dll IMPORTLIB = urlmon IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 -EXTRADEFS = -D_URLMON_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_URLMON_ DELAYIMPORTS = advpack C_SRCS = \ diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 7217f5326ad..c0880892f98 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = urlmon.dll IMPORTS = urlmon wininet ole32 oleaut32 shlwapi user32 advapi32 diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index 6040071ddaf..026f4ba4219 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = usbd.sys IMPORTLIB = usbd IMPORTS = ntoskrnl diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index 7e2438d033f..e4a2c4a723a 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = user.exe16 IMPORTS = mpr user32 gdi32 win32u EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 54feab3400f..b3970d44e4d 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_USER32_ -D_WINABLE_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = $(PNG_PE_LIBS) setupapi gdi32 version sechost advapi32 kernelbase win32u diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3c..f375234af51 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = user32.dll IMPORTS = user32 gdi32 advapi32 hid diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index dcda835708e..8dde5344c9c 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = userenv.dll IMPORTS = advapi32 IMPORTLIB = userenv diff --git a/dlls/userenv/tests/Makefile.in b/dlls/userenv/tests/Makefile.in index c4aa8d0db4a..4eca08ed851 100644 --- a/dlls/userenv/tests/Makefile.in +++ b/dlls/userenv/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = userenv.dll IMPORTS = userenv advapi32 diff --git a/dlls/usp10/tests/Makefile.in b/dlls/usp10/tests/Makefile.in index 131bcee1727..c0a51922332 100644 --- a/dlls/usp10/tests/Makefile.in +++ b/dlls/usp10/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = usp10.dll IMPORTS = usp10 user32 gdi32 diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 933650f4261..42f4c9867b4 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uxtheme.dll IMPORTLIB = uxtheme IMPORTS = user32 gdi32 advapi32 diff --git a/dlls/uxtheme/tests/Makefile.in b/dlls/uxtheme/tests/Makefile.in index 3fd3c23f5d8..876cd1d7815 100644 --- a/dlls/uxtheme/tests/Makefile.in +++ b/dlls/uxtheme/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = uxtheme.dll IMPORTS = advapi32 user32 gdi32 uxtheme diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index a6a0569cc03..96e4e0affb9 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vbscript.dll IMPORTS = oleaut32 ole32 user32 diff --git a/dlls/vbscript/tests/Makefile.in b/dlls/vbscript/tests/Makefile.in index 35379baf198..bab23098f99 100644 --- a/dlls/vbscript/tests/Makefile.in +++ b/dlls/vbscript/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = vbscript.dll IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/vcomp/Makefile.in b/dlls/vcomp/Makefile.in index a54a86f8eb6..201b855718a 100644 --- a/dlls/vcomp/Makefile.in +++ b/dlls/vcomp/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp.dll C_SRCS = \ diff --git a/dlls/vcomp/tests/Makefile.in b/dlls/vcomp/tests/Makefile.in index d1b7b1291bd..f8a66a74d92 100644 --- a/dlls/vcomp/tests/Makefile.in +++ b/dlls/vcomp/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = vcomp.dll C_SRCS = \ diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in index b087e894ad7..6c4d19a9797 100644 --- a/dlls/vcomp100/Makefile.in +++ b/dlls/vcomp100/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp100.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp110/Makefile.in b/dlls/vcomp110/Makefile.in index abd3d465934..c44f5eae8d8 100644 --- a/dlls/vcomp110/Makefile.in +++ b/dlls/vcomp110/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp110.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp110/tests/Makefile.in b/dlls/vcomp110/tests/Makefile.in index 98fba09e5b4..cc48f6e9fc8 100644 --- a/dlls/vcomp110/tests/Makefile.in +++ b/dlls/vcomp110/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = vcomp110.dll C_SRCS = \ diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in index 9a2f2428f6f..c52812f4384 100644 --- a/dlls/vcomp120/Makefile.in +++ b/dlls/vcomp120/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp120.dll PARENTSRC = ../vcomp diff --git a/dlls/vcomp140/Makefile.in b/dlls/vcomp140/Makefile.in index 644ac670af9..10263e2112f 100644 --- a/dlls/vcomp140/Makefile.in +++ b/dlls/vcomp140/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcomp140.dll PARENTSRC = ../vcomp diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in index 2b4d6af7c91..af1b62c0b40 100644 --- a/dlls/vcruntime140/Makefile.in +++ b/dlls/vcruntime140/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcruntime140.dll C_SRCS = \ diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in index 31f15af2989..5770333edcd 100644 --- a/dlls/vcruntime140_1/Makefile.in +++ b/dlls/vcruntime140_1/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vcruntime140_1.dll C_SRCS = \ diff --git a/dlls/vdhcp.vxd/Makefile.in b/dlls/vdhcp.vxd/Makefile.in index b27d520f256..715a2acf6b0 100644 --- a/dlls/vdhcp.vxd/Makefile.in +++ b/dlls/vdhcp.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vdhcp.vxd C_SRCS = \ diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in index 63051c1c23c..8b99c6ba891 100644 --- a/dlls/vdmdbg/Makefile.in +++ b/dlls/vdmdbg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vdmdbg.dll IMPORTLIB = vdmdbg diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in index 1c68dfc5035..ca72752ca4f 100644 --- a/dlls/ver.dll16/Makefile.in +++ b/dlls/ver.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ver.dll16 IMPORTS = version lz32 diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index e26069e18c4..8bb38e37075 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = version.dll IMPORTLIB = version IMPORTS = kernelbase diff --git a/dlls/version/tests/Makefile.in b/dlls/version/tests/Makefile.in index a1e24f9be22..8cc84e2d89c 100644 --- a/dlls/version/tests/Makefile.in +++ b/dlls/version/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = version.dll IMPORTS = version shell32 diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in index 949065907fc..0b224bd459b 100644 --- a/dlls/virtdisk/Makefile.in +++ b/dlls/virtdisk/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = virtdisk.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/virtdisk/tests/Makefile.in b/dlls/virtdisk/tests/Makefile.in index 3ace1a702d3..6d573f357e9 100644 --- a/dlls/virtdisk/tests/Makefile.in +++ b/dlls/virtdisk/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = virtdisk.dll C_SRCS = \ diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in index 28a5302f532..9d4818c1926 100644 --- a/dlls/vmm.vxd/Makefile.in +++ b/dlls/vmm.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vmm.vxd C_SRCS = \ diff --git a/dlls/vnbt.vxd/Makefile.in b/dlls/vnbt.vxd/Makefile.in index 8fc6b3e4a73..61d0c786c36 100644 --- a/dlls/vnbt.vxd/Makefile.in +++ b/dlls/vnbt.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vnbt.vxd IMPORTS = iphlpapi ws2_32 diff --git a/dlls/vnetbios.vxd/Makefile.in b/dlls/vnetbios.vxd/Makefile.in index 8e8cb60481c..d1f77cb78e8 100644 --- a/dlls/vnetbios.vxd/Makefile.in +++ b/dlls/vnetbios.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vnetbios.vxd IMPORTS = netapi32 diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in index 867a56287a5..0df40af2830 100644 --- a/dlls/vssapi/Makefile.in +++ b/dlls/vssapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vssapi.dll C_SRCS = \ diff --git a/dlls/vtdapi.vxd/Makefile.in b/dlls/vtdapi.vxd/Makefile.in index 685495e70e9..043b4f7d2e3 100644 --- a/dlls/vtdapi.vxd/Makefile.in +++ b/dlls/vtdapi.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vtdapi.vxd C_SRCS = \ diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in index c9f9f0727c8..6bff576d70f 100644 --- a/dlls/vulkan-1/tests/Makefile.in +++ b/dlls/vulkan-1/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = vulkan-1.dll IMPORTS = vulkan-1 diff --git a/dlls/vwin32.vxd/Makefile.in b/dlls/vwin32.vxd/Makefile.in index 6157900448c..81282166549 100644 --- a/dlls/vwin32.vxd/Makefile.in +++ b/dlls/vwin32.vxd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = vwin32.vxd IMPORTS = kernel diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in index 73691b2fa5d..08c67ad3ad4 100644 --- a/dlls/w32sys.dll16/Makefile.in +++ b/dlls/w32sys.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = w32sys.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 682cee35391..88de6e935bd 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wbemdisp.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/wbemdisp/tests/Makefile.in b/dlls/wbemdisp/tests/Makefile.in index f509d374f24..0a8d63bddb5 100644 --- a/dlls/wbemdisp/tests/Makefile.in +++ b/dlls/wbemdisp/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wbemdisp.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 48a43646491..89c209ab183 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi diff --git a/dlls/wbemprox/tests/Makefile.in b/dlls/wbemprox/tests/Makefile.in index 565edd0a289..92a15b6c8e9 100644 --- a/dlls/wbemprox/tests/Makefile.in +++ b/dlls/wbemprox/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wbemprox.dll IMPORTS = uuid oleaut32 ole32 user32 advapi32 diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index b58714d3253..ac0600a5b9e 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = webservices.dll IMPORTLIB = webservices IMPORTS = winhttp rpcrt4 user32 ws2_32 diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index 63e24e66db0..b8a3137c2a5 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = webservices.dll IMPORTS = webservices oleaut32 ole32 user32 rpcrt4 ws2_32 advapi32 diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in index a422a934bc0..ac3d79bd59d 100644 --- a/dlls/wer/Makefile.in +++ b/dlls/wer/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wer.dll IMPORTLIB = wer IMPORTS = advapi32 diff --git a/dlls/wer/tests/Makefile.in b/dlls/wer/tests/Makefile.in index ec7bb5c1df5..51d7216d821 100644 --- a/dlls/wer/tests/Makefile.in +++ b/dlls/wer/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wer.dll IMPORTS = wer diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index 4b300799051..b99c0527ab6 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wevtapi.dll IMPORTLIB = wevtapi diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in index 47fde74b0eb..db69ecb71d2 100644 --- a/dlls/wevtapi/tests/Makefile.in +++ b/dlls/wevtapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wevtapi.dll IMPORTS = wevtapi advapi32 diff --git a/dlls/wevtsvc/Makefile.in b/dlls/wevtsvc/Makefile.in index 729089463f9..6480c4ecdbf 100644 --- a/dlls/wevtsvc/Makefile.in +++ b/dlls/wevtsvc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wevtsvc.dll IMPORTS = rpcrt4 advapi32 diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index c2ba299c4e3..9d71d10423e 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wiaservc.dll IMPORTS = uuid ole32 advapi32 diff --git a/dlls/wiaservc/tests/Makefile.in b/dlls/wiaservc/tests/Makefile.in index 594e1b2a988..7eadf649a35 100644 --- a/dlls/wiaservc/tests/Makefile.in +++ b/dlls/wiaservc/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wiaservc.dll IMPORTS = ole32 diff --git a/dlls/wimgapi/Makefile.in b/dlls/wimgapi/Makefile.in index 7b4216e54cc..75b83cf31ee 100644 --- a/dlls/wimgapi/Makefile.in +++ b/dlls/wimgapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wimgapi.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 41c252be59c..76fd4396c7d 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = win32u.dll UNIXLIB = win32u.so IMPORTLIB = win32u diff --git a/dlls/win32u/tests/Makefile.in b/dlls/win32u/tests/Makefile.in index c0fa70e4e08..a89a6dd491f 100644 --- a/dlls/win32u/tests/Makefile.in +++ b/dlls/win32u/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = win32u.dll IMPORTS = user32 win32u diff --git a/dlls/win87em.dll16/Makefile.in b/dlls/win87em.dll16/Makefile.in index b40ceb0c68d..b4a9ebea56b 100644 --- a/dlls/win87em.dll16/Makefile.in +++ b/dlls/win87em.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = win87em.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in index a2058b3d002..dcac3c204c7 100644 --- a/dlls/windows.devices.enumeration/Makefile.in +++ b/dlls/windows.devices.enumeration/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.devices.enumeration.dll IMPORTS = combase uuid diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index fab3c4e62d5..db009015e88 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.gaming.input.dll IMPORTS = combase uuid diff --git a/dlls/windows.gaming.input/tests/Makefile.in b/dlls/windows.gaming.input/tests/Makefile.in index 88e1c05fbcf..19fb708d0d2 100644 --- a/dlls/windows.gaming.input/tests/Makefile.in +++ b/dlls/windows.gaming.input/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.gaming.input.dll IMPORTS = combase uuid diff --git a/dlls/windows.globalization/Makefile.in b/dlls/windows.globalization/Makefile.in index d29c44ea746..84e78eb2842 100644 --- a/dlls/windows.globalization/Makefile.in +++ b/dlls/windows.globalization/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.globalization.dll IMPORTS = combase uuid diff --git a/dlls/windows.globalization/tests/Makefile.in b/dlls/windows.globalization/tests/Makefile.in index 7ee2bc407d6..2b643ef8437 100644 --- a/dlls/windows.globalization/tests/Makefile.in +++ b/dlls/windows.globalization/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.globalization.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in index b4cdb69900e..cbeb55cba42 100644 --- a/dlls/windows.media.devices/Makefile.in +++ b/dlls/windows.media.devices/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.media.devices.dll IMPORTS = combase diff --git a/dlls/windows.media.devices/tests/Makefile.in b/dlls/windows.media.devices/tests/Makefile.in index 4d107889dad..37f5f7bde06 100644 --- a/dlls/windows.media.devices/tests/Makefile.in +++ b/dlls/windows.media.devices/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.devices.dll IMPORTS = combase diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 9fbff8e132f..fc01608d62c 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index 2ee10d3db21..e1616991573 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 068730971e8..cd4c428c54f 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32 diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 3d1e9e8a84e..1a4d2fa8646 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windowscodecs.dll IMPORTS = windowscodecs propsys oleaut32 ole32 user32 gdi32 shlwapi uuid diff --git a/dlls/windowscodecsext/tests/Makefile.in b/dlls/windowscodecsext/tests/Makefile.in index d99067ef296..22c052f8384 100644 --- a/dlls/windowscodecsext/tests/Makefile.in +++ b/dlls/windowscodecsext/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windowscodecsext.dll IMPORTS = windowscodecsext ole32 diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 39ae55f3802..7ce382e64c2 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winealsa.drv IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 7fcad453374..0e3a632b8fb 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineandroid.drv IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl win32u diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index d9ea33d267d..6eaaa248c0c 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winebus.sys UNIXLIB = winebus.so IMPORTS = ntoskrnl hidparse diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 4be396c489c..e21cc07f62e 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winecoreaudio.drv UNIXLIB = winecoreaudio.so IMPORTS = uuid ole32 user32 advapi32 diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 17da4da29c6..6915e69eb4b 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES STATICLIB = libwinecrt0.a C_SRCS = \ diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 41e129b24f6..f95a6778a30 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wined3d.dll IMPORTLIB = wined3d IMPORTS = opengl32 user32 gdi32 advapi32 win32u diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 76e6aeed54d..062fe57bdbb 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so IMPORTLIB = winegstreamer diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index 0ae026647c9..36302330877 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winehid.sys IMPORTS = hidclass ntoskrnl diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index c43fcd46ed3..da2e5eaf4c4 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemac.drv IMPORTS = uuid rpcrt4 user32 gdi32 advapi32 win32u DELAYIMPORTS = ole32 shell32 imm32 diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in index 813ee42b349..5408ee834b7 100644 --- a/dlls/winemapi/Makefile.in +++ b/dlls/winemapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemapi.dll IMPORTS = shlwapi shell32 mapi32 diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index e6019e89eb4..ce96ca73bf4 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineoss.drv IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index c7282d8a06e..1bf67a6a2c2 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineps.drv IMPORTS = user32 gdi32 winspool advapi32 diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index 64c0c9a70e7..c71b2833d13 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winepulse.drv UNIXLIB = winepulse.so IMPORTS = dxguid uuid winmm user32 advapi32 ole32 diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index 1bee6e76773..0aeabd8e9a1 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineusb.sys IMPORTS = ntoskrnl EXTRALIBS = $(USB_LIBS) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index 38809211308..a6df9d52c1f 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winevulkan.dll UNIXLIB = winevulkan.so IMPORTLIB = winevulkan diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index c64a8464914..64df2075cc4 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winex11.drv IMPORTS = uuid setupapi rpcrt4 user32 gdi32 advapi32 win32u DELAYIMPORTS = comctl32 ole32 shell32 imm32 diff --git a/dlls/winexinput.sys/Makefile.in b/dlls/winexinput.sys/Makefile.in index e115235920a..ce98960de9b 100644 --- a/dlls/winexinput.sys/Makefile.in +++ b/dlls/winexinput.sys/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winexinput.sys IMPORTS = ntoskrnl hidparse EXTRADLLFLAGS = -Wl,--subsystem,native diff --git a/dlls/wing.dll16/Makefile.in b/dlls/wing.dll16/Makefile.in index d9b936ea98a..af007d4c641 100644 --- a/dlls/wing.dll16/Makefile.in +++ b/dlls/wing.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wing.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 97266fbc92a..44ccf738d99 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 ws2_32 diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in index 77ebefae170..73dce0b7dc9 100644 --- a/dlls/winhttp/tests/Makefile.in +++ b/dlls/winhttp/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = winhttp.dll IMPORTS = winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 7e8111f811d..b3c497fd67f 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32 diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index ae18bb72faf..0188d2aa995 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wininet.dll IMPORTS = wininet crypt32 ws2_32 user32 advapi32 shell32 diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index c515a3aba2e..0d1791b68e6 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_WINMM_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm IMPORTS = uuid user32 advapi32 ole32 msacm32 diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 1b191cb5747..c668ea611f7 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = winmm.dll IMPORTS = winmm ole32 user32 advapi32 diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in index 89449698b66..e162e6d3cda 100644 --- a/dlls/winscard/Makefile.in +++ b/dlls/winscard/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winscard.dll IMPORTLIB = winscard diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 673b26e1fae..019b0e8ab9d 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SPOOL32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SPOOL32_ MODULE = winspool.drv UNIXLIB = winspool.so IMPORTLIB = winspool diff --git a/dlls/winspool.drv/tests/Makefile.in b/dlls/winspool.drv/tests/Makefile.in index 3a8c6fece1c..df9a6320e11 100644 --- a/dlls/winspool.drv/tests/Makefile.in +++ b/dlls/winspool.drv/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = winspool.drv IMPORTS = winspool advapi32 diff --git a/dlls/winsta/Makefile.in b/dlls/winsta/Makefile.in index dcf29b6ccb1..19d7066367a 100644 --- a/dlls/winsta/Makefile.in +++ b/dlls/winsta/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winsta.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in index 05479200a09..7e39fc2ba69 100644 --- a/dlls/wintab.dll16/Makefile.in +++ b/dlls/wintab.dll16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,wintab32.dll diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 050c78b86d3..56cfd6c2f41 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab32.dll IMPORTLIB = wintab32 IMPORTS = user32 advapi32 diff --git a/dlls/wintab32/tests/Makefile.in b/dlls/wintab32/tests/Makefile.in index 635e03fd5d6..921d97284dc 100644 --- a/dlls/wintab32/tests/Makefile.in +++ b/dlls/wintab32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wintab32.dll IMPORTS = user32 diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 244f17f0728..01ace34cbb3 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintrust.dll IMPORTLIB = wintrust IMPORTS = crypt32 user32 advapi32 diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 87654a685ff..c19db4558a9 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wintrust.dll IMPORTS = wintrust crypt32 advapi32 diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in index 312e5407800..8f219cc6148 100644 --- a/dlls/wlanapi/Makefile.in +++ b/dlls/wlanapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wlanapi.dll IMPORTLIB = wlanapi diff --git a/dlls/wlanapi/tests/Makefile.in b/dlls/wlanapi/tests/Makefile.in index a08db320f1f..6fede3572c8 100644 --- a/dlls/wlanapi/tests/Makefile.in +++ b/dlls/wlanapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wlanapi.dll IMPORTS = wlanapi diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 088b1c3abf5..ba60d525ac6 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wldap32.dll UNIXLIB = wldap32.so IMPORTLIB = wldap32 diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index 05fe5b9af6d..7fc7a026023 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wldap32.dll IMPORTS = wldap32 diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index 22d756c1f5a..8086851e047 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmiutils.dll IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/wmiutils/tests/Makefile.in b/dlls/wmiutils/tests/Makefile.in index 3099d506bed..60135dcc0a1 100644 --- a/dlls/wmiutils/tests/Makefile.in +++ b/dlls/wmiutils/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmiutils.dll IMPORTS = ole32 diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 0e17ee4b257..5f3cb501f92 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmp.dll IMPORTS = oleaut32 ole32 urlmon shlwapi user32 gdi32 diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index 089d9e7f3e1..4b97242f3aa 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index cb095120e94..3cdd523668e 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmphoto.dll IMPORTS = $(JXR_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi EXTRAINCL = $(JXR_PE_CFLAGS) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 6aed828abae..56dd85bb191 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in index 856e02d45d5..159de067e06 100644 --- a/dlls/wmvcore/tests/Makefile.in +++ b/dlls/wmvcore/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmvcore.dll IMPORTS = ole32 wmvcore diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 5c3fa66e9d0..6122ee8d8f6 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wnaspi32.dll IMPORTLIB = wnaspi32 IMPORTS = advapi32 diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in index eebf9e8e53a..6b161b5cc3e 100644 --- a/dlls/wow64/Makefile.in +++ b/dlls/wow64/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wow64.dll IMPORTLIB = wow64 IMPORTS = ntdll winecrt0 diff --git a/dlls/wpc/tests/Makefile.in b/dlls/wpc/tests/Makefile.in index 72f550d576f..45098b8fbf9 100644 --- a/dlls/wpc/tests/Makefile.in +++ b/dlls/wpc/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wpc.dll IMPORTS = ole32 diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 83ae5e915ae..c8ce97ef842 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 diff --git a/dlls/ws2_32/tests/Makefile.in b/dlls/ws2_32/tests/Makefile.in index b1b10c1636e..492be3f7579 100644 --- a/dlls/ws2_32/tests/Makefile.in +++ b/dlls/ws2_32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ws2_32.dll IMPORTS = iphlpapi ws2_32 user32 diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index dd7b350d80b..cb477fd5f44 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wsdapi.dll IMPORTLIB = wsdapi IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index eaefa3a962b..2198c066369 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 iphlpapi rpcrt4 diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index fed2babda33..70653a1a1f6 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wshom.ocx IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 diff --git a/dlls/wshom.ocx/tests/Makefile.in b/dlls/wshom.ocx/tests/Makefile.in index f115163aceb..1251173ffd4 100644 --- a/dlls/wshom.ocx/tests/Makefile.in +++ b/dlls/wshom.ocx/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wshom.ocx IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index b5a9c437825..5307150bfef 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wsock32.dll IMPORTLIB = wsock32 IMPORTS = mswsock ws2_32 iphlpapi diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in index e54c088f21c..4bcff219411 100644 --- a/dlls/wtsapi32/Makefile.in +++ b/dlls/wtsapi32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wtsapi32.dll IMPORTLIB = wtsapi32 IMPORTS = advapi32 diff --git a/dlls/wtsapi32/tests/Makefile.in b/dlls/wtsapi32/tests/Makefile.in index 57014aea938..1b18073bdac 100644 --- a/dlls/wtsapi32/tests/Makefile.in +++ b/dlls/wtsapi32/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wtsapi32.dll IMPORTS = wtsapi32 advapi32 psapi diff --git a/dlls/xactengine2_0/Makefile.in b/dlls/xactengine2_0/Makefile.in index 5c4b635b060..1fe077c95a3 100644 --- a/dlls/xactengine2_0/Makefile.in +++ b/dlls/xactengine2_0/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_0.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0200 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0200 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine2_4/Makefile.in b/dlls/xactengine2_4/Makefile.in index 2b5fd547b61..78e78146311 100644 --- a/dlls/xactengine2_4/Makefile.in +++ b/dlls/xactengine2_4/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_4.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0204 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0204 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine2_7/Makefile.in b/dlls/xactengine2_7/Makefile.in index 6861555b23b..445ba17f6ae 100644 --- a/dlls/xactengine2_7/Makefile.in +++ b/dlls/xactengine2_7/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_7.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0207 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0207 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine2_9/Makefile.in b/dlls/xactengine2_9/Makefile.in index e5f8c83e962..0f8e137ffba 100644 --- a/dlls/xactengine2_9/Makefile.in +++ b/dlls/xactengine2_9/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine2_9.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0209 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0209 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in index 10259e44ee0..60673ff8101 100644 --- a/dlls/xactengine3_0/Makefile.in +++ b/dlls/xactengine3_0/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_0.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0300 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0300 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in index 3105c3443bd..f812bea5c9b 100644 --- a/dlls/xactengine3_1/Makefile.in +++ b/dlls/xactengine3_1/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_1.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0301 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0301 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_2/Makefile.in b/dlls/xactengine3_2/Makefile.in index 92481ba1e26..bde069efe30 100644 --- a/dlls/xactengine3_2/Makefile.in +++ b/dlls/xactengine3_2/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_2.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0302 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0302 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_3/Makefile.in b/dlls/xactengine3_3/Makefile.in index 1963f033557..1bdfc72b1b7 100644 --- a/dlls/xactengine3_3/Makefile.in +++ b/dlls/xactengine3_3/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_3.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0303 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0303 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in index 5d639c4e7ad..5987dc0df78 100644 --- a/dlls/xactengine3_4/Makefile.in +++ b/dlls/xactengine3_4/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_4.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0304 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0304 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_5/Makefile.in b/dlls/xactengine3_5/Makefile.in index 47731dd7017..5a95ceb9e30 100644 --- a/dlls/xactengine3_5/Makefile.in +++ b/dlls/xactengine3_5/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_5.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0305 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0305 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in index b0e235ecd08..dfca6ac31d4 100644 --- a/dlls/xactengine3_6/Makefile.in +++ b/dlls/xactengine3_6/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_6.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0306 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0306 PARENTSRC = ../xactengine3_7 C_SRCS = \ diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in index 128a41cf59a..18ef2a683e8 100644 --- a/dlls/xactengine3_7/Makefile.in +++ b/dlls/xactengine3_7/Makefile.in @@ -1,7 +1,7 @@ MODULE = xactengine3_7.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) -EXTRADEFS = -DXACT3_VER=0x0307 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXACT3_VER=0x0307 C_SRCS = \ xact_dll.c diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in index c32b2562546..693c3687728 100644 --- a/dlls/xactengine3_7/tests/Makefile.in +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xactengine3_7.dll IMPORTS = ole32 diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in index 1eb2e2210c0..98340327178 100644 --- a/dlls/xapofx1_1/Makefile.in +++ b/dlls/xapofx1_1/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAPOFX1_VER=1 -DXAUDIO2_VER=2 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=1 -DXAUDIO2_VER=2 MODULE = xapofx1_1.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in index 38db115b39a..450600c85ee 100644 --- a/dlls/xapofx1_2/Makefile.in +++ b/dlls/xapofx1_2/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAPOFX1_VER=2 -DXAUDIO2_VER=3 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=2 -DXAUDIO2_VER=3 MODULE = xapofx1_2.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in index 409fc9ad55b..ffa542a982b 100644 --- a/dlls/xapofx1_3/Makefile.in +++ b/dlls/xapofx1_3/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAPOFX1_VER=3 -DXAUDIO2_VER=4 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=3 -DXAUDIO2_VER=4 MODULE = xapofx1_3.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in index 63eccff64b0..23cc86c6025 100644 --- a/dlls/xapofx1_4/Makefile.in +++ b/dlls/xapofx1_4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAPOFX1_VER=4 -DXAUDIO2_VER=6 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=4 -DXAUDIO2_VER=6 MODULE = xapofx1_4.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in index fc692d781db..9b23f2e68c0 100644 --- a/dlls/xapofx1_5/Makefile.in +++ b/dlls/xapofx1_5/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAPOFX1_VER=5 -DXAUDIO2_VER=7 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAPOFX1_VER=5 -DXAUDIO2_VER=7 MODULE = xapofx1_5.dll IMPORTS = $(FAUDIO_PE_LIBS) ole32 EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index 860e03e716f..adca89c6062 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=0 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=0 MODULE = xaudio2_0.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in index fa942761308..eeb297de6d6 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=1 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=1 MODULE = xaudio2_1.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in index 26eee0a6f31..0656e2b39d8 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=2 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=2 MODULE = xaudio2_2.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in index f6c555a9a3b..efbf392be5b 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=3 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=3 MODULE = xaudio2_3.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in index 33bd0c155db..17d85ebdb17 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=4 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=4 MODULE = xaudio2_4.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in index c4035aeb13f..2becbec90f4 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=5 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=5 MODULE = xaudio2_5.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in index dbe2ae7829f..faa71447a6f 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=6 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=6 MODULE = xaudio2_6.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index ef3987b693e..f0cb4e8c275 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=7 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=7 MODULE = xaudio2_7.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_7/tests/Makefile.in b/dlls/xaudio2_7/tests/Makefile.in index ba56d94a1f3..e44130a1d7a 100644 --- a/dlls/xaudio2_7/tests/Makefile.in +++ b/dlls/xaudio2_7/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xaudio2_7.dll IMPORTS = ole32 diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in index 3e00abd892d..ddc22921dd0 100644 --- a/dlls/xaudio2_8/Makefile.in +++ b/dlls/xaudio2_8/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=8 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=8 MODULE = xaudio2_8.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in index eb299816b55..5ded3cef196 100644 --- a/dlls/xaudio2_9/Makefile.in +++ b/dlls/xaudio2_9/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DXAUDIO2_VER=9 +EXTRADEFS = -DWINE_NO_LONG_TYPES -DXAUDIO2_VER=9 MODULE = xaudio2_9.dll IMPORTS = $(FAUDIO_PE_LIBS) advapi32 ole32 user32 uuid EXTRAINCL = $(FAUDIO_PE_CFLAGS) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index cc2825d0d19..14053b0050a 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xinput1_1.dll IMPORTS = hid setupapi advapi32 user32 PARENTSRC = ../xinput1_3 diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 1c4b48cdbda..508bc3860d1 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xinput1_2.dll IMPORTS = hid setupapi advapi32 user32 PARENTSRC = ../xinput1_3 diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index a1c58a7452a..cbbbedc6b7d 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xinput1_3.dll IMPORTLIB = xinput IMPORTS = hid setupapi advapi32 user32 diff --git a/dlls/xinput1_3/tests/Makefile.in b/dlls/xinput1_3/tests/Makefile.in index 260a8a634e4..e326d5c1aac 100644 --- a/dlls/xinput1_3/tests/Makefile.in +++ b/dlls/xinput1_3/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xinput1_3.dll IMPORTS = user32 hid setupapi diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 393a416af9e..d7d2d687743 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xinput1_4.dll IMPORTS = hid setupapi advapi32 user32 PARENTSRC = ../xinput1_3 diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index 55ea44ba666..5a9c7d997d1 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xinput9_1_0.dll IMPORTS = hid setupapi advapi32 user32 PARENTSRC = ../xinput1_3 diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in index aeb448162f6..003c36a3a37 100644 --- a/dlls/xmllite/Makefile.in +++ b/dlls/xmllite/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xmllite.dll IMPORTLIB = xmllite diff --git a/dlls/xmllite/tests/Makefile.in b/dlls/xmllite/tests/Makefile.in index 6a87e6663aa..1548dc50193 100644 --- a/dlls/xmllite/tests/Makefile.in +++ b/dlls/xmllite/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xmllite.dll IMPORTS = xmllite ole32 diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index f39cd90f0b9..c2bebe884fe 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xolehlp.dll IMPORTS = uuid diff --git a/include/basetsd.h b/include/basetsd.h index a4774a2fea5..a46172403ef 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -108,7 +108,6 @@ typedef /* [public] */ signed __int3264 INT_PTR, *PINT_PTR; typedef /* [public] */ signed __int3264 LONG_PTR, *PLONG_PTR; typedef /* [public] */ unsigned __int3264 UINT_PTR, *PUINT_PTR; typedef /* [public] */ unsigned __int3264 ULONG_PTR, *PULONG_PTR; -typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; #elif defined(_WIN64) @@ -118,17 +117,20 @@ typedef signed __int64 INT_PTR, *PINT_PTR; typedef signed __int64 LONG_PTR, *PLONG_PTR; typedef unsigned __int64 UINT_PTR, *PUINT_PTR; typedef unsigned __int64 ULONG_PTR, *PULONG_PTR; -typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; #else #define __int3264 __int32 +#ifdef WINE_NO_LONG_TYPES typedef long INT_PTR, *PINT_PTR; typedef unsigned long UINT_PTR, *PUINT_PTR; +#else +typedef int INT_PTR, *PINT_PTR; +typedef unsigned int UINT_PTR, *PUINT_PTR; +#endif typedef long LONG_PTR, *PLONG_PTR; typedef unsigned long ULONG_PTR, *PULONG_PTR; -typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; #endif @@ -262,7 +264,7 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef LONG_PTR SSIZE_T, *PSSIZE_T; typedef ULONG_PTR SIZE_T, *PSIZE_T; - +typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; typedef ULONG_PTR KAFFINITY, *PKAFFINITY; #define MINLONGLONG ((LONGLONG)~MAXLONGLONG) diff --git a/include/ntdef.h b/include/ntdef.h index 74c88ba572b..92366c3f3bb 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -55,7 +55,7 @@ typedef enum _WAIT_TYPE { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#ifdef WINE_USE_LONG +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; diff --git a/include/windef.h b/include/windef.h index f352706c7f2..cb7eb1179c8 100644 --- a/include/windef.h +++ b/include/windef.h @@ -237,7 +237,7 @@ extern "C" { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#ifdef WINE_USE_LONG +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; @@ -253,7 +253,7 @@ typedef int INT, *PINT, *LPINT; typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; typedef char *PSZ; -#ifdef WINE_USE_LONG +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; #else diff --git a/include/winnt.h b/include/winnt.h index e20b504a4f9..18d9fa656f8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -467,7 +467,7 @@ typedef VOID *PVOID64; typedef BYTE BOOLEAN, *PBOOLEAN; typedef char CHAR, *PCHAR; typedef short SHORT, *PSHORT; -#ifdef WINE_USE_LONG +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) typedef long LONG, *PLONG; #else typedef int LONG, *PLONG; diff --git a/libs/strmbase/Makefile.in b/libs/strmbase/Makefile.in index 8b6ea8a3b43..c9b4a9ebb5c 100644 --- a/libs/strmbase/Makefile.in +++ b/libs/strmbase/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES STATICLIB = libstrmbase.a C_SRCS = \ diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in index 2c2eade6b69..128ecf91e32 100644 --- a/programs/attrib/Makefile.in +++ b/programs/attrib/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = attrib.exe IMPORTS = user32 diff --git a/programs/cabarc/Makefile.in b/programs/cabarc/Makefile.in index 769df20457d..c0c825500de 100644 --- a/programs/cabarc/Makefile.in +++ b/programs/cabarc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cabarc.exe IMPORTS = cabinet diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in index c7037abb10f..7a55d3cf15f 100644 --- a/programs/chcp.com/Makefile.in +++ b/programs/chcp.com/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = chcp.com IMPORTS = kernelbase diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index b3b33aa1413..8c8489af727 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cmd.exe IMPORTS = shell32 user32 advapi32 diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in index 87942fedcf9..78d92f7c778 100644 --- a/programs/cmd/tests/Makefile.in +++ b/programs/cmd/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = cmd.exe C_SRCS = \ diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 2a407006697..69559c668ad 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = conhost.exe IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = comctl32 diff --git a/programs/conhost/tests/Makefile.in b/programs/conhost/tests/Makefile.in index ecaf68fe4b2..831c2afd457 100644 --- a/programs/conhost/tests/Makefile.in +++ b/programs/conhost/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = conhost.exe IMPORTS = user32 diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index d87a28fcc54..2795a66eeca 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -1,6 +1,6 @@ MODULE = cscript.exe IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 -EXTRADEFS = -DCSCRIPT_BUILD +EXTRADEFS = -DWINE_NO_LONG_TYPES -DCSCRIPT_BUILD PARENTSRC = ../wscript EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 2ea7a084d19..9f2f0f19b14 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxdiag.exe IMPORTS = dxguid ole32 oleaut32 user32 comctl32 diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in index 76274f66d97..86704201c2b 100644 --- a/programs/eject/Makefile.in +++ b/programs/eject/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = eject.exe EXTRADLLFLAGS = -mconsole diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 5507d747bb1..8d5cd94957f 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = explorer.exe IMPORTS = rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi diff --git a/programs/find/tests/Makefile.in b/programs/find/tests/Makefile.in index c5b359bd98f..5c4e5e39250 100644 --- a/programs/find/tests/Makefile.in +++ b/programs/find/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = find.exe IMPORTS = user32 diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index df1c8ac6657..676e9d593dd 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fsutil.exe IMPORTS = user32 diff --git a/programs/fsutil/tests/Makefile.in b/programs/fsutil/tests/Makefile.in index f0490b3b660..01605e695f7 100644 --- a/programs/fsutil/tests/Makefile.in +++ b/programs/fsutil/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = fsutil.exe IMPORTS = advapi32 user32 diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index e873f7aeaa8..9aebdbdddf0 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msiexec.exe IMPORTS = msi ole32 advapi32 user32 comctl32 diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index eb8e1e48ff3..a4c0f2f238a 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = net.exe IMPORTS = netapi32 user32 advapi32 diff --git a/programs/netstat/Makefile.in b/programs/netstat/Makefile.in index e16d01ba4e9..693fde0c1f4 100644 --- a/programs/netstat/Makefile.in +++ b/programs/netstat/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netstat.exe IMPORTS = iphlpapi user32 ws2_32 diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in index 0ed66f470ea..9ac4f6e4a3b 100644 --- a/programs/ping/Makefile.in +++ b/programs/ping/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ping.exe IMPORTS = ws2_32 iphlpapi diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index 137ea28ba43..3a491d137b0 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = plugplay.exe IMPORTS = advapi32 rpcrt4 user32 diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in index 412523e1048..34e8ca96d46 100644 --- a/programs/presentationfontcache/Makefile.in +++ b/programs/presentationfontcache/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = presentationfontcache.exe IMPORTS = advapi32 diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index d7e4e4b65ce..635ac7751a4 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = reg.exe IMPORTS = advapi32 DELAYIMPORTS = user32 diff --git a/programs/reg/tests/Makefile.in b/programs/reg/tests/Makefile.in index 6d7530bb5d6..27edcfb7d7a 100644 --- a/programs/reg/tests/Makefile.in +++ b/programs/reg/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = reg.exe IMPORTS = advapi32 diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 9f8fb5af165..d53a1c5ccfc 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = regedit.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 diff --git a/programs/regedit/tests/Makefile.in b/programs/regedit/tests/Makefile.in index 06bf31b402b..215ca96006a 100644 --- a/programs/regedit/tests/Makefile.in +++ b/programs/regedit/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = regedit.exe IMPORTS = advapi32 diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index 38779634408..ed8374a2cb6 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = regsvr32.exe IMPORTS = ole32 user32 kernelbase diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index a4d3533e55e..b7a451f0001 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rpcss.exe IMPORTS = rpcrt4 advapi32 diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in index 4ee6b86bdc7..8d6c4ca4e1b 100644 --- a/programs/sc/Makefile.in +++ b/programs/sc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sc.exe IMPORTS = advapi32 diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in index 6eb8d530425..63afc93a876 100644 --- a/programs/schtasks/Makefile.in +++ b/programs/schtasks/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schtasks.exe IMPORTS = oleaut32 ole32 diff --git a/programs/schtasks/tests/Makefile.in b/programs/schtasks/tests/Makefile.in index dcf641c4b13..23cb744ff15 100644 --- a/programs/schtasks/tests/Makefile.in +++ b/programs/schtasks/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schtasks.exe IMPORTS = ole32 diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index 31e77c49082..4e15c4c18ca 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = services.exe IMPORTS = rpcrt4 advapi32 userenv setupapi diff --git a/programs/services/tests/Makefile.in b/programs/services/tests/Makefile.in index 3abec747653..efa8bd754cc 100644 --- a/programs/services/tests/Makefile.in +++ b/programs/services/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = services.exe IMPORTS = user32 advapi32 diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index 5046a9c0861..04c8a5cbeee 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolsv.exe IMPORTS = advapi32 diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 04bc38808bf..7dfdd55b794 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = start.exe IMPORTS = shell32 user32 diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index f31e393c8af..969a31da11e 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = svchost.exe IMPORTS = advapi32 diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in index 6a83ee3b9b9..9876e2faaba 100644 --- a/programs/termsv/Makefile.in +++ b/programs/termsv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = termsv.exe IMPORTS = advapi32 diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index f7fef51a51c..0fc7d679f19 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uninstaller.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32 diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in index 4898a96f456..8ae2dd94d2f 100644 --- a/programs/whoami/Makefile.in +++ b/programs/whoami/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = whoami.exe IMPORTS = secur32 diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 667f8f48702..3b78729dce6 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineboot.exe IMPORTS = uuid advapi32 ws2_32 kernelbase DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index 161be7e08de..fe4371b6bf2 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winebrowser.exe IMPORTS = urlmon oleaut32 shell32 user32 advapi32 diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 84be34eab10..f7540a55372 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winecfg.exe IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index b859ef8a27a..882ee9a3b1d 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineconsole.exe IMPORTS = advapi32 DELAYIMPORTS = comctl32 user32 gdi32 diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 4e6d90df728..2e73adc2496 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winedbg.exe IMPORTS = dbghelp advapi32 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 ws2_32 diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index 6f3868013d1..dd5349418a9 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winedevice.exe IMPORTS = advapi32 ntoskrnl diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index 12326d1e4e2..fe144efc53d 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemenubuilder.exe IMPORTS = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32 diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in index b9e73869645..97ad6f13074 100644 --- a/programs/winemsibuilder/Makefile.in +++ b/programs/winemsibuilder/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemsibuilder.exe IMPORTS = msi ole32 diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index c4d505e4545..3f823f46946 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winetest.exe IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 msvcrt DELAYIMPORTS = ole32 diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 79841972fd0..2e712952725 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winhlp32.exe IMPORTS = user32 gdi32 DELAYIMPORTS = shell32 comctl32 comdlg32 diff --git a/programs/winmgmt/Makefile.in b/programs/winmgmt/Makefile.in index f1f804d2ed8..f12f693ef5d 100644 --- a/programs/winmgmt/Makefile.in +++ b/programs/winmgmt/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winmgmt.exe IMPORTS = advapi32 diff --git a/programs/winoldap.mod16/Makefile.in b/programs/winoldap.mod16/Makefile.in index 8d0c73c0956..063f77aea15 100644 --- a/programs/winoldap.mod16/Makefile.in +++ b/programs/winoldap.mod16/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winoldap.mod16 EXTRADLLFLAGS = -mconsole -m16 diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 265003a736a..e8fc1e38df8 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wordpad.exe IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32 diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 33b2e66d9bc..77d276d6c01 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wscript.exe IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 diff --git a/programs/wscript/tests/Makefile.in b/programs/wscript/tests/Makefile.in index 1f038b04588..bdb231353b7 100644 --- a/programs/wscript/tests/Makefile.in +++ b/programs/wscript/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wscript.exe IMPORTS = ole32 oleaut32 psapi advapi32 diff --git a/programs/wuauserv/Makefile.in b/programs/wuauserv/Makefile.in index 6bfaf71ddf4..1e936127167 100644 --- a/programs/wuauserv/Makefile.in +++ b/programs/wuauserv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wuauserv.exe IMPORTS = advapi32 diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 171377bc2f2..a5702bfe657 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wusa.exe IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32 diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index b22ff7814ec..f51370405da 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xcopy.exe IMPORTS = shell32 user32 diff --git a/programs/xcopy/tests/Makefile.in b/programs/xcopy/tests/Makefile.in index 3b3d5d5bdc5..5fb76fe2d20 100644 --- a/programs/xcopy/tests/Makefile.in +++ b/programs/xcopy/tests/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xcopy.exe C_SRCS = \ diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 54028024b0d..e36e4dc5aa5 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES PROGRAMS = winedump MANPAGES = winedump.man.in SCRIPTS = function_grep.pl