prepare for new sync of dxdiag.dll from wine.

svn path=/trunk/; revision=19902

diff --git a/reactos/w32api/include/strmif.h b/reactos/w32api/include/strmif.h
index 38af6e9..64cd7bc 100644 (file)
--- a/reactos/w32api/include/strmif.h
+++ b/reactos/w32api/include/strmif.h
@@ -4390,19 +4390,6 @@ enum {
 #ifndef _WINGDI_
 
 
 #ifndef _WINGDI_
 
 

-typedef struct _RGNDATAHEADER {
-    DWORD dwSize;
-    DWORD iType;
-    DWORD nCount;
-    DWORD nRgnSize;
-    RECT rcBound;
-} RGNDATAHEADER;
-
-
-typedef struct _RGNDATA {
-    RGNDATAHEADER rdh;
-    char Buffer[1];
-} RGNDATA;

 
 #endif /* _WINGDI_ for wine */
 #endif
 
 #endif /* _WINGDI_ for wine */
 #endif

diff --git a/reactos/w32api/include/vfw.h b/reactos/w32api/include/vfw.h
index 3523988..f283fb0 100644 (file)
--- a/reactos/w32api/include/vfw.h
+++ b/reactos/w32api/include/vfw.h
@@ -13,9 +13,6 @@
 #if !defined  (_OLE2_H) && !defined (__OBJC__)
 #include <ole2.h>
 #endif
 #if !defined  (_OLE2_H) && !defined (__OBJC__)
 #include <ole2.h>
 #endif

-#if !defined NOMMREG
-#include <mmreg.h>
-#endif

 
 #define VFWAPI WINAPI
 #define VFWAPIV WINAPIV
 
 #define VFWAPI WINAPI
 #define VFWAPIV WINAPIV