From 8e04cb351f4682aa253e979e956b2cb1d692cb3c Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Mon, 31 Oct 2005 19:02:09 +0000 Subject: [PATCH] Use the info we got from callback for the res in createsurface svn path=/trunk/; revision=18913 --- reactos/lib/ddraw/main/surface_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/reactos/lib/ddraw/main/surface_main.c b/reactos/lib/ddraw/main/surface_main.c index c8d28d86856..2af5991a223 100644 --- a/reactos/lib/ddraw/main/surface_main.c +++ b/reactos/lib/ddraw/main/surface_main.c @@ -22,7 +22,7 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD; - + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { /* can the driver create the surface */ @@ -41,9 +41,12 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC /* surface global struct */ memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); 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; + This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; + This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; + This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; + + + /* surface more struct */ memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE));