Changeset 7926 for trunk/src/ole32/ifs.c

Timestamp:

Feb 15, 2002, 6:18:52 PM (24 years ago)

Author:

sandervl

Message:

Wine 20020215 resync

File:

• trunk/src/ole32/ifs.c (modified) (6 diffs)

trunk/src/ole32/ifs.c

@@ -5 +5 @@
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+
+#include "ole2.h"
+#include "windef.h"
 #include "winerror.h"
-#include "heap.h"
+
+#include "wine/obj_base.h"
 #include "wine/winbase16.h"
-#include "wine/obj_base.h"
+#include "ifs.h"
+
 #include "debugtools.h"
-
-#include "ole.h"
-#include "ifs.h"
 
 DEFAULT_DEBUG_CHANNEL(relay);
@@ -139 +143 @@
         ICOM_THIS(IMalloc16Impl,iface);
         TRACE("(%p)->Alloc(%ld)\n",This,cb);
-        return MapLS( HeapAlloc( GetProcessHeap(), HEAP_WINE_SEGPTR, cb ) );
+        return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) );
 }
 
@@ -145 +149 @@
  * IMalloc16_Realloc [COMPOBJ.504]
  */
-SEGPTR WINAPI IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) {
-        ICOM_THIS(IMalloc16Impl,iface);
-        TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb);
-        return MapLS( HeapReAlloc( GetProcessHeap(), HEAP_WINE_SEGPTR, MapSL(pv), cb ) );
+SEGPTR WINAPI IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb)
+{
+    SEGPTR ret;
+    ICOM_THIS(IMalloc16Impl,iface);
+    TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb);
+    ret = MapLS( HeapReAlloc( GetProcessHeap(), 0, MapSL(pv), cb ) );
+    UnMapLS(pv);
+    return ret;
 }
 
@@ -154 +162 @@
  * IMalloc16_Free [COMPOBJ.505]
  */
-VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv) {
-        ICOM_THIS(IMalloc16Impl,iface);
-        TRACE("(%p)->Free(%08lx)\n",This,pv);
-        HeapFree( GetProcessHeap(), HEAP_WINE_SEGPTR, MapSL(pv) );
+VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv)
+{
+    void *ptr = MapSL(pv);
+    ICOM_THIS(IMalloc16Impl,iface);
+    TRACE("(%p)->Free(%08lx)\n",This,pv);
+    UnMapLS(pv);
+    HeapFree( GetProcessHeap(), 0, ptr );
 }
 
@@ -167 +178 @@
         ICOM_CTHIS(IMalloc16Impl,iface);
         TRACE("(%p)->GetSize(%08lx)\n",This,pv);
-        return HeapSize( GetProcessHeap(), HEAP_WINE_SEGPTR, MapSL(pv) );
+        return HeapSize( GetProcessHeap(), 0, MapSL(pv) );
 }
 
@@ -188 +199 @@
 }
 
-static ICOM_VTABLE(IMalloc16)* msegvt16 = NULL;
-
 /******************************************************************************
  * IMalloc16_Constructor [VTABLE]
  */
 LPMALLOC16
-IMalloc16_Constructor() {
-        IMalloc16Impl*  This;
-        HMODULE16       hcomp = GetModuleHandle16("COMPOBJ");
-
-        This = (IMalloc16Impl*)SEGPTR_NEW(IMalloc16Impl);
-        if (!msegvt16) {
-            msegvt16 = SEGPTR_NEW(ICOM_VTABLE(IMalloc16));
-
-#define VTENT(x) msegvt16->x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(msegvt16->x)
-            VTENT(QueryInterface);
-            VTENT(AddRef);
-            VTENT(Release);
-            VTENT(Alloc);
-            VTENT(Realloc);
-            VTENT(Free);
-            VTENT(GetSize);
-            VTENT(DidAlloc);
-            VTENT(HeapMinimize);
+IMalloc16_Constructor()
+{
+    static ICOM_VTABLE(IMalloc16) vt16;
+    static SEGPTR msegvt16;
+    IMalloc16Impl* This;
+    HMODULE16 hcomp = GetModuleHandle16("COMPOBJ");
+
+    This = HeapAlloc( GetProcessHeap(), 0, sizeof(IMalloc16Impl) );
+    if (!msegvt16)
+    {
+#define VTENT(x) vt16.x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(vt16.x)
+        VTENT(QueryInterface);
+        VTENT(AddRef);
+        VTENT(Release);
+        VTENT(Alloc);
+        VTENT(Realloc);
+        VTENT(Free);
+        VTENT(GetSize);
+        VTENT(DidAlloc);
+        VTENT(HeapMinimize);
 #undef VTENT
-        }
-        ICOM_VTBL(This) = (ICOM_VTABLE(IMalloc16)*)SEGPTR_GET(msegvt16);
-        This->ref = 1;
-        return (LPMALLOC16)SEGPTR_GET(This);
+        msegvt16 = MapLS( &vt16 );
+    }
+    ICOM_VTBL(This) = (ICOM_VTABLE(IMalloc16)*)msegvt16;
+    This->ref = 1;
+    return (LPMALLOC16)MapLS( This );
 }
 #endif