Vincent Povirk : windowscodecs: Add locking to the GIF decoder.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3caf7204e6f997bae5d25ddc3c0b082fda8d09d2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3caf7204e6f997bae5d25ddc3c...

Author: Vincent Povirk 
Date:   Fri Apr  9 14:30:24 2010 -0500

windowscodecs: Add locking to the GIF decoder.

---

dlls/windowscodecs/gifformat.c |   22 ++++++++++++++++++++--
 dlls/windowscodecs/regsvr.c    |    2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c
index 0597b1a..3443b2c 100644
--- a/dlls/windowscodecs/gifformat.c
+++ b/dlls/windowscodecs/gifformat.c
@@ -40,6 +40,7 @@ typedef struct {
     LONG ref;
     BOOL initialized;
     GifFileType *gif;
+    CRITICAL_SECTION lock;
 } GifDecoder;

typedef struct {
@@ -302,6 +303,8 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface)

if (ref == 0)
     {
+        This->lock.DebugInfo->Spare[0] = 0;
+        DeleteCriticalSection(&This->lock);
         DGifCloseFile(This->gif);
         HeapFree(GetProcessHeap(), 0, This);
     }
@@ -341,9 +344,12 @@ static HRESULT WINAPI GifDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p

TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions);

+    EnterCriticalSection(&This->lock);
+
     if (This->initialized || This->gif)
     {
         WARN("already initialized\n");
+        LeaveCriticalSection(&This->lock);
         return WINCODEC_ERR_WRONGSTATE;
     }

@@ -353,16 +359,26 @@ static HRESULT WINAPI GifDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p

/* read all data from the stream */
     This->gif = DGifOpen((void*)pIStream, _gif_inputfunc);
-    if (!This->gif) return E_FAIL;
+    if (!This->gif)
+    {
+        LeaveCriticalSection(&This->lock);
+        return E_FAIL;
+    }

ret = DGifSlurp(This->gif);
-    if (ret == GIF_ERROR) return E_FAIL;
+    if (ret == GIF_ERROR)
+    {
+        LeaveCriticalSection(&This->lock);
+        return E_FAIL;
+    }

/* make sure we don't use the stream after this method returns */
     This->gif->UserData = NULL;

This->initialized = TRUE;

+    LeaveCriticalSection(&This->lock);
+
     return S_OK;
 }

@@ -502,6 +518,8 @@ HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
     This->ref = 1;
     This->initialized = FALSE;
     This->gif = NULL;
+    InitializeCriticalSection(&This->lock);
+    This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": GifDecoder.lock");

ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv);
     IUnknown_Release((IUnknown*)This);
diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index 334ce85..fa876c8 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -757,7 +757,7 @@ static struct regsvr_coclass const coclass_list[] = {
    "WIC GIF Decoder",
    NULL,
    "windowscodecs.dll",
-	"Apartment"
+	"Both"
     },
     {   &CLSID_WICIcoDecoder,
    "WIC ICO Decoder",