ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Make the ddraw list lock a global dll lock.

This commit is contained in:
Stefan Dösinger 2007-05-18 15:31:47 +02:00 committed by Alexandre Julliard
parent 2e67fa32b1
commit 5307dd2029
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ddraw/ddraw_private.h
View File

@ -80,6 +80,9 @@ extern ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain);
extern ULONG WINAPI D3D7CB_DestroyDepthStencilSurface(IWineD3DSurface *pSurface);
/* Global critical section */
extern CRITICAL_SECTION ddraw_cs;
/*****************************************************************************
* IDirectDraw implementation structure
*****************************************************************************/

21
dlls/ddraw/main.c
View File

@ -59,15 +59,14 @@ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN;
/* DDraw list and critical section */
static struct list global_ddraw_list = LIST_INIT(global_ddraw_list);
static CRITICAL_SECTION ddraw_list_cs;
static CRITICAL_SECTION_DEBUG ddraw_list_cs_debug =
static CRITICAL_SECTION_DEBUG ddraw_cs_debug =
{
0, 0, &ddraw_list_cs,
{ &ddraw_list_cs_debug.ProcessLocksList,
&ddraw_list_cs_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": ddraw_list_cs") }
0, 0, &ddraw_cs,
{ &ddraw_cs_debug.ProcessLocksList,
&ddraw_cs_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": ddraw_cs") }
};
static CRITICAL_SECTION ddraw_list_cs = { &ddraw_list_cs_debug, -1, 0, 0, 0, 0 };
CRITICAL_SECTION ddraw_cs = { &ddraw_cs_debug, -1, 0, 0, 0, 0 };
/***********************************************************************
*
@ -319,9 +318,9 @@ DDRAW_Create(const GUID *guid,
list_init(&This->surface_list);
EnterCriticalSection(&ddraw_list_cs);
EnterCriticalSection(&ddraw_cs);
list_add_head(&global_ddraw_list, &This->ddraw_list_entry);
LeaveCriticalSection(&ddraw_list_cs);
LeaveCriticalSection(&ddraw_cs);
This->decls = HeapAlloc(GetProcessHeap(), 0, 0);
if(!This->decls)
@ -948,7 +947,7 @@ DllMain(HINSTANCE hInstDLL,
void
remove_ddraw_object(IDirectDrawImpl *ddraw)
{
EnterCriticalSection(&ddraw_list_cs);
EnterCriticalSection(&ddraw_cs);
list_remove(&ddraw->ddraw_list_entry);
LeaveCriticalSection(&ddraw_list_cs);
LeaveCriticalSection(&ddraw_cs);
}