wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Nicolas Le Cam : wininet/tests: Temporize async HttpSendRequestEx test to avoid timeouts.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 6ef2402c506118781502176ddfe1ded312a62501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef2402c506118781502176dd… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun May 10 00:40:03 2009 +0200 wininet/tests: Temporize async HttpSendRequestEx test to avoid timeouts. --- dlls/wininet/tests/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e3c33bd..7e4cb62 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2493,6 +2493,7 @@ static void test_async_HttpSendRequestEx(void) InternetCloseHandle( ses ); WaitForSingleObject( info.wait, 10000 ); + Sleep(100); CloseHandle( info.wait ); } @@ -2557,9 +2558,9 @@ START_TEST(http) InternetOpenRequest_test(); test_http_cache(); InternetOpenUrlA_test(); - HttpSendRequestEx_test(); HttpHeaders_test(); test_http_connection(); test_user_agent_header(); test_bogus_accept_types_array(); + HttpSendRequestEx_test(); }

1 0

Ricardo Filipe : cfgmgr32: Forward CM_Locate_DevNode_ExA/ W calls to setupapi.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 16d3442a3490e1b6d6379a07f1c12919b270ec95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d3442a3490e1b6d6379a07f… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu May 7 13:03:33 2009 +0100 cfgmgr32: Forward CM_Locate_DevNode_ExA/W calls to setupapi. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index f080e7d..da53b37 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -119,8 +119,8 @@ @ stub CM_Is_Dock_Station_Present @ stdcall CM_Locate_DevNodeA(ptr str long) setupapi.CM_Locate_DevNodeA @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW -@ stub CM_Locate_DevNode_ExA -@ stub CM_Locate_DevNode_ExW +@ stdcall CM_Locate_DevNode_ExA(ptr str long long) setupapi.CM_Locate_DevNode_ExA +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) setupapi.CM_Locate_DevNode_ExW @ stub CM_Merge_Range_List @ stub CM_Modify_Res_Des @ stub CM_Modify_Res_Des_Ex

1 0

Ricardo Filipe : setupapi: Add stubs for CM_Locate_DevNode_ExA/W.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 6ba3cc1c2eaf66a121dd8d03ee37314ba4bde382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba3cc1c2eaf66a121dd8d03e… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Thu May 7 13:02:37 2009 +0100 setupapi: Add stubs for CM_Locate_DevNode_ExA/W. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c37a2b9..cd7bf62 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -130,8 +130,8 @@ @ stub CM_Is_Dock_Station_Present @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) -@ stub CM_Locate_DevNode_ExA -@ stub CM_Locate_DevNode_ExW +@ stdcall CM_Locate_DevNode_ExA(ptr str long long) +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) @ stub CM_Merge_Range_List @ stub CM_Modify_Res_Des @ stub CM_Modify_Res_Des_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 3997447..4478066 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -265,3 +265,23 @@ CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, return CR_FAILURE; } + +/*********************************************************************** + * CM_Locate_DevNode_ExA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Locate_DevNode_ExA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %s 0x%08x %p: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags, hMachine); + + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Locate_DevNode_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %s 0x%08x %p: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); + + return CR_FAILURE; +}

1 0

Nikolay Sivov : comctl32/listview: Add LVN_INCREMENTALSEARCH definitions.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 50e9ceb9e4e0915b98200469bbc9334a1b2258b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e9ceb9e4e0915b98200469b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 14:42:44 2009 +0400 comctl32/listview: Add LVN_INCREMENTALSEARCH definitions. --- include/commctrl.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 7b93497..d3c24cd 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3253,12 +3253,20 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVN_GETINFOTIPA (LVN_FIRST-57) #define LVN_GETINFOTIPW (LVN_FIRST-58) #define LVN_GETINFOTIP WINELIB_NAME_AW(LVN_GETINFOTIP) +#define LVN_INCREMENTALSEARCHA (LVN_FIRST-62) +#define LVN_INCREMENTALSEARCHW (LVN_FIRST-63) +#define LVN_INCREMENTALSEARCH WINELIB_NAME_AW(LVN_INCREMENTALSEARCH) #define LVN_BEGINSCROLL (LVN_FIRST-80) #define LVN_ENDSCROLL (LVN_FIRST-81) #define LVN_LINKCLICK (LVN_FIRST-84) #define LVN_ASYNCDRAWN (LVN_FIRST-86) #define LVN_GETEMPTYMARKUP (LVN_FIRST-87) +/* LVN_INCREMENTALSEARCH return codes */ +#define LVNSCH_DEFAULT -1 +#define LVNSCH_ERROR -2 +#define LVNSCH_IGNORE -3 + #define LVA_DEFAULT 0x0000 #define LVA_ALIGNLEFT 0x0001 #define LVA_ALIGNTOP 0x0002

1 0

Nikolay Sivov : comctl32/listview: Don' t redraw focus rectangle on column scroll.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: e847d7c038cab5ce9f77fa62380a8ea712ed69e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e847d7c038cab5ce9f77fa623… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 13:15:44 2009 +0400 comctl32/listview: Don't redraw focus rectangle on column scroll. --- dlls/comctl32/listview.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7bed09e..f268855 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4658,9 +4658,6 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) /* do not update screen if not in report mode */ if (!is_redrawing(infoPtr) || (infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) return; - /* if we have a focus, we must first erase the focus rect */ - if (infoPtr->bFocus) LISTVIEW_ShowFocusRect(infoPtr, FALSE); - /* Need to reset the item width when inserting a new column */ infoPtr->nItemWidth += dx; @@ -4671,9 +4668,6 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) rcOld = infoPtr->rcList; rcOld.left = ptOrigin.x + rcCol.left + dx; ScrollWindowEx(infoPtr->hwndSelf, dx, 0, &rcOld, &rcOld, 0, 0, SW_ERASE | SW_INVALIDATE); - - /* we can restore focus now */ - if (infoPtr->bFocus) LISTVIEW_ShowFocusRect(infoPtr, TRUE); } /***

1 0

Nikolay Sivov : comctl32/listview: Select all items with LVM_SETITEMSTATE is blocked in LVS_SINGLESEL.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 4a5e23a2f960dfaa19de6fed481a2f13c69356a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5e23a2f960dfaa19de6fed4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 13:02:57 2009 +0400 comctl32/listview: Select all items with LVM_SETITEMSTATE is blocked in LVS_SINGLESEL. --- dlls/comctl32/listview.c | 4 ++++ dlls/comctl32/tests/listview.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1928d4b..7bed09e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7687,6 +7687,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if (nItem == -1) { + /* select all isn't allowed in LVS_SINGLESEL */ + if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL)) + return FALSE; + /* apply to all items */ for (lvItem.iItem = 0; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++) if (!LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE)) bResult = FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e94bdaa..5987e1e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1496,6 +1496,7 @@ static void test_multiselect(void) BYTE kstate[256]; select_task task; LONG_PTR style; + LVITEMA item; static struct t_select_task task_list[] = { { "using VK_DOWN", 0, VK_DOWN, -1, -1 }, @@ -1605,6 +1606,36 @@ todo_wine todo_wine expect(-1, r); + /* try to select all on LVS_SINGLESEL */ + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + ListView_SetSelectionMark(hwnd, -1); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(FALSE, r); + + r = ListView_GetSelectedCount(hwnd); + expect(0, r); + r = ListView_GetSelectionMark(hwnd); + expect(-1, r); + + /* try to deselect all on LVS_SINGLESEL */ + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, r); + + item.stateMask = LVIS_SELECTED; + item.state = 0; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + r = ListView_GetSelectedCount(hwnd); + expect(0, r); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Remove superfluous forward declarations.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 472b521606ea6c30278b185d86fb613374582624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=472b521606ea6c30278b185d8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 12:30:30 2009 +0400 comctl32/listview: Remove superfluous forward declarations. --- dlls/comctl32/listview.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a8ecd91..1928d4b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -411,12 +411,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *, INT, LPRECT); static INT LISTVIEW_GetLabelWidth(const LISTVIEW_INFO *, INT); static void LISTVIEW_GetOrigin(const LISTVIEW_INFO *, LPPOINT); static BOOL LISTVIEW_GetViewRect(const LISTVIEW_INFO *, LPRECT); -static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *, INT); -static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *, LVITEMW *, BOOL); -static void LISTVIEW_UpdateScroll(const LISTVIEW_INFO *); -static void LISTVIEW_SetSelection(LISTVIEW_INFO *, INT); static void LISTVIEW_UpdateSize(LISTVIEW_INFO *); -static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *, INT, BOOL); static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *, WPARAM, LPARAM); static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); @@ -424,7 +419,6 @@ static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT, HWND); static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT, HWND); -static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, INT, INT, INT, INT, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST);

1 0

Nikolay Sivov : comctl32/listview: Make ListView_* macros match PSDK.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: f8f8f0a4573f7a2f7c4b3f0459f8d7d5fe51521b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f8f0a4573f7a2f7c4b3f045… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 12:11:53 2009 +0400 comctl32/listview: Make ListView_* macros match PSDK. --- dlls/appwiz.cpl/appwiz.c | 4 +- dlls/shell32/control.c | 4 +- dlls/shell32/shlview.c | 19 ++++---- include/commctrl.h | 104 +++++++++++++++++++++++----------------------- 4 files changed, 65 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8f8f0a4573f7a2f7c4b3…

1 0

Guy Albertelli : kernel32/tests: Add more tests for GetVolumeNameForVolumeMountPointA.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 7d4bbe9e7958130f00ef8007d804817fabdbd5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d4bbe9e7958130f00ef8007d… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Fri May 8 23:57:05 2009 -0400 kernel32/tests: Add more tests for GetVolumeNameForVolumeMountPointA. --- dlls/kernel32/tests/volume.c | 48 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 19fc6f0..498c2d8 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -114,7 +114,8 @@ static void test_GetVolumeNameForVolumeMountPointA(void) { BOOL ret; char volume[MAX_PATH], path[] = "c:\\"; - DWORD len = sizeof(volume); + DWORD len = sizeof(volume), reti; + char temp_path[MAX_PATH]; /* not present before w2k */ if (!pGetVolumeNameForVolumeMountPointA) { @@ -122,6 +123,10 @@ static void test_GetVolumeNameForVolumeMountPointA(void) return; } + reti = GetTempPathA(MAX_PATH, temp_path); + ok(reti != 0, "GetTempPathA error %d\n", GetLastError()); + ok(reti < MAX_PATH, "temp path should fit into MAX_PATH\n"); + ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); @@ -135,6 +140,47 @@ static void test_GetVolumeNameForVolumeMountPointA(void) ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); + ok(!strncmp( volume, "\\\\?\\Volume{", 11), + "GetVolumeNameForVolumeMountPointA failed to return valid string <%s>\n", + volume); + + /* test with too small buffer */ + ret = pGetVolumeNameForVolumeMountPointA(path, volume, 10); +todo_wine + ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, + "GetVolumeNameForVolumeMountPointA failed, wrong error returned, was %d, should be ERROR_FILENAME_EXCED_RANGE\n", + GetLastError()); + + /* Try on a arbitrary directory */ + ret = pGetVolumeNameForVolumeMountPointA(temp_path, volume, len); +todo_wine + ok(ret == FALSE && GetLastError() == ERROR_NOT_A_REPARSE_POINT, + "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", + temp_path, GetLastError()); + + /* Try on a non-existent dos drive */ + path[2] = 0; + for (;path[0] <= 'z'; path[0]++) { + ret = QueryDosDeviceA( path, volume, len); + if(!ret) break; + } + if (path[0] <= 'z') + { + path[2] = '\\'; + ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); +todo_wine + ok(ret == FALSE && GetLastError() == ERROR_FILE_NOT_FOUND, + "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", + path, GetLastError()); + + /* Try without trailing \ and on a non-existent dos drive */ + path[2] = 0; + ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); +todo_wine + ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME, + "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", + path, GetLastError()); + } } static void test_GetVolumeNameForVolumeMountPointW(void)

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::GetForeground.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: cbf4671d4825b2ae3d4c4853b8d0aa0afc651820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf4671d4825b2ae3d4c4853b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 8 08:51:18 2009 -0500 msctf: Implement ITfKeystrokeMgr::GetForeground. --- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 5ab645d..ac993cc 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -406,7 +406,7 @@ static void test_KeystrokeMgr(void) test_KEV_OnSetFocus = SINK_EXPECTED; hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n"); - todo_wine ok(test_KEV_OnSetFocus == SINK_FIRED, "KeyEventSink_OnSetFocus not fired as expected\n"); + ok(test_KEV_OnSetFocus == SINK_FIRED, "KeyEventSink_OnSetFocus not fired as expected\n"); hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); ok(hr == CONNECT_E_ADVISELIMIT,"Wrong return, expected CONNECT_E_ADVISELIMIT\n"); hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,cid,sink,TRUE); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 5ee08dd..277923e 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -79,6 +79,7 @@ typedef struct tagACLMulti { LONG activationCount; ITfKeyEventSink *forgroundKeyEventSink; + CLSID forgroundTextService; struct list CurrentPreservedKeys; @@ -535,9 +536,14 @@ static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface, if (fForeground) { if (This->forgroundKeyEventSink) + { + ITfKeyEventSink_OnSetFocus(This->forgroundKeyEventSink, FALSE); ITfKeyEventSink_Release(This->forgroundKeyEventSink); + } ITfKeyEventSink_AddRef(check); + ITfKeyEventSink_OnSetFocus(check, TRUE); This->forgroundKeyEventSink = check; + This->forgroundTextService = textservice; } return S_OK; } @@ -569,6 +575,7 @@ static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface, { ITfKeyEventSink_Release(This->forgroundKeyEventSink); This->forgroundKeyEventSink = NULL; + This->forgroundTextService = GUID_NULL; } return S_OK; } @@ -577,8 +584,15 @@ static HRESULT WINAPI KeystrokeMgr_GetForeground(ITfKeystrokeMgr *iface, CLSID *pclsid) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,pclsid); + if (!pclsid) + return E_INVALIDARG; + + if (IsEqualCLSID(&This->forgroundTextService,&GUID_NULL)) + return S_FALSE; + + *pclsid = This->forgroundTextService; + return S_OK; } static HRESULT WINAPI KeystrokeMgr_TestKeyDown(ITfKeystrokeMgr *iface,

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009