Michael Stefaniuc : mapi32: COM cleanup for the IMalloc iface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5a9d74a3338054f54864b4a25883d9d47d2dc46d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5a9d74a3338054f54864b4a258...

Author: Michael Stefaniuc 
Date:   Mon Jan 24 00:19:29 2011 +0100

mapi32: COM cleanup for the IMalloc iface.

---

dlls/mapi32/imalloc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c
index 351c38b..eec81b6 100644
--- a/dlls/mapi32/imalloc.c
+++ b/dlls/mapi32/imalloc.c
@@ -41,11 +41,11 @@ static const IMallocVtbl MAPI_IMalloc_vt;

typedef struct
 {
-  const IMallocVtbl *lpVtbl;
+  IMalloc IMalloc_iface;
   LONG lRef;
 } MAPI_IMALLOC;

-static MAPI_IMALLOC MAPI_IMalloc = { &MAPI_IMalloc_vt, 0u };
+static MAPI_IMALLOC MAPI_IMalloc = { { &MAPI_IMalloc_vt }, 0 };

extern LONG MAPI_ObjectCount; /* In mapi32_main.c */

@@ -67,8 +67,8 @@ LPMALLOC WINAPI MAPIGetDefaultMalloc(void)
     if (mapiFunctions.MAPIGetDefaultMalloc)
         return mapiFunctions.MAPIGetDefaultMalloc();

-    IMalloc_AddRef((LPMALLOC)&MAPI_IMalloc);
-    return (LPMALLOC)&MAPI_IMalloc;
+    IMalloc_AddRef(&MAPI_IMalloc.IMalloc_iface);
+    return &MAPI_IMalloc.IMalloc_iface;
 }

/**************************************************************************