Moved a couple of types from include/wine/obj_*.h to

include/wine/obj_misc.h

@@ -130,17 +130,6 @@ ICOM_DEFINE(IMalloc,IUnknown)
 #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
-
-
 /*****************************************************************************
  * IMallocSpy interface
  */

include/wine/obj_storage.h

@@ -132,14 +132,6 @@ typedef struct IStream IStream,*LPSTREAM;
 #define STGTY_PROPERTY  4
 
 /*****************************************************************************
- * STATFLAG enumeration
- *
- * See IStorage and IStream
- */
-#define STATFLAG_DEFAULT 0
-#define STATFLAG_NONAME  1
-
-/*****************************************************************************
  * STREAM_SEEK enumeration
  *
  * See IStream

include/wtypes.h

@@ -192,6 +192,14 @@ typedef struct _COSERVERINFO {
     DWORD dwReserved2;
 } COSERVERINFO;
 
+typedef enum tagMEMCTX {
+    MEMCTX_TASK = 1,
+    MEMCTX_SHARED = 2,
+    MEMCTX_MACSYSTEM = 3,
+    MEMCTX_UNKNOWN = -1,
+    MEMCTX_SAME = -2
+} MEMCTX;
+
 #ifndef _ROTFLAGS_DEFINED
 #define _ROTFLAGS_DEFINED
 #define ROTFLAGS_REGISTRATIONKEEPSALIVE 0x1
@@ -485,6 +493,12 @@ typedef enum tagSTGMOVE {
     STGMOVE_SHALLOWCOPY = 2
 } STGMOVE;
 
+typedef enum tagSTATFLAG {
+    STATFLAG_DEFAULT = 0,
+    STATFLAG_NONAME = 1,
+    STATFLAG_NOOPEN = 2
+} STATFLAG;
+
 #if 0
 typedef struct tagCY {
     LONGLONG int64;

include/wtypes.idl

@@ -199,6 +199,14 @@ typedef struct _COSERVERINFO {
   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")
@@ -466,6 +474,12 @@ typedef enum tagSTGMOVE {
   STGMOVE_SHALLOWCOPY = 2
 } STGMOVE;
 
+typedef enum tagSTATFLAG {
+  STATFLAG_DEFAULT = 0,
+  STATFLAG_NONAME  = 1,
+  STATFLAG_NOOPEN  = 2
+} STATFLAG;
+
 /******************** OLE Automation ********************/
 
 cpp_quote("#if 0") /* for IDL only */