From 431e369f6258188522cf99813cab92a57a37a13d Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 3 Dec 2010 19:51:08 +0100 Subject: [PATCH] ole32: Convert dll registration to the IRegistrar mechanism. --- dlls/ole32/Makefile.in | 9 +- dlls/ole32/compobj.c | 18 +- dlls/ole32/ole32_objidl.idl | 85 ++++++ dlls/ole32/regsvr.c | 574 ------------------------------------ tools/wine.inf.in | 2 +- 5 files changed, 110 insertions(+), 578 deletions(-) delete mode 100644 dlls/ole32/regsvr.c diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index db9475a8160..ea9c9cb7ff5 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -2,7 +2,7 @@ MODULE = ole32.dll IMPORTLIB = ole32 IMPORTS = uuid advapi32 user32 gdi32 rpcrt4 EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DREGISTER_PROXY_DLL + -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL C_SRCS = \ antimoniker.c \ @@ -34,7 +34,6 @@ C_SRCS = \ oleobj.c \ oleproxy.c \ pointermoniker.c \ - regsvr.c \ rpc.c \ stg_prop.c \ stg_stream.c \ @@ -53,6 +52,12 @@ IDL_P_SRCS = \ ole32_oleidl.idl \ ole32_unknwn.idl +IDL_R_SRCS = \ + dcom.idl \ + ole32_objidl.idl \ + ole32_oleidl.idl \ + ole32_unknwn.idl + EXTRA_OBJS = dlldata.o @MAKE_DLL_RULES@ diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 937f3d8a06c..fae4c8fb774 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -59,7 +59,9 @@ #include "ctxtcall.h" #include "dde.h" +#include "initguid.h" #include "compobj_private.h" +#include "moniker.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -4168,4 +4170,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } -/* NOTE: DllRegisterServer and DllUnregisterServer are in regsvr.c */ +/*********************************************************************** + * DllRegisterServer (OLE32.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return OLE32_DllRegisterServer(); +} + +/*********************************************************************** + * DllUnregisterServer (OLE32.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return OLE32_DllUnregisterServer(); +} diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index 64368bd484f..bbb91a4a661 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -23,3 +23,88 @@ cpp_quote("#if 0 /* ole32_objidl.idl hack */") #include "objidl.idl" cpp_quote("#endif /* ole32_objidl.idl hack */") + +[ + threading(both), + uuid(00000300-0000-0000-c000-000000000046) +] +coclass StdOleLink { interface IMarshal; } + +[ + threading(both), + progid("file"), + uuid(00000303-0000-0000-c000-000000000046) +] +coclass FileMoniker { interface IMoniker; } + +[ + threading(both), + uuid(00000304-0000-0000-c000-000000000046) +] +coclass ItemMoniker { interface IMoniker; } + +[ + threading(both), + uuid(00000305-0000-0000-c000-000000000046) +] +coclass AntiMoniker { interface IMoniker; } + +[ + threading(both), + uuid(00000306-0000-0000-c000-000000000046) +] +coclass PointerMoniker { interface IMoniker; } + +[ + threading(both), + uuid(00000308-0000-0000-c000-000000000046) +] +coclass PackagerMoniker { interface IMoniker; } + +[ + threading(both), + uuid(00000309-0000-0000-c000-000000000046) +] +coclass CompositeMoniker { interface IMoniker; } + +[ + threading(both), + uuid(0000030b-0000-0000-c000-000000000046) +] +coclass DfMarshal { interface IMarshal; } + +[ + helpstring("Picture (Metafile)"), + threading(both), + progid("StaticMetafile"), + uuid(00000315-0000-0000-c000-000000000046) +] +coclass Picture_Metafile { interface IPicture; } + +[ + helpstring("Picture (Device Independent Bitmap)"), + threading(both), + progid("StaticDib"), + uuid(00000316-0000-0000-c000-000000000046) +] +coclass Picture_Dib { interface IPicture; } + +[ + threading(both), + progid("CLSID"), + uuid(0000031a-0000-0000-c000-000000000046) +] +coclass ClassMoniker { interface IMoniker; } + +[ + threading(apartment), + uuid(00000323-0000-0000-c000-000000000046) +] +coclass StdGlobalInterfaceTable { interface IGlobalInterfaceTable; } + +[ + helpstring("Component Categories Manager"), + threading(both), + uuid(0002e005-0000-0000-c000-000000000046) +] +coclass StdComponentCategoriesMgr { interface ICatRegister; interface ICatInformation; } diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c deleted file mode 100644 index b124a1686c9..00000000000 --- a/dlls/ole32/regsvr.c +++ /dev/null @@ -1,574 +0,0 @@ -/* - * self-registerable dll functions for ole32.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 - */ - -#include "config.h" - -#include -#include - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "objbase.h" - -#include "ole2.h" -#include "olectl.h" -#include "comcat.h" -#include "initguid.h" -#include "compobj_private.h" -#include "moniker.h" - -#include "wine/debug.h" -#include "wine/unicode.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 */ - LPCSTR progid; /* 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 WCHAR const progid_keyname[7] = { - 'P', 'r', 'o', 'g', 'I', 'D', 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 register_progid(WCHAR const *clsid, char const *progid, - char const *name); - -/*********************************************************************** - * 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; - - sprintfW(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]; - - StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - } - - 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; - } - - if (list->progid) { - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->progid, list->name); - 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]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - 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; -} - -/*********************************************************************** - * regsvr_progid - */ -static LONG register_progid( - WCHAR const *clsid, - char const *progid, - char const *name) -{ - LONG res; - HKEY progid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) return res; - - if (name) { - res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, - (CONST BYTE*)name, strlen(name) + 1); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (clsid) { - res = register_key_defvalueW(progid_key, clsid_keyname, clsid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - -error_close_progid_key: - RegCloseKey(progid_key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static GUID const CLSID_StdOleLink = { - 0x00000300, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -static GUID const CLSID_PackagerMoniker = { - 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -extern GUID const CLSID_Picture_Metafile; -extern GUID const CLSID_Picture_Dib; - -static struct regsvr_coclass const coclass_list[] = { - { &CLSID_StdOleLink, - "StdOleLink", - NULL, - "ole32.dll", - NULL - }, - { &CLSID_FileMoniker, - "FileMoniker", - NULL, - "ole32.dll", - "Both", - "file" - }, - { &CLSID_ItemMoniker, - "ItemMoniker", - NULL, - "ole32.dll", - "Both" - }, - { &CLSID_AntiMoniker, - "AntiMoniker", - NULL, - "ole32.dll", - "Both" - }, - { &CLSID_PointerMoniker, - "PointerMoniker", - NULL, - "ole32.dll", - "Both" - }, - { &CLSID_PackagerMoniker, - "PackagerMoniker", - NULL, - "ole32.dll", - "Both" - }, - { &CLSID_CompositeMoniker, - "CompositeMoniker", - NULL, - "ole32.dll", - "Both" - }, - { &CLSID_DfMarshal, - "DfMarshal", - NULL, - "ole32.dll", - "Both" - }, - { &CLSID_Picture_Metafile, - "Picture (Metafile)", - NULL, - "ole32.dll", - NULL, - "StaticMetafile" - }, - { &CLSID_Picture_Dib, - "Picture (Device Independent Bitmap)", - NULL, - "ole32.dll", - NULL, - "StaticDib" - }, - { &CLSID_ClassMoniker, - "ClassMoniker", - NULL, - "ole32.dll", - "Both", - "CLSID" - }, - { &CLSID_PSFactoryBuffer, - "PSFactoryBuffer", - NULL, - "ole32.dll", - "Both" - }, - { &CLSID_StdGlobalInterfaceTable, - "StdGlobalInterfaceTable", - NULL, - "ole32.dll", - "Apartment" - }, - { &CLSID_StdComponentCategoriesMgr, - "Component Categories Manager", - NULL, - "ole32.dll", - "Both" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * interface list - */ - -#define INTERFACE_ENTRY(interface, base) { &IID_##interface, #interface, base, sizeof(interface##Vtbl)/sizeof(void*), NULL, NULL } - -static const struct regsvr_interface interface_list[] = { - INTERFACE_ENTRY( IUnknown, NULL ), - INTERFACE_ENTRY( IMalloc, NULL ), - INTERFACE_ENTRY( IMarshal, NULL ), - INTERFACE_ENTRY( IMoniker, &IID_IPersistStream ), - INTERFACE_ENTRY( IMessageFilter, NULL ), - INTERFACE_ENTRY( IStdMarshalInfo, NULL ), - INTERFACE_ENTRY( IExternalConnection, NULL ), - INTERFACE_ENTRY( IMallocSpy, NULL ), - INTERFACE_ENTRY( IMultiQI, NULL ), - INTERFACE_ENTRY( IPersistStream, &IID_IPersist ), - INTERFACE_ENTRY( IPersistStorage, &IID_IPersist ), - INTERFACE_ENTRY( IPersistFile, &IID_IPersist ), - INTERFACE_ENTRY( IDataAdviseHolder, NULL ), - INTERFACE_ENTRY( IOleAdviseHolder, NULL ), - INTERFACE_ENTRY( IOleInPlaceObject, &IID_IOleWindow ), - INTERFACE_ENTRY( IOleInPlaceUIWindow, &IID_IOleWindow ), - INTERFACE_ENTRY( IOleInPlaceActiveObject, &IID_IOleWindow ), - INTERFACE_ENTRY( IOleInPlaceSite, &IID_IOleWindow ), - INTERFACE_ENTRY( IOleContainer, &IID_IParseDisplayName ), - INTERFACE_ENTRY( IOleItemContainer, &IID_IOleContainer ), - INTERFACE_ENTRY( IDropSource, NULL ), - INTERFACE_ENTRY( IAdviseSink2, &IID_IAdviseSink ), - INTERFACE_ENTRY( IViewObject2, &IID_IViewObject ), - INTERFACE_ENTRY( IOleCache2, &IID_IOleCache ), - INTERFACE_ENTRY( IClientSecurity, NULL ), - INTERFACE_ENTRY( IServerSecurity, NULL ), - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (OLE32.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = OLE32_DllRegisterServer(); - if (SUCCEEDED(hr)) - hr = register_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = register_interfaces(interface_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (OLE32.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - if (SUCCEEDED(hr)) - hr = unregister_interfaces(interface_list); - if (SUCCEEDED(hr)) - hr = OLE32_DllUnregisterServer(); - return hr; -} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8d8ac3fbb48..57ecddb9ce3 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2483,8 +2483,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] ;;some dlls have to be registered first -11,,ole32.dll,1 11,,atl.dll,1 +11,,ole32.dll,1 11,,oleaut32.dll,1 11,,shell32.dll,1