avifil32: Convert dll registration to the IRegistrar mechanism.

dlls/avifil32/Makefile.in

@@ -11,10 +11,11 @@ C_SRCS = \
 	factory.c \
 	getframe.c \
 	icmstream.c \
-	regsvr.c \
 	tmpfile.c \
 	wavfile.c
 
+IDL_R_SRCS = avifil32.idl
+
 RC_SRCS = \
 	avifile_Cs.rc \
 	avifile_Da.rc \

dlls/avifil32/avifil32.idl

+/*
+ * COM Classes for avifil32
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * 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
+ */
+
+[
+    helpstring("Microsoft AVI Files"),
+    threading(apartment),
+    uuid(00020000-0000-0000-C000-000000000046)
+]
+coclass AVIFile { interface IAVIFile; }
+
+[
+    helpstring("AVI Compressed Stream"),
+    threading(apartment),
+    uuid(00020001-0000-0000-c000-000000000046)
+]
+coclass ICMStream { interface IAVIStream; }
+
+[
+    helpstring("Microsoft Wave File"),
+    threading(apartment),
+    uuid(00020003-0000-0000-c000-000000000046)
+]
+coclass WAVFile { interface IAVIFile; }
+
+[
+    helpstring("IAVIStream & IAVIFile Proxy"),
+    threading(apartment),
+    uuid(0002000d-0000-0000-c000-000000000046)
+]
+coclass AVIProxy { }
+
+[
+    helpstring("ACM Compressed Audio Stream"),
+    threading(apartment),
+    uuid(0002000f-0000-0000-c000-000000000046)
+]
+coclass ACMStream { interface IAVIStream; }

dlls/avifil32/avifile.rgs

+HKCR
+{
+    NoRemove CLSID
+    {
+        '{00020000-0000-0000-C000-000000000046}' { InprocServer = s 'avifile.dll' }
+        '{00020001-0000-0000-C000-000000000046}' { InprocServer = s 'avifile.dll' }
+        '{00020003-0000-0000-C000-000000000046}' { InprocServer = s 'avifile.dll' }
+        '{0002000d-0000-0000-C000-000000000046}' { InprocServer = s 'avifile.dll' }
+        '{0002000f-0000-0000-C000-000000000046}' { InprocServer = s 'avifile.dll' }
+    }
+}

dlls/avifil32/factory.c

@@ -26,6 +26,7 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "ole2.h"
+#include "rpcproxy.h"
 
 #include "initguid.h"
 #include "vfw.h"
@@ -221,3 +222,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
 
   return TRUE;
 }
+
+/***********************************************************************
+ *		DllRegisterServer (AVIFIL32.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( AVIFILE_hModule, NULL );
+}
+
+/***********************************************************************
+ *		DllUnregisterServer (AVIFIL32.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return __wine_unregister_resources( AVIFILE_hModule, NULL );
+}

dlls/avifil32/rsrc.rc

@@ -20,6 +20,9 @@
 
 #include "avifile_private.h"
 
+/* @makedep: avifile.rgs */
+1 WINE_REGISTRY avifile.rgs
+
 #define WINE_FILEDESCRIPTION_STR "Wine AVI file support library"
 #define WINE_FILENAME_STR "avifil32.dll"
 #define WINE_FILEVERSION 4,0,3,1998