From 7a050e50e594f4091e174ffe2e66bd06b872987c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 17 Nov 2016 22:52:27 +0000 Subject: [PATCH] [MSIMTF] Sync with Wine Staging 1.9.23. CORE-12409 svn path=/trunk/; revision=73282 --- reactos/dll/win32/msimtf/activeimmapp.c | 4 ++-- reactos/media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/msimtf/activeimmapp.c b/reactos/dll/win32/msimtf/activeimmapp.c index 8ecd16a5d9d..973a7d57220 100644 --- a/reactos/dll/win32/msimtf/activeimmapp.c +++ b/reactos/dll/win32/msimtf/activeimmapp.c @@ -45,7 +45,7 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IActiveIMMApp)) { - *ppvOut = This; + *ppvOut = &This->IActiveIMMApp_iface; } else if (IsEqualIID(iid, &IID_IActiveIMMMessagePumpOwner)) { @@ -888,6 +888,6 @@ DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown * This->refCount = 1; TRACE("returning %p\n",This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IActiveIMMApp_iface; return S_OK; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 3d0631a73fa..f5bf1589f57 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -114,7 +114,7 @@ reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-1.9.16 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msimtf # Synced to WineStaging-1.9.16 +reactos/dll/win32/msimtf # Synced to WineStaging-1.9.23 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11 reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.9.11 reactos/dll/win32/msnet32 # Synced to WineStaging-1.9.11