From 0749054fcf1aef7cf0bdf442cf3c4e6371cf2d33 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Tue, 1 Nov 2005 18:53:37 +0000 Subject: [PATCH] do not try free memmory at exit it seam like the DdDeleteDirectDrawObject doing it for us, and it does not crash any longer at exists svn path=/trunk/; revision=18936 --- reactos/lib/ddraw/hal/ddraw_hal.c | 2 ++ reactos/lib/ddraw/hal/surface_hal.c | 1 + 2 files changed, 3 insertions(+) diff --git a/reactos/lib/ddraw/hal/ddraw_hal.c b/reactos/lib/ddraw/hal/ddraw_hal.c index 3d4775b5c4b..6997c15f8c2 100644 --- a/reactos/lib/ddraw/hal/ddraw_hal.c +++ b/reactos/lib/ddraw/hal/ddraw_hal.c @@ -315,6 +315,7 @@ VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 iface) DdDeleteDirectDrawObject (&This->DirectDrawGlobal); + /* if(This->DirectDrawGlobal.lpDDKernelCaps) HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDKernelCaps); @@ -344,6 +345,7 @@ VOID Hal_DirectDraw_Release (LPDIRECTDRAW7 iface) if(This->DirectDrawGlobal.lpD3DGlobalDriverData) HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); + */ } diff --git a/reactos/lib/ddraw/hal/surface_hal.c b/reactos/lib/ddraw/hal/surface_hal.c index e956bc2b717..f6a988faa66 100644 --- a/reactos/lib/ddraw/hal/surface_hal.c +++ b/reactos/lib/ddraw/hal/surface_hal.c @@ -80,6 +80,7 @@ HRESULT Hal_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pD This->Local.lpGbl = &This->Global; This->Local.lpSurfMore = &This->More; + /* FIXME do a memcopy */ This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps;