include: Some DirectX headers are supposed to define COM_NO_WINDOWS_H.

include/d3d.h

@@ -20,6 +20,8 @@
 #define __WINE_D3D_H
 
 #include <stdlib.h>
+
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <d3dtypes.h> /* must precede d3dcaps.h */
 #include <d3dcaps.h>

include/d3d8.h

@@ -23,6 +23,7 @@
 #define DIRECT3D_VERSION  0x0800
 #endif
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #include <d3d8types.h>

include/d3d9.h

@@ -24,6 +24,7 @@
 #define DIRECT3D_VERSION  0x0900
 #endif
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #include <d3d9types.h>

include/ddraw.h

@@ -19,6 +19,7 @@
 #ifndef __WINE_DDRAW_H
 #define __WINE_DDRAW_H
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #ifdef __cplusplus

include/dinput.h

@@ -19,6 +19,7 @@
 #ifndef __WINE_DINPUT_H
 #define __WINE_DINPUT_H
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #ifndef DIRECTINPUT_VERSION

include/dmplugin.h

@@ -25,6 +25,7 @@
 #include <windows.h>
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 #include <dmusici.h>

include/dmusicc.h

@@ -24,6 +24,7 @@
 #include <windows.h>
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 

include/dmusicf.h

@@ -25,6 +25,7 @@
 #include <windows.h>
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 #include <pshpack8.h>

include/dmusici.h

@@ -27,6 +27,7 @@
 #include <oleauto.h> /* VARIANT */
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 #include <dmusicc.h>