Changeset 5616 for trunk/include/win/wine

Timestamp:

Apr 28, 2001, 3:28:18 PM (24 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win/wine

Files:

• obj_base.h (modified) (2 diffs)
• undocshell.h (modified) (4 diffs)

trunk/include/win/wine/obj_base.h

@@ -1 @@
-/* $Id: obj_base.h,v 1.18 2001-04-26 19:23:33 sandervl Exp $ */
 /*
  * This file defines the macros and types necessary to define COM interfaces,
@@ -813 +812 @@
 #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
 
 HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, LPMALLOC16* lpMalloc);

trunk/include/win/wine/undocshell.h

@@ -1 @@
-/* $Id: undocshell.h,v 1.6 2000-08-29 21:20:50 sandervl Exp $ */
 #ifndef __WINE_UNDOCSHELL_H
 #define __WINE_UNDOCSHELL_H
@@ -102 +101 @@
         DWORD len,
         LPSTRRET src,
-        LPITEMIDLIST pidl);
+        const ITEMIDLIST *pidl);
 
 HRESULT WINAPI StrRetToStrNW (
@@ -108 +107 @@
         DWORD len,
         LPSTRRET src,
-        LPITEMIDLIST pidl);
+        const ITEMIDLIST *pidl);
 
 HRESULT WINAPI StrRetToStrNAW (
@@ -114 +113 @@
         DWORD len,
         LPSTRRET src,
-        LPITEMIDLIST pidl);
-
-HRESULT WINAPI StrRetToBufA (
-        LPSTRRET src,
-        LPITEMIDLIST pidl,
-        LPSTR dest,
-        DWORD len);
-
-HRESULT WINAPI StrRetToBufW (
-        LPSTRRET src,
-        LPITEMIDLIST pidl,
-        LPWSTR dest,
-        DWORD len);
+        const ITEMIDLIST *pidl);
 
 /****************************************************************************