Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 27355: Removed file/folder
by cwittich＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: cwittich Date: Mon Jul 2 05:35:53 2007 New Revision: 27355 URL: http://svn.reactos.org/svn/reactos?rev=27355&view=rev Log: Removed file/folder Removed: trunk/reactos/dll/win32/comcat/

1 0

[cwittich] 27354: Added a folder remotely
by cwittich＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: cwittich Date: Mon Jul 2 05:32:15 2007 New Revision: 27354 URL: http://svn.reactos.org/svn/reactos?rev=27354&view=rev Log: Added a folder remotely Added: trunk/reactos/dll/win32/comcat/

1 0

[cwittich] 27353: Copied remotely
by cwittich＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: cwittich Date: Mon Jul 2 05:28:21 2007 New Revision: 27353 URL: http://svn.reactos.org/svn/reactos?rev=27353&view=rev Log: Copied remotely Added: vendor/wine/dlls/comcat/current/ - copied from r27352, vendor/wine/dlls/comcat/Wine-0_9_40/

1 0

[cwittich] 27352: wine vendor drop comcat.dll
by cwittich＠svn.reactos.org 02 Jul '07

02 Jul '07

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>

1 0

[cwittich] 27351: -deleted comcat.h -added comcat.idl to build -added the baseaddress for comcat.dll -added comcat related error values to winerror.h
by cwittich＠svn.reactos.org 01 Jul '07

01 Jul '07

Author: cwittich Date: Mon Jul 2 02:13:20 2007 New Revision: 27351 URL: http://svn.reactos.org/svn/reactos?rev=27351&view=rev Log: -deleted comcat.h -added comcat.idl to build -added the baseaddress for comcat.dll -added comcat related error values to winerror.h Removed: trunk/reactos/include/psdk/comcat.h Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/winerror.h Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=273… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Mon Jul 2 02:13:20 2007 @@ -3,6 +3,7 @@ <group> <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> Removed: trunk/reactos/include/psdk/comcat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/comcat.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/comcat.h (original) +++ trunk/reactos/include/psdk/comcat.h (removed) @@ -1,689 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\comcat.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_COMCAT_H -#define __WIDL_INCLUDE_PSDK_COMCAT_H -#ifdef __cplusplus -extern "C" { -#endif -#include <unknwn.h> -typedef GUID CATID; -typedef REFGUID REFCATID; -#define CATID_NULL GUID_NULL -#define IsEqualCATID(rcatid1, rcatid2) IsEqualGUID(rcatid1, rcatid2) -#define IEnumCATID IEnumGUID -#define IID_IEnumCATID IID_IEnumGUID -#define LPENUMCATID LPENUMGUID -#define IEnumCLSID IEnumGUID -#define IID_IEnumCLSID IID_IEnumGUID -#define LPENUMCLSID LPENUMGUID -#ifndef __IEnumGUID_FWD_DEFINED__ -#define __IEnumGUID_FWD_DEFINED__ -typedef interface IEnumGUID IEnumGUID; -#endif - -typedef IEnumGUID *LPENUMGUID; -/***************************************************************************** - * IEnumGUID interface - */ -#ifndef __IEnumGUID_INTERFACE_DEFINED__ -#define __IEnumGUID_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IEnumGUID, 0x0002e000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IEnumGUID : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE Next( - ULONG celt, - GUID* rgelt, - ULONG* pceltFetched) = 0; - - virtual HRESULT STDMETHODCALLTYPE Skip( - ULONG celt) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE Clone( - IEnumGUID** ppenum) = 0; - -}; -#else -typedef struct IEnumGUIDVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumGUID* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumGUID* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IEnumGUID* This); - - /*** IEnumGUID methods ***/ - HRESULT (STDMETHODCALLTYPE *Next)( - IEnumGUID* This, - ULONG celt, - GUID* rgelt, - ULONG* pceltFetched); - - HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumGUID* This, - ULONG celt); - - HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumGUID* This); - - HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumGUID* This, - IEnumGUID** ppenum); - - END_INTERFACE -} IEnumGUIDVtbl; -interface IEnumGUID { - const IEnumGUIDVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IEnumGUID_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IEnumGUID_Release(p) (p)->lpVtbl->Release(p) -/*** IEnumGUID methods ***/ -#define IEnumGUID_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) -#define IEnumGUID_Skip(p,a) (p)->lpVtbl->Skip(p,a) -#define IEnumGUID_Reset(p) (p)->lpVtbl->Reset(p) -#define IEnumGUID_Clone(p,a) (p)->lpVtbl->Clone(p,a) -#endif - -#endif - -HRESULT CALLBACK IEnumGUID_Next_Proxy( - IEnumGUID* This, - ULONG celt, - GUID* rgelt, - ULONG* pceltFetched); -void __RPC_STUB IEnumGUID_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumGUID_Skip_Proxy( - IEnumGUID* This, - ULONG celt); -void __RPC_STUB IEnumGUID_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumGUID_Reset_Proxy( - IEnumGUID* This); -void __RPC_STUB IEnumGUID_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumGUID_Clone_Proxy( - IEnumGUID* This, - IEnumGUID** ppenum); -void __RPC_STUB IEnumGUID_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IEnumGUID_INTERFACE_DEFINED__ */ - -#ifndef __IEnumCATEGORYINFO_FWD_DEFINED__ -#define __IEnumCATEGORYINFO_FWD_DEFINED__ -typedef interface IEnumCATEGORYINFO IEnumCATEGORYINFO; -#endif - -typedef IEnumCATEGORYINFO *LPENUMCATEGORYINFO; -typedef struct tagCATEGORYINFO { - CATID catid; - LCID lcid; - OLECHAR szDescription[128]; -} CATEGORYINFO, *LPCATEGORYINFO; -/***************************************************************************** - * IEnumCATEGORYINFO interface - */ -#ifndef __IEnumCATEGORYINFO_INTERFACE_DEFINED__ -#define __IEnumCATEGORYINFO_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IEnumCATEGORYINFO, 0x0002e011, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IEnumCATEGORYINFO : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE Next( - ULONG celt, - CATEGORYINFO* rgelt, - ULONG* pceltFetched) = 0; - - virtual HRESULT STDMETHODCALLTYPE Skip( - ULONG celt) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE Clone( - IEnumCATEGORYINFO** ppenum) = 0; - -}; -#else -typedef struct IEnumCATEGORYINFOVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumCATEGORYINFO* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumCATEGORYINFO* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IEnumCATEGORYINFO* This); - - /*** IEnumCATEGORYINFO methods ***/ - HRESULT (STDMETHODCALLTYPE *Next)( - IEnumCATEGORYINFO* This, - ULONG celt, - CATEGORYINFO* rgelt, - ULONG* pceltFetched); - - HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumCATEGORYINFO* This, - ULONG celt); - - HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumCATEGORYINFO* This); - - HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumCATEGORYINFO* This, - IEnumCATEGORYINFO** ppenum); - - END_INTERFACE -} IEnumCATEGORYINFOVtbl; -interface IEnumCATEGORYINFO { - const IEnumCATEGORYINFOVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IEnumCATEGORYINFO_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IEnumCATEGORYINFO_Release(p) (p)->lpVtbl->Release(p) -/*** IEnumCATEGORYINFO methods ***/ -#define IEnumCATEGORYINFO_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) -#define IEnumCATEGORYINFO_Skip(p,a) (p)->lpVtbl->Skip(p,a) -#define IEnumCATEGORYINFO_Reset(p) (p)->lpVtbl->Reset(p) -#define IEnumCATEGORYINFO_Clone(p,a) (p)->lpVtbl->Clone(p,a) -#endif - -#endif - -HRESULT CALLBACK IEnumCATEGORYINFO_Next_Proxy( - IEnumCATEGORYINFO* This, - ULONG celt, - CATEGORYINFO* rgelt, - ULONG* pceltFetched); -void __RPC_STUB IEnumCATEGORYINFO_Next_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumCATEGORYINFO_Skip_Proxy( - IEnumCATEGORYINFO* This, - ULONG celt); -void __RPC_STUB IEnumCATEGORYINFO_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumCATEGORYINFO_Reset_Proxy( - IEnumCATEGORYINFO* This); -void __RPC_STUB IEnumCATEGORYINFO_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumCATEGORYINFO_Clone_Proxy( - IEnumCATEGORYINFO* This, - IEnumCATEGORYINFO** ppenum); -void __RPC_STUB IEnumCATEGORYINFO_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IEnumCATEGORYINFO_INTERFACE_DEFINED__ */ - -#ifndef __ICatInformation_FWD_DEFINED__ -#define __ICatInformation_FWD_DEFINED__ -typedef interface ICatInformation ICatInformation; -#endif - -typedef ICatInformation *LPCATINFORMATION; -/***************************************************************************** - * ICatInformation interface - */ -#ifndef __ICatInformation_INTERFACE_DEFINED__ -#define __ICatInformation_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_ICatInformation, 0x0002e013, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface ICatInformation : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE EnumCategories( - LCID lcid, - IEnumCATEGORYINFO** ppenumCategoryInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetCategoryDesc( - REFCATID rcatid, - LCID lcid, - LPWSTR* pszDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnumClassesOfCategories( - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[], - IEnumGUID** ppenumClsid) = 0; - - virtual HRESULT STDMETHODCALLTYPE IsClassOfCategories( - REFCLSID rclsid, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[]) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnumImplCategoriesOfClass( - REFCLSID rclsid, - IEnumGUID** ppenumCatid) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnumReqCategoriesOfClass( - REFCLSID rclsid, - IEnumGUID** ppenumCatid) = 0; - -}; -#else -typedef struct ICatInformationVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICatInformation* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - ICatInformation* This); - - ULONG (STDMETHODCALLTYPE *Release)( - ICatInformation* This); - - /*** ICatInformation methods ***/ - HRESULT (STDMETHODCALLTYPE *EnumCategories)( - ICatInformation* This, - LCID lcid, - IEnumCATEGORYINFO** ppenumCategoryInfo); - - HRESULT (STDMETHODCALLTYPE *GetCategoryDesc)( - ICatInformation* This, - REFCATID rcatid, - LCID lcid, - LPWSTR* pszDesc); - - HRESULT (STDMETHODCALLTYPE *EnumClassesOfCategories)( - ICatInformation* This, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[], - IEnumGUID** ppenumClsid); - - HRESULT (STDMETHODCALLTYPE *IsClassOfCategories)( - ICatInformation* This, - REFCLSID rclsid, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[]); - - HRESULT (STDMETHODCALLTYPE *EnumImplCategoriesOfClass)( - ICatInformation* This, - REFCLSID rclsid, - IEnumGUID** ppenumCatid); - - HRESULT (STDMETHODCALLTYPE *EnumReqCategoriesOfClass)( - ICatInformation* This, - REFCLSID rclsid, - IEnumGUID** ppenumCatid); - - END_INTERFACE -} ICatInformationVtbl; -interface ICatInformation { - const ICatInformationVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define ICatInformation_AddRef(p) (p)->lpVtbl->AddRef(p) -#define ICatInformation_Release(p) (p)->lpVtbl->Release(p) -/*** ICatInformation methods ***/ -#define ICatInformation_EnumCategories(p,a,b) (p)->lpVtbl->EnumCategories(p,a,b) -#define ICatInformation_GetCategoryDesc(p,a,b,c) (p)->lpVtbl->GetCategoryDesc(p,a,b,c) -#define ICatInformation_EnumClassesOfCategories(p,a,b,c,d,e) (p)->lpVtbl->EnumClassesOfCategories(p,a,b,c,d,e) -#define ICatInformation_IsClassOfCategories(p,a,b,c,d,e) (p)->lpVtbl->IsClassOfCategories(p,a,b,c,d,e) -#define ICatInformation_EnumImplCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumImplCategoriesOfClass(p,a,b) -#define ICatInformation_EnumReqCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumReqCategoriesOfClass(p,a,b) -#endif - -#endif - -HRESULT CALLBACK ICatInformation_EnumCategories_Proxy( - ICatInformation* This, - LCID lcid, - IEnumCATEGORYINFO** ppenumCategoryInfo); -void __RPC_STUB ICatInformation_EnumCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatInformation_GetCategoryDesc_Proxy( - ICatInformation* This, - REFCATID rcatid, - LCID lcid, - LPWSTR* pszDesc); -void __RPC_STUB ICatInformation_GetCategoryDesc_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatInformation_RemoteEnumClassesOfCategories_Proxy( - ICatInformation* This, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[], - IEnumGUID** ppenumClsid); -void __RPC_STUB ICatInformation_RemoteEnumClassesOfCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatInformation_EnumClassesOfCategories_Proxy( - ICatInformation* This, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[], - IEnumGUID** ppenumClsid); -HRESULT __RPC_STUB ICatInformation_EnumClassesOfCategories_Stub( - ICatInformation* This, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[], - IEnumGUID** ppenumClsid); -HRESULT CALLBACK ICatInformation_RemoteIsClassOfCategories_Proxy( - ICatInformation* This, - REFCLSID rclsid, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[]); -void __RPC_STUB ICatInformation_RemoteIsClassOfCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatInformation_IsClassOfCategories_Proxy( - ICatInformation* This, - REFCLSID rclsid, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[]); -HRESULT __RPC_STUB ICatInformation_IsClassOfCategories_Stub( - ICatInformation* This, - REFCLSID rclsid, - ULONG cImplemented, - CATID rgcatidImpl[], - ULONG cRequired, - CATID rgcatidReq[]); -HRESULT CALLBACK ICatInformation_EnumImplCategoriesOfClass_Proxy( - ICatInformation* This, - REFCLSID rclsid, - IEnumGUID** ppenumCatid); -void __RPC_STUB ICatInformation_EnumImplCategoriesOfClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatInformation_EnumReqCategoriesOfClass_Proxy( - ICatInformation* This, - REFCLSID rclsid, - IEnumGUID** ppenumCatid); -void __RPC_STUB ICatInformation_EnumReqCategoriesOfClass_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __ICatInformation_INTERFACE_DEFINED__ */ - -#ifndef __ICatRegister_FWD_DEFINED__ -#define __ICatRegister_FWD_DEFINED__ -typedef interface ICatRegister ICatRegister; -#endif - -typedef ICatRegister *LPCATREGISTER; -/***************************************************************************** - * ICatRegister interface - */ -#ifndef __ICatRegister_INTERFACE_DEFINED__ -#define __ICatRegister_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_ICatRegister, 0x0002e012, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface ICatRegister : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE RegisterCategories( - ULONG cCategories, - CATEGORYINFO rgCategoryInfo[]) = 0; - - virtual HRESULT STDMETHODCALLTYPE UnRegisterCategories( - ULONG cCategories, - CATID rgcatid[]) = 0; - - virtual HRESULT STDMETHODCALLTYPE RegisterClassImplCategories( - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]) = 0; - - virtual HRESULT STDMETHODCALLTYPE UnRegisterClassImplCategories( - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]) = 0; - - virtual HRESULT STDMETHODCALLTYPE RegisterClassReqCategories( - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]) = 0; - - virtual HRESULT STDMETHODCALLTYPE UnRegisterClassReqCategories( - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]) = 0; - -}; -#else -typedef struct ICatRegisterVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - ICatRegister* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - ICatRegister* This); - - ULONG (STDMETHODCALLTYPE *Release)( - ICatRegister* This); - - /*** ICatRegister methods ***/ - HRESULT (STDMETHODCALLTYPE *RegisterCategories)( - ICatRegister* This, - ULONG cCategories, - CATEGORYINFO rgCategoryInfo[]); - - HRESULT (STDMETHODCALLTYPE *UnRegisterCategories)( - ICatRegister* This, - ULONG cCategories, - CATID rgcatid[]); - - HRESULT (STDMETHODCALLTYPE *RegisterClassImplCategories)( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); - - HRESULT (STDMETHODCALLTYPE *UnRegisterClassImplCategories)( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); - - HRESULT (STDMETHODCALLTYPE *RegisterClassReqCategories)( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); - - HRESULT (STDMETHODCALLTYPE *UnRegisterClassReqCategories)( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); - - END_INTERFACE -} ICatRegisterVtbl; -interface ICatRegister { - const ICatRegisterVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define ICatRegister_AddRef(p) (p)->lpVtbl->AddRef(p) -#define ICatRegister_Release(p) (p)->lpVtbl->Release(p) -/*** ICatRegister methods ***/ -#define ICatRegister_RegisterCategories(p,a,b) (p)->lpVtbl->RegisterCategories(p,a,b) -#define ICatRegister_UnRegisterCategories(p,a,b) (p)->lpVtbl->UnRegisterCategories(p,a,b) -#define ICatRegister_RegisterClassImplCategories(p,a,b,c) (p)->lpVtbl->RegisterClassImplCategories(p,a,b,c) -#define ICatRegister_UnRegisterClassImplCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassImplCategories(p,a,b,c) -#define ICatRegister_RegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->RegisterClassReqCategories(p,a,b,c) -#define ICatRegister_UnRegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassReqCategories(p,a,b,c) -#endif - -#endif - -HRESULT CALLBACK ICatRegister_RegisterCategories_Proxy( - ICatRegister* This, - ULONG cCategories, - CATEGORYINFO rgCategoryInfo[]); -void __RPC_STUB ICatRegister_RegisterCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatRegister_UnRegisterCategories_Proxy( - ICatRegister* This, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_UnRegisterCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatRegister_RegisterClassImplCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_RegisterClassImplCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatRegister_UnRegisterClassImplCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_UnRegisterClassImplCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatRegister_RegisterClassReqCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_RegisterClassReqCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK ICatRegister_UnRegisterClassReqCategories_Proxy( - ICatRegister* This, - REFCLSID rclsid, - ULONG cCategories, - CATID rgcatid[]); -void __RPC_STUB ICatRegister_UnRegisterClassReqCategories_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __ICatRegister_INTERFACE_DEFINED__ */ - -DEFINE_GUID( CATID_Insertable, 0x40fc6ed3, 0x2438, 0x11cf, 0xa3, 0xdb, 0x08, 0x00, 0x36, 0xf1, 0x25, 0x02); -DEFINE_GUID( CATID_Control, 0x40fc6ed4, 0x2438, 0x11cf, 0xa3, 0xdb, 0x08, 0x00, 0x36, 0xf1, 0x25, 0x02); -DEFINE_GUID( CATID_Programmable, 0x40fc6ed5, 0x2438, 0x11cf, 0xa3, 0xdb, 0x08, 0x00, 0x36, 0xf1, 0x25, 0x02); -DEFINE_GUID( CATID_IsShortcut, 0x40fc6ed6, 0x2438, 0x11cf, 0xa3, 0xdb, 0x08, 0x00, 0x36, 0xf1, 0x25, 0x02); -DEFINE_GUID( CATID_NeverShowExt, 0x40fc6ed7, 0x2438, 0x11cf, 0xa3, 0xdb, 0x08, 0x00, 0x36, 0xf1, 0x25, 0x02); -DEFINE_GUID( CATID_DocObject, 0x40fc6ed8, 0x2438, 0x11cf, 0xa3, 0xdb, 0x08, 0x00, 0x36, 0xf1, 0x25, 0x02); -DEFINE_GUID( CATID_Printable, 0x40fc6ed9, 0x2438, 0x11cf, 0xa3, 0xdb, 0x08, 0x00, 0x36, 0xf1, 0x25, 0x02); -DEFINE_GUID( CATID_RequiresDataPathHost, 0x0de86a50, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_PersistsToMoniker, 0x0de86a51, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_PersistsToStorage, 0x0de86a52, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_PersistsToStreamInit, 0x0de86a53, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_PersistsToStream, 0x0de86a54, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_PersistsToMemory, 0x0de86a55, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_PersistsToFile, 0x0de86a56, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_PersistsToPropertyBag, 0x0de86a57, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_InternetAware, 0x0de86a58, 0x2baa, 0x11cf, 0xa2, 0x29, 0x00, 0xaa, 0x00, 0x3d, 0x73, 0x52); -DEFINE_GUID( CATID_DesignTimeUIActivatableControl, 0xf2bb56d1, 0xdb07, 0x11d1, 0xaa, 0x6b, 0x00, 0x60, 0x97, 0xdb, 0x95, 0x39); -DEFINE_GUID(CLSID_StdComponentCategoriesMgr, 0x0002e005, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_COMCAT_H */ Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild (original) +++ trunk/reactos/include/psdk/psdk.rbuild Mon Jul 2 02:13:20 2007 @@ -23,4 +23,5 @@ <file>mshtmhst.idl</file> <file>exdisp.idl</file> <file>wtypes.idl</file> + <file>comcat.idl</file> </module> Modified: trunk/reactos/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/winerror.h (original) +++ trunk/reactos/include/psdk/winerror.h Mon Jul 2 02:13:20 2007 @@ -2588,5 +2588,10 @@ #define SCARD_W_CARD_NOT_AUTHENTICATED _HRESULT_TYPEDEF_(0x8010006FL) +#define CAT_E_FIRST _HRESULT_TYPEDEF_(0x80040160L) +#define CAT_E_CATIDNOEXIST _HRESULT_TYPEDEF_(0x80040160L) +#define CAT_E_NODESCRIPTION _HRESULT_TYPEDEF_(0x80040161L) +#define CAT_E_LAST _HRESULT_TYPEDEF_(0x80040161L) + #endif

1 0

[greatlrd] 27350: update dejavu font from 2.15 to 2.17 ------------------------------------ What new Extend latin C support two more langues are complete over 600 new glypt have been add reencoing thing to unicode that was not inu uncode format. bug fix ae special char and other bugfix as well this is last update of dejavu until they come to version 2.3.0 or to version 3.0.0
by greatlrd＠svn.reactos.org 01 Jul '07

01 Jul '07

Author: greatlrd Date: Sun Jul 1 22:34:40 2007 New Revision: 27350 URL: http://svn.reactos.org/svn/reactos?rev=27350&view=rev Log: update dejavu font from 2.15 to 2.17 ------------------------------------ What new Extend latin C support two more langues are complete over 600 new glypt have been add reencoing thing to unicode that was not inu uncode format. bug fix ae special char and other bugfix as well this is last update of dejavu until they come to version 2.3.0 or to version 3.0.0 Added: trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf (with props) trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf (with props) trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf (with props) Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu_unicover.txt trunk/reactos/media/fonts/fonts.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Added: trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Added: trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-It… Modified: trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Ob… Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Added: trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_AUT… Modified: trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_NEW… Modified: trunk/reactos/media/fonts/doc/DejaVu_README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_REA… Modified: trunk/reactos/media/fonts/doc/DejaVu_langcover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_lan… Modified: trunk/reactos/media/fonts/doc/DejaVu_status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_sta… Modified: trunk/reactos/media/fonts/doc/DejaVu_unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_uni… Modified: trunk/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?r…

1 0

[hamtitampti] 27349: Added Repair and update function to installer
by hamtitampti＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: hamtitampti Date: Sat Jun 30 23:37:43 2007 New Revision: 27349 URL: http://svn.reactos.org/svn/reactos?rev=27349&view=rev Log: Added Repair and update function to installer Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sat Jun 30 23:37:43 2007 @@ -81,6 +81,7 @@ LONG UnattendMBRInstallType = -1; LONG UnattendFormatPartition = 0; WCHAR UnattendInstallationDirectory[MAX_PATH]; +BOOLEAN RepairUpdateFlag = FALSE; /* LOCALS *******************************************************************/ @@ -814,11 +815,13 @@ CONSOLE_SetTextXY(6, 12, "The repair functions are not implemented yet."); - CONSOLE_SetTextXY(8, 15, "\x07 Press R for the Recovery Console."); - - CONSOLE_SetTextXY(8, 17, "\x07 Press ESC to return to the main page."); - - CONSOLE_SetTextXY(8, 19, "\x07 Press ENTER to reboot your computer."); + CONSOLE_SetTextXY(8, 15, "\x07 Press U for Updating OS."); + + CONSOLE_SetTextXY(8, 17, "\x07 Press R for the Recovery Console."); + + CONSOLE_SetTextXY(8, 19, "\x07 Press ESC to return to the main page."); + + CONSOLE_SetTextXY(8, 21, "\x07 Press ENTER to reboot your computer."); CONSOLE_SetStatusText(" ESC = Main page ENTER = Reboot"); @@ -829,6 +832,11 @@ if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { return REBOOT_PAGE; + } + else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'U') /* U */ + { + RepairUpdateFlag = TRUE; + return INSTALL_INTRO_PAGE; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { @@ -870,6 +878,12 @@ CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + if (RepairUpdateFlag) + { + //return SELECT_PARTITION_PAGE; + return DEVICE_SETTINGS_PAGE; + } + if (IsUnattendedSetup) { return SELECT_PARTITION_PAGE; @@ -1017,7 +1031,12 @@ CONSOLE_SetTextXY(6, 24, "and press ENTER."); CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); - + + if (RepairUpdateFlag) + { + return SELECT_PARTITION_PAGE; + } + while(TRUE) { CONSOLE_ConInKey(Ir); @@ -2058,7 +2077,12 @@ DrawFileSystemList (FileSystemList); CONSOLE_SetStatusText (" ENTER = Continue ESC = Cancel F3 = Quit"); - + if (RepairUpdateFlag) + { + return (CHECK_FILE_SYSTEM_PAGE); + //return SELECT_PARTITION_PAGE; + } + if (IsUnattendedSetup) { if (UnattendFormatPartition) @@ -3046,7 +3070,12 @@ CONSOLE_SetTextXY(6, 8, "Setup is updating the system configuration"); CONSOLE_SetStatusText(" Creating registry hives..."); - + + if (RepairUpdateFlag) + { + return SUCCESS_PAGE; + } + if (!SetInstallPathValue(&DestinationPath)) { DPRINT("SetInstallPathValue() failed\n");

1 0

[fireball] 27348: - Commit a fix for KDBG's attach to process problem. See issue #1263 for more details.
by fireball＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: fireball Date: Sat Jun 30 22:58:09 2007 New Revision: 27348 URL: http://svn.reactos.org/svn/reactos?rev=27348&view=rev Log: - Commit a fix for KDBG's attach to process problem. See issue #1263 for more details. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c Sat Jun 30 22:58:09 2007 @@ -168,6 +168,29 @@ /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ } +STATIC VOID +KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack, + PKDB_KTRAP_FRAME KdbTrapFrame) +{ + ULONG_PTR *StackPtr; + + RtlZeroMemory(KdbTrapFrame, sizeof(KDB_KTRAP_FRAME)); + StackPtr = (ULONG_PTR *) KernelStack; + KdbTrapFrame->Tf.Ebp = StackPtr[3]; + KdbTrapFrame->Tf.Edi = StackPtr[4]; + KdbTrapFrame->Tf.Esi = StackPtr[5]; + KdbTrapFrame->Tf.Ebx = StackPtr[6]; + KdbTrapFrame->Tf.Eip = StackPtr[7]; + KdbTrapFrame->Tf.HardwareEsp = (ULONG) (StackPtr + 8); + KdbTrapFrame->Tf.HardwareSegSs = KGDT_R0_DATA; + KdbTrapFrame->Tf.SegCs = KGDT_R0_CODE; + KdbTrapFrame->Tf.SegDs = KGDT_R0_DATA; + KdbTrapFrame->Tf.SegEs = KGDT_R0_DATA; + KdbTrapFrame->Tf.SegGs = KGDT_R0_DATA; + + /* FIXME: what about the other registers??? */ +} + /*!\brief Overwrites the instruction at \a Address with \a NewInst and stores * the old instruction in *OldInst. * @@ -1040,7 +1063,8 @@ if (KdbCurrentThread != KdbOriginalThread) { ASSERT(KdbCurrentTrapFrame == &KdbThreadTrapFrame); - KdbpKdbTrapFrameToTrapFrame(KdbCurrentTrapFrame, KdbCurrentThread->Tcb.TrapFrame); + /* Actually, we can't save the context, there's no guarantee that there + * was a trap frame */ } else { @@ -1050,12 +1074,13 @@ /* Switch to the thread's context */ if (Thread != KdbOriginalThread) { - if (Thread->Tcb.TrapFrame == NULL) - { - KdbpPrint("Threads TrapFrame is NULL! Cannot attach.\n"); - return FALSE; - } - KdbpTrapFrameToKdbTrapFrame(Thread->Tcb.TrapFrame, &KdbThreadTrapFrame); + /* The thread we're attaching to isn't the thread on which we entered + * kdb and so the thread we're attaching to is not running. There + * is no guarantee that it actually has a trap frame. So we have to + * peek directly at the registers which were saved on the stack when the + * thread was preempted in the scheduler */ + KdbpKdbTrapFrameFromKernelStack(Thread->Tcb.KernelStack, + &KdbThreadTrapFrame); KdbCurrentTrapFrame = &KdbThreadTrapFrame; } else /* Switching back to original thread */ @@ -1529,11 +1554,8 @@ } } - /* Save the current thread's trapframe */ - if (KdbCurrentTrapFrame == &KdbThreadTrapFrame) - { - KdbpKdbTrapFrameToTrapFrame(KdbCurrentTrapFrame, KdbCurrentThread->Tcb.TrapFrame); - } + /* We can't update the current thread's trapframe 'cause it might not + have one */ /* Detach from attached process */ if (KdbCurrentProcess != KdbOriginalProcess)

1 0

[greatlrd] 27347: forget adding this file sprry I broken the build thx HeisSpiter See issue #2314 for more details.
by greatlrd＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: greatlrd Date: Sat Jun 30 21:47:14 2007 New Revision: 27347 URL: http://svn.reactos.org/svn/reactos?rev=27347&view=rev Log: forget adding this file sprry I broken the build thx HeisSpiter See issue #2314 for more details. Added: trunk/reactos/lib/sdk/libcntpr/string/strtoull.c (with props) Added: trunk/reactos/lib/sdk/libcntpr/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/st… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/strtoull.c (added) +++ trunk/reactos/lib/sdk/libcntpr/string/strtoull.c Sat Jun 30 21:47:14 2007 @@ -1,0 +1,71 @@ +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <limits.h> +#include <ctype.h> + + +unsigned long long +strtoull(const char *nptr, char **endptr, int base) +{ + const char *s = nptr; + unsigned long long acc; + int c; + unsigned long long cutoff; + int neg = 0, any, cutlim; + + /* + * See strtol for comments as to the logic used. + */ + do { + c = *s++; + } while (isspace(c)); + if (c == '-') + { + neg = 1; + c = *s++; + } + else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + cutoff = (unsigned long long)ULLONG_MAX / (unsigned long long)base; + cutlim = (unsigned long long)ULLONG_MAX % (unsigned long long)base; + for (acc = 0, any = 0;; c = *s++) + { + if (isdigit(c)) + c -= '0'; + else if (isalpha(c)) + c -= isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) + { + acc = ULLONG_MAX; + + } + else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); + return acc; +} + + Propchange: trunk/reactos/lib/sdk/libcntpr/string/strtoull.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 27346: - Revert accidentally committed ASSERT by Magnus in revision 27342.
by fireball＠svn.reactos.org 30 Jun '07

30 Jun '07

Author: fireball Date: Sat Jun 30 20:03:34 2007 New Revision: 27346 URL: http://svn.reactos.org/svn/reactos?rev=27346&view=rev Log: - Revert accidentally committed ASSERT by Magnus in revision 27342. Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c Sat Jun 30 20:03:34 2007 @@ -110,8 +110,6 @@ PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; DPRINT("IntVideoPortDispatchOpen\n"); - - ASSERT(Irp != NULL); if (CsrssInitialized == FALSE) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs