From 6407f62d2929c2d40d91af82acfbeff1f60e143b Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 22 Sep 2013 16:16:55 +0000
Subject: [PATCH] [MSCTF_WINETEST] * Sync with Wine 1.7.1. CORE-7469

svn path=/trunk/; revision=60304
---
 rostests/winetests/msctf/CMakeLists.txt   |  4 +---
 rostests/winetests/msctf/inputprocessor.c | 19 +++++++++----------
 rostests/winetests/msctf/testlist.c       |  5 +----
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/rostests/winetests/msctf/CMakeLists.txt b/rostests/winetests/msctf/CMakeLists.txt
index 2b2009c7da7..14ee96cd43e 100644
--- a/rostests/winetests/msctf/CMakeLists.txt
+++ b/rostests/winetests/msctf/CMakeLists.txt
@@ -1,7 +1,5 @@
 
-add_definitions(-D__ROS_LONG64__)
 add_executable(msctf_winetest inputprocessor.c testlist.c)
-target_link_libraries(msctf_winetest wine)
 set_module_type(msctf_winetest win32cui)
-add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll)
+add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32)
 add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin FOR all)
diff --git a/rostests/winetests/msctf/inputprocessor.c b/rostests/winetests/msctf/inputprocessor.c
index 8f409c35c23..027795d25f4 100644
--- a/rostests/winetests/msctf/inputprocessor.c
+++ b/rostests/winetests/msctf/inputprocessor.c
@@ -203,7 +203,7 @@ static HRESULT WINAPI TextStoreACP_QueryInterface(ITextStoreACP *iface, REFIID i
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITextStoreACP_AddRef(iface);
         return S_OK;
     }
 
@@ -492,7 +492,7 @@ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *i
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfThreadMgrEventSink_AddRef(iface);
         return S_OK;
     }
 
@@ -752,7 +752,7 @@ static HRESULT WINAPI TextService_QueryInterface(ITfTextInputProcessor *iface, R
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfTextInputProcessor_AddRef(iface);
         return S_OK;
     }
 
@@ -1079,7 +1079,7 @@ static HRESULT WINAPI KeyEventSink_QueryInterface(ITfKeyEventSink *iface, REFIID
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfKeyEventSink_AddRef(iface);
         return S_OK;
     }
 
@@ -1305,8 +1305,8 @@ static void test_EnumDocumentMgr(ITfThreadMgr *tm, ITfDocumentMgr *search, ITfDo
 
 static inline int check_context_refcount(ITfContext *iface)
 {
-    IUnknown_AddRef(iface);
-    return IUnknown_Release(iface);
+    ITfContext_AddRef(iface);
+    return ITfContext_Release(iface);
 }
 
 
@@ -1341,7 +1341,7 @@ static HRESULT WINAPI TextEditSink_QueryInterface(ITfTextEditSink *iface, REFIID
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfTextEditSink_AddRef(iface);
         return S_OK;
     }
 
@@ -1697,7 +1697,7 @@ static HRESULT WINAPI EditSession_QueryInterface(ITfEditSession *iface, REFIID i
 
     if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfEditSession_AddRef(iface);
         return S_OK;
     }
 
@@ -1901,10 +1901,9 @@ static void test_TStoApplicationText(void)
     {
         hr = ITfSource_UnadviseSink(source, editSinkCookie);
         ok(SUCCEEDED(hr),"Failed to unadvise Sink\n");
-        ITfTextEditSink_Release(sink);
         ITfSource_Release(source);
     }
-
+    ITfTextEditSink_Release(sink);
     ITfContext_Release(cxt);
     ITfDocumentMgr_Release(dm);
     ITfEditSession_Release(es);
diff --git a/rostests/winetests/msctf/testlist.c b/rostests/winetests/msctf/testlist.c
index 8338fa7b8ce..36b3e5739dc 100644
--- a/rostests/winetests/msctf/testlist.c
+++ b/rostests/winetests/msctf/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_inputprocessor(void);