ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
svn path=/trunk/; revision=25141
This commit is contained in:
Magnus Olsen
2006-12-13 07:54:45 +00:00
parent f696e3e547
commit cb00971319
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/directx/ddraw/main/surface_main.c
+14 -10
View File
@@ -228,9 +228,11 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
}
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 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
{
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 @@ HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
//}
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;
}