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

windowscodecs: Make the IWICPalette implementation thread-safe.

This commit is contained in:
Vincent Povirk 2010-03-19 13:17:29 -05:00 committed by Alexandre Julliard
parent 79662e2aa4
commit 8255df5698
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/windowscodecs/palette.c
View File

@ -40,6 +40,7 @@ typedef struct {
UINT count; UINT count;
WICColor *colors; WICColor *colors;
WICBitmapPaletteType type; WICBitmapPaletteType type;
CRITICAL_SECTION lock; /* must be held when count, colors, or type is accessed */
} PaletteImpl; } PaletteImpl;
static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid,
@ -83,6 +84,8 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface)
if (ref == 0) if (ref == 0)
{ {
This->lock.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&This->lock);
HeapFree(GetProcessHeap(), 0, This->colors); HeapFree(GetProcessHeap(), 0, This->colors);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
@ -117,10 +120,12 @@ static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface,
memcpy(new_colors, pColors, sizeof(WICColor) * colorCount); memcpy(new_colors, pColors, sizeof(WICColor) * colorCount);
} }
EnterCriticalSection(&This->lock);
HeapFree(GetProcessHeap(), 0, This->colors); HeapFree(GetProcessHeap(), 0, This->colors);
This->colors = new_colors; This->colors = new_colors;
This->count = colorCount; This->count = colorCount;
This->type = WICBitmapPaletteTypeCustom; This->type = WICBitmapPaletteTypeCustom;
LeaveCriticalSection(&This->lock);
return S_OK; return S_OK;
} }
@ -148,7 +153,9 @@ static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface,
if (!pePaletteType) return E_INVALIDARG; if (!pePaletteType) return E_INVALIDARG;
EnterCriticalSection(&This->lock);
*pePaletteType = This->type; *pePaletteType = This->type;
LeaveCriticalSection(&This->lock);
return S_OK; return S_OK;
} }
@ -161,7 +168,9 @@ static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCoun
if (!pcCount) return E_INVALIDARG; if (!pcCount) return E_INVALIDARG;
EnterCriticalSection(&This->lock);
*pcCount = This->count; *pcCount = This->count;
LeaveCriticalSection(&This->lock);
return S_OK; return S_OK;
} }
@ -175,12 +184,16 @@ static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount,
if (!pColors || !pcActualColors) return E_INVALIDARG; if (!pColors || !pcActualColors) return E_INVALIDARG;
EnterCriticalSection(&This->lock);
if (This->count < colorCount) colorCount = This->count; if (This->count < colorCount) colorCount = This->count;
memcpy(pColors, This->colors, sizeof(WICColor) * colorCount); memcpy(pColors, This->colors, sizeof(WICColor) * colorCount);
*pcActualColors = colorCount; *pcActualColors = colorCount;
LeaveCriticalSection(&This->lock);
return S_OK; return S_OK;
} }
@ -192,10 +205,12 @@ static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBla
if (!pfIsBlackWhite) return E_INVALIDARG; if (!pfIsBlackWhite) return E_INVALIDARG;
EnterCriticalSection(&This->lock);
if (This->type == WICBitmapPaletteTypeFixedBW) if (This->type == WICBitmapPaletteTypeFixedBW)
*pfIsBlackWhite = TRUE; *pfIsBlackWhite = TRUE;
else else
*pfIsBlackWhite = FALSE; *pfIsBlackWhite = FALSE;
LeaveCriticalSection(&This->lock);
return S_OK; return S_OK;
} }
@ -208,6 +223,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray
if (!pfIsGrayscale) return E_INVALIDARG; if (!pfIsGrayscale) return E_INVALIDARG;
EnterCriticalSection(&This->lock);
switch(This->type) switch(This->type)
{ {
case WICBitmapPaletteTypeFixedBW: case WICBitmapPaletteTypeFixedBW:
@ -219,6 +235,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray
default: default:
*pfIsGrayscale = FALSE; *pfIsGrayscale = FALSE;
} }
LeaveCriticalSection(&This->lock);
return S_OK; return S_OK;
} }
@ -234,12 +251,14 @@ static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha)
*pfHasAlpha = FALSE; *pfHasAlpha = FALSE;
EnterCriticalSection(&This->lock);
for (i=0; i<This->count; i++) for (i=0; i<This->count; i++)
if ((This->colors[i]&0xff000000) != 0xff000000) if ((This->colors[i]&0xff000000) != 0xff000000)
{ {
*pfHasAlpha = TRUE; *pfHasAlpha = TRUE;
break; break;
} }
LeaveCriticalSection(&This->lock);
return S_OK; return S_OK;
} }
@ -272,6 +291,8 @@ HRESULT PaletteImpl_Create(IWICPalette **palette)
This->count = 0; This->count = 0;
This->colors = NULL; This->colors = NULL;
This->type = WICBitmapPaletteTypeCustom; This->type = WICBitmapPaletteTypeCustom;
InitializeCriticalSection(&This->lock);
This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PaletteImpl.lock");
*palette = (IWICPalette*)This; *palette = (IWICPalette*)This;