From 708a1c03f9ba9843ab09ddd7f8e245004c1aac9d Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <weigand@informatik.uni-erlangen.de>
Date: Wed, 18 Aug 1999 18:32:21 +0000
Subject: [PATCH] Adapted to WOW changes.

---
 multimedia/mmsystem.c | 3 ++-
 ole/compobj.c         | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/multimedia/mmsystem.c b/multimedia/mmsystem.c
index 423f34854ad..8a9d80010a4 100644
--- a/multimedia/mmsystem.c
+++ b/multimedia/mmsystem.c
@@ -21,6 +21,7 @@
 
 #include "winbase.h"
 #include "wine/winbase16.h"
+#include "wownt32.h"
 #include "heap.h"
 #include "user.h"
 #include "driver.h"
@@ -5043,7 +5044,7 @@ void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt)
 	/* it's not a WOW call back proc, but since the proc signature is the
 	 * same, why bother creating a new entry in Callbacks table ?
 	 */
-	Callbacks->CallWOWCallbackProc(lpMMThd->fpThread, lpMMThd->dwThreadPmt);
+	WOWCallback16((DWORD)lpMMThd->fpThread, lpMMThd->dwThreadPmt);
     }
     lpMMThd->dwStatus = 0x30;
     TRACE("[30-%08x]\n", lpMMThd->hThread);
diff --git a/ole/compobj.c b/ole/compobj.c
index 3cb28cc1b66..6b9cf3d5bbe 100644
--- a/ole/compobj.c
+++ b/ole/compobj.c
@@ -35,8 +35,8 @@
 #include <assert.h>
 #include "windef.h"
 #include "wine/winbase16.h"
-#include "wine/winestring.h"
 #include "winerror.h"
+#include "wownt32.h"
 #include "ole.h"
 #include "ole2ver.h"
 #include "debugtools.h"
@@ -47,6 +47,7 @@
 
 #include "wine/obj_base.h"
 #include "wine/obj_misc.h"
+#include "wine/obj_storage.h"
 #include "wine/obj_clientserver.h"
 
 #include "ifs.h"
@@ -792,11 +793,11 @@ HRESULT WINAPI StringFromCLSID16(
      * everything we need.
      */
     if (!WOWCallback16Ex(
-    	(FARPROC16)((ICOM_VTABLE(IMalloc16)*)PTR_SEG_TO_LIN(
+    	(DWORD)((ICOM_VTABLE(IMalloc16)*)PTR_SEG_TO_LIN(
 		((LPMALLOC16)PTR_SEG_TO_LIN(mllc))->lpvtbl)
 	)->fnAlloc,
 	WCB16_CDECL,
-	2,
+	2*sizeof(DWORD),
 	(LPVOID)args,
 	(LPDWORD)idstr
     )) {
-- 
2.11.4.GIT