diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index 65cd913027c..d031daa85a1 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -10,6 +10,7 @@ C_SRCS = \
 	bmpdecode.c \
 	bmpencode.c \
 	clsfactory.c \
+	colorcontext.c \
 	converter.c \
 	fliprotate.c \
 	gifformat.c \
diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c
new file mode 100644
index 00000000000..9517988ab14
--- /dev/null
+++ b/dlls/windowscodecs/colorcontext.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2012 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+#include "wincodec.h"
+
+#include "wincodecs_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
+
+typedef struct ColorContext {
+    IWICColorContext IWICColorContext_iface;
+    LONG ref;
+} ColorContext;
+
+static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface)
+{
+    return CONTAINING_RECORD(iface, ColorContext, IWICColorContext_iface);
+}
+
+static HRESULT WINAPI ColorContext_QueryInterface(IWICColorContext *iface, REFIID iid,
+    void **ppv)
+{
+    ColorContext *This = impl_from_IWICColorContext(iface);
+    TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv);
+
+    if (!ppv) return E_INVALIDARG;
+
+    if (IsEqualIID(&IID_IUnknown, iid) ||
+        IsEqualIID(&IID_IWICColorContext, iid))
+    {
+        *ppv = &This->IWICColorContext_iface;
+    }
+    else
+    {
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown*)*ppv);
+    return S_OK;
+}
+
+static ULONG WINAPI ColorContext_AddRef(IWICColorContext *iface)
+{
+    ColorContext *This = impl_from_IWICColorContext(iface);
+    ULONG ref = InterlockedIncrement(&This->ref);
+
+    TRACE("(%p) refcount=%u\n", iface, ref);
+
+    return ref;
+}
+
+static ULONG WINAPI ColorContext_Release(IWICColorContext *iface)
+{
+    ColorContext *This = impl_from_IWICColorContext(iface);
+    ULONG ref = InterlockedDecrement(&This->ref);
+
+    TRACE("(%p) refcount=%u\n", iface, ref);
+
+    if (ref == 0)
+    {
+        HeapFree(GetProcessHeap(), 0, This);
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI ColorContext_InitializeFromFilename(IWICColorContext *iface,
+    LPCWSTR wzFilename)
+{
+    FIXME("(%p,%s)\n", iface, debugstr_w(wzFilename));
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface,
+    const BYTE *pbBuffer, UINT cbBufferSize)
+{
+    FIXME("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface,
+    UINT value)
+{
+    FIXME("(%p,%u)\n", iface, value);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface,
+    WICColorContextType *pType)
+{
+    FIXME("(%p,%p)\n", iface, pType);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface,
+    UINT cbBuffer, BYTE *pbBuffer, UINT *pcbActual)
+{
+    FIXME("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface,
+    UINT *pValue)
+{
+    FIXME("(%p,%p)\n", iface, pValue);
+    return E_NOTIMPL;
+}
+
+static const IWICColorContextVtbl ColorContext_Vtbl = {
+    ColorContext_QueryInterface,
+    ColorContext_AddRef,
+    ColorContext_Release,
+    ColorContext_InitializeFromFilename,
+    ColorContext_InitializeFromMemory,
+    ColorContext_InitializeFromExifColorSpace,
+    ColorContext_GetType,
+    ColorContext_GetProfileBytes,
+    ColorContext_GetExifColorSpace
+};
+
+HRESULT ColorContext_Create(IWICColorContext **colorcontext)
+{
+    ColorContext *This;
+
+    This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorContext));
+    if (!This) return E_OUTOFMEMORY;
+
+    This->IWICColorContext_iface.lpVtbl = &ColorContext_Vtbl;
+    This->ref = 1;
+
+    *colorcontext = &This->IWICColorContext_iface;
+
+    return S_OK;
+}
diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c
index 8ba0a1d7d3c..54b390b3be7 100644
--- a/dlls/windowscodecs/imgfactory.c
+++ b/dlls/windowscodecs/imgfactory.c
@@ -442,8 +442,8 @@ static HRESULT WINAPI ComponentFactory_CreateStream(IWICComponentFactory *iface,
 static HRESULT WINAPI ComponentFactory_CreateColorContext(IWICComponentFactory *iface,
     IWICColorContext **ppIColorContext)
 {
-    FIXME("(%p,%p): stub\n", iface, ppIColorContext);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, ppIColorContext);
+    return ColorContext_Create(ppIColorContext);
 }
 
 static HRESULT WINAPI ComponentFactory_CreateColorTransformer(IWICComponentFactory *iface,
diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h
index 41d2d80ca1f..6857176dd71 100644
--- a/dlls/windowscodecs/wincodecs_private.h
+++ b/dlls/windowscodecs/wincodecs_private.h
@@ -51,6 +51,7 @@ extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN;
 extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN;
 extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN;
 extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN;
+extern HRESULT ColorContext_Create(IWICColorContext **context) DECLSPEC_HIDDEN;
 
 extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer,
     UINT srcwidth, UINT srcheight, INT srcstride,