amstream: Convert dll registration to the IRegistrar mechanism.

dlls/amstream/Makefile.in

@@ -5,8 +5,9 @@ C_SRCS = \
 	amstream.c \
 	main.c \
 	mediastream.c \
-	mediastreamfilter.c \
-	regsvr.c
+	mediastreamfilter.c
+
+IDL_R_SRCS = amstream_classes.idl
 
 RC_SRCS = version.rc
 

dlls/amstream/amstream_classes.idl

+/*
+ * COM Classes for amstream
+ *
+ * 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("SFilter Class"),
+    threading(both),
+    uuid(49c47ce0-9ba4-11d0-8212-00c04fc32c45)
+]
+coclass MediaStreamFilter { interface IMediaStreamFilter; }
+
+[
+    helpstring("Stream Class"),
+    threading(both),
+    uuid(49c47ce4-9ba4-11d0-8212-00c04fc32c45)
+]
+coclass AMDirectDrawStream { interface IAMMultiMediaStream; }
+
+[
+    helpstring("MMStream Class"),
+    threading(both),
+    uuid(49c47ce5-9ba4-11d0-8212-00c04fc32c45)
+]
+coclass AMMultiMediaStream { interface IAMMultiMediaStream; }

dlls/amstream/main.c

@@ -32,6 +32,7 @@
 #include "winerror.h"
 
 #include "ole2.h"
+#include "rpcproxy.h"
 
 #include "amstream_private.h"
 #include "amstream.h"
@@ -40,6 +41,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(amstream);
 
+static HINSTANCE instance;
 static DWORD dll_ref = 0;
 
 /* For the moment, do nothing here. */
@@ -47,6 +49,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
     switch(fdwReason) {
         case DLL_PROCESS_ATTACH:
+            instance = hInstDLL;
             DisableThreadLibraryCalls(hInstDLL);
 	    break;
 	case DLL_PROCESS_DETACH:
@@ -207,3 +210,19 @@ HRESULT WINAPI DllCanUnloadNow(void)
 {
     return dll_ref != 0 ? S_FALSE : S_OK;
 }
+
+/***********************************************************************
+ *		DllRegisterServer (AMSTREAM.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( instance, NULL );
+}
+
+/***********************************************************************
+ *		DllUnregisterServer (AMSTREAM.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return __wine_unregister_resources( instance, NULL );
+}