fix a bug and some warnings in ddraw

svn path=/trunk/; revision=26403
This commit is contained in:
Christoph von Wittich 2007-04-18 19:51:21 +00:00
parent f90ddf0d29
commit dd05afbec1
4 changed files with 6 additions and 5 deletions

View file

@ -15,7 +15,7 @@
VOID
Cleanup(LPDIRECTDRAW7 iface)
{
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
//LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
DX_WINDBG_trace();

View file

@ -171,7 +171,8 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
LPDDRAWI_DDRAWSURFACE_LCL *lpLcl;
DWORD dwHowManySurface = 1;
DWORD i;
LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl;
//LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl;
if (pUnkOuter!=NULL)
{
return CLASS_E_NOAGGREGATION;
@ -232,7 +233,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
}
/* Calc how many surface we need setup */
if (pDDSD->ddsCaps.dwCaps &DDSD_BACKBUFFERCOUNT)
if (pDDSD->ddsCaps.dwCaps & DDSD_BACKBUFFERCOUNT)
{
/* One primary + xx backbuffer */
dwHowManySurface |= pDDSD->dwBackBufferCount;

View file

@ -497,7 +497,7 @@ Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC)
This = (LPDDRAWI_DDRAWSURFACE_INT)iface;
*phDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC;
*phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC;
return DD_OK;
}

View file

@ -926,7 +926,7 @@ Create_DirectDraw (LPGUID pGUID,
}
/* we need check the GUID lpGUID what type it is */
if (pGUID != DDCREATE_HARDWAREONLY)
if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY)
{
if (pGUID !=NULL)
{