From 9fe46733473a0ae09e37d931447766d41887e21f Mon Sep 17 00:00:00 2001 From: Francois Gouget <fgouget@free.fr> Date: Tue, 24 Oct 2006 12:38:21 +0200 Subject: [PATCH] Don't include windows.h & co in the Wine sources. Remove uneeded COM_NO_WINDOWS_H defines. --- dlls/amstream/main.c | 1 - dlls/amstream/regsvr.c | 1 - dlls/avicap32/avicap32_main.c | 2 -- dlls/avifil32/acmstream.c | 1 - dlls/avifil32/api.c | 1 - dlls/avifil32/avifile.c | 1 - dlls/avifil32/editstream.c | 1 - dlls/avifil32/extrachunk.c | 1 - dlls/avifil32/factory.c | 1 - dlls/avifil32/getframe.c | 1 - dlls/avifil32/icmstream.c | 1 - dlls/avifil32/regsvr.c | 1 - dlls/avifil32/tmpfile.c | 1 - dlls/avifil32/wavfile.c | 1 - dlls/comcat/comcat_private.h | 1 - dlls/comcat/regsvr.c | 2 -- dlls/comctl32/animate.c | 1 - dlls/comdlg32/cdlg.h | 1 - dlls/comdlg32/cdlg16.h | 1 - dlls/comdlg32/filedlgbrowser.h | 1 - dlls/d3dxof/main.c | 1 - dlls/d3dxof/regsvr.c | 1 - dlls/devenum/devenum_private.h | 1 - dlls/dxdiagn/regsvr.c | 1 - dlls/dxerr8/dxerr8.c | 1 - dlls/dxerr9/dxerr9.c | 1 - dlls/dxguid/dx8guid.c | 1 - dlls/dxguid/dx9guid.c | 1 - dlls/dxguid/dxguid.c | 1 - dlls/hhctrl.ocx/regsvr.c | 1 - dlls/mciavi32/private_mciavi.h | 1 - dlls/msdmo/dmoreg.c | 1 - dlls/msdmo/dmort.c | 1 - dlls/msrle32/msrle_private.h | 1 - dlls/msvfw32/msvideo16.c | 1 - dlls/msvfw32/msvideo_main.c | 1 - dlls/objsel/objsel_private.h | 1 - dlls/oledlg/oledlg_main.c | 1 - dlls/oledlg/pastespl.c | 1 - dlls/olepro32/olepro32stubs.c | 1 - dlls/quartz/enummoniker.c | 1 - dlls/quartz/filtergraph.c | 1 - dlls/quartz/filtermapper.c | 1 - dlls/quartz/regsvr.c | 1 - dlls/quartz/systemclock.c | 1 - dlls/shdocvw/shdocvw.h | 1 - dlls/shdocvw/shlinstobj.c | 1 - dlls/shlwapi/msgbox.c | 1 - dlls/shlwapi/ordinal.c | 1 - dlls/shlwapi/string.c | 1 - dlls/strmiids/strmiids.c | 1 - dlls/urlmon/regsvr.c | 1 - dlls/urlmon/umon.c | 1 - dlls/uuid/uuid.c | 1 - dlls/winex11.drv/event.c | 5 ++++- dlls/wininet/urlcache.c | 1 - include/mediaobj.idl | 2 +- 57 files changed, 5 insertions(+), 59 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 75372d71d56..ac1dd0c974d 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -25,7 +25,6 @@ #include <string.h> #define COBJMACROS -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c index 0ae7bac64de..cf005fff3b5 100644 --- a/dlls/amstream/regsvr.c +++ b/dlls/amstream/regsvr.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h> diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index c663465d7b3..41d790ebd1d 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -20,8 +20,6 @@ #include "config.h" #include "wine/port.h" -#define COM_NO_WINDOWS_H - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 79f21e26175..6cda8c9f567 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h> diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index dacd5a73520..9236f0d08f4 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 861aa597fc4..f989c795254 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -30,7 +30,6 @@ * When index is missing it works, but index seems to be okay. */ -#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h> diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 53c6b9439a3..d275390443b 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h> diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c index ec7ba7036e5..ac3a04d5748 100644 --- a/dlls/avifil32/extrachunk.c +++ b/dlls/avifil32/extrachunk.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <assert.h> #include "extrachunk.h" diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 6b426fe0a69..24d669d9965 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -20,7 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 42838cd2311..558ff4aa27e 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h> diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 6065c554381..5e9af16defa 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h> diff --git a/dlls/avifil32/regsvr.c b/dlls/avifil32/regsvr.c index 57badd1d013..ce811518aec 100644 --- a/dlls/avifil32/regsvr.c +++ b/dlls/avifil32/regsvr.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h> diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index ddfdc59422f..6d6c5d1bd2a 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h> diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 4784c0b3c80..e2f82fe0300 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h> diff --git a/dlls/comcat/comcat_private.h b/dlls/comcat/comcat_private.h index cf39fa8f7c6..88587b51faa 100644 --- a/dlls/comcat/comcat_private.h +++ b/dlls/comcat/comcat_private.h @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" diff --git a/dlls/comcat/regsvr.c b/dlls/comcat/regsvr.c index 2e730f5cd7a..1a2bb686045 100644 --- a/dlls/comcat/regsvr.c +++ b/dlls/comcat/regsvr.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H - #include <stdarg.h> #include <string.h> diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index f2655fc68d2..6949213b313 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -33,7 +33,6 @@ * - check for the 'rec ' list in some AVI files */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h> #include "windef.h" diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index e440c384572..dc0ca017aa3 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -21,7 +21,6 @@ #ifndef _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H -#define COM_NO_WINDOWS_H #include "dlgs.h" #include "wownt32.h" diff --git a/dlls/comdlg32/cdlg16.h b/dlls/comdlg32/cdlg16.h index fbc44d4f509..00d204e7099 100644 --- a/dlls/comdlg32/cdlg16.h +++ b/dlls/comdlg32/cdlg16.h @@ -23,7 +23,6 @@ #ifndef _WINE_DLL_CDLG16_H #define _WINE_DLL_CDLG16_H -#define COM_NO_WINDOWS_H #include "dlgs.h" #include "wine/windef16.h" #include "wine/winbase16.h" diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index e1ff58647d3..1725c451763 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -26,7 +26,6 @@ #include <stdarg.h> #endif -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 3fd392dcdbf..432109aa822 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -25,7 +25,6 @@ #include <string.h> #define COBJMACROS -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" diff --git a/dlls/d3dxof/regsvr.c b/dlls/d3dxof/regsvr.c index 091794eeda3..7c90bd60ee2 100644 --- a/dlls/d3dxof/regsvr.c +++ b/dlls/d3dxof/regsvr.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h> diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index c9f284a7620..061a8f46836 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -32,7 +32,6 @@ #include "winerror.h" #define COBJMACROS -#define COM_NO_WINDOWS_H #include "ole2.h" #include "strmif.h" diff --git a/dlls/dxdiagn/regsvr.c b/dlls/dxdiagn/regsvr.c index a1cd9035a0d..3e606968dd7 100644 --- a/dlls/dxdiagn/regsvr.c +++ b/dlls/dxdiagn/regsvr.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h> diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 57d54259681..9a0160dd9aa 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index 7bfb91be754..ff2a5c4ccee 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/dxguid/dx8guid.c b/dlls/dxguid/dx8guid.c index 2b163bc181b..78c6114adb6 100644 --- a/dlls/dxguid/dx8guid.c +++ b/dlls/dxguid/dx8guid.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/dxguid/dx9guid.c b/dlls/dxguid/dx9guid.c index a3785889db8..2ab60ad8e69 100644 --- a/dlls/dxguid/dx9guid.c +++ b/dlls/dxguid/dx9guid.c @@ -22,7 +22,6 @@ #include <stdarg.h> -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index ee8c69f56d4..c2c102ffe58 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/hhctrl.ocx/regsvr.c b/dlls/hhctrl.ocx/regsvr.c index 2e14d1ad7b1..cfdc36288c7 100644 --- a/dlls/hhctrl.ocx/regsvr.c +++ b/dlls/hhctrl.ocx/regsvr.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h> diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index aadcf6b980c..66003d761f4 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -21,7 +21,6 @@ #ifndef __WINE_PRIVATE_MCIAVI_H #define __WINE_PRIVATE_MCIAVI_H -#define COM_NO_WINDOWS_H #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index d5617c249bb..9e607384d89 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include "windef.h" diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c index d72d376f11a..67d18aa8746 100644 --- a/dlls/msdmo/dmort.c +++ b/dlls/msdmo/dmort.c @@ -19,7 +19,6 @@ #include <stdarg.h> #define COBJMACROS -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h index 65009f0475c..c055b5cb6fa 100644 --- a/dlls/msrle32/msrle_private.h +++ b/dlls/msrle32/msrle_private.h @@ -23,7 +23,6 @@ #include <stdarg.h> #endif -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c index 57e9e432e68..0974ff7e4b3 100644 --- a/dlls/msvfw32/msvideo16.c +++ b/dlls/msvfw32/msvideo16.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 051915b44e7..7ad53f3398e 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -30,7 +30,6 @@ #include <stdio.h> #include <string.h> -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h index a4fe00c53a4..8c9a3c85ae4 100644 --- a/dlls/objsel/objsel_private.h +++ b/dlls/objsel/objsel_private.h @@ -29,7 +29,6 @@ #include "winuser.h" #define COBJMACROS -#define COM_NO_WINDOWS_H #include "ole2.h" #include "strmif.h" diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index b9a4d65d4d0..6033231ea6f 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include "windef.h" diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 8e01f4b5295..64507e7f9a4 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index f3c98ecfca7..5046960dd40 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include "wine/debug.h" diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c index 64da70bcff9..5c314942936 100644 --- a/dlls/quartz/enummoniker.c +++ b/dlls/quartz/enummoniker.c @@ -22,7 +22,6 @@ */ #define COBJMACROS -#define COM_NO_WINDOWS_H #include "quartz_private.h" diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b01932a052d..33bb6c7e5bd 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -32,7 +32,6 @@ #include "dshow.h" #include "wine/debug.h" #include "quartz_private.h" -#define COM_NO_WINDOWS_H #include "ole2.h" #include "olectl.h" #include "strmif.h" diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 8ee226e068d..362de85d81c 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -31,7 +31,6 @@ #include "quartz_private.h" -#define COM_NO_WINDOWS_H #include "ole2.h" #include "olectl.h" #include "strmif.h" diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index fba6024856e..7206e240d4a 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -21,7 +21,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h> diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 3d3627d66a1..50797cc585b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include "quartz_private.h" #include "wine/debug.h" diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index e8ca951916a..be7526354f0 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -22,7 +22,6 @@ #ifndef __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H -#define COM_NO_WINDOWS_H #define COBJMACROS #include <stdarg.h> diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index b53dbde8502..7fb85a19e07 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -26,7 +26,6 @@ #include <stdarg.h> #define COBJMACROS -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c index a9c355aa49a..5e8c0633da6 100644 --- a/dlls/shlwapi/msgbox.c +++ b/dlls/shlwapi/msgbox.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include "config.h" #include "wine/port.h" diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index d0db76bfbaf..6e4cc2da85c 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include "config.h" #include "wine/port.h" diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 50d81db9a72..b8cabf1beb5 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include "config.h" #include "wine/port.h" diff --git a/dlls/strmiids/strmiids.c b/dlls/strmiids/strmiids.c index 95f6f217cdd..579bc74fdb0 100644 --- a/dlls/strmiids/strmiids.c +++ b/dlls/strmiids/strmiids.c @@ -21,7 +21,6 @@ #include <stdarg.h> -#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 0234b0faf79..64eb1a78dc2 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 5d40c52f164..7f695806666 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include <stdarg.h> #include <stdio.h> diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 483eea58241..b3c85115bff 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -22,7 +22,6 @@ #include <stdarg.h> #include "windef.h" -#define COM_NO_WINDOWS_H #include "initguid.h" /* GUIDs defined in uuids.lib */ diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index b0e65f86466..fd84fb93c36 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include "config.h" #include <X11/Xatom.h> @@ -650,6 +649,8 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) wine_tsx11_lock(); XQueryPointer( event->display, win, &w_aux_root, &w_aux_child, &x, &y, &dummy, &dummy, (unsigned int*)&aux_long); + x += virtual_screen_rect.left; + y += virtual_screen_rect.top; wine_tsx11_unlock(); pWnd = WIN_GetPtr(hWnd); @@ -802,6 +803,8 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) wine_tsx11_lock(); XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux, &x, &y, &u.i, &u.i, &u.u); + x += virtual_screen_rect.left; + y += virtual_screen_rect.top; wine_tsx11_unlock(); drop_len += sizeof(DROPFILES) + 1; diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e2eb312988a..ec895a27d07 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -22,7 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COM_NO_WINDOWS_H #include "config.h" #include "wine/port.h" diff --git a/include/mediaobj.idl b/include/mediaobj.idl index bc7226a8d6c..a8700dbae91 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#ifndef COM_NO_WINDOWS_H") +cpp_quote("#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)") cpp_quote("#include <windows.h>") cpp_quote("#include <ole2.h>") cpp_quote("#endif") -- GitLab