Author: greatlrd Date: Wed Dec 13 10:54:45 2006 New Revision: 25141
URL: http://svn.reactos.org/svn/reactos?rev=25141&view=rev Log: Fixed, yeah our second test apps works ms dx sdk font.exe works equal good as it use to now. We are getting Ddlock and Ddunlock working again.
Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c
Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/surf... ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Wed Dec 13 10:54:45 2006 @@ -228,9 +228,11 @@ } else { - mdLock.bHasRect = FALSE; - } - + mdLock.bHasRect = FALSE; + } + + This->lpLcl->lpSurfMore->slist[0]->hDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; + mdLock.ddRVal = DDERR_NOTPALETTIZED; mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Lock; mdLock.dwFlags = flags; @@ -248,13 +250,7 @@ { DX_STUB_str("Here DDHAL_DRIVER_HANDLED lock"); return DDERR_UNSUPPORTED; - } - - if (mdLock.ddRVal!= DD_OK) - { - DX_STUB_str("Here ddRVal lock"); - return mdLock.ddRVal; - } + }
// FIXME ??? is this right ?? if (pDDSD != NULL) @@ -277,9 +273,17 @@ //}
pDDSD->lpSurface = (LPVOID) mdLock.lpSurfData; + + pDDSD->dwHeight =This->lpLcl->lpGbl->wHeight; + pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth; + pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl-> + lpModeInfo->dwBPP; + pDDSD->lPitch = This->lpLcl->lpGbl->lPitch; + pDDSD->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; + }
- return DD_OK; + return mdLock.ddRVal; }