Forget commit some changes

svn path=/trunk/; revision=23255
This commit is contained in:
Magnus Olsen 2006-07-23 19:57:36 +00:00
parent 881a60f895
commit c9ef32aff5

View file

@ -19,12 +19,29 @@ HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id,
/* DirectDraw Cleanup code only internal use */ /* DirectDraw Cleanup code only internal use */
VOID Cleanup(LPDIRECTDRAW7 iface); VOID Cleanup(LPDIRECTDRAW7 iface);
/* own macro to alloc memmory */ /* own macro to alloc memmory */
#define DxHeapMemAlloc(m) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m) #define DxHeapMemAlloc(m) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m)
#define DxHeapMemFree(p) HeapFree(GetProcessHeap(), 0, p); #define DxHeapMemFree(p) HeapFree(GetProcessHeap(), 0, p);
/******** Main Object ********/ /******** Main Object ********/
/* Public interface */
HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, REFIID id, LPVOID *obj);
ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface);
ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface);
HRESULT WINAPI Main_DirectDraw_Compact (LPDIRECTDRAW7 iface);
HRESULT WINAPI Main_DirectDraw_CreateClipper (LPDIRECTDRAW7 iface,
DWORD dwFlags,
LPDIRECTDRAWCLIPPER *ppClipper,
IUnknown *pUnkOuter);
HRESULT WINAPI Main_DirectDraw_CreatePalette (LPDIRECTDRAW7 iface,
DWORD dwFlags,
LPPALETTEENTRY palent,
LPDIRECTDRAWPALETTE* ppPalette,
LPUNKNOWN pUnkOuter);
typedef struct typedef struct
{ {
/* Setup the Vtbl COM table */ /* Setup the Vtbl COM table */
@ -69,9 +86,6 @@ typedef struct
/* HEL stuff */ /* HEL stuff */
DWORD HELMemoryAvilable; DWORD HELMemoryAvilable;
/* internal counter */
ULONG ref;
/* DD Callbacks info */ /* DD Callbacks info */
DDHAL_DESTROYDRIVERDATA mDdDestroyDriver; DDHAL_DESTROYDRIVERDATA mDdDestroyDriver;
DDHAL_CREATESURFACEDATA mDdCreateSurface; DDHAL_CREATESURFACEDATA mDdCreateSurface;
@ -94,6 +108,9 @@ typedef struct
DDSURFACEDESC mddsdPrimary; DDSURFACEDESC mddsdPrimary;
/* adding a switch */
DWORD devicetype;
} IDirectDrawImpl; } IDirectDrawImpl;
/******** Surface Object ********/ /******** Surface Object ********/
@ -158,7 +175,7 @@ typedef struct
LONG ref; LONG ref;
IDirectDrawImpl* owner; IDirectDrawImpl* owner;
DDRAWI_DDRAWPALETTE_GBL DDPalette;
} IDirectDrawPaletteImpl; } IDirectDrawPaletteImpl;
/******** Gamma Object ********/ /******** Gamma Object ********/