Nikolay Sivov : mfuuid: Define Media Platform guids.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Mar 11 13:28:07 2019 +0300

mfuuid: Define Media Platform guids.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mfreadwrite/main.c         | 7 +++----
 dlls/mfreadwrite/tests/mfplat.c | 6 +-----
 dlls/mfuuid/mfuuid.c            | 3 +++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c
index a83ece0..098100df 100644
--- a/dlls/mfreadwrite/main.c
+++ b/dlls/mfreadwrite/main.c
@@ -27,16 +27,15 @@
 #include "initguid.h"
 #include "ole2.h"
 #include "rpcproxy.h"
+
+#undef INITGUID
+#include <guiddef.h>
 #include "mfidl.h"
 #include "mfreadwrite.h"
 
 #include "wine/debug.h"
 #include "wine/heap.h"
 
-DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f);
-DEFINE_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4);
-DEFINE_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90);
-
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 
 static HINSTANCE mfinstance;
diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index b2675dc..58533cc 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -26,6 +26,7 @@
 #include "winuser.h"
 #include "winreg.h"
 
+#undef INITGUID
 #include "mfapi.h"
 #include "mfidl.h"
 #include "mferror.h"
@@ -33,11 +34,6 @@
 
 #include "wine/test.h"
 
-#include "initguid.h"
-DEFINE_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO,0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);
-DEFINE_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO,   0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1);
-DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f);
-
 static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream);
 
 static void init_functions(void)
diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c
index f9b1a8a..5bfd521 100644
--- a/dlls/mfuuid/mfuuid.c
+++ b/dlls/mfuuid/mfuuid.c
@@ -23,6 +23,9 @@
 #include "strmif.h"
 #include "mediaobj.h"
 
+#undef EXTERN_GUID
+#define EXTERN_GUID DEFINE_GUID
+
 #include "initguid.h"
 
 #include "mfapi.h"