mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 09:33:20 +00:00
[MSCTF_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
svn path=/trunk/; revision=72291
This commit is contained in:
parent
f841a54235
commit
c99ab15017
1 changed files with 36 additions and 3 deletions
|
@ -74,6 +74,7 @@ static INT test_OnPushContext = SINK_UNEXPECTED;
|
||||||
static INT test_OnPopContext = SINK_UNEXPECTED;
|
static INT test_OnPopContext = SINK_UNEXPECTED;
|
||||||
static INT test_KEV_OnSetFocus = SINK_UNEXPECTED;
|
static INT test_KEV_OnSetFocus = SINK_UNEXPECTED;
|
||||||
static INT test_ACP_AdviseSink = SINK_UNEXPECTED;
|
static INT test_ACP_AdviseSink = SINK_UNEXPECTED;
|
||||||
|
static INT test_ACP_UnadviseSink = SINK_UNEXPECTED;
|
||||||
static INT test_ACP_GetStatus = SINK_UNEXPECTED;
|
static INT test_ACP_GetStatus = SINK_UNEXPECTED;
|
||||||
static INT test_ACP_RequestLock = SINK_UNEXPECTED;
|
static INT test_ACP_RequestLock = SINK_UNEXPECTED;
|
||||||
static INT test_ACP_GetEndACP = SINK_UNEXPECTED;
|
static INT test_ACP_GetEndACP = SINK_UNEXPECTED;
|
||||||
|
@ -232,6 +233,9 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface,
|
||||||
|
|
||||||
sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink");
|
sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink");
|
||||||
|
|
||||||
|
if(ACPSink)
|
||||||
|
return S_OK;
|
||||||
|
|
||||||
hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink);
|
hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink);
|
||||||
ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n");
|
ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n");
|
||||||
|
|
||||||
|
@ -245,7 +249,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface,
|
||||||
static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface,
|
static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface,
|
||||||
IUnknown *punk)
|
IUnknown *punk)
|
||||||
{
|
{
|
||||||
trace("\n");
|
sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink");
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -563,9 +567,9 @@ ITfContext *pic)
|
||||||
hr = ITfContext_GetDocumentMgr(pic,&docmgr);
|
hr = ITfContext_GetDocumentMgr(pic,&docmgr);
|
||||||
ok(SUCCEEDED(hr),"GetDocumentMgr failed\n");
|
ok(SUCCEEDED(hr),"GetDocumentMgr failed\n");
|
||||||
test = (ITfContext*)0xdeadbeef;
|
test = (ITfContext*)0xdeadbeef;
|
||||||
ITfDocumentMgr_Release(docmgr);
|
|
||||||
hr = ITfDocumentMgr_GetTop(docmgr,&test);
|
hr = ITfDocumentMgr_GetTop(docmgr,&test);
|
||||||
ok(SUCCEEDED(hr),"GetTop failed\n");
|
ok(SUCCEEDED(hr),"GetTop failed\n");
|
||||||
|
ITfDocumentMgr_Release(docmgr);
|
||||||
ok(test == pic, "Wrong context is on top\n");
|
ok(test == pic, "Wrong context is on top\n");
|
||||||
if (test)
|
if (test)
|
||||||
ITfContext_Release(test);
|
ITfContext_Release(test);
|
||||||
|
@ -969,6 +973,11 @@ static void test_EnumLanguageProfiles(void)
|
||||||
{
|
{
|
||||||
BOOL found = FALSE;
|
BOOL found = FALSE;
|
||||||
IEnumTfLanguageProfiles *ppEnum;
|
IEnumTfLanguageProfiles *ppEnum;
|
||||||
|
HRESULT hr;
|
||||||
|
|
||||||
|
hr = ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp, gLangid, NULL);
|
||||||
|
ok(hr == E_INVALIDARG, "EnumLanguageProfiles failed: %x\n", hr);
|
||||||
|
|
||||||
if (SUCCEEDED(ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp,gLangid,&ppEnum)))
|
if (SUCCEEDED(ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp,gLangid,&ppEnum)))
|
||||||
{
|
{
|
||||||
TF_LANGUAGEPROFILE profile;
|
TF_LANGUAGEPROFILE profile;
|
||||||
|
@ -1474,7 +1483,7 @@ static void test_startSession(void)
|
||||||
DWORD editCookie;
|
DWORD editCookie;
|
||||||
ITfDocumentMgr *dmtest;
|
ITfDocumentMgr *dmtest;
|
||||||
ITfContext *cxt,*cxt2,*cxt3,*cxtTest;
|
ITfContext *cxt,*cxt2,*cxt3,*cxtTest;
|
||||||
ITextStoreACP *ts;
|
ITextStoreACP *ts = NULL;
|
||||||
TfClientId cid2 = 0;
|
TfClientId cid2 = 0;
|
||||||
ITfThreadMgrEx *tmex;
|
ITfThreadMgrEx *tmex;
|
||||||
|
|
||||||
|
@ -1641,6 +1650,8 @@ static void test_startSession(void)
|
||||||
ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr);
|
ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr);
|
||||||
ok(dmtest == NULL,"returned documentmgr should be null\n");
|
ok(dmtest == NULL,"returned documentmgr should be null\n");
|
||||||
|
|
||||||
|
ITfContext_Release(cxt2);
|
||||||
|
|
||||||
hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest);
|
hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest);
|
||||||
ok(SUCCEEDED(hr),"GetTop Failed\n");
|
ok(SUCCEEDED(hr),"GetTop Failed\n");
|
||||||
ok(cxtTest == cxt, "Wrong context on top\n");
|
ok(cxtTest == cxt, "Wrong context on top\n");
|
||||||
|
@ -1651,6 +1662,25 @@ static void test_startSession(void)
|
||||||
ok(cxtTest == cxt, "Wrong context on base\n");
|
ok(cxtTest == cxt, "Wrong context on base\n");
|
||||||
ITfContext_Release(cxtTest);
|
ITfContext_Release(cxtTest);
|
||||||
|
|
||||||
|
hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie);
|
||||||
|
ok(hr == S_OK,"CreateContext Failed\n");
|
||||||
|
|
||||||
|
test_OnPushContext = SINK_EXPECTED;
|
||||||
|
test_ACP_AdviseSink = SINK_EXPECTED;
|
||||||
|
hr = ITfDocumentMgr_Push(g_dm, cxt2);
|
||||||
|
ok(hr == S_OK,"Push Failed\n");
|
||||||
|
sink_check_ok(&test_OnPushContext,"OnPushContext");
|
||||||
|
sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink");
|
||||||
|
|
||||||
|
test_ACP_UnadviseSink = SINK_EXPECTED;
|
||||||
|
cnt = check_context_refcount(cxt2);
|
||||||
|
test_OnPopContext = SINK_EXPECTED;
|
||||||
|
hr = ITfDocumentMgr_Pop(g_dm, 0);
|
||||||
|
ok(hr == S_OK,"Pop Failed\n");
|
||||||
|
ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n");
|
||||||
|
sink_check_ok(&test_OnPopContext,"OnPopContext");
|
||||||
|
sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink");
|
||||||
|
|
||||||
hr = ITfDocumentMgr_Pop(g_dm, 0);
|
hr = ITfDocumentMgr_Pop(g_dm, 0);
|
||||||
ok(FAILED(hr),"Pop Succeeded\n");
|
ok(FAILED(hr),"Pop Succeeded\n");
|
||||||
|
|
||||||
|
@ -2320,6 +2350,9 @@ START_TEST(inputprocessor)
|
||||||
test_UnregisterCategory();
|
test_UnregisterCategory();
|
||||||
test_Unregister();
|
test_Unregister();
|
||||||
test_profile_mgr();
|
test_profile_mgr();
|
||||||
|
|
||||||
|
ITextStoreACPSink_Release(ACPSink);
|
||||||
|
ITfDocumentMgr_Release(g_dm);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
skip("Unable to create InputProcessor\n");
|
skip("Unable to create InputProcessor\n");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue