Recovery of release 990110 after disk crash.
See Changelog for changes between 990103 and 990110.
diff --git a/ole/ifs.c b/ole/ifs.c
index 9e8ebca..5fb8031 100644
--- a/ole/ifs.c
+++ b/ole/ifs.c
@@ -9,24 +9,17 @@
#include <string.h>
#include <assert.h>
#include "winerror.h"
-#include "ole.h"
-#include "ole2.h"
#include "ldt.h"
#include "heap.h"
-#include "compobj.h"
-#include "interfaces.h"
-#include "shlobj.h"
+#include "wine/obj_base.h"
+#include "objbase.h"
#include "local.h"
#include "module.h"
#include "debug.h"
+
/* --- IUnknown implementation */
-typedef struct _IUnknown {
- /* IUnknown fields */
- ICOM_VTABLE(IUnknown)* lpvtbl;
- DWORD ref;
-} _IUnknown;
/******************************************************************************
* IUnknown_AddRef [VTABLE:IUNKNOWN.1]
@@ -86,30 +79,26 @@
return (LPUNKNOWN)unk;
}
-/*
- * IMalloc
- */
-/******************************************************************************
- * IMalloc16_AddRef [COMPOBJ.501]
- */
-ULONG WINAPI IMalloc16_AddRef(LPMALLOC16 this) {
- TRACE(relay,"(%p)->AddRef()\n",this);
- return 1; /* cannot be freed */
-}
+/* --- IMalloc16 implementation */
-/******************************************************************************
- * IMalloc16_Release [COMPOBJ.502]
+
+typedef struct _IMalloc16 {
+ /* IUnknown fields */
+ ICOM_VTABLE(IMalloc16)* lpvtbl;
+ DWORD ref;
+ /* IMalloc16 fields */
+ /* Gmm, I think one is not enough, we should probably manage a list of
+ * heaps
*/
-ULONG WINAPI IMalloc16_Release(LPMALLOC16 this) {
- TRACE(relay,"(%p)->Release()\n",this);
- return 1; /* cannot be freed */
-}
+ HGLOBAL16 heap;
+} _IMalloc16;
/******************************************************************************
* IMalloc16_QueryInterface [COMPOBJ.500]
*/
-HRESULT WINAPI IMalloc16_QueryInterface(LPMALLOC16 this,REFIID refiid,LPVOID *obj) {
+HRESULT WINAPI IMalloc16_fnQueryInterface(LPUNKNOWN iface,REFIID refiid,LPVOID *obj) {
+ ICOM_THIS(IMalloc16,iface);
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
@@ -124,9 +113,28 @@
}
/******************************************************************************
+ * IMalloc16_AddRef [COMPOBJ.501]
+ */
+ULONG WINAPI IMalloc16_fnAddRef(LPUNKNOWN iface) {
+ ICOM_THIS(IMalloc16,iface);
+ TRACE(relay,"(%p)->AddRef()\n",this);
+ return 1; /* cannot be freed */
+}
+
+/******************************************************************************
+ * IMalloc16_Release [COMPOBJ.502]
+ */
+ULONG WINAPI IMalloc16_fnRelease(LPUNKNOWN iface) {
+ ICOM_THIS(IMalloc16,iface);
+ TRACE(relay,"(%p)->Release()\n",this);
+ return 1; /* cannot be freed */
+}
+
+/******************************************************************************
* IMalloc16_Alloc [COMPOBJ.503]
*/
-LPVOID WINAPI IMalloc16_Alloc(LPMALLOC16 this,DWORD cb) {
+LPVOID WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
+ ICOM_THIS(IMalloc16,iface);
TRACE(relay,"(%p)->Alloc(%ld)\n",this,cb);
return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(this->heap,LOCAL_Alloc(this->heap,0,cb));
}
@@ -134,7 +142,8 @@
/******************************************************************************
* IMalloc16_Realloc [COMPOBJ.504]
*/
-LPVOID WINAPI IMalloc16_Realloc(LPMALLOC16 this,LPVOID pv,DWORD cb) {
+LPVOID WINAPI IMalloc16_fnRealloc(IMalloc16* iface,LPVOID pv,DWORD cb) {
+ ICOM_THIS(IMalloc16,iface);
TRACE(relay,"(%p)->Realloc(%p,%ld)\n",this,pv,cb);
return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(this->heap,LOCAL_ReAlloc(this->heap,0,LOWORD(pv),cb));
}
@@ -142,7 +151,8 @@
/******************************************************************************
* IMalloc16_Free [COMPOBJ.505]
*/
-VOID WINAPI IMalloc16_Free(LPMALLOC16 this,LPVOID pv) {
+VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,LPVOID pv) {
+ ICOM_THIS(IMalloc16,iface);
TRACE(relay,"(%p)->Free(%p)\n",this,pv);
LOCAL_Free(this->heap,LOWORD(pv));
}
@@ -150,7 +160,8 @@
/******************************************************************************
* IMalloc16_GetSize [COMPOBJ.506]
*/
-DWORD WINAPI IMalloc16_GetSize(LPMALLOC16 this,LPVOID pv) {
+DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,LPVOID pv) {
+ ICOM_CTHIS(IMalloc16,iface);
TRACE(relay,"(%p)->GetSize(%p)\n",this,pv);
return LOCAL_Size(this->heap,LOWORD(pv));
}
@@ -158,7 +169,8 @@
/******************************************************************************
* IMalloc16_DidAlloc [COMPOBJ.507]
*/
-INT16 WINAPI IMalloc16_DidAlloc(LPMALLOC16 this,LPVOID pv) {
+INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
+ ICOM_CTHIS(IMalloc16,iface);
TRACE(relay,"(%p)->DidAlloc(%p)\n",this,pv);
return (INT16)-1;
}
@@ -166,52 +178,40 @@
/******************************************************************************
* IMalloc16_HeapMinimize [COMPOBJ.508]
*/
-LPVOID WINAPI IMalloc16_HeapMinimize(LPMALLOC16 this) {
+LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) {
+ ICOM_THIS(IMalloc16,iface);
TRACE(relay,"(%p)->HeapMinimize()\n",this);
return NULL;
}
-#ifdef OLD_TABLE
-/* FIXME: This is unused */
-static IMalloc16_VTable mvt16 = {
- IMalloc16_QueryInterface,
- IMalloc16_AddRef,
- IMalloc16_Release,
- IMalloc16_Alloc,
- IMalloc16_Realloc,
- IMalloc16_Free,
- IMalloc16_GetSize,
- IMalloc16_DidAlloc,
- IMalloc16_HeapMinimize,
-};
-#endif
-static IMalloc16_VTable *msegvt16 = NULL;
+static ICOM_VTABLE(IMalloc16)* msegvt16 = NULL;
/******************************************************************************
* IMalloc16_Constructor [VTABLE]
*/
LPMALLOC16
IMalloc16_Constructor() {
- LPMALLOC16 this;
+ _IMalloc16* this;
HMODULE16 hcomp = GetModuleHandle16("COMPOBJ");
- this = (LPMALLOC16)SEGPTR_NEW(IMalloc16);
+ this = (_IMalloc16*)SEGPTR_NEW(_IMalloc16);
if (!msegvt16) {
- this->lpvtbl = msegvt16 = SEGPTR_NEW(IMalloc16_VTable);
+ this->lpvtbl = msegvt16 = SEGPTR_NEW(ICOM_VTABLE(IMalloc16));
-#define FN(x) this->lpvtbl->fn##x = (void*)WIN32_GetProcAddress16(hcomp,"IMalloc16_"#x);assert(this->lpvtbl->fn##x)
- FN(QueryInterface);
- FN(AddRef);
- FN(Release);
- FN(Alloc);
- FN(Realloc);
- FN(Free);
- FN(GetSize);
- FN(DidAlloc);
- FN(HeapMinimize);
- msegvt16 = (LPMALLOC16_VTABLE)SEGPTR_GET(msegvt16);
-#undef FN
- this->lpvtbl = msegvt16;
+#define VTENT(x) msegvt16->bvt.fn##x = (void*)WIN32_GetProcAddress16(hcomp,"IMalloc16_"#x);assert(msegvt16->bvt.fn##x)
+ VTENT(QueryInterface);
+ VTENT(AddRef);
+ VTENT(Release);
+#undef VTENT
+#define VTENT(x) msegvt16->fn##x = (void*)WIN32_GetProcAddress16(hcomp,"IMalloc16_"#x);assert(msegvt16->fn##x)
+ VTENT(Alloc);
+ VTENT(Realloc);
+ VTENT(Free);
+ VTENT(GetSize);
+ VTENT(DidAlloc);
+ VTENT(HeapMinimize);
+ msegvt16 = (ICOM_VTABLE(IMalloc16)*)SEGPTR_GET(msegvt16);
+#undef VTENT
}
this->ref = 1;
/* FIXME: implement multiple heaps */
@@ -220,30 +220,20 @@
return (LPMALLOC16)SEGPTR_GET(this);
}
-/*
- * IMalloc32
- */
-/******************************************************************************
- * IMalloc32_AddRef [VTABLE]
- */
-static ULONG WINAPI IMalloc32_AddRef(LPMALLOC32 this) {
- TRACE(relay,"(%p)->AddRef()\n",this);
- return 1; /* cannot be freed */
-}
+/* --- IMalloc32 implementation */
-/******************************************************************************
- * IMalloc32_Release [VTABLE]
- */
-static ULONG WINAPI IMalloc32_Release(LPMALLOC32 this) {
- TRACE(relay,"(%p)->Release()\n",this);
- return 1; /* cannot be freed */
-}
+typedef struct _IMalloc32 {
+ /* IUnknown fields */
+ ICOM_VTABLE(IMalloc32)* lpvtbl;
+ DWORD ref;
+} _IMalloc32;
/******************************************************************************
* IMalloc32_QueryInterface [VTABLE]
*/
-static HRESULT WINAPI IMalloc32_QueryInterface(LPMALLOC32 this,REFIID refiid,LPVOID *obj) {
+static HRESULT WINAPI IMalloc32_fnQueryInterface(LPUNKNOWN iface,REFIID refiid,LPVOID *obj) {
+ ICOM_THIS(IMalloc32,iface);
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
@@ -252,15 +242,34 @@
!memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
) {
*obj = this;
- return 0;
+ return S_OK;
}
return OLE_E_ENUM_NOMORE;
}
/******************************************************************************
+ * IMalloc32_AddRef [VTABLE]
+ */
+static ULONG WINAPI IMalloc32_fnAddRef(LPUNKNOWN iface) {
+ ICOM_THIS(IMalloc32,iface);
+ TRACE(relay,"(%p)->AddRef()\n",this);
+ return 1; /* cannot be freed */
+}
+
+/******************************************************************************
+ * IMalloc32_Release [VTABLE]
+ */
+static ULONG WINAPI IMalloc32_fnRelease(LPUNKNOWN iface) {
+ ICOM_THIS(IMalloc32,iface);
+ TRACE(relay,"(%p)->Release()\n",this);
+ return 1; /* cannot be freed */
+}
+
+/******************************************************************************
* IMalloc32_Alloc [VTABLE]
*/
-static LPVOID WINAPI IMalloc32_Alloc(LPMALLOC32 this,DWORD cb) {
+static LPVOID WINAPI IMalloc32_fnAlloc(LPMALLOC32 iface,DWORD cb) {
+ ICOM_THIS(IMalloc32,iface);
TRACE(relay,"(%p)->Alloc(%ld)\n",this,cb);
return HeapAlloc(GetProcessHeap(),0,cb);
}
@@ -268,7 +277,8 @@
/******************************************************************************
* IMalloc32_Realloc [VTABLE]
*/
-static LPVOID WINAPI IMalloc32_Realloc(LPMALLOC32 this,LPVOID pv,DWORD cb) {
+static LPVOID WINAPI IMalloc32_fnRealloc(LPMALLOC32 iface,LPVOID pv,DWORD cb) {
+ ICOM_THIS(IMalloc32,iface);
TRACE(relay,"(%p)->Realloc(%p,%ld)\n",this,pv,cb);
return HeapReAlloc(GetProcessHeap(),0,pv,cb);
}
@@ -276,7 +286,8 @@
/******************************************************************************
* IMalloc32_Free [VTABLE]
*/
-static VOID WINAPI IMalloc32_Free(LPMALLOC32 this,LPVOID pv) {
+static VOID WINAPI IMalloc32_fnFree(LPMALLOC32 iface,LPVOID pv) {
+ ICOM_THIS(IMalloc32,iface);
TRACE(relay,"(%p)->Free(%p)\n",this,pv);
HeapFree(GetProcessHeap(),0,pv);
}
@@ -284,7 +295,8 @@
/******************************************************************************
* IMalloc32_GetSize [VTABLE]
*/
-static DWORD WINAPI IMalloc32_GetSize(LPMALLOC32 this,LPVOID pv) {
+static DWORD WINAPI IMalloc32_fnGetSize(const IMalloc32* iface,LPVOID pv) {
+ ICOM_CTHIS(IMalloc32,iface);
TRACE(relay,"(%p)->GetSize(%p)\n",this,pv);
return HeapSize(GetProcessHeap(),0,pv);
}
@@ -292,7 +304,8 @@
/******************************************************************************
* IMalloc32_DidAlloc [VTABLE]
*/
-static INT32 WINAPI IMalloc32_DidAlloc(LPMALLOC32 this,LPVOID pv) {
+static INT32 WINAPI IMalloc32_fnDidAlloc(const IMalloc32* iface,LPVOID pv) {
+ ICOM_CTHIS(IMalloc32,iface);
TRACE(relay,"(%p)->DidAlloc(%p)\n",this,pv);
return -1;
}
@@ -300,21 +313,24 @@
/******************************************************************************
* IMalloc32_HeapMinimize [VTABLE]
*/
-static LPVOID WINAPI IMalloc32_HeapMinimize(LPMALLOC32 this) {
+static LPVOID WINAPI IMalloc32_fnHeapMinimize(LPMALLOC32 iface) {
+ ICOM_THIS(IMalloc32,iface);
TRACE(relay,"(%p)->HeapMinimize()\n",this);
return NULL;
}
-static IMalloc32_VTable VT_IMalloc32 = {
- IMalloc32_QueryInterface,
- IMalloc32_AddRef,
- IMalloc32_Release,
- IMalloc32_Alloc,
- IMalloc32_Realloc,
- IMalloc32_Free,
- IMalloc32_GetSize,
- IMalloc32_DidAlloc,
- IMalloc32_HeapMinimize,
+static ICOM_VTABLE(IMalloc32) VT_IMalloc32 = {
+ {
+ IMalloc32_fnQueryInterface,
+ IMalloc32_fnAddRef,
+ IMalloc32_fnRelease
+ },
+ IMalloc32_fnAlloc,
+ IMalloc32_fnRealloc,
+ IMalloc32_fnFree,
+ IMalloc32_fnGetSize,
+ IMalloc32_fnDidAlloc,
+ IMalloc32_fnHeapMinimize
};
/******************************************************************************
@@ -322,12 +338,12 @@
*/
LPMALLOC32
IMalloc32_Constructor() {
- LPMALLOC32 this;
+ _IMalloc32* this;
- this = (LPMALLOC32)HeapAlloc(GetProcessHeap(),0,sizeof(IMalloc32));
+ this = (_IMalloc32*)HeapAlloc(GetProcessHeap(),0,sizeof(_IMalloc32));
this->lpvtbl = &VT_IMalloc32;
this->ref = 1;
- return this;
+ return (LPMALLOC32)this;
}
/****************************************************************************
