Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compile

Browse source 
svn path=/trunk/; revision=18885
This commit is contained in:
Maarten Bosma 2005-10-30 15:39:00 +00:00
parent c515c8db37
commit 41477c4529
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/lib/ddraw/hal/surface_hal.c
View file

@ -24,10 +24,10 @@ HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest,
DDHAL_BLTDATA BltData; DDHAL_BLTDATA BltData;
BltData.lpDD = &This->owner->DirectDrawGlobal; BltData.lpDD = &This->owner->DirectDrawGlobal;
BltData.dwFlags = dwFlags; BltData.dwFlags = dwFlags;
BltData.lpDDDestSurface = This->local; BltData.lpDDDestSurface = &This->Local;
if(rDest) BltData.rDest = *(RECTL*)rDest; if(rDest) BltData.rDest = *(RECTL*)rDest;
if(rSrc) BltData.rSrc = *(RECTL*)rSrc; if(rSrc) BltData.rSrc = *(RECTL*)rSrc;
if(That) BltData.lpDDSrcSurface = That->local; if(That) BltData.lpDDSrcSurface = &That->Local;
if(lpbltfx) BltData.bltFX = *lpbltfx; if(lpbltfx) BltData.bltFX = *lpbltfx;
if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDDSurface.Blt(&BltData) != DDHAL_DRIVER_HANDLED) if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDDSurface.Blt(&BltData) != DDHAL_DRIVER_HANDLED)
@ -37,4 +37,3 @@ HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest,
return BltData.ddRVal; return BltData.ddRVal;
} }

2
reactos/lib/ddraw/main/surface_main.c
View file

@ -43,7 +43,7 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC
/* surface global struct */ /* surface global struct */
memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL));
This->Global.lpDD = &This->owner->DirectDrawThis->Global; This->Global.lpDD = &This->owner->DirectDrawGlobal;
This->Global.wHeight = This->owner->Height; This->Global.wHeight = This->owner->Height;
This->Global.wWidth = This->owner->Width; This->Global.wWidth = This->owner->Width;
This->Global.dwLinearSize = This->Global.wWidth * This->owner->Bpp/8; This->Global.dwLinearSize = This->Global.wWidth * This->owner->Bpp/8;