Nikolay Sivov : mfuuid: Add file scheme handler CLSID to static library.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 17db99e318cbf95674ae424d332f5873d9033c6d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=17db99e318cbf95674ae424d3...

Author: Nikolay Sivov 
Date:   Mon Apr 27 10:44:38 2020 +0300

mfuuid: Add file scheme handler CLSID to static library.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/mf/main.c       | 8 ++------
 dlls/mf/mf.idl       | 4 ++--
 dlls/mfuuid/mfuuid.c | 1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/mf/main.c b/dlls/mf/main.c
index 01fe17866c..15c9e5e3c9 100644
--- a/dlls/mf/main.c
+++ b/dlls/mf/main.c
@@ -26,11 +26,6 @@
 #include "mfidl.h"
 #include "rpcproxy.h"

-#include "initguid.h"
-#include "mf.h"
-
-#undef INITGUID
-#include <guiddef.h>
 #include "mfapi.h"
 #include "mferror.h"

@@ -43,6 +38,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);

static HINSTANCE mf_instance;
+extern const GUID CLSID_FileSchemePlugin;

struct activate_object
 {
@@ -1032,7 +1028,7 @@ static const struct class_object
 }
 class_objects[] =
 {
-    { &CLSID_FileSchemeHandler, &file_scheme_handler_factory.IClassFactory_iface },
+    { &CLSID_FileSchemePlugin, &file_scheme_handler_factory.IClassFactory_iface },
 };

/*******************************************************************************
diff --git a/dlls/mf/mf.idl b/dlls/mf/mf.idl
index 824c246d30..289a521b4f 100644
--- a/dlls/mf/mf.idl
+++ b/dlls/mf/mf.idl
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#pragma makedep header register
+#pragma makedep register

[
     helpstring("File scheme handler"),
     threading(both),
     uuid(477ec299-1421-4bdd-971f-7ccb933f21ad)
 ]
-coclass FileSchemeHandler { }
+coclass FileSchemePlugin { }
diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c
index 8801eac8b8..537eaef642 100644
--- a/dlls/mfuuid/mfuuid.c
+++ b/dlls/mfuuid/mfuuid.c
@@ -34,3 +34,4 @@
 #include "mfmediaengine.h"

DEFINE_GUID(MF_SCRUBBING_SERVICE, 0xdd0ac3d8,0x40e3,0x4128,0xac,0x48,0xc0,0xad,0xd0,0x67,0xb7,0x14);
+DEFINE_GUID(CLSID_FileSchemePlugin, 0x477ec299,0x1421,0x4bdd,0x97,0x1f,0x7c,0xcb,0x93,0x3f,0x21,0xad);