Don't include windows.h & co in the Wine sources.
Francois Gouget
fgouget at free.fr
Tue Oct 24 05:38:21 CDT 2006
Remove uneeded COM_NO_WINDOWS_H defines.
---
As a first step, let's fix the mediaobj.idl COM_NO_WINDOWS_H section so
it checks for __WINESRC__. This will let us remove all these '#define
COM_NO_WINDOWS_H' from the Wine sources. Then, when we find the right
(or good enough) rules, we'll modify widl to generate this section
automatically.
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 | 1 -
dlls/wininet/urlcache.c | 1 -
include/mediaobj.idl | 2 +-
57 files changed, 1 insertions(+), 59 deletions(-)
diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c
index 75372d7..ac1dd0c 100644
--- a/dlls/amstream/main.c
+++ b/dlls/amstream/main.c
@@ -25,7 +25,6 @@ #include <stdarg.h>
#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 0ae7bac..cf005ff 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 c663465..41d790e 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 79f21e2..6cda8c9 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 dacd5a7..9236f0d 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -21,7 +21,6 @@ #include <assert.h>
#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 861aa59..f989c79 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 53c6b94..d275390 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 ec7ba70..ac3a04d 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 6b426fe..24d669d 100644
--- a/dlls/avifil32/factory.c
+++ b/dlls/avifil32/factory.c
@@ -20,7 +20,6 @@ #include <assert.h>
#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 42838cd..558ff4a 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 6065c55..5e9af16 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 57badd1..ce81151 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 ddfdc59..6d6c5d1 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 4784c0b..e2f82fe 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 cf39fa8..88587b5 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 2e730f5..1a2bb68 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 f2655fc..6949213 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 e440c38..dc0ca01 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 fbc44d4..00d204e 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 e1ff586..1725c45 100644
--- a/dlls/comdlg32/filedlgbrowser.h
+++ b/dlls/comdlg32/filedlgbrowser.h
@@ -26,7 +26,6 @@ #ifndef RC_INVOKED
#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 3fd392d..432109a 100644
--- a/dlls/d3dxof/main.c
+++ b/dlls/d3dxof/main.c
@@ -25,7 +25,6 @@ #include <stdarg.h>
#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 091794e..7c90bd6 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 c9f284a..061a8f4 100644
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -32,7 +32,6 @@ #include "winreg.h"
#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 a1cd903..3e60696 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 57d5425..9a0160d 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 7bfb91b..ff2a5c4 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 2b163bc..78c6114 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 a378588..2ab60ad 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 ee8c69f..c2c102f 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 7d60c50..8843d72 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 aadcf6b..66003d7 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 d5617c2..9e60738 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 d72d376..67d18aa 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 65009f0..c055b5c 100644
--- a/dlls/msrle32/msrle_private.h
+++ b/dlls/msrle32/msrle_private.h
@@ -23,7 +23,6 @@ #ifndef RC_INVOKED
#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 57e9e43..0974ff7 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 051915b..7ad53f3 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -30,7 +30,6 @@ #include <stdarg.h>
#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 a4fe00c..8c9a3c8 100644
--- a/dlls/objsel/objsel_private.h
+++ b/dlls/objsel/objsel_private.h
@@ -29,7 +29,6 @@ #include "wingdi.h"
#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 b9a4d65..6033231 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 8e01f4b..64507e7 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 f3c98ec..5046960 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 64da70b..5c31494 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 b01932a..33bb6c7 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -32,7 +32,6 @@ #include "winuser.h"
#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 8ee226e..362de85 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -31,7 +31,6 @@ #include "winerror.h"
#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 fba6024..7206e24 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 3d3627d..50797cc 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 e8ca951..be75263 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 b53dbde..7fb85a1 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 a9c355a..5e8c063 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 d0db76b..6e4cc2d 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 50d81db..b8cabf1 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 95f6f21..579bc74 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 0234b0f..64eb1a7 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 5d40c52..7f69580 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 483eea5..b3c8511 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 b0e65f8..4c80235 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>
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index e2eb312..ec895a2 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 bc7226a..a8700db 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")
--
1.4.1.1
More information about the wine-patches
mailing list