svn path=/trunk/; revision=26937
This commit is contained in:
Dmitry Gorbachev
2007-05-29 13:36:03 +00:00
parent 3804dd3952
commit d36da2336c
+12 -7
View File
@@ -207,15 +207,20 @@ Main_DirectDraw_CreateSurface (LPDIRECTDRAW iface, LPDDSURFACEDESC pDDSD,
// EnterCriticalSection(&ddcs);
_SEH_TRY
{
if (pDDSD->dwSize != sizeof(DDSURFACEDESC))
if (pDDSD->dwSize == sizeof(DDSURFACEDESC))
{
return DDERR_INVALIDPARAMS;
CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD);
ret = Internal_CreateSurface((LPDDRAWI_DIRECTDRAW_INT)iface,
&dd_desc_v2,
(LPDIRECTDRAWSURFACE7 *)ppSurf,
pUnkOuter);
}
else
{
ret = DDERR_INVALIDPARAMS;
}
CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD);
ret = Internal_CreateSurface( (LPDDRAWI_DIRECTDRAW_INT)iface,&dd_desc_v2, (LPDIRECTDRAWSURFACE7 *)ppSurf,pUnkOuter);
}
_SEH_HANDLE
_SEH_HANDLE
{
ret = DDERR_GENERIC;
}
@@ -236,7 +241,7 @@ Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD,
_SEH_TRY
{
ret = Internal_CreateSurface( (LPDDRAWI_DIRECTDRAW_INT)iface,pDDSD, ppSurf,pUnkOuter);
}
}
_SEH_HANDLE
{
ret = DDERR_GENERIC;