[ros-diffs] [akhaldi] 60304: [MSCTF_WINETEST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sun Sep 22 16:16:55 2013
New Revision: 60304

URL: http://svn.reactos.org/svn/reactos?rev=60304&view=rev
Log:
[MSCTF_WINETEST]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/rostests/winetests/msctf/CMakeLists.txt
    trunk/rostests/winetests/msctf/inputprocessor.c
    trunk/rostests/winetests/msctf/testlist.c

Modified: trunk/rostests/winetests/msctf/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeLists...
==============================================================================
--- trunk/rostests/winetests/msctf/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/msctf/CMakeLists.txt	[iso-8859-1] Sun Sep 22 16:16:55 2013
@@ -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)

Modified: trunk/rostests/winetests/msctf/inputprocessor.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproce...
==============================================================================
--- trunk/rostests/winetests/msctf/inputprocessor.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/msctf/inputprocessor.c	[iso-8859-1] Sun Sep 22 16:16:55 2013
@@ -203,7 +203,7 @@

if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITextStoreACP_AddRef(iface);
         return S_OK;
     }

@@ -492,7 +492,7 @@

if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfThreadMgrEventSink_AddRef(iface);
         return S_OK;
     }

@@ -752,7 +752,7 @@

if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfTextInputProcessor_AddRef(iface);
         return S_OK;
     }

@@ -1079,7 +1079,7 @@

if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfKeyEventSink_AddRef(iface);
         return S_OK;
     }

@@ -1305,8 +1305,8 @@

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 @@

if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfTextEditSink_AddRef(iface);
         return S_OK;
     }

@@ -1697,7 +1697,7 @@

if (*ppvOut)
     {
-        IUnknown_AddRef(iface);
+        ITfEditSession_AddRef(iface);
         return S_OK;
     }

@@ -1901,10 +1901,9 @@
     {
         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);

Modified: trunk/rostests/winetests/msctf/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/testlist.c...
==============================================================================
--- trunk/rostests/winetests/msctf/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/msctf/testlist.c	[iso-8859-1] Sun Sep 22 16:16:55 2013
@@ -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);