ole32: Remove duplicated CLSIDs.

dlls/ole32/compobj_private.h

@@ -41,6 +41,9 @@
 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

dlls/ole32/regsvr.c

@@ -33,6 +33,7 @@
 #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 key)
 /***********************************************************************
  *		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",