Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 03:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed crash in stub of createsurface

Browse source 
svn path=/trunk/; revision=25009
This commit is contained in:
Magnus Olsen 2006-11-30 22:58:48 +00:00
parent 04210101de
commit 898809f6cb
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
reactos/dll/directx/ddraw/main/ddraw_main.c
View file

@ -198,24 +198,16 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
LPDDRAWI_DDRAWSURFACE_INT That; LPDDRAWI_DDRAWSURFACE_INT That;
DX_WINDBG_trace();
if (pUnkOuter!=NULL) if (pUnkOuter!=NULL)
{ {
return CLASS_E_NOAGGREGATION; return CLASS_E_NOAGGREGATION;
} }
DX_STUB_str("ok pUnkOuter == NULL");
if (sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) if (sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize)
{ {
return DDERR_UNSUPPORTED; return DDERR_UNSUPPORTED;
} }
DX_STUB_str("ok pDDSD->dwSize ok");
That = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); That = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT));
if (That == NULL) if (That == NULL)
@ -223,22 +215,18 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
DX_STUB_str("That got memory"); That->lpLcl = (LPDDRAWI_DDRAWSURFACE_LCL)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL));
if (That == NULL)
{
return E_OUTOFMEMORY;
}
That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl = &DirectDrawSurface7_Vtable;
DX_STUB_str("That->lpVtbl ok");
*ppSurf = (LPDIRECTDRAWSURFACE7)That; *ppSurf = (LPDIRECTDRAWSURFACE7)That;
DX_STUB_str("*ppSurf ok");
That->lpLcl->lpGbl = &ddSurfGbl; That->lpLcl->lpGbl = &ddSurfGbl;
DX_STUB_str("ddSurfGbl ok");
That->lpLcl->lpGbl->lpDD = &ddgbl; That->lpLcl->lpGbl->lpDD = &ddgbl;
DX_STUB_str("crash one line below : why ? to tried figout lpDD ok");
Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That); Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That);