These moniker CLSIDs are not declared in any MS header, as far as I can
see, so I moved them, along with a Wine-specific macro, into the
implementation files where they are used.
dlls/ole32/moniker.h is a new file.
Log:
Ove Kaaven <ovek@transgaming.com>
Moved some definitions from include/wine/obj_moniker.h to
dlls/ole32/moniker.h.
Index: include/wine/obj_moniker.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_moniker.h,v
retrieving revision 1.17
diff -u -r1.17 obj_moniker.h
--- include/wine/obj_moniker.h 10 Mar 2002 00:02:38 -0000 1.17
+++ include/wine/obj_moniker.h 18 Dec 2002 17:48:52 -0000
@@ -50,14 +50,6 @@
DEFINE_OLEGUID(IID_IRunningObjectTable, 0x00000010L, 0, 0);
typedef struct IRunningObjectTable IRunningObjectTable,*LPRUNNINGOBJECTTABLE;
-DEFINE_GUID( CLSID_FileMoniker,0x00000303,0,0,0xc0,0,0,0,0,0,0,0x46);
-
-DEFINE_GUID( CLSID_ItemMoniker,0x00000304,0,0,0xc0,0,0,0,0,0,0,0x46);
-
-DEFINE_GUID( CLSID_AntiMoniker,0x00000305,0,0,0xc0,0,0,0,0,0,0,0x46);
-
-DEFINE_GUID( CLSID_CompositeMoniker,0x00000309,0,0,0xc0,0,0,0,0,0,0,0x46);
-
/*********************************************************************************
* BIND_OPTS and BIND_OPTS2 structures definition
* These structures contain parameters used during a moniker-binding operation.
@@ -281,8 +273,6 @@
#define IROTData_Release(p) ICOM_CALL (Release,p)
/*** IROTData methods ***/
#define IROTData_GetComparisonData(p,a,b,c) ICOM_CALL3(GetComparisonData,p,a,b,c)
-
-#define ICOM_THIS_From_IROTData(class, name) class* This = (class*)(((char*)name)-sizeof(void*))
/*****************************************************************************
* IRunnableObject interface
Index: dlls/ole32/antimoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/antimoniker.c,v
retrieving revision 1.11
diff -u -r1.11 antimoniker.c
--- dlls/ole32/antimoniker.c 5 Dec 2002 20:33:08 -0000 1.11
+++ dlls/ole32/antimoniker.c 18 Dec 2002 17:48:53 -0000
@@ -25,8 +25,13 @@
#include "wine/unicode.h"
#include "objbase.h"
#include "wine/debug.h"
+#include "moniker.h"
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{
Index: dlls/ole32/compositemoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/compositemoniker.c,v
retrieving revision 1.16
diff -u -r1.16 compositemoniker.c
--- dlls/ole32/compositemoniker.c 5 Dec 2002 20:33:08 -0000 1.16
+++ dlls/ole32/compositemoniker.c 18 Dec 2002 17:48:53 -0000
@@ -24,8 +24,13 @@
#include "wine/debug.h"
#include "wine/unicode.h"
#include "ole2.h"
+#include "moniker.h"
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 */
Index: dlls/ole32/filemoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/filemoniker.c,v
retrieving revision 1.21
diff -u -r1.21 filemoniker.c
--- dlls/ole32/filemoniker.c 5 Dec 2002 20:33:08 -0000 1.21
+++ dlls/ole32/filemoniker.c 18 Dec 2002 17:48:54 -0000
@@ -26,10 +26,15 @@
#include "wine/unicode.h"
#include "wine/debug.h"
#include "objbase.h"
+#include "moniker.h"
#include "compobj_private.h"
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{
Index: dlls/ole32/itemmoniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/itemmoniker.c,v
retrieving revision 1.15
diff -u -r1.15 itemmoniker.c
--- dlls/ole32/itemmoniker.c 5 Dec 2002 20:33:08 -0000 1.15
+++ dlls/ole32/itemmoniker.c 18 Dec 2002 17:48:55 -0000
@@ -26,8 +26,13 @@
#include "wine/debug.h"
#include "ole2.h"
#include "wine/unicode.h"
+#include "moniker.h"
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{
--- /dev/null 2002-12-17 00:11:05.000000000 +0100
+++ dlls/ole32/moniker.h 2002-12-18 18:48:10.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef __WINE_MONIKER_H__
+#define __WINE_MONIKER_H__
+
+#define ICOM_THIS_From_IROTData(class, name) class* This = (class*)(((char*)name)-sizeof(void*))
+
+extern const CLSID CLSID_FileMoniker;
+extern const CLSID CLSID_ItemMoniker;
+extern const CLSID CLSID_AntiMoniker;
+extern const CLSID CLSID_CompositeMoniker;
+
+#endif /* __WINE_MONIKER_H__ */
