[ros-diffs] [akhaldi] 73281: [MSCTF_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

Author: akhaldi
Date: Thu Nov 17 22:50:52 2016
New Revision: 73281

URL: http://svn.reactos.org/svn/reactos?rev=73281&view=rev
Log:
[MSCTF_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

Modified:
    trunk/rostests/winetests/msctf/inputprocessor.c

Modified: trunk/rostests/winetests/msctf/inputprocessor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc…
==============================================================================
--- trunk/rostests/winetests/msctf/inputprocessor.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/msctf/inputprocessor.c	[iso-8859-1] Thu Nov 17 22:50:52 2016
@@ -191,12 +191,11 @@
 
 static HRESULT WINAPI TextStoreACP_QueryInterface(ITextStoreACP *iface, REFIID iid,
LPVOID *ppvOut)
 {
-    TextStoreACP *This = impl_from_ITextStoreACP(iface);
     *ppvOut = NULL;
 
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITextStoreACP))
     {
-        *ppvOut = This;
+        *ppvOut = iface;
     }
 
     if (*ppvOut)
@@ -464,7 +463,7 @@
     This->ITextStoreACP_iface.lpVtbl = &TextStoreACP_TextStoreACPVtbl;
     This->refCount = 1;
 
-    *ppOut = (IUnknown *)This;
+    *ppOut = (IUnknown*)&This->ITextStoreACP_iface;
     return S_OK;
 }
 
@@ -489,12 +488,11 @@
 
 static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface,
REFIID iid, LPVOID *ppvOut)
 {
-    ThreadMgrEventSink *This = impl_from_ITfThreadMgrEventSink(iface);
     *ppvOut = NULL;
 
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid,
&IID_ITfThreadMgrEventSink))
     {
-        *ppvOut = This;
+        *ppvOut = iface;
     }
 
     if (*ppvOut)
@@ -623,7 +621,7 @@
     This->ITfThreadMgrEventSink_iface.lpVtbl =
&ThreadMgrEventSink_ThreadMgrEventSinkVtbl;
     This->refCount = 1;
 
-    *ppOut = (IUnknown *)This;
+    *ppOut = (IUnknown*)&This->ITfThreadMgrEventSink_iface;
     return S_OK;
 }
 
@@ -773,7 +771,7 @@
     This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl;
     This->ref = 1;
     This->ctor = ctor;
-    *ppvOut = (LPVOID)This;
+    *ppvOut = &This->IClassFactory_iface;
     TS_refCount++;
     return S_OK;
 }
@@ -785,12 +783,11 @@
 
 static HRESULT WINAPI TextService_QueryInterface(ITfTextInputProcessor *iface, REFIID
iid, LPVOID *ppvOut)
 {
-    TextService *This = impl_from_ITfTextInputProcessor(iface);
     *ppvOut = NULL;
 
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid,
&IID_ITfTextInputProcessor))
     {
-        *ppvOut = This;
+        *ppvOut = iface;
     }
 
     if (*ppvOut)
@@ -858,7 +855,7 @@
     This->ITfTextInputProcessor_iface.lpVtbl =
&TextService_TextInputProcessorVtbl;
     This->refCount = 1;
 
-    *ppOut = (IUnknown *)This;
+    *ppOut = (IUnknown*)&This->ITfTextInputProcessor_iface;
     return S_OK;
 }
 
@@ -1148,12 +1145,11 @@
 
 static HRESULT WINAPI KeyEventSink_QueryInterface(ITfKeyEventSink *iface, REFIID iid,
LPVOID *ppvOut)
 {
-    KeyEventSink *This = impl_from_ITfKeyEventSink(iface);
     *ppvOut = NULL;
 
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfKeyEventSink))
     {
-        *ppvOut = This;
+        *ppvOut = iface;
     }
 
     if (*ppvOut)
@@ -1410,12 +1406,11 @@
 
 static HRESULT WINAPI TextEditSink_QueryInterface(ITfTextEditSink *iface, REFIID iid,
LPVOID *ppvOut)
 {
-    TextEditSink *This = impl_from_ITfTextEditSink(iface);
     *ppvOut = NULL;
 
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfTextEditSink))
     {
-        *ppvOut = This;
+        *ppvOut = iface;
     }
 
     if (*ppvOut)
@@ -1802,12 +1797,11 @@
 
 static HRESULT WINAPI EditSession_QueryInterface(ITfEditSession *iface, REFIID iid,
LPVOID *ppvOut)
 {
-    EditSession *This = impl_from_ITfEditSession(iface);
     *ppvOut = NULL;
 
     if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfEditSession))
     {
-        *ppvOut = This;
+        *ppvOut = iface;
     }
 
     if (*ppvOut)