Robert Shearman : ole32: Remove duplicated CLSIDs.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: b155f233f30cb2dfc4b2bd20e870e8b6bda9dff2
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=b155f233f30cb2dfc4b2bd20...

Author: Robert Shearman 
Date:   Mon May  8 15:55:25 2006 +0100

ole32: Remove duplicated CLSIDs.

---

dlls/ole32/compobj_private.h |    3 +++
 dlls/ole32/regsvr.c          |   24 +-----------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 66a7c1c..f362d16 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -41,6 +41,9 @@ #include "winternl.h"
 struct apartment;
 typedef struct apartment APARTMENT;

+extern const CLSID CLSID_PSFactoryBuffer;
+extern const CLSID CLSID_DfMarshal;
+
 /* Thread-safety Annotation Legend:
  *
  * RO    - The value is read only. It never changes after creation, so no
diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c
index 31f0e22..741821f 100644
--- a/dlls/ole32/regsvr.c
+++ b/dlls/ole32/regsvr.c
@@ -33,6 +33,7 @@ #include "objbase.h"
 #include "compobj_private.h"
 #include "ole2.h"
 #include "olectl.h"
+#include "moniker.h"

#include "wine/debug.h"

@@ -398,35 +399,12 @@ static LONG recursive_delete_key(HKEY ke
 /***********************************************************************
  *		coclass list
  */
-static GUID const CLSID_FileMoniker = {
-    0x00000303, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-static GUID const CLSID_ItemMoniker = {
-    0x00000304, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-static GUID const CLSID_AntiMoniker = {
-    0x00000305, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
 static GUID const CLSID_PointerMoniker = {
     0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };

static GUID const CLSID_PackagerMoniker = {
     0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };

-static GUID const CLSID_CompositeMoniker = {
-    0x00000309, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-/* FIXME: DfMarshal and PSFactoryBuffer are defined elsewhere too */
-
-static GUID const CLSID_DfMarshal = {
-    0x0000030B, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-static GUID const CLSID_ClassMoniker = {
-    0x0000031A, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
-static GUID const CLSID_PSFactoryBuffer = {
-    0x00000320, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
-
 static struct regsvr_coclass const coclass_list[] = {
     {   &CLSID_FileMoniker,
    "FileMoniker",