Author: akhaldi
Date: Mon Nov 23 20:49:33 2015
New Revision: 70077
URL:
http://svn.reactos.org/svn/reactos?rev=70077&view=rev
Log:
[MSCTF_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
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] Mon Nov 23 20:49:33 2015
@@ -921,6 +921,7 @@
if(IsEqualGUID(&g,&CLSID_FakeService))
found = TRUE;
}
+ IEnumGUID_Release(ppEnum);
}
ok(found,"Did not find registered text service\n");
}
@@ -943,6 +944,7 @@
ok(IsEqualGUID(&profile.guidProfile,&CLSID_FakeService),
"guidProfile Incorrect\n");
}
}
+ IEnumTfLanguageProfiles_Release(ppEnum);
}
ok(found,"Registered text service not found\n");
}
@@ -1407,6 +1409,7 @@
ITfContext *cxt,*cxt2,*cxt3,*cxtTest;
ITextStoreACP *ts;
TfClientId cid2 = 0;
+ ITfThreadMgrEx *tmex;
hr = ITfThreadMgr_Deactivate(g_tm);
ok(hr == E_UNEXPECTED,"Deactivate should have failed with
E_UNEXPECTED\n");
@@ -1419,10 +1422,21 @@
test_ShouldActivate = FALSE;
hr = ITfThreadMgr_Activate(g_tm,&cid2);
ok(SUCCEEDED(hr),"Failed to Activate\n");
- ok (cid == cid2, "Second activate client ID does not match\n");
+ ok(cid == cid2, "Second activate client ID does not match\n");
+
+ hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfThreadMgrEx, (void **)&tmex);
+ ok(SUCCEEDED(hr), "Unable to acquire ITfThreadMgrEx interface\n");
+
+ hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0);
+ ok(SUCCEEDED(hr), "Failed to Activate\n");
+ ok(cid == cid2, "ActivateEx client ID does not match\n");
+
+ ITfThreadMgrEx_Release(tmex);
hr = ITfThreadMgr_Deactivate(g_tm);
- ok(SUCCEEDED(hr),"Failed to Deactivate\n");
+ ok(SUCCEEDED(hr), "Failed to Deactivate\n");
+ hr = ITfThreadMgr_Deactivate(g_tm);
+ ok(SUCCEEDED(hr), "Failed to Deactivate\n");
test_EnumDocumentMgr(g_tm,NULL,NULL);