ole32: Convert dll registration to the IRegistrar mechanism.

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@

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();
+}

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; }

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