--- trunk/reactos/w32api/include/ddk/ddrawi.h 2005-07-20 04:43:12 UTC (rev 16660)
+++ trunk/reactos/w32api/include/ddk/ddrawi.h 2005-07-20 07:27:09 UTC (rev 16661)
@@ -616,14 +616,13 @@
/*****************************************************************************
* high-level ddraw implementation structures
*/
-#ifndef __USE_W32API
-typedef DWORD IUnknown; /* FIXME: implement proper definition */
-#endif
+#ifndef _NO_COM
typedef struct _IUNKNOWN_LIST {
struct _IUNKNOWN_LIST * lpLink;
LPGUID lpGuid;
IUnknown * lpIUnknown;
} IUNKNOWN_LIST,*LPIUNKNOWN_LIST;
+#endif /* _NO_COM */
typedef struct _PROCESS_LIST {
struct _PROCESS_LIST * lpLink;
@@ -669,6 +668,7 @@
DWORD dwIntRefCnt;
} DDRAWI_DIRECTDRAW_INT;
+#ifndef _NO_COM
typedef struct _DDRAWI_DIRECTDRAW_LCL {
DWORD lpDDMore;
LPDDRAWI_DIRECTDRAW_GBL lpGbl;
@@ -701,6 +701,7 @@
ULONG_PTR hGammaCalibrator;
LPDDGAMMACALIBRATORPROC lpGammaCalibrator;
} DDRAWI_DIRECTDRAW_LCL;
+#endif /* _NO_COM */
#define DDRAWILCL_HASEXCLUSIVEMODE 0x00000001
#define DDRAWILCL_ISFULLSCREEN 0x00000002
@@ -896,6 +897,7 @@
#define GET_LPDDRAWSURFACE_GBL_MORE(psurf_gbl) \
(*(((LPDDRAWI_DDRAWSURFACE_GBL_MORE *)(psurf_gbl)) - 1))
+#ifndef _NO_COM
typedef struct _DDRAWI_DDRAWSURFACE_MORE {
DWORD dwSize;
IUNKNOWN_LIST * lpIUnknowns;
@@ -930,6 +932,7 @@
DWORD dwFVF;
LPVOID lpVB;
} DDRAWI_DDRAWSURFACE_MORE;
+#endif /* _NO_COM */
typedef struct _DDRAWI_DDRAWSURFACE_LCL {
LPDDRAWI_DDRAWSURFACE_MORE lpSurfMore;
@@ -1031,6 +1034,7 @@
#define DDRAWIPAL_STORED_8INDEX 0x00001000
#define DDRAWIPAL_ALPHA 0x00002000
+#ifndef _NO_COM
typedef struct _DDRAWI_DDRAWPALETTE_LCL {
DWORD lpPalMore;
LPDDRAWI_DDRAWPALETTE_GBL lpGbl;
@@ -1044,6 +1048,7 @@
ULONG_PTR dwDDRAWReserved2;
ULONG_PTR dwDDRAWReserved3;
} DDRAWI_DDRAWPALETTE_LCL;
+#endif /* _NO_COM */
typedef struct _DDHAL_GETMOCOMPGUIDSDATA FAR *LPDDHAL_GETMOCOMPGUIDSDATA;
typedef struct _DDHAL_GETMOCOMPFORMATSDATA FAR *LPDDHAL_GETMOCOMPFORMATSDATA;
--- trunk/reactos/w32api/include/ddraw.h 2005-07-20 04:43:12 UTC (rev 16660)
+++ trunk/reactos/w32api/include/ddraw.h 2005-07-20 07:27:09 UTC (rev 16661)
@@ -43,7 +43,9 @@
#ifndef __WINE_DDRAW_H
#define __WINE_DDRAW_H
+#ifndef _NO_COM
#include <objbase.h>
+#endif
#ifdef __cplusplus
extern "C" {
@@ -56,6 +58,7 @@
/*****************************************************************************
* Predeclare the interfaces
*/
+#ifndef _NO_COM
#ifndef __DDRAW_GUID_DEFINED__
DEFINE_GUID( CLSID_DirectDraw, 0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 );
DEFINE_GUID( CLSID_DirectDraw7, 0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 );
@@ -74,6 +77,7 @@
DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8 );
DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E );
#endif
+#endif
typedef struct IDirectDraw *LPDIRECTDRAW;
typedef struct IDirectDraw2 *LPDIRECTDRAW2;
@@ -1069,16 +1073,17 @@
WORD blue[256];
} DDGAMMARAMP,*LPDDGAMMARAMP;
-typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
-typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
-DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
-
typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID);
+#ifndef _NO_COM
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
+DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
+
typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
@@ -1090,6 +1095,7 @@
typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXA)( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXW)( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
DECL_WINELIB_TYPE_AW(LPDIRECTDRAWENUMERATEEX)
+#endif /* _NO_COM */
/* flags for DirectDrawEnumerateEx */
#define DDENUM_ATTACHEDSECONDARYDEVICES 0x00000001
@@ -1229,6 +1235,7 @@
DWORD dwWHQLLevel; /* Windows Hardware Quality Lab certification level */
} DDDEVICEIDENTIFIER2, * LPDDDEVICEIDENTIFIER2;
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawPalette interface
*/
@@ -1268,8 +1275,10 @@
#define IDirectDrawPalette_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
#define IDirectDrawPalette_SetEntries(p,a,b,c,d) (p)->SetEntries(a,b,c,d)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawClipper interface
*/
@@ -1315,8 +1324,10 @@
#define IDirectDrawClipper_SetClipList(p,a,b) (p)->SetClipList(a,b)
#define IDirectDrawClipper_SetHWnd(p,a,b) (p)->SetHWnd(a,b)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDraw interface
*/
@@ -1404,6 +1415,7 @@
#define IDirectDraw_SetDisplayMode(p,a,b,c) (p)->SetDisplayMode(a,b,c)
#define IDirectDraw_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
#endif
+#endif /* _NO_COM */
/* flags for Lock() */
@@ -1417,6 +1429,7 @@
#define DDLOCK_DISCARDCONTENTS 0x00002000
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDraw2 interface
*/
@@ -1513,8 +1526,10 @@
/*** IDirectDraw2 methods ***/
#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDraw4 interface
*/
@@ -1623,8 +1638,10 @@
#define IDirectDraw4_TestCooperativeLevel(p) (p)->TestCooperativeLevel()
#define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->GetDeviceIdentifier(a,b)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDraw7 interface
*/
@@ -1745,8 +1762,10 @@
#define IDirectDraw7_StartModeTest(p,a,b,c) (p)->StartModeTest(a,b,c)
#define IDirectDraw7_EvaluateMode(p,a,b) (p)->EvaluateMode(a,b)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawSurface interface
*/
@@ -1873,8 +1892,10 @@
#define IDirectDrawSurface_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawSurface2 interface
*/
@@ -2016,8 +2037,10 @@
#define IDirectDrawSurface2_PageLock(p,a) (p)->PageLock(a)
#define IDirectDrawSurface2_PageUnlock(p,a) (p)->PageUnlock(a)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawSurface3 interface
*/
@@ -2165,8 +2188,10 @@
/*** IDirectDrawSurface3 methods ***/
#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawSurface4 interface
*/
@@ -2331,8 +2356,10 @@
#define IDirectDrawSurface4_GetUniquenessValue(p,a) (p)->GetUniquenessValue(a)
#define IDirectDrawSurface4_ChangeUniquenessValue(p) (p)->ChangeUniquenessValue()
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawSurface7 interface
*/
@@ -2510,7 +2537,9 @@
#define IDirectDrawSurface7_SetLOD(p,a) (p)->SetLOD(a)
#define IDirectDrawSurface7_GetLOD(p,a) (p)->GetLOD(a)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawColorControl interface
*/
@@ -2544,7 +2573,9 @@
#define IDirectDrawColorControl_GetColorControls(p,a) (p)->GetColorControls(a)
#define IDirectDrawColorControl_SetColorControls(p,a) (p)->SetColorControls(a)
#endif
+#endif /* _NO_COM */
+#ifndef _NO_COM
/*****************************************************************************
* IDirectDrawGammaControl interface
*/
@@ -2578,14 +2609,16 @@
#define IDirectDrawGammaControl_GetGammaRamp(p,a,b) (p)->GetGammaRamp(a,b)
#define IDirectDrawGammaControl_SetGammaRamp(p,a,b) (p)->SetGammaRamp(a,b)
#endif
+#endif /* _NO_COM */
-
+#ifndef _NO_COM
HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN);
HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
+#endif /* _NO_COM */
#ifdef __cplusplus
} /* extern "C" */