Adapted to WOW changes.
This commit is contained in:
parent
c3d9f28172
commit
708a1c03f9
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
)) {
|
||||
|
|
Loading…
Reference in New Issue