Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCTF_WINETEST]

Browse source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62916
This commit is contained in:
Amine Khaldi 2014-04-23 14:32:47 +00:00
parent c786664e29
commit 57c7d8140b
1 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
rostests/winetests/msctf/inputprocessor.c
View file

@ -938,7 +938,8 @@ static void test_EnumLanguageProfiles(void)
{ {
found = TRUE; found = TRUE;
ok(profile.langid == gLangid, "LangId Incorrect\n"); ok(profile.langid == gLangid, "LangId Incorrect\n");
ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD), "CatId Incorrect\n"); ok(IsEqualGUID(&profile.catid,&GUID_TFCAT_TIP_KEYBOARD) ||
broken(IsEqualGUID(&profile.catid,&GUID_NULL) /* Win8 */), "CatId Incorrect\n");
ok(IsEqualGUID(&profile.guidProfile,&CLSID_FakeService), "guidProfile Incorrect\n"); ok(IsEqualGUID(&profile.guidProfile,&CLSID_FakeService), "guidProfile Incorrect\n");
} }
} }
@ -2000,10 +2001,10 @@ static void processPendingMessages(void)
{ {
if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT)
break; break;
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE))
{ {
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessageW(&msg);
} }
diff = time - GetTickCount(); diff = time - GetTickCount();
} }
@ -2032,11 +2033,11 @@ static void test_AssociateFocus(void)
hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm2); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm2);
ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n");
wnd1 = CreateWindow("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); wnd1 = CreateWindowA("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL);
ok(wnd1!=NULL,"Unable to create window 1\n"); ok(wnd1!=NULL,"Unable to create window 1\n");
wnd2 = CreateWindow("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); wnd2 = CreateWindowA("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL);
ok(wnd2!=NULL,"Unable to create window 2\n"); ok(wnd2!=NULL,"Unable to create window 2\n");
wnd3 = CreateWindow("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); wnd3 = CreateWindowA("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL);
ok(wnd3!=NULL,"Unable to create window 3\n"); ok(wnd3!=NULL,"Unable to create window 3\n");
processPendingMessages(); processPendingMessages();
@ -2075,20 +2076,15 @@ static void test_AssociateFocus(void)
processPendingMessages(); processPendingMessages();
ITfThreadMgr_GetFocus(g_tm, &dmcheck); ITfThreadMgr_GetFocus(g_tm, &dmcheck);
if (dmcheck != NULL) ok(dmcheck == dm1 || broken(dmcheck == dmorig /* Win7+ */), "Expected DocumentMgr not focused\n");
{ ITfDocumentMgr_Release(dmcheck);
ok(dmcheck == dm1, "Expected DocumentMgr not focused\n");
ITfDocumentMgr_Release(dmcheck); /* We need to explicitly set focus on Win7+ */
} test_CurrentFocus = dm1;
else test_PrevFocus = FOCUS_IGNORE;
{ test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */
/* Sometimes we need to explicitly set focus on Win7 */ ITfThreadMgr_SetFocus(g_tm, dm1);
test_CurrentFocus = dm1; sink_check_ok(&test_OnSetFocus, "OnSetFocus");
test_PrevFocus = FOCUS_IGNORE;
test_OnSetFocus = SINK_EXPECTED;
ITfThreadMgr_SetFocus(g_tm, dm1);
sink_check_ok(&test_OnSetFocus,"OnSetFocus");
}
hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm);
ok(SUCCEEDED(hr),"AssociateFocus failed\n"); ok(SUCCEEDED(hr),"AssociateFocus failed\n");
@ -2133,7 +2129,7 @@ static void test_AssociateFocus(void)
test_CurrentFocus = dmorig; test_CurrentFocus = dmorig;
test_PrevFocus = dm1; test_PrevFocus = dm1;
test_OnSetFocus = SINK_EXPECTED; test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */
test_ACP_GetStatus = SINK_IGNORE; test_ACP_GetStatus = SINK_IGNORE;
ITfThreadMgr_SetFocus(g_tm,dmorig); ITfThreadMgr_SetFocus(g_tm,dmorig);
sink_check_ok(&test_OnSetFocus,"OnSetFocus"); sink_check_ok(&test_OnSetFocus,"OnSetFocus");