From 6688acce7dbb00ceea4e755fe0f4a771a5520c24 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Tue, 7 Nov 2006 00:45:16 +0100
Subject: [PATCH] include: Some DirectX headers are supposed to define
 COM_NO_WINDOWS_H.

---
 include/d3d.h      | 2 ++
 include/d3d8.h     | 1 +
 include/d3d9.h     | 1 +
 include/ddraw.h    | 1 +
 include/dinput.h   | 1 +
 include/dmplugin.h | 1 +
 include/dmusicc.h  | 1 +
 include/dmusicf.h  | 1 +
 include/dmusici.h  | 1 +
 9 files changed, 10 insertions(+)

diff --git a/include/d3d.h b/include/d3d.h
index a8972277b6d..76237d7bfb7 100644
--- a/include/d3d.h
+++ b/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>
diff --git a/include/d3d8.h b/include/d3d8.h
index 75d1810dd38..8b7ea53ee1d 100644
--- a/include/d3d8.h
+++ b/include/d3d8.h
@@ -23,6 +23,7 @@
 #define DIRECT3D_VERSION  0x0800
 #endif
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #include <d3d8types.h>
diff --git a/include/d3d9.h b/include/d3d9.h
index 2cc9012f3d9..2575dbeb3a3 100644
--- a/include/d3d9.h
+++ b/include/d3d9.h
@@ -24,6 +24,7 @@
 #define DIRECT3D_VERSION  0x0900
 #endif
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 
 #include <d3d9types.h>
diff --git a/include/ddraw.h b/include/ddraw.h
index b8a28ceb771..f92d47946a3 100644
--- a/include/ddraw.h
+++ b/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
diff --git a/include/dinput.h b/include/dinput.h
index f6e766b9300..e8c56580454 100644
--- a/include/dinput.h
+++ b/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
diff --git a/include/dmplugin.h b/include/dmplugin.h
index 76b06c82f56..28a38f5d7c3 100644
--- a/include/dmplugin.h
+++ b/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>
diff --git a/include/dmusicc.h b/include/dmusicc.h
index 87d9e765cd4..369774b0854 100644
--- a/include/dmusicc.h
+++ b/include/dmusicc.h
@@ -24,6 +24,7 @@
 #include <windows.h>
 #endif /* __WINESRC__ */
 
+#define COM_NO_WINDOWS_H
 #include <objbase.h>
 #include <mmsystem.h>
 
diff --git a/include/dmusicf.h b/include/dmusicf.h
index a568b046584..8c12a289a25 100644
--- a/include/dmusicf.h
+++ b/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>
diff --git a/include/dmusici.h b/include/dmusici.h
index 54038772401..42ba6ddd46e 100644
--- a/include/dmusici.h
+++ b/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>