[ros-diffs] [cwittich] 27352: wine vendor drop comcat.dll

Author: cwittich
Date: Mon Jul  2 05:27:07 2007
New Revision: 27352

URL: http://svn.reactos.org/svn/reactos?rev=27352&view=rev
Log:
wine vendor drop comcat.dll

Added:
    vendor/wine/dlls/comcat/
    vendor/wine/dlls/comcat/Wine-0_9_40/
    vendor/wine/dlls/comcat/Wine-0_9_40/comcat.spec
    vendor/wine/dlls/comcat/Wine-0_9_40/comcat_main.c
    vendor/wine/dlls/comcat/Wine-0_9_40/comcat_private.h
    vendor/wine/dlls/comcat/Wine-0_9_40/factory.c
    vendor/wine/dlls/comcat/Wine-0_9_40/information.c
    vendor/wine/dlls/comcat/Wine-0_9_40/manager.c
    vendor/wine/dlls/comcat/Wine-0_9_40/register.c
    vendor/wine/dlls/comcat/Wine-0_9_40/regsvr.c
    vendor/wine/dlls/comcat/Wine-0_9_40/version.rc

Added: vendor/wine/dlls/comcat/Wine-0_9_40/comcat.spec
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/comc…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/comcat.spec (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/comcat.spec Mon Jul  2 05:27:07 2007
@@ -1,0 +1,4 @@
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()

Added: vendor/wine/dlls/comcat/Wine-0_9_40/comcat_main.c
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/comc…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/comcat_main.c (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/comcat_main.c Mon Jul  2 05:27:07 2007
@@ -1,0 +1,55 @@
+/*
+ *	exported dll functions for comcat.dll
+ *
+ * Copyright (C) 2002-2003 John K. Hohm
+ *
+ * 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 "comcat_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+LONG dll_ref = 0;
+
+/***********************************************************************
+ *		Global string constant definitions
+ */
+const WCHAR clsid_keyname[6] = { 'C', 'L', 'S', 'I',
'D', 0 };
+
+/***********************************************************************
+ *		DllGetClassObject (COMCAT.@)
+ */
+HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
+{
+    *ppv = NULL;
+    if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) {
+	return IClassFactory_QueryInterface((LPCLASSFACTORY)&COMCAT_ClassFactory, iid,
ppv);
+    }
+   
FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid));
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+/***********************************************************************
+ *		DllCanUnloadNow (COMCAT.@)
+ */
+HRESULT WINAPI DllCanUnloadNow(void)
+{
+    return dll_ref != 0 ? S_FALSE : S_OK;
+}
+
+/* NOTE: DllRegisterServer and DllUnregisterServer are in regsvr.c */

Added: vendor/wine/dlls/comcat/Wine-0_9_40/comcat_private.h
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/comc…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/comcat_private.h (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/comcat_private.h Mon Jul  2 05:27:07 2007
@@ -1,0 +1,73 @@
+/*
+ *	includes for comcat.dll
+ *
+ * Copyright (C) 2002 John K. Hohm
+ *
+ * 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 <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "winerror.h"
+
+#include "ole2.h"
+#include "comcat.h"
+#include "wine/unicode.h"
+
+#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) -
offsetof(impl,field))
+
+/**********************************************************************
+ * Dll lifetime tracking declaration for comcat.dll
+ */
+extern LONG dll_ref;
+
+/**********************************************************************
+ * ClassFactory declaration for comcat.dll
+ */
+typedef struct
+{
+    /* IUnknown fields */
+    const IClassFactoryVtbl *lpVtbl;
+    LONG ref;
+} ClassFactoryImpl;
+
+extern ClassFactoryImpl COMCAT_ClassFactory;
+
+/**********************************************************************
+ * StdComponentCategoriesMgr declaration for comcat.dll
+ */
+typedef struct
+{
+    /* IUnknown fields */
+    const IUnknownVtbl *unkVtbl;
+    const ICatRegisterVtbl *regVtbl;
+    const ICatInformationVtbl *infVtbl;
+    LONG ref;
+} ComCatMgrImpl;
+
+extern ComCatMgrImpl COMCAT_ComCatMgr;
+extern const ICatRegisterVtbl COMCAT_ICatRegister_Vtbl;
+extern const ICatInformationVtbl COMCAT_ICatInformation_Vtbl;
+
+/**********************************************************************
+ * Global string constant declarations
+ */
+extern const WCHAR clsid_keyname[6];

Added: vendor/wine/dlls/comcat/Wine-0_9_40/factory.c
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/fact…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/factory.c (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/factory.c Mon Jul  2 05:27:07 2007
@@ -1,0 +1,149 @@
+/*
+ *	ClassFactory implementation for comcat.dll
+ *
+ * Copyright (C) 2002 John K. Hohm
+ *
+ * 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 "comcat_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface);
+
+/**********************************************************************
+ * COMCAT_IClassFactory_QueryInterface (also IUnknown)
+ */
+static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface(
+    LPCLASSFACTORY iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    if (IsEqualGUID(riid, &IID_IUnknown) ||
+	IsEqualGUID(riid, &IID_IClassFactory))
+    {
+	*ppvObj = (LPVOID)iface;
+	COMCAT_IClassFactory_AddRef(iface);
+	return S_OK;
+    }
+
+    return E_NOINTERFACE;
+}
+
+/**********************************************************************
+ * COMCAT_IClassFactory_AddRef (also IUnknown)
+ */
+static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface)
+{
+    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
+    ULONG ref;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    ref = InterlockedIncrement(&This->ref);
+    if (ref == 1) {
+	InterlockedIncrement(&dll_ref);
+    }
+    return ref;
+}
+
+/**********************************************************************
+ * COMCAT_IClassFactory_Release (also IUnknown)
+ */
+static ULONG WINAPI COMCAT_IClassFactory_Release(LPCLASSFACTORY iface)
+{
+    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
+    ULONG ref;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    ref = InterlockedDecrement(&This->ref);
+    if (ref == 0) {
+	InterlockedDecrement(&dll_ref);
+    }
+    return ref;
+}
+
+/**********************************************************************
+ * COMCAT_IClassFactory_CreateInstance
+ */
+static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance(
+    LPCLASSFACTORY iface,
+    LPUNKNOWN pUnkOuter,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    ClassFactoryImpl *This = (ClassFactoryImpl *)iface;
+    HRESULT res;
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    /* Don't support aggregation (Windows doesn't) */
+    if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION;
+
+    res = IUnknown_QueryInterface((LPUNKNOWN)&COMCAT_ComCatMgr, riid, ppvObj);
+    if (SUCCEEDED(res)) {
+	return res;
+    }
+
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+/**********************************************************************
+ * COMCAT_IClassFactory_LockServer
+ */
+static HRESULT WINAPI COMCAT_IClassFactory_LockServer(
+    LPCLASSFACTORY iface,
+    BOOL fLock)
+{
+    TRACE("\n");
+
+    if (fLock != FALSE) {
+	IClassFactory_AddRef(iface);
+    } else {
+	IClassFactory_Release(iface);
+    }
+    return S_OK;
+}
+
+/**********************************************************************
+ * IClassFactory_Vtbl
+ */
+static const IClassFactoryVtbl IClassFactory_Vtbl =
+{
+    COMCAT_IClassFactory_QueryInterface,
+    COMCAT_IClassFactory_AddRef,
+    COMCAT_IClassFactory_Release,
+    COMCAT_IClassFactory_CreateInstance,
+    COMCAT_IClassFactory_LockServer
+};
+
+/**********************************************************************
+ * static ClassFactory instance
+ */
+ClassFactoryImpl COMCAT_ClassFactory = { &IClassFactory_Vtbl, 0 };

Added: vendor/wine/dlls/comcat/Wine-0_9_40/information.c
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/info…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/information.c (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/information.c Mon Jul  2 05:27:07 2007
@@ -1,0 +1,969 @@
+/*
+ *	ComCatMgr ICatInformation implementation for comcat.dll
+ *
+ * Copyright (C) 2002 John K. Hohm
+ *
+ * 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 <string.h>
+#include "comcat_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+static LPENUMCATEGORYINFO COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid);
+static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc,
+				      ULONG buf_wchars);
+
+struct class_categories {
+    LPCWSTR impl_strings;
+    LPCWSTR req_strings;
+};
+
+static struct class_categories *COMCAT_PrepareClassCategories(
+    ULONG impl_count, const CATID *impl_catids, ULONG req_count, const CATID
*req_catids);
+static HRESULT COMCAT_IsClassOfCategories(
+    HKEY key, struct class_categories const* class_categories);
+static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(
+    struct class_categories const* class_categories);
+static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct(
+    REFCLSID rclsid, LPCWSTR impl_req);
+
+/**********************************************************************
+ * COMCAT_ICatInformation_QueryInterface
+ */
+static HRESULT WINAPI COMCAT_ICatInformation_QueryInterface(
+    LPCATINFORMATION iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface);
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    return IUnknown_QueryInterface((LPUNKNOWN)&This->unkVtbl, riid, ppvObj);
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_AddRef
+ */
+static ULONG WINAPI COMCAT_ICatInformation_AddRef(LPCATINFORMATION iface)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface);
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    return IUnknown_AddRef((LPUNKNOWN)&This->unkVtbl);
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_Release
+ */
+static ULONG WINAPI COMCAT_ICatInformation_Release(LPCATINFORMATION iface)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface);
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    return IUnknown_Release((LPUNKNOWN)&This->unkVtbl);
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_EnumCategories
+ */
+static HRESULT WINAPI COMCAT_ICatInformation_EnumCategories(
+    LPCATINFORMATION iface,
+    LCID lcid,
+    LPENUMCATEGORYINFO *ppenumCatInfo)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface); */
+    TRACE("\n");
+
+    if (iface == NULL || ppenumCatInfo == NULL) return E_POINTER;
+
+    *ppenumCatInfo = COMCAT_IEnumCATEGORYINFO_Construct(lcid);
+    if (*ppenumCatInfo == NULL) return E_OUTOFMEMORY;
+    IEnumCATEGORYINFO_AddRef(*ppenumCatInfo);
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_GetCategoryDesc
+ */
+static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc(
+    LPCATINFORMATION iface,
+    REFCATID rcatid,
+    LCID lcid,
+    PWCHAR *ppszDesc)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface); */
+    WCHAR keyname[60] = { 'C', 'o', 'm', 'p',
'o', 'n', 'e', 'n',
+			  't', ' ', 'C', 'a', 't', 'e',
'g', 'o',
+			  'r', 'i', 'e', 's', '\\', 0 };
+    HKEY key;
+    HRESULT res;
+
+    TRACE("\n\tCATID:\t%s\n\tLCID:\t%X\n",debugstr_guid(rcatid), lcid);
+
+    if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG;
+
+    /* Open the key for this category. */
+    if (!StringFromGUID2(rcatid, keyname + 21, 39)) return E_FAIL;
+    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &key);
+    if (res != ERROR_SUCCESS) return CAT_E_CATIDNOEXIST;
+
+    /* Allocate a sensible amount of memory for the description. */
+    *ppszDesc = (PWCHAR) CoTaskMemAlloc(128 * sizeof(WCHAR));
+    if (*ppszDesc == NULL) {
+	RegCloseKey(key);
+	return E_OUTOFMEMORY;
+    }
+
+    /* Get the description, and make sure it's null terminated. */
+    res = COMCAT_GetCategoryDesc(key, lcid, *ppszDesc, 128);
+    RegCloseKey(key);
+    if (FAILED(res)) {
+	CoTaskMemFree(*ppszDesc);
+	return res;
+    }
+
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_EnumClassesOfCategories
+ */
+static HRESULT WINAPI COMCAT_ICatInformation_EnumClassesOfCategories(
+    LPCATINFORMATION iface,
+    ULONG cImplemented,
+    CATID *rgcatidImpl,
+    ULONG cRequired,
+    CATID *rgcatidReq,
+    LPENUMCLSID *ppenumCLSID)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface); */
+    struct class_categories *categories;
+
+    TRACE("\n");
+
+	if (cImplemented == (ULONG)-1) 
+		cImplemented = 0;
+	if (cRequired == (ULONG)-1) 
+		cRequired = 0;
+	
+    if (iface == NULL || ppenumCLSID == NULL ||
+	(cImplemented && rgcatidImpl == NULL) ||
+	(cRequired && rgcatidReq == NULL)) return E_POINTER;
+
+    categories = COMCAT_PrepareClassCategories(cImplemented, rgcatidImpl,
+					       cRequired, rgcatidReq);
+    if (categories == NULL) return E_OUTOFMEMORY;
+    *ppenumCLSID = COMCAT_CLSID_IEnumGUID_Construct(categories);
+    if (*ppenumCLSID == NULL) {
+	HeapFree(GetProcessHeap(), 0, categories);
+	return E_OUTOFMEMORY;
+    }
+    IEnumGUID_AddRef(*ppenumCLSID);
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_IsClassOfCategories
+ */
+static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories(
+    LPCATINFORMATION iface,
+    REFCLSID rclsid,
+    ULONG cImplemented,
+    CATID *rgcatidImpl,
+    ULONG cRequired,
+    CATID *rgcatidReq)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface); */
+    WCHAR keyname[45] = { 'C', 'L', 'S', 'I',
'D', '\\', 0 };
+    HRESULT res;
+    struct class_categories *categories;
+    HKEY key;
+
+    if (WINE_TRACE_ON(ole)) {
+	ULONG count;
+	TRACE("\n\tCLSID:\t%s\n\tImplemented
%u\n",debugstr_guid(rclsid),cImplemented);
+	for (count = 0; count < cImplemented; ++count)
+	    TRACE("\t\t%s\n",debugstr_guid(&rgcatidImpl[count]));
+	TRACE("\tRequired %u\n",cRequired);
+	for (count = 0; count < cRequired; ++count)
+	    TRACE("\t\t%s\n",debugstr_guid(&rgcatidReq[count]));
+    }
+
+    if ((cImplemented && rgcatidImpl == NULL) ||
+	(cRequired && rgcatidReq == NULL)) return E_POINTER;
+
+    res = StringFromGUID2(rclsid, keyname + 6, 39);
+    if (FAILED(res)) return res;
+
+    categories = COMCAT_PrepareClassCategories(cImplemented, rgcatidImpl,
+					       cRequired, rgcatidReq);
+    if (categories == NULL) return E_OUTOFMEMORY;
+
+    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &key);
+    if (res == ERROR_SUCCESS) {
+	res = COMCAT_IsClassOfCategories(key, categories);
+	RegCloseKey(key);
+    } else res = S_FALSE;
+
+    HeapFree(GetProcessHeap(), 0, categories);
+
+    return res;
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_EnumImplCategoriesOfClass
+ */
+static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass(
+    LPCATINFORMATION iface,
+    REFCLSID rclsid,
+    LPENUMCATID *ppenumCATID)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface); */
+    static const WCHAR postfix[24] = { '\\', 'I', 'm',
'p', 'l', 'e', 'm', 'e',
+			  'n', 't', 'e', 'd', ' ', 'C',
'a', 't',
+			  'e', 'g', 'o', 'r', 'i', 'e',
's', 0 };
+
+    TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid));
+
+    if (iface == NULL || rclsid == NULL || ppenumCATID == NULL)
+	return E_POINTER;
+
+    *ppenumCATID = COMCAT_CATID_IEnumGUID_Construct(rclsid, postfix);
+    if (*ppenumCATID == NULL) return E_OUTOFMEMORY;
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_EnumReqCategoriesOfClass
+ */
+static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass(
+    LPCATINFORMATION iface,
+    REFCLSID rclsid,
+    LPENUMCATID *ppenumCATID)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, infVtbl, iface); */
+    static const WCHAR postfix[21] = { '\\', 'R', 'e',
'q', 'u', 'i', 'r', 'e',
+			  'd', ' ', 'C', 'a', 't', 'e',
'g', 'o',
+			  'r', 'i', 'e', 's', 0 };
+
+    TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid));
+
+    if (iface == NULL || rclsid == NULL || ppenumCATID == NULL)
+	return E_POINTER;
+
+    *ppenumCATID = COMCAT_CATID_IEnumGUID_Construct(rclsid, postfix);
+    if (*ppenumCATID == NULL) return E_OUTOFMEMORY;
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_ICatInformation_Vtbl
+ */
+const ICatInformationVtbl COMCAT_ICatInformation_Vtbl =
+{
+    COMCAT_ICatInformation_QueryInterface,
+    COMCAT_ICatInformation_AddRef,
+    COMCAT_ICatInformation_Release,
+    COMCAT_ICatInformation_EnumCategories,
+    COMCAT_ICatInformation_GetCategoryDesc,
+    COMCAT_ICatInformation_EnumClassesOfCategories,
+    COMCAT_ICatInformation_IsClassOfCategories,
+    COMCAT_ICatInformation_EnumImplCategoriesOfClass,
+    COMCAT_ICatInformation_EnumReqCategoriesOfClass
+};
+
+/**********************************************************************
+ * IEnumCATEGORYINFO implementation
+ *
+ * This implementation is not thread-safe.  The manager itself is, but
+ * I can't imagine a valid use of an enumerator in several threads.
+ */
+typedef struct
+{
+    const IEnumCATEGORYINFOVtbl *lpVtbl;
+    LONG  ref;
+    LCID  lcid;
+    HKEY  key;
+    DWORD next_index;
+} IEnumCATEGORYINFOImpl;
+
+static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_AddRef(LPENUMCATEGORYINFO iface)
+{
+    IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    return InterlockedIncrement(&This->ref);
+}
+
+static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface(
+    LPENUMCATEGORYINFO iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    if (IsEqualGUID(riid, &IID_IUnknown) ||
+	IsEqualGUID(riid, &IID_IEnumCATEGORYINFO))
+    {
+	*ppvObj = (LPVOID)iface;
+	COMCAT_IEnumCATEGORYINFO_AddRef(iface);
+	return S_OK;
+    }
+
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_Release(LPENUMCATEGORYINFO iface)
+{
+    IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
+    ULONG ref;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    ref = InterlockedDecrement(&This->ref);
+    if (ref == 0) {
+	if (This->key) RegCloseKey(This->key);
+	HeapFree(GetProcessHeap(), 0, This);
+	return 0;
+    }
+    return ref;
+}
+
+static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Next(
+    LPENUMCATEGORYINFO iface,
+    ULONG celt,
+    CATEGORYINFO *rgelt,
+    ULONG *pceltFetched)
+{
+    IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
+    ULONG fetched = 0;
+
+    TRACE("\n");
+
+    if (This == NULL || rgelt == NULL) return E_POINTER;
+
+    if (This->key) while (fetched < celt) {
+	HRESULT res;
+	WCHAR catid[39];
+	DWORD cName = 39;
+	HKEY subkey;
+
+	res = RegEnumKeyExW(This->key, This->next_index, catid, &cName,
+			    NULL, NULL, NULL, NULL);
+	if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break;
+	++(This->next_index);
+
+	res = CLSIDFromString(catid, &rgelt->catid);
+	if (FAILED(res)) continue;
+
+	res = RegOpenKeyExW(This->key, catid, 0, KEY_READ, &subkey);
+	if (res != ERROR_SUCCESS) continue;
+
+	res = COMCAT_GetCategoryDesc(subkey, This->lcid,
+				     rgelt->szDescription, 128);
+	RegCloseKey(subkey);
+	if (FAILED(res)) continue;
+
+	rgelt->lcid = This->lcid;
+	++fetched;
+	++rgelt;
+    }
+
+    if (pceltFetched) *pceltFetched = fetched;
+    return fetched == celt ? S_OK : S_FALSE;
+}
+
+static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Skip(
+    LPENUMCATEGORYINFO iface,
+    ULONG celt)
+{
+    IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+    This->next_index += celt;
+    /* This should return S_FALSE when there aren't celt elems to skip. */
+    return S_OK;
+}
+
+static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Reset(LPENUMCATEGORYINFO iface)
+{
+    IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+    This->next_index = 0;
+    return S_OK;
+}
+
+static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone(
+    LPENUMCATEGORYINFO iface,
+    IEnumCATEGORYINFO **ppenum)
+{
+    IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface;
+    static const WCHAR keyname[] = { 'C', 'o', 'm', 'p',
'o', 'n', 'e', 'n',
+                                     't', ' ', 'C', 'a',
't', 'e', 'g', 'o',
+                                     'r', 'i', 'e', 's',
0 };
+    IEnumCATEGORYINFOImpl *new_this;
+
+    TRACE("\n");
+
+    if (This == NULL || ppenum == NULL) return E_POINTER;
+
+    new_this = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(IEnumCATEGORYINFOImpl));
+    if (new_this == NULL) return E_OUTOFMEMORY;
+
+    new_this->lpVtbl = This->lpVtbl;
+    new_this->ref = 1;
+    new_this->lcid = This->lcid;
+    /* FIXME: could we more efficiently use DuplicateHandle? */
+    RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &new_this->key);
+    new_this->next_index = This->next_index;
+
+    *ppenum = (LPENUMCATEGORYINFO)new_this;
+    return S_OK;
+}
+
+static const IEnumCATEGORYINFOVtbl COMCAT_IEnumCATEGORYINFO_Vtbl =
+{
+    COMCAT_IEnumCATEGORYINFO_QueryInterface,
+    COMCAT_IEnumCATEGORYINFO_AddRef,
+    COMCAT_IEnumCATEGORYINFO_Release,
+    COMCAT_IEnumCATEGORYINFO_Next,
+    COMCAT_IEnumCATEGORYINFO_Skip,
+    COMCAT_IEnumCATEGORYINFO_Reset,
+    COMCAT_IEnumCATEGORYINFO_Clone
+};
+
+static LPENUMCATEGORYINFO COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid)
+{
+    IEnumCATEGORYINFOImpl *This;
+
+    This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumCATEGORYINFOImpl));
+    if (This) {
+        static const WCHAR keyname[] = { 'C', 'o', 'm',
'p', 'o', 'n', 'e', 'n',
+                                         't', ' ', 'C',
'a', 't', 'e', 'g', 'o',
+                                         'r', 'i', 'e',
's', 0 };
+
+	This->lpVtbl = &COMCAT_IEnumCATEGORYINFO_Vtbl;
+	This->lcid = lcid;
+	RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &This->key);
+    }
+    return (LPENUMCATEGORYINFO)This;
+}
+
+/**********************************************************************
+ * COMCAT_GetCategoryDesc
+ */
+static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc,
+				      ULONG buf_wchars)
+{
+    static const WCHAR fmt[] = { '%', 'l', 'X', 0 };
+    WCHAR valname[5];
+    HRESULT res;
+    DWORD type, size = (buf_wchars - 1) * sizeof(WCHAR);
+
+    if (pszDesc == NULL) return E_INVALIDARG;
+
+    /* FIXME: lcid comparisons are more complex than this! */
+    wsprintfW(valname, fmt, lcid);
+    res = RegQueryValueExW(key, valname, 0, &type, (LPBYTE)pszDesc, &size);
+    if (res != ERROR_SUCCESS || type != REG_SZ) {
+	FIXME("Simplified lcid comparison\n");
+	return CAT_E_NODESCRIPTION;
+    }
+    pszDesc[size / sizeof(WCHAR)] = (WCHAR)0;
+
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_PrepareClassCategories
+ */
+static struct class_categories *COMCAT_PrepareClassCategories(
+    ULONG impl_count, const CATID *impl_catids, ULONG req_count, const CATID
*req_catids)
+{
+    struct class_categories *categories;
+    WCHAR *strings;
+
+    categories = HeapAlloc(
+	GetProcessHeap(), HEAP_ZERO_MEMORY,
+	sizeof(struct class_categories) +
+	((impl_count + req_count) * 39 + 2) * sizeof(WCHAR));
+    if (categories == NULL) return categories;
+
+    strings = (WCHAR *)(categories + 1);
+    categories->impl_strings = strings;
+    while (impl_count--) {
+	StringFromGUID2(impl_catids++, strings, 39);
+	strings += 39;
+    }
+    *strings++ = 0;
+
+    categories->req_strings = strings;
+    while (req_count--) {
+	StringFromGUID2(req_catids++, strings, 39);
+	strings += 39;
+    }
+    *strings++ = 0;
+
+    return categories;
+}
+
+/**********************************************************************
+ * COMCAT_IsClassOfCategories
+ */
+static HRESULT COMCAT_IsClassOfCategories(
+    HKEY key,
+    struct class_categories const* categories)
+{
+    static const WCHAR impl_keyname[] = { 'I', 'm', 'p',
'l', 'e', 'm', 'e', 'n',
+                                          't', 'e', 'd', '
', 'C', 'a', 't', 'e',
+                                          'g', 'o', 'r',
'i', 'e', 's', 0 };
+    static const WCHAR req_keyname[]  = { 'R', 'e', 'q',
'u', 'i', 'r', 'e', 'd',
+                                          ' ', 'C', 'a',
't', 'e', 'g', 'o', 'r',
+                                          'i', 'e', 's', 0 };
+    HKEY subkey;
+    HRESULT res;
+    DWORD index;
+    LPCWSTR string;
+
+    /* Check that every given category is implemented by class. */
+    res = RegOpenKeyExW(key, impl_keyname, 0, KEY_READ, &subkey);
+    if (res != ERROR_SUCCESS) return S_FALSE;
+    for (string = categories->impl_strings; *string; string += 39) {
+	HKEY catkey;
+	res = RegOpenKeyExW(subkey, string, 0, 0, &catkey);
+	if (res != ERROR_SUCCESS) {
+	    RegCloseKey(subkey);
+	    return S_FALSE;
+	}
+	RegCloseKey(catkey);
+    }
+    RegCloseKey(subkey);
+
+    /* Check that all categories required by class are given. */
+    res = RegOpenKeyExW(key, req_keyname, 0, KEY_READ, &subkey);
+    if (res == ERROR_SUCCESS) {
+	for (index = 0; ; ++index) {
+	    WCHAR keyname[39];
+	    DWORD size = 39;
+
+	    res = RegEnumKeyExW(subkey, index, keyname, &size,
+				NULL, NULL, NULL, NULL);
+	    if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break;
+	    if (size != 38) continue; /* bogus catid in registry */
+	    for (string = categories->req_strings; *string; string += 39)
+		if (!strcmpiW(string, keyname)) break;
+	    if (!*string) {
+		RegCloseKey(subkey);
+		return S_FALSE;
+	    }
+	}
+	RegCloseKey(subkey);
+    }
+
+    return S_OK;
+}
+
+/**********************************************************************
+ * ClassesOfCategories IEnumCLSID (IEnumGUID) implementation
+ *
+ * This implementation is not thread-safe.  The manager itself is, but
+ * I can't imagine a valid use of an enumerator in several threads.
+ */
+typedef struct
+{
+    const IEnumGUIDVtbl *lpVtbl;
+    LONG  ref;
+    const struct class_categories *categories;
+    HKEY  key;
+    DWORD next_index;
+} CLSID_IEnumGUIDImpl;
+
+static ULONG WINAPI COMCAT_CLSID_IEnumGUID_AddRef(LPENUMGUID iface)
+{
+    CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    return InterlockedIncrement(&This->ref);
+}
+
+static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface(
+    LPENUMGUID iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    if (IsEqualGUID(riid, &IID_IUnknown) ||
+	IsEqualGUID(riid, &IID_IEnumGUID))
+    {
+	*ppvObj = (LPVOID)iface;
+	COMCAT_CLSID_IEnumGUID_AddRef(iface);
+	return S_OK;
+    }
+
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI COMCAT_CLSID_IEnumGUID_Release(LPENUMGUID iface)
+{
+    CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
+    ULONG ref;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    ref = InterlockedDecrement(&This->ref);
+    if (ref == 0) {
+	if (This->key) RegCloseKey(This->key);
+	HeapFree(GetProcessHeap(), 0, (LPVOID)This->categories);
+	HeapFree(GetProcessHeap(), 0, This);
+	return 0;
+    }
+    return ref;
+}
+
+static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Next(
+    LPENUMGUID iface,
+    ULONG celt,
+    GUID *rgelt,
+    ULONG *pceltFetched)
+{
+    CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
+    ULONG fetched = 0;
+
+    TRACE("\n");
+
+    if (This == NULL || rgelt == NULL) return E_POINTER;
+
+    if (This->key) while (fetched < celt) {
+	HRESULT res;
+	WCHAR clsid[39];
+	DWORD cName = 39;
+	HKEY subkey;
+
+	res = RegEnumKeyExW(This->key, This->next_index, clsid, &cName,
+			    NULL, NULL, NULL, NULL);
+	if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break;
+	++(This->next_index);
+
+	res = CLSIDFromString(clsid, rgelt);
+	if (FAILED(res)) continue;
+
+	res = RegOpenKeyExW(This->key, clsid, 0, KEY_READ, &subkey);
+	if (res != ERROR_SUCCESS) continue;
+
+	res = COMCAT_IsClassOfCategories(subkey, This->categories);
+	RegCloseKey(subkey);
+	if (res != S_OK) continue;
+
+	++fetched;
+	++rgelt;
+    }
+
+    if (pceltFetched) *pceltFetched = fetched;
+    return fetched == celt ? S_OK : S_FALSE;
+}
+
+static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Skip(
+    LPENUMGUID iface,
+    ULONG celt)
+{
+    CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+    This->next_index += celt;
+    FIXME("Never returns S_FALSE\n");
+    return S_OK;
+}
+
+static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Reset(LPENUMGUID iface)
+{
+    CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+    This->next_index = 0;
+    return S_OK;
+}
+
+static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Clone(
+    LPENUMGUID iface,
+    IEnumGUID **ppenum)
+{
+    CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface;
+    static const WCHAR keyname[] = { 'C', 'L', 'S', 'I',
'D', 0 };
+    CLSID_IEnumGUIDImpl *new_this;
+    DWORD size;
+
+    TRACE("\n");
+
+    if (This == NULL || ppenum == NULL) return E_POINTER;
+
+    new_this = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(CLSID_IEnumGUIDImpl));
+    if (new_this == NULL) return E_OUTOFMEMORY;
+
+    new_this->lpVtbl = This->lpVtbl;
+    new_this->ref = 1;
+    size = HeapSize(GetProcessHeap(), 0, (LPVOID)This->categories);
+    new_this->categories =
+	HeapAlloc(GetProcessHeap(), 0, size);
+    if (new_this->categories == NULL) {
+	HeapFree(GetProcessHeap(), 0, new_this);
+	return E_OUTOFMEMORY;
+    }
+    memcpy((LPVOID)new_this->categories, This->categories, size);
+    /* FIXME: could we more efficiently use DuplicateHandle? */
+    RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &new_this->key);
+    new_this->next_index = This->next_index;
+
+    *ppenum = (LPENUMGUID)new_this;
+    return S_OK;
+}
+
+static const IEnumGUIDVtbl COMCAT_CLSID_IEnumGUID_Vtbl =
+{
+    COMCAT_CLSID_IEnumGUID_QueryInterface,
+    COMCAT_CLSID_IEnumGUID_AddRef,
+    COMCAT_CLSID_IEnumGUID_Release,
+    COMCAT_CLSID_IEnumGUID_Next,
+    COMCAT_CLSID_IEnumGUID_Skip,
+    COMCAT_CLSID_IEnumGUID_Reset,
+    COMCAT_CLSID_IEnumGUID_Clone
+};
+
+static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(
+    struct class_categories const* categories)
+{
+    CLSID_IEnumGUIDImpl *This;
+
+    This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLSID_IEnumGUIDImpl));
+    if (This) {
+	static const WCHAR keyname[] = { 'C', 'L', 'S', 'I',
'D', 0 };
+
+	This->lpVtbl = &COMCAT_CLSID_IEnumGUID_Vtbl;
+	This->categories = categories;
+	RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &This->key);
+    }
+    return (LPENUMGUID)This;
+}
+
+/**********************************************************************
+ * CategoriesOfClass IEnumCATID (IEnumGUID) implementation
+ *
+ * This implementation is not thread-safe.  The manager itself is, but
+ * I can't imagine a valid use of an enumerator in several threads.
+ */
+typedef struct
+{
+    const IEnumGUIDVtbl *lpVtbl;
+    LONG  ref;
+    WCHAR keyname[68];
+    HKEY  key;
+    DWORD next_index;
+} CATID_IEnumGUIDImpl;
+
+static ULONG WINAPI COMCAT_CATID_IEnumGUID_AddRef(LPENUMGUID iface)
+{
+    CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    return InterlockedIncrement(&This->ref);
+}
+
+static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface(
+    LPENUMGUID iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    if (IsEqualGUID(riid, &IID_IUnknown) ||
+	IsEqualGUID(riid, &IID_IEnumGUID))
+    {
+	*ppvObj = (LPVOID)iface;
+	COMCAT_CATID_IEnumGUID_AddRef(iface);
+	return S_OK;
+    }
+
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI COMCAT_CATID_IEnumGUID_Release(LPENUMGUID iface)
+{
+    CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
+    ULONG ref;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    ref = InterlockedDecrement(&This->ref);
+    if (ref == 0) {
+	if (This->key) RegCloseKey(This->key);
+	HeapFree(GetProcessHeap(), 0, This);
+	return 0;
+    }
+    return ref;
+}
+
+static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Next(
+    LPENUMGUID iface,
+    ULONG celt,
+    GUID *rgelt,
+    ULONG *pceltFetched)
+{
+    CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
+    ULONG fetched = 0;
+
+    TRACE("\n");
+
+    if (This == NULL || rgelt == NULL) return E_POINTER;
+
+    if (This->key) while (fetched < celt) {
+	HRESULT res;
+	WCHAR catid[39];
+	DWORD cName = 39;
+
+	res = RegEnumKeyExW(This->key, This->next_index, catid, &cName,
+			    NULL, NULL, NULL, NULL);
+	if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break;
+	++(This->next_index);
+
+	res = CLSIDFromString(catid, rgelt);
+	if (FAILED(res)) continue;
+
+	++fetched;
+	++rgelt;
+    }
+
+    if (pceltFetched) *pceltFetched = fetched;
+    return fetched == celt ? S_OK : S_FALSE;
+}
+
+static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Skip(
+    LPENUMGUID iface,
+    ULONG celt)
+{
+    CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+    This->next_index += celt;
+    FIXME("Never returns S_FALSE\n");
+    return S_OK;
+}
+
+static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Reset(LPENUMGUID iface)
+{
+    CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+    This->next_index = 0;
+    return S_OK;
+}
+
+static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Clone(
+    LPENUMGUID iface,
+    IEnumGUID **ppenum)
+{
+    CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface;
+    CATID_IEnumGUIDImpl *new_this;
+
+    TRACE("\n");
+
+    if (This == NULL || ppenum == NULL) return E_POINTER;
+
+    new_this = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(CATID_IEnumGUIDImpl));
+    if (new_this == NULL) return E_OUTOFMEMORY;
+
+    new_this->lpVtbl = This->lpVtbl;
+    new_this->ref = 1;
+    lstrcpyW(new_this->keyname, This->keyname);
+    /* FIXME: could we more efficiently use DuplicateHandle? */
+    RegOpenKeyExW(HKEY_CLASSES_ROOT, new_this->keyname, 0, KEY_READ,
&new_this->key);
+    new_this->next_index = This->next_index;
+
+    *ppenum = (LPENUMGUID)new_this;
+    return S_OK;
+}
+
+static const IEnumGUIDVtbl COMCAT_CATID_IEnumGUID_Vtbl =
+{
+    COMCAT_CATID_IEnumGUID_QueryInterface,
+    COMCAT_CATID_IEnumGUID_AddRef,
+    COMCAT_CATID_IEnumGUID_Release,
+    COMCAT_CATID_IEnumGUID_Next,
+    COMCAT_CATID_IEnumGUID_Skip,
+    COMCAT_CATID_IEnumGUID_Reset,
+    COMCAT_CATID_IEnumGUID_Clone
+};
+
+static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct(
+    REFCLSID rclsid, LPCWSTR postfix)
+{
+    CATID_IEnumGUIDImpl *This;
+
+    This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl));
+    if (This) {
+	WCHAR prefix[6] = { 'C', 'L', 'S', 'I', 'D',
'\\' };
+
+	This->lpVtbl = &COMCAT_CATID_IEnumGUID_Vtbl;
+	memcpy(This->keyname, prefix, sizeof(prefix));
+	StringFromGUID2(rclsid, This->keyname + 6, 39);
+	lstrcpyW(This->keyname + 44, postfix);
+	RegOpenKeyExW(HKEY_CLASSES_ROOT, This->keyname, 0, KEY_READ, &This->key);
+    }
+    return (LPENUMGUID)This;
+}

Added: vendor/wine/dlls/comcat/Wine-0_9_40/manager.c
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/mana…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/manager.c (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/manager.c Mon Jul  2 05:27:07 2007
@@ -1,0 +1,120 @@
+/*
+ *	ComCatMgr IUnknown implementation for comcat.dll
+ *
+ * Copyright (C) 2002 John K. Hohm
+ *
+ * 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 "comcat_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+static ULONG WINAPI COMCAT_IUnknown_AddRef(LPUNKNOWN iface);
+
+/**********************************************************************
+ * COMCAT_IUnknown_QueryInterface
+ */
+static HRESULT WINAPI COMCAT_IUnknown_QueryInterface(
+    LPUNKNOWN iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, unkVtbl, iface);
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    if (IsEqualGUID(riid, &IID_IUnknown)) {
+	*ppvObj = &This->unkVtbl;
+	COMCAT_IUnknown_AddRef(iface);
+	return S_OK;
+    }
+
+    if (IsEqualGUID(riid, &IID_ICatRegister)) {
+	*ppvObj = &This->regVtbl;
+	COMCAT_IUnknown_AddRef(iface);
+	return S_OK;
+    }
+
+    if (IsEqualGUID(riid, &IID_ICatInformation)) {
+	*ppvObj = &This->infVtbl;
+	COMCAT_IUnknown_AddRef(iface);
+	return S_OK;
+    }
+
+    return E_NOINTERFACE;
+}
+
+/**********************************************************************
+ * COMCAT_IUnknown_AddRef
+ */
+static ULONG WINAPI COMCAT_IUnknown_AddRef(LPUNKNOWN iface)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, unkVtbl, iface);
+    ULONG ref;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    ref = InterlockedIncrement(&This->ref);
+    if (ref == 1) {
+	InterlockedIncrement(&dll_ref);
+    }
+    return ref;
+}
+
+/**********************************************************************
+ * COMCAT_IUnknown_Release
+ */
+static ULONG WINAPI COMCAT_IUnknown_Release(LPUNKNOWN iface)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, unkVtbl, iface);
+    ULONG ref;
+
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    ref = InterlockedDecrement(&This->ref);
+    if (ref == 0) {
+	InterlockedDecrement(&dll_ref);
+    }
+    return ref;
+}
+
+/**********************************************************************
+ * COMCAT_IUnknown_Vtbl
+ */
+static const IUnknownVtbl COMCAT_IUnknown_Vtbl =
+{
+    COMCAT_IUnknown_QueryInterface,
+    COMCAT_IUnknown_AddRef,
+    COMCAT_IUnknown_Release
+};
+
+/**********************************************************************
+ * static ComCatMgr instance
+ */
+ComCatMgrImpl COMCAT_ComCatMgr =
+{
+    &COMCAT_IUnknown_Vtbl,
+    &COMCAT_ICatRegister_Vtbl,
+    &COMCAT_ICatInformation_Vtbl,
+    0
+};

Added: vendor/wine/dlls/comcat/Wine-0_9_40/register.c
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/regi…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/register.c (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/register.c Mon Jul  2 05:27:07 2007
@@ -1,0 +1,342 @@
+/*
+ *	ComCatMgr ICatRegister implementation for comcat.dll
+ *
+ * Copyright (C) 2002 John K. Hohm
+ *
+ * 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 "comcat_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+/**********************************************************************
+ * File-scope string constants
+ */
+static const WCHAR comcat_keyname[21] = {
+    'C', 'o', 'm', 'p', 'o', 'n',
'e', 'n', 't', ' ', 'C', 'a',
+    't', 'e', 'g', 'o', 'r', 'i',
'e', 's', 0 };
+static const WCHAR impl_keyname[23] = {
+    'I', 'm', 'p', 'l', 'e', 'm',
'e', 'n',
+    't', 'e', 'd', ' ', 'C', 'a',
't', 'e',
+    'g', 'o', 'r', 'i', 'e', 's', 0 };
+static const WCHAR req_keyname[20] = {
+    'R', 'e', 'q', 'u', 'i', 'r',
'e', 'd',
+    ' ', 'C', 'a', 't', 'e', 'g',
'o', 'r',
+    'i', 'e', 's', 0 };
+
+static HRESULT COMCAT_RegisterClassCategories(
+    REFCLSID rclsid, LPCWSTR type,
+    ULONG cCategories, const CATID *rgcatid);
+static HRESULT COMCAT_UnRegisterClassCategories(
+    REFCLSID rclsid, LPCWSTR type,
+    ULONG cCategories, const CATID *rgcatid);
+
+/**********************************************************************
+ * COMCAT_ICatRegister_QueryInterface
+ */
+static HRESULT WINAPI COMCAT_ICatRegister_QueryInterface(
+    LPCATREGISTER iface,
+    REFIID riid,
+    LPVOID *ppvObj)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface);
+    TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
+
+    if (This == NULL || ppvObj == NULL) return E_POINTER;
+
+    return IUnknown_QueryInterface((LPUNKNOWN)&This->unkVtbl, riid, ppvObj);
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_AddRef
+ */
+static ULONG WINAPI COMCAT_ICatRegister_AddRef(LPCATREGISTER iface)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface);
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    return IUnknown_AddRef((LPUNKNOWN)&This->unkVtbl);
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_Release
+ */
+static ULONG WINAPI COMCAT_ICatRegister_Release(LPCATREGISTER iface)
+{
+    ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface);
+    TRACE("\n");
+
+    if (This == NULL) return E_POINTER;
+
+    return IUnknown_Release((LPUNKNOWN)&This->unkVtbl);
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_RegisterCategories
+ */
+static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories(
+    LPCATREGISTER iface,
+    ULONG cCategories,
+    CATEGORYINFO *rgci)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface); */
+    HKEY comcat_key;
+    HRESULT res;
+
+    TRACE("\n");
+
+    if (iface == NULL || (cCategories && rgci == NULL))
+	return E_POINTER;
+
+    /* Create (or open) the component categories key. */
+    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, comcat_keyname, 0, NULL, 0,
+			  KEY_READ | KEY_WRITE, NULL, &comcat_key, NULL);
+    if (res != ERROR_SUCCESS) return E_FAIL;
+
+    for (; cCategories; --cCategories, ++rgci) {
+	static const WCHAR fmt[] = { '%', 'l', 'X', 0 };
+	WCHAR keyname[39];
+	WCHAR valname[9];
+	HKEY cat_key;
+
+	/* Create (or open) the key for this category. */
+	if (!StringFromGUID2(&rgci->catid, keyname, 39)) continue;
+	res = RegCreateKeyExW(comcat_key, keyname, 0, NULL, 0,
+			      KEY_READ | KEY_WRITE, NULL, &cat_key, NULL);
+	if (res != ERROR_SUCCESS) continue;
+
+	/* Set the value for this locale's description. */
+	wsprintfW(valname, fmt, rgci->lcid);
+	RegSetValueExW(cat_key, valname, 0, REG_SZ,
+		       (CONST BYTE*)(rgci->szDescription),
+		       (lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR));
+
+	RegCloseKey(cat_key);
+    }
+
+    RegCloseKey(comcat_key);
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_UnRegisterCategories
+ */
+static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterCategories(
+    LPCATREGISTER iface,
+    ULONG cCategories,
+    CATID *rgcatid)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface); */
+    HKEY comcat_key;
+    HRESULT res;
+
+    TRACE("\n");
+
+    if (iface == NULL || (cCategories && rgcatid == NULL))
+	return E_POINTER;
+
+    /* Open the component categories key. */
+    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, comcat_keyname, 0,
+			KEY_READ | KEY_WRITE, &comcat_key);
+    if (res != ERROR_SUCCESS) return E_FAIL;
+
+    for (; cCategories; --cCategories, ++rgcatid) {
+	WCHAR keyname[39];
+
+	/* Delete the key for this category. */
+	if (!StringFromGUID2(rgcatid, keyname, 39)) continue;
+	RegDeleteKeyW(comcat_key, keyname);
+    }
+
+    RegCloseKey(comcat_key);
+    return S_OK;
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_RegisterClassImplCategories
+ */
+static HRESULT WINAPI COMCAT_ICatRegister_RegisterClassImplCategories(
+    LPCATREGISTER iface,
+    REFCLSID rclsid,
+    ULONG cCategories,
+    CATID *rgcatid)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface); */
+    TRACE("\n");
+
+    return COMCAT_RegisterClassCategories(
+	rclsid,	impl_keyname, cCategories, rgcatid);
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_UnRegisterClassImplCategories
+ */
+static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterClassImplCategories(
+    LPCATREGISTER iface,
+    REFCLSID rclsid,
+    ULONG cCategories,
+    CATID *rgcatid)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface); */
+    TRACE("\n");
+
+    return COMCAT_UnRegisterClassCategories(
+	rclsid, impl_keyname, cCategories, rgcatid);
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_RegisterClassReqCategories
+ */
+static HRESULT WINAPI COMCAT_ICatRegister_RegisterClassReqCategories(
+    LPCATREGISTER iface,
+    REFCLSID rclsid,
+    ULONG cCategories,
+    CATID *rgcatid)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface); */
+    TRACE("\n");
+
+    return COMCAT_RegisterClassCategories(
+	rclsid, req_keyname, cCategories, rgcatid);
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_UnRegisterClassReqCategories
+ */
+static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterClassReqCategories(
+    LPCATREGISTER iface,
+    REFCLSID rclsid,
+    ULONG cCategories,
+    CATID *rgcatid)
+{
+/*     ICOM_THIS_MULTI(ComCatMgrImpl, regVtbl, iface); */
+    TRACE("\n");
+
+    return COMCAT_UnRegisterClassCategories(
+	rclsid, req_keyname, cCategories, rgcatid);
+}
+
+/**********************************************************************
+ * COMCAT_ICatRegister_Vtbl
+ */
+const ICatRegisterVtbl COMCAT_ICatRegister_Vtbl =
+{
+    COMCAT_ICatRegister_QueryInterface,
+    COMCAT_ICatRegister_AddRef,
+    COMCAT_ICatRegister_Release,
+    COMCAT_ICatRegister_RegisterCategories,
+    COMCAT_ICatRegister_UnRegisterCategories,
+    COMCAT_ICatRegister_RegisterClassImplCategories,
+    COMCAT_ICatRegister_UnRegisterClassImplCategories,
+    COMCAT_ICatRegister_RegisterClassReqCategories,
+    COMCAT_ICatRegister_UnRegisterClassReqCategories
+};
+
+/**********************************************************************
+ * COMCAT_RegisterClassCategories
+ */
+static HRESULT COMCAT_RegisterClassCategories(
+    REFCLSID rclsid,
+    LPCWSTR type,
+    ULONG cCategories,
+    const CATID *rgcatid)
+{
+    WCHAR keyname[39];
+    HRESULT res;
+    HKEY clsid_key, class_key, type_key;
+
+    if (cCategories && rgcatid == NULL) return E_POINTER;
+
+    /* Format the class key name. */
+    res = StringFromGUID2(rclsid, keyname, 39);
+    if (FAILED(res)) return res;
+
+    /* Create (or open) the CLSID key. */
+    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
+			  KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
+    if (res != ERROR_SUCCESS) return E_FAIL;
+
+    /* Create (or open) the class key. */
+    res = RegCreateKeyExW(clsid_key, keyname, 0, NULL, 0,
+			  KEY_READ | KEY_WRITE, NULL, &class_key, NULL);
+    if (res == ERROR_SUCCESS) {
+	/* Create (or open) the category type key. */
+	res = RegCreateKeyExW(class_key, type, 0, NULL, 0,
+			      KEY_READ | KEY_WRITE, NULL, &type_key, NULL);
+	if (res == ERROR_SUCCESS) {
+	    for (; cCategories; --cCategories, ++rgcatid) {
+		HKEY key;
+
+		/* Format the category key name. */
+		res = StringFromGUID2(rgcatid, keyname, 39);
+		if (FAILED(res)) continue;
+
+		/* Do the register. */
+		res = RegCreateKeyExW(type_key, keyname, 0, NULL, 0,
+				      KEY_READ | KEY_WRITE, NULL, &key, NULL);
+		if (res == ERROR_SUCCESS) RegCloseKey(key);
+	    }
+	    res = S_OK;
+	} else res = E_FAIL;
+	RegCloseKey(class_key);
+    } else res = E_FAIL;
+    RegCloseKey(clsid_key);
+
+    return res;
+}
+
+/**********************************************************************
+ * COMCAT_UnRegisterClassCategories
+ */
+static HRESULT COMCAT_UnRegisterClassCategories(
+    REFCLSID rclsid,
+    LPCWSTR type,
+    ULONG cCategories,
+    const CATID *rgcatid)
+{
+    WCHAR keyname[68] = { 'C', 'L', 'S', 'I',
'D', '\\' };
+    HRESULT res;
+    HKEY type_key;
+
+    if (cCategories && rgcatid == NULL) return E_POINTER;
+
+    /* Format the class category type key name. */
+    res = StringFromGUID2(rclsid, keyname + 6, 39);
+    if (FAILED(res)) return res;
+    keyname[44] = '\\';
+    lstrcpyW(keyname + 45, type);
+
+    /* Open the class category type key. */
+    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0,
+			KEY_READ | KEY_WRITE, &type_key);
+    if (res != ERROR_SUCCESS) return E_FAIL;
+
+    for (; cCategories; --cCategories, ++rgcatid) {
+	/* Format the category key name. */
+	res = StringFromGUID2(rgcatid, keyname, 39);
+	if (FAILED(res)) continue;
+
+	/* Do the unregister. */
+	RegDeleteKeyW(type_key, keyname);
+    }
+    RegCloseKey(type_key);
+
+    return S_OK;
+}

Added: vendor/wine/dlls/comcat/Wine-0_9_40/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/regs…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/regsvr.c (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/regsvr.c Mon Jul  2 05:27:07 2007
@@ -1,0 +1,473 @@
+/*
+ *	self-registerable dll functions for comcat.dll
+ *
+ * Copyright (C) 2002-2003 John K. Hohm
+ *
+ * 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 <stdarg.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "winerror.h"
+
+#include "ole2.h"
+#include "comcat.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
+
+/*
+ * Near the bottom of this file are the exported DllRegisterServer and
+ * DllUnregisterServer, which make all this worthwhile.
+ */
+
+/***********************************************************************
+ *		interface for self-registering
+ */
+struct regsvr_interface
+{
+    IID const *iid;		/* NULL for end of list */
+    LPCSTR name;		/* can be NULL to omit */
+    IID const *base_iid;	/* can be NULL to omit */
+    int num_methods;		/* can be <0 to omit */
+    CLSID const *ps_clsid;	/* can be NULL to omit */
+    CLSID const *ps_clsid32;	/* can be NULL to omit */
+};
+
+static HRESULT register_interfaces(struct regsvr_interface const *list);
+static HRESULT unregister_interfaces(struct regsvr_interface const *list);
+
+struct regsvr_coclass
+{
+    CLSID const *clsid;		/* NULL for end of list */
+    LPCSTR name;		/* can be NULL to omit */
+    LPCSTR ips;			/* can be NULL to omit */
+    LPCSTR ips32;		/* can be NULL to omit */
+    LPCSTR ips32_tmodel;	/* can be NULL to omit */
+};
+
+static HRESULT register_coclasses(struct regsvr_coclass const *list);
+static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
+
+/***********************************************************************
+ *		static string constants
+ */
+static WCHAR const interface_keyname[10] = {
+    'I', 'n', 't', 'e', 'r', 'f',
'a', 'c', 'e', 0 };
+static WCHAR const base_ifa_keyname[14] = {
+    'B', 'a', 's', 'e', 'I', 'n',
't', 'e', 'r', 'f', 'a', 'c',
+    'e', 0 };
+static WCHAR const num_methods_keyname[11] = {
+    'N', 'u', 'm', 'M', 'e', 't',
'h', 'o', 'd', 's', 0 };
+static WCHAR const ps_clsid_keyname[15] = {
+    'P', 'r', 'o', 'x', 'y', 'S',
't', 'u', 'b', 'C', 'l', 's',
+    'i', 'd', 0 };
+static WCHAR const ps_clsid32_keyname[17] = {
+    'P', 'r', 'o', 'x', 'y', 'S',
't', 'u', 'b', 'C', 'l', 's',
+    'i', 'd', '3', '2', 0 };
+static WCHAR const clsid_keyname[6] = {
+    'C', 'L', 'S', 'I', 'D', 0 };
+static WCHAR const ips_keyname[13] = {
+    'I', 'n', 'P', 'r', 'o', 'c',
'S', 'e', 'r', 'v', 'e', 'r',
+    0 };
+static WCHAR const ips32_keyname[15] = {
+    'I', 'n', 'P', 'r', 'o', 'c',
'S', 'e', 'r', 'v', 'e', 'r',
+    '3', '2', 0 };
+static char const tmodel_valuename[] = "ThreadingModel";
+
+/***********************************************************************
+ *		static helper functions
+ */
+static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid);
+static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
+				   WCHAR const *value);
+static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
+				   char const *value);
+static LONG recursive_delete_key(HKEY key);
+
+
+/***********************************************************************
+ *		register_interfaces
+ */
+static HRESULT register_interfaces(struct regsvr_interface const *list)
+{
+    LONG res = ERROR_SUCCESS;
+    HKEY interface_key;
+
+    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0,
+			  KEY_READ | KEY_WRITE, NULL, &interface_key, NULL);
+    if (res != ERROR_SUCCESS) goto error_return;
+
+    for (; res == ERROR_SUCCESS && list->iid; ++list) {
+	WCHAR buf[39];
+	HKEY iid_key;
+
+	StringFromGUID2(list->iid, buf, 39);
+	res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0,
+			      KEY_READ | KEY_WRITE, NULL, &iid_key, NULL);
+	if (res != ERROR_SUCCESS) goto error_close_interface_key;
+
+	if (list->name) {
+	    res = RegSetValueExA(iid_key, NULL, 0, REG_SZ,
+				 (CONST BYTE*)(list->name),
+				 strlen(list->name) + 1);
+	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
+	}
+
+	if (list->base_iid) {
+	    res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
+	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
+	}
+
+	if (0 <= list->num_methods) {
+	    static WCHAR const fmt[3] = { '%', 'd', 0 };
+	    HKEY key;
+
+	    res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,
+				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
+	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
+
+	    wsprintfW(buf, fmt, list->num_methods);
+	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
+				 (CONST BYTE*)buf,
+				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
+	    RegCloseKey(key);
+
+	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
+	}
+
+	if (list->ps_clsid) {
+	    res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
+	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
+	}
+
+	if (list->ps_clsid32) {
+	    res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
+	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
+	}
+
+    error_close_iid_key:
+	RegCloseKey(iid_key);
+    }
+
+error_close_interface_key:
+    RegCloseKey(interface_key);
+error_return:
+    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
+}
+
+/***********************************************************************
+ *		unregister_interfaces
+ */
+static HRESULT unregister_interfaces(struct regsvr_interface const *list)
+{
+    LONG res = ERROR_SUCCESS;
+    HKEY interface_key;
+
+    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
+			KEY_READ | KEY_WRITE, &interface_key);
+    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
+    if (res != ERROR_SUCCESS) goto error_return;
+
+    for (; res == ERROR_SUCCESS && list->iid; ++list) {
+	WCHAR buf[39];
+	HKEY iid_key;
+
+	StringFromGUID2(list->iid, buf, 39);
+	res = RegOpenKeyExW(interface_key, buf, 0,
+			    KEY_READ | KEY_WRITE, &iid_key);
+	if (res == ERROR_FILE_NOT_FOUND) {
+	    res = ERROR_SUCCESS;
+	    continue;
+	}
+	if (res != ERROR_SUCCESS) goto error_close_interface_key;
+	res = recursive_delete_key(iid_key);
+	RegCloseKey(iid_key);
+	if (res != ERROR_SUCCESS) goto error_close_interface_key;
+    }
+
+error_close_interface_key:
+    RegCloseKey(interface_key);
+error_return:
+    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
+}
+
+/***********************************************************************
+ *		register_coclasses
+ */
+static HRESULT register_coclasses(struct regsvr_coclass const *list)
+{
+    LONG res = ERROR_SUCCESS;
+    HKEY coclass_key;
+
+    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
+			  KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
+    if (res != ERROR_SUCCESS) goto error_return;
+
+    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
+	WCHAR buf[39];
+	HKEY clsid_key;
+
+	StringFromGUID2(list->clsid, buf, 39);
+	res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
+			      KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
+	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
+
+	if (list->name) {
+	    res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
+				 (CONST BYTE*)(list->name),
+				 strlen(list->name) + 1);
+	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
+	}
+
+	if (list->ips) {
+	    res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
+	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
+	}
+
+	if (list->ips32) {
+	    HKEY ips32_key;
+
+	    res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
+				  KEY_READ | KEY_WRITE, NULL,
+				  &ips32_key, NULL);
+	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
+
+	    res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
+				 (CONST BYTE*)list->ips32,
+				 lstrlenA(list->ips32) + 1);
+	    if (res == ERROR_SUCCESS && list->ips32_tmodel)
+		res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
+				     (CONST BYTE*)list->ips32_tmodel,
+				     strlen(list->ips32_tmodel) + 1);
+	    RegCloseKey(ips32_key);
+	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
+	}
+
+    error_close_clsid_key:
+	RegCloseKey(clsid_key);
+    }
+
+error_close_coclass_key:
+    RegCloseKey(coclass_key);
+error_return:
+    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
+}
+
+/***********************************************************************
+ *		unregister_coclasses
+ */
+static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
+{
+    LONG res = ERROR_SUCCESS;
+    HKEY coclass_key;
+
+    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
+			KEY_READ | KEY_WRITE, &coclass_key);
+    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
+    if (res != ERROR_SUCCESS) goto error_return;
+
+    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
+	WCHAR buf[39];
+	HKEY clsid_key;
+
+	StringFromGUID2(list->clsid, buf, 39);
+	res = RegOpenKeyExW(coclass_key, buf, 0,
+			    KEY_READ | KEY_WRITE, &clsid_key);
+	if (res == ERROR_FILE_NOT_FOUND) {
+	    res = ERROR_SUCCESS;
+	    continue;
+	}
+	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
+	res = recursive_delete_key(clsid_key);
+	RegCloseKey(clsid_key);
+	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
+    }
+
+error_close_coclass_key:
+    RegCloseKey(coclass_key);
+error_return:
+    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
+}
+
+/***********************************************************************
+ *		regsvr_key_guid
+ */
+static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid)
+{
+    WCHAR buf[39];
+
+    StringFromGUID2(guid, buf, 39);
+    return register_key_defvalueW(base, name, buf);
+}
+
+/***********************************************************************
+ *		regsvr_key_defvalueW
+ */
+static LONG register_key_defvalueW(
+    HKEY base,
+    WCHAR const *name,
+    WCHAR const *value)
+{
+    LONG res;
+    HKEY key;
+
+    res = RegCreateKeyExW(base, name, 0, NULL, 0,
+			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
+    if (res != ERROR_SUCCESS) return res;
+    res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
+			 (lstrlenW(value) + 1) * sizeof(WCHAR));
+    RegCloseKey(key);
+    return res;
+}
+
+/***********************************************************************
+ *		regsvr_key_defvalueA
+ */
+static LONG register_key_defvalueA(
+    HKEY base,
+    WCHAR const *name,
+    char const *value)
+{
+    LONG res;
+    HKEY key;
+
+    res = RegCreateKeyExW(base, name, 0, NULL, 0,
+			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
+    if (res != ERROR_SUCCESS) return res;
+    res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
+			 lstrlenA(value) + 1);
+    RegCloseKey(key);
+    return res;
+}
+
+/***********************************************************************
+ *		recursive_delete_key
+ */
+static LONG recursive_delete_key(HKEY key)
+{
+    LONG res;
+    WCHAR subkey_name[MAX_PATH];
+    DWORD cName;
+    HKEY subkey;
+
+    for (;;) {
+	cName = sizeof(subkey_name) / sizeof(WCHAR);
+	res = RegEnumKeyExW(key, 0, subkey_name, &cName,
+			    NULL, NULL, NULL, NULL);
+	if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) {
+	    res = ERROR_SUCCESS; /* presumably we're done enumerating */
+	    break;
+	}
+	res = RegOpenKeyExW(key, subkey_name, 0,
+			    KEY_READ | KEY_WRITE, &subkey);
+	if (res == ERROR_FILE_NOT_FOUND) continue;
+	if (res != ERROR_SUCCESS) break;
+
+	res = recursive_delete_key(subkey);
+	RegCloseKey(subkey);
+	if (res != ERROR_SUCCESS) break;
+    }
+
+    if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0);
+    return res;
+}
+
+/***********************************************************************
+ *		coclass list
+ */
+static struct regsvr_coclass const coclass_list[] = {
+    {	&CLSID_StdComponentCategoriesMgr,
+	"Component Categories Manager",
+	NULL,
+	"comcat.dll",
+	"Both"
+    },
+    { NULL }			/* list terminator */
+};
+
+/***********************************************************************
+ *		interface list
+ */
+static GUID const CLSID_PSFactoryBuffer_actxprxy = {
+    0xB8DA6310, 0xE19B, 0x11D0, {0x93,0x3C,0x00,0xA0,0xC9,0x0D,0xCA,0xA9} };
+
+static struct regsvr_interface const interface_list[] = {
+    {   &IID_IEnumGUID,
+	"IEnumGUID",
+	NULL,
+	7,
+	NULL,
+	&CLSID_PSFactoryBuffer_actxprxy
+    },
+    {   &IID_IEnumCATEGORYINFO,
+	"IEnumCATEGORYINFO",
+	NULL,
+	7,
+	NULL,
+	&CLSID_PSFactoryBuffer_actxprxy
+    },
+    {   &IID_ICatRegister,
+	"ICatRegister",
+	NULL,
+	9,
+	NULL,
+	&CLSID_PSFactoryBuffer_actxprxy
+    },
+    {   &IID_ICatInformation,
+	"ICatInformation",
+	NULL,
+	9,
+	NULL,
+	&CLSID_PSFactoryBuffer_actxprxy
+    },
+    { NULL }			/* list terminator */
+};
+
+/***********************************************************************
+ *		DllRegisterServer (COMCAT.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    HRESULT hr;
+
+    TRACE("\n");
+
+    hr = register_coclasses(coclass_list);
+    if (SUCCEEDED(hr))
+	hr = register_interfaces(interface_list);
+    return hr;
+}
+
+/***********************************************************************
+ *		DllUnregisterServer (COMCAT.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    HRESULT hr;
+
+    TRACE("\n");
+
+    hr = unregister_coclasses(coclass_list);
+    if (SUCCEEDED(hr))
+	hr = unregister_interfaces(interface_list);
+    return hr;
+}

Added: vendor/wine/dlls/comcat/Wine-0_9_40/version.rc
URL:
http://svn.reactos.org/svn/reactos/vendor/wine/dlls/comcat/Wine-0_9_40/vers…
==============================================================================
--- vendor/wine/dlls/comcat/Wine-0_9_40/version.rc (added)
+++ vendor/wine/dlls/comcat/Wine-0_9_40/version.rc Mon Jul  2 05:27:07 2007
@@ -1,0 +1,24 @@
+/*
+ *	version information for comcat.dll
+ *
+ * Copyright (C) 2003 John K. Hohm
+ *
+ * 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
+ */
+
+#define WINE_OLESELFREGISTER
+#define WINE_FILENAME_STR "comcat.dll"
+
+#include <wine/wine_common_ver.rc>