This is the last of the definition shuffling I had to do before my
(rewind) build tree compiled with a replaced objidl.h.
Log:
Ove Kaaven <ovek@transgaming.com>
Moved a couple of types from include/wine/obj_*.h to include/wtypes.idl.
Index: include/wtypes.idl
===================================================================
RCS file: /cvsroot/rewind/rewind/include/wtypes.idl,v
retrieving revision 1.4
diff -u -r1.4 wtypes.idl
--- include/wtypes.idl 19 Dec 2002 18:52:30 -0000 1.4
+++ include/wtypes.idl 19 Dec 2002 19:18:51 -0000
@@ -187,6 +187,14 @@
DWORD dwReserved2;
} COSERVERINFO;
+typedef enum tagMEMCTX {
+ MEMCTX_TASK = 1,
+ MEMCTX_SHARED = 2,
+ MEMCTX_MACSYSTEM = 3,
+ MEMCTX_UNKNOWN = -1,
+ MEMCTX_SAME = -2
+} MEMCTX;
+
cpp_quote("#ifndef _ROTFLAGS_DEFINED")
cpp_quote("#define _ROTFLAGS_DEFINED")
cpp_quote("#define ROTFLAGS_REGISTRATIONKEEPSALIVE 0x1")
@@ -453,6 +461,12 @@
STGMOVE_COPY = 1,
STGMOVE_SHALLOWCOPY = 2
} STGMOVE;
+
+typedef enum tagSTATFLAG {
+ STATFLAG_DEFAULT = 0,
+ STATFLAG_NONAME = 1,
+ STATFLAG_NOOPEN = 2
+} STATFLAG;
/******************** OLE Automation ********************/
Index: include/wine/obj_misc.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/wine/obj_misc.h,v
retrieving revision 1.15
diff -u -r1.15 obj_misc.h
--- include/wine/obj_misc.h 19 Dec 2002 19:18:08 -0000 1.15
+++ include/wine/obj_misc.h 19 Dec 2002 19:18:51 -0000
@@ -112,17 +114,6 @@
#define IMalloc_GetSize(p,a) ICOM_CALL1(GetSize,p,a)
#define IMalloc_DidAlloc(p,a) ICOM_CALL1(DidAlloc,p,a)
#define IMalloc_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
-
-
-/* values passed to CoGetMalloc */
-#define MEMCTX_TASK 1 /* private task memory */
-#define MEMCTX_SHARED 2 /* shared memory */
-#ifdef _MAC
-#define MEMCTX_MACSYSTEM 3 /* system heap on mac */
-#endif
-/* mainly for internal use... */
-#define MEMCTX_UNKNOWN -1
-#define MEMCTX_SAME -2
/*****************************************************************************
Index: include/wine/obj_storage.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/wine/obj_storage.h,v
retrieving revision 1.24
diff -u -r1.24 obj_storage.h
--- include/wine/obj_storage.h 19 Dec 2002 18:48:55 -0000 1.24
+++ include/wine/obj_storage.h 19 Dec 2002 19:18:52 -0000
@@ -114,14 +116,6 @@
#define STGTY_STREAM 2
#define STGTY_LOCKBYTES 3
#define STGTY_PROPERTY 4
-
-/*****************************************************************************
- * STATFLAG enumeration
- *
- * See IStorage and IStream
- */
-#define STATFLAG_DEFAULT 0
-#define STATFLAG_NONAME 1
/*****************************************************************************
* STREAM_SEEK enumeration
