From 41477c4529fb65ec07f760c6a5f74150863f798b Mon Sep 17 00:00:00 2001 From: Maarten Bosma Date: Sun, 30 Oct 2005 15:39:00 +0000 Subject: [PATCH] Fix compile svn path=/trunk/; revision=18885 --- reactos/lib/ddraw/hal/surface_hal.c | 5 ++--- reactos/lib/ddraw/main/surface_main.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/reactos/lib/ddraw/hal/surface_hal.c b/reactos/lib/ddraw/hal/surface_hal.c index f313ca0fbd0..335addd853f 100644 --- a/reactos/lib/ddraw/hal/surface_hal.c +++ b/reactos/lib/ddraw/hal/surface_hal.c @@ -24,10 +24,10 @@ HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, DDHAL_BLTDATA BltData; BltData.lpDD = &This->owner->DirectDrawGlobal; BltData.dwFlags = dwFlags; - BltData.lpDDDestSurface = This->local; + BltData.lpDDDestSurface = &This->Local; if(rDest) BltData.rDest = *(RECTL*)rDest; if(rSrc) BltData.rSrc = *(RECTL*)rSrc; - if(That) BltData.lpDDSrcSurface = That->local; + if(That) BltData.lpDDSrcSurface = &That->Local; if(lpbltfx) BltData.bltFX = *lpbltfx; 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; } - diff --git a/reactos/lib/ddraw/main/surface_main.c b/reactos/lib/ddraw/main/surface_main.c index 247deff0833..da62043437a 100644 --- a/reactos/lib/ddraw/main/surface_main.c +++ b/reactos/lib/ddraw/main/surface_main.c @@ -43,7 +43,7 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC /* surface global struct */ 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.wWidth = This->owner->Width; This->Global.dwLinearSize = This->Global.wWidth * This->owner->Bpp/8;