Fix compile
authorMaarten Bosma <maarten@bosma.de>
Sun, 30 Oct 2005 15:39:00 +0000 (15:39 +0000)
committerMaarten Bosma <maarten@bosma.de>
Sun, 30 Oct 2005 15:39:00 +0000 (15:39 +0000)
svn path=/trunk/; revision=18885

reactos/lib/ddraw/hal/surface_hal.c
reactos/lib/ddraw/main/surface_main.c

index f313ca0..335addd 100644 (file)
@@ -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;
 }
-
index 247deff..da62043 100644 (file)
@@ -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;