ole32: Use the standard DEFINE_OLEGUID macro to define GUIDs.

dlls/ole32/antimoniker.c

@@ -35,10 +35,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-const CLSID CLSID_AntiMoniker = {
-  0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
-};
-
 /* AntiMoniker data structure */
 typedef struct AntiMonikerImpl{
 

dlls/ole32/classmoniker.c

@@ -39,10 +39,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-const GUID CLSID_ClassMoniker = {
-  0x31A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
-};
-
 #define CHARS_IN_GUID 39
 
 /* ClassMoniker data structure */

dlls/ole32/compobj_private.h

@@ -41,8 +41,9 @@
 struct apartment;
 typedef struct apartment APARTMENT;
 
-extern const CLSID CLSID_PSFactoryBuffer;
-extern const CLSID CLSID_DfMarshal;
+DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 );
+DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 );
+DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 );
 
 /* Thread-safety Annotation Legend:
  *

dlls/ole32/compositemoniker.c

@@ -37,10 +37,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-const CLSID CLSID_CompositeMoniker = {
-  0x309, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
-};
-
 #define  BLOCK_TAB_SIZE 5 /* represent the first size table and it's increment block size */
 
 /* CompositeMoniker data structure */

dlls/ole32/filemoniker.c

@@ -39,10 +39,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-const CLSID CLSID_FileMoniker = {
-  0x303, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
-};
-
 /* filemoniker data structure */
 typedef struct FileMonikerImpl{
 

dlls/ole32/ftmarshal.c

@@ -38,8 +38,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-const CLSID CLSID_InProcFreeMarshaler = { 0x33A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} };
-
 typedef struct _FTMarshalImpl {
 	const IUnknownVtbl *lpVtbl;
 	LONG ref;

dlls/ole32/itemmoniker.c

@@ -38,10 +38,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-const CLSID CLSID_ItemMoniker = {
-  0x304, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
-};
-
 /* ItemMoniker data structure */
 typedef struct ItemMonikerImpl{
 

dlls/ole32/moniker.h

+/*
+ * Monikers
+ *
+ * Copyright 1998 Marcus Meissner
+ * Copyright 1999 Noomen Hamza
+ * Copyright 2005 Robert Shearman (for CodeWeavers)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
 #ifndef __WINE_MONIKER_H__
 #define __WINE_MONIKER_H__
 
-extern const CLSID CLSID_FileMoniker;
-extern const CLSID CLSID_ItemMoniker;
-extern const CLSID CLSID_AntiMoniker;
-extern const CLSID CLSID_CompositeMoniker;
-extern const CLSID CLSID_ClassMoniker;
+DEFINE_OLEGUID( CLSID_FileMoniker,      0x303, 0, 0 );
+DEFINE_OLEGUID( CLSID_ItemMoniker,      0x304, 0, 0 );
+DEFINE_OLEGUID( CLSID_AntiMoniker,      0x305, 0, 0 );
+DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 );
+DEFINE_OLEGUID( CLSID_ClassMoniker,     0x31a, 0, 0 );
 
 HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv);
 HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv);

dlls/ole32/oleproxy.c

@@ -63,9 +63,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-const CLSID CLSID_DfMarshal       = { 0x0000030b, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
-const CLSID CLSID_PSFactoryBuffer = { 0x00000320, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
-
 static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface);
 
 /* From: http://msdn.microsoft.com/library/en-us/com/cmi_m_4lda.asp

dlls/ole32/regsvr.c

@@ -30,9 +30,10 @@
 #include "winerror.h"
 #include "objbase.h"
 
-#include "compobj_private.h"
 #include "ole2.h"
 #include "olectl.h"
+#include "initguid.h"
+#include "compobj_private.h"
 #include "moniker.h"
 
 #include "wine/debug.h"

dlls/ole32/stubmanager.c

@@ -560,8 +560,6 @@ BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid)
  * interacts with stub managers.
  */
 
-const IID IID_IRemUnknown = { 0x00000131, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
-
 typedef struct rem_unknown
 {
     const IRemUnknownVtbl *lpVtbl;