Alexandre Julliard : uuid: Remove a few iids that don't belong here.
Alexandre Julliard
julliard at winehq.org
Tue Feb 19 13:59:11 CST 2008
Module: wine
Branch: master
Commit: 427cd9183aa2a4d955f6184fe8deb3ff0f5b52d4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=427cd9183aa2a4d955f6184fe8deb3ff0f5b52d4
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 19 20:09:19 2008 +0100
uuid: Remove a few iids that don't belong here.
---
dlls/avifil32/factory.c | 7 +++----
dlls/dplayx/dpclassfactory.c | 4 ++++
dlls/mapi32/mapi32_main.c | 1 +
dlls/mapi32/tests/prop.c | 1 +
dlls/uuid/uuid.c | 7 -------
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c
index 26a5ae2..6d9afa3 100644
--- a/dlls/avifil32/factory.c
+++ b/dlls/avifil32/factory.c
@@ -25,17 +25,16 @@
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
-
#include "ole2.h"
+
+#include "initguid.h"
#include "vfw.h"
+#include "avifile_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
-#include "initguid.h"
-#include "avifile_private.h"
-
HMODULE AVIFILE_hModule = NULL;
static BOOL AVIFILE_bLocked;
diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c
index 9ce483e..b01b984 100644
--- a/dlls/dplayx/dpclassfactory.c
+++ b/dlls/dplayx/dpclassfactory.c
@@ -24,9 +24,13 @@
#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
#include "objbase.h"
#include "winerror.h"
#include "wine/debug.h"
+#include "dplay.h"
+#include "dplobby.h"
+#include "initguid.h"
#include "dpinit.h"
WINE_DEFAULT_DEBUG_CHANNEL(dplay);
diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c
index edfa326..936d435 100644
--- a/dlls/mapi32/mapi32_main.c
+++ b/dlls/mapi32/mapi32_main.c
@@ -24,6 +24,7 @@
#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "initguid.h"
#include "mapix.h"
#include "mapiform.h"
#include "mapi.h"
diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c
index d78eb36..adc1d85 100644
--- a/dlls/mapi32/tests/prop.c
+++ b/dlls/mapi32/tests/prop.c
@@ -24,6 +24,7 @@
#include "winuser.h"
#include "winerror.h"
#include "winnt.h"
+#include "initguid.h"
#include "mapiutil.h"
#include "mapitags.h"
diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c
index 28cdec4..d209696 100644
--- a/dlls/uuid/uuid.c
+++ b/dlls/uuid/uuid.c
@@ -50,7 +50,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
#include "shldisp.h"
#include "comcat.h"
#include "urlmon.h"
-#include "mapiguid.h"
#include "activscp.h"
#include "dispex.h"
#include "mlang.h"
@@ -72,14 +71,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
/* FIXME: cguids declares GUIDs but does not define their values */
-/* other GUIDs */
-
-#include "vfw.h"
-
/* GUIDs not declared in an exported header file */
-DEFINE_GUID(IID_IDirectPlaySP, 0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3);
DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00);
-DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c);
DEFINE_GUID(IID_IProxyManager, 0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b);
More information about the wine-cvs
mailing list