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

ddraw: Hold the lock in IDirectDrawPalette methods.

Browse Source
This commit is contained in:
Stefan Dösinger 2007-05-30 16:11:25 +02:00 committed by Alexandre Julliard
parent 38079e0744
commit a2227de7af
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/ddraw/palette.c
View File

@ -105,11 +105,13 @@ IDirectDrawPaletteImpl_Release(IDirectDrawPalette *iface)
if (ref == 0) if (ref == 0)
{ {
EnterCriticalSection(&ddraw_cs);
IWineD3DPalette_Release(This->wineD3DPalette); IWineD3DPalette_Release(This->wineD3DPalette);
if(This->ifaceToRelease) if(This->ifaceToRelease)
{ {
IUnknown_Release(This->ifaceToRelease); IUnknown_Release(This->ifaceToRelease);
} }
LeaveCriticalSection(&ddraw_cs);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
@ -160,9 +162,13 @@ IDirectDrawPaletteImpl_GetCaps(IDirectDrawPalette *iface,
DWORD *Caps) DWORD *Caps)
{ {
ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface); ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface);
HRESULT hr;
TRACE("(%p)->(%p): Relay\n", This, Caps); TRACE("(%p)->(%p): Relay\n", This, Caps);
return IWineD3DPalette_GetCaps(This->wineD3DPalette, Caps); EnterCriticalSection(&ddraw_cs);
hr = IWineD3DPalette_GetCaps(This->wineD3DPalette, Caps);
LeaveCriticalSection(&ddraw_cs);
return hr;
} }
/***************************************************************************** /*****************************************************************************
@ -191,12 +197,16 @@ IDirectDrawPaletteImpl_SetEntries(IDirectDrawPalette *iface,
PALETTEENTRY *PalEnt) PALETTEENTRY *PalEnt)
{ {
ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface); ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface);
HRESULT hr;
TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt); TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt);
if(!PalEnt) if(!PalEnt)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
return IWineD3DPalette_SetEntries(This->wineD3DPalette, Flags, Start, Count, PalEnt); EnterCriticalSection(&ddraw_cs);
hr = IWineD3DPalette_SetEntries(This->wineD3DPalette, Flags, Start, Count, PalEnt);
LeaveCriticalSection(&ddraw_cs);
return hr;
} }
/***************************************************************************** /*****************************************************************************
@ -224,12 +234,16 @@ IDirectDrawPaletteImpl_GetEntries(IDirectDrawPalette *iface,
PALETTEENTRY *PalEnt) PALETTEENTRY *PalEnt)
{ {
ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface); ICOM_THIS_FROM(IDirectDrawPaletteImpl, IDirectDrawPalette, iface);
HRESULT hr;
TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt); TRACE("(%p)->(%x,%d,%d,%p): Relay\n", This, Flags, Start, Count, PalEnt);
if(!PalEnt) if(!PalEnt)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
return IWineD3DPalette_GetEntries(This->wineD3DPalette, Flags, Start, Count, PalEnt); EnterCriticalSection(&ddraw_cs);
hr = IWineD3DPalette_GetEntries(This->wineD3DPalette, Flags, Start, Count, PalEnt);
LeaveCriticalSection(&ddraw_cs);
return hr;
} }
const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl = const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl =