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

Thanks billycash to explain for me how ref counter works in ddraw. Now we free the COM when it need it (no more memory leak)

Browse source 
svn path=/trunk/; revision=21532
This commit is contained in:
Magnus Olsen 2006-04-09 15:07:43 +00:00
parent 62556472e1
commit 6f2a74079c
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,11 +118,11 @@ Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface)
IDirectDrawImpl* This = (IDirectDrawImpl*)iface; IDirectDrawImpl* This = (IDirectDrawImpl*)iface;
ULONG ref=0; ULONG ref=0;
if (iface!=NULL) if (iface!=NULL)
{ {
ref = InterlockedIncrement((PLONG)&This->mDDrawGlobal.dwRefCnt); ref = InterlockedIncrement(&This->ref);
} }
return ref; return ref;
} }
@ -143,8 +143,10 @@ Main_DirectDraw_Release (LPDIRECTDRAW7 iface)
if (iface!=NULL) if (iface!=NULL)
{ {
ref = InterlockedDecrement((PLONG)&This->mDDrawGlobal.dwRefCnt); ref = InterlockedDecrement(&This->ref);
DX_WINDBG_trace_res((INT)This->mDDrawGlobal.dwRefCnt,(INT)ref,(INT)0);
if (ref == 0) if (ref == 0)
{ {
// set resoltion back to the one in registry // set resoltion back to the one in registry
@ -153,17 +155,11 @@ Main_DirectDraw_Release (LPDIRECTDRAW7 iface)
ChangeDisplaySettings(NULL, 0); ChangeDisplaySettings(NULL, 0);
} }
Hal_DirectDraw_Release(iface); Hal_DirectDraw_Release(iface);
//Hel_DirectDraw_Release(iface); //Hel_DirectDraw_Release(iface);
RtlZeroMemory(&This->mDDrawGlobal, sizeof(DDRAWI_DIRECTDRAW_GBL));
//RtlZeroMemory(This, sizeof(IDirectDrawImpl));
if (This!=NULL) if (This!=NULL)
{ {
HeapFree(GetProcessHeap(), 0, This);
// HeapFree(GetProcessHeap(), 0, This);
} }
} }
} }

3
reactos/dll/directx/ddraw/rosdraw.h
View file

@ -75,6 +75,9 @@ typedef struct
/* HEL stuff */ /* HEL stuff */
DWORD HELMemoryAvilable; DWORD HELMemoryAvilable;
/* internal counter */
ULONG ref;
} IDirectDrawImpl; } IDirectDrawImpl;
/******** Surface Object ********/ /******** Surface Object ********/