Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

make the cleanup working as it should, do not crash when it try free unlinked dd interface.

Browse source 
svn path=/trunk/; revision=25158
This commit is contained in:
Magnus Olsen 2006-12-14 10:53:35 +00:00
parent 80f2505753
commit 75f5b641f2
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/directx/ddraw/cleanup.c
View file

@ -17,6 +17,8 @@ Cleanup(LPDIRECTDRAW7 iface)
{
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
DX_WINDBG_trace();
if (ddgbl.lpDDCBtmp != NULL)
{
DxHeapMemFree(ddgbl.lpDDCBtmp);
@ -34,7 +36,7 @@ Cleanup(LPDIRECTDRAW7 iface)
*/
/* release the linked interface */
while (This->lpVtbl != NULL)
while (!IsBadWritePtr( This->lpVtbl, sizeof( LPDDRAWI_DIRECTDRAW_INT )) )
{
LPDDRAWI_DIRECTDRAW_INT newThis = This->lpVtbl;
if (This->lpLcl != NULL)
@ -42,7 +44,8 @@ Cleanup(LPDIRECTDRAW7 iface)
DeleteDC(This->lpLcl->hDC);
DxHeapMemFree(This->lpLcl);
}
DxHeapMemFree(This);
This = newThis;
}
@ -52,6 +55,10 @@ Cleanup(LPDIRECTDRAW7 iface)
DeleteDC(This->lpLcl->hDC);
DxHeapMemFree(This->lpLcl);
}
if (This != NULL)
{
DxHeapMemFree(This);
}
}

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

@ -85,7 +85,7 @@ Main_DirectDraw_Release (LPDIRECTDRAW7 iface)
This->lpLcl->lpGbl->dwRefCnt--;
}
if ( This->dwIntRefCnt == 0)
if ( This->lpLcl->lpGbl->dwRefCnt == 0)
{
// set resoltion back to the one in registry
/*if(This->cooperative_level & DDSCL_EXCLUSIVE)
@ -94,13 +94,10 @@ Main_DirectDraw_Release (LPDIRECTDRAW7 iface)
}*/
Cleanup(iface);
if (This!=NULL)
{
HeapFree(GetProcessHeap(), 0, This);
}
return 0;
}
}
return This ? This->dwIntRefCnt : 0;
return This->dwIntRefCnt;
}
/*