May 2009 - Wine-Commits - list.winehq.org

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

May 11, 2009

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

Jacek Caban : urlmon: Cache the binding notif window.
by Alexandre Julliard May 11, 2009

May 11, 2009

Module: wine Branch: master Commit: bee36fe8315cdacf2d71a903ab524c929e645122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee36fe8315cdacf2d71a903a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 13:14:45 2009 +0200 urlmon: Cache the binding notif window. --- dlls/urlmon/binding.c | 55 ++++++++++++++++++++++++----- dlls/urlmon/urlmon_main.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon_main.h | 10 +++++ 3 files changed, 140 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 28d0802..f8ad73a 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -125,6 +125,7 @@ struct Binding { #define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) #define WM_MK_CONTINUE (WM_USER+101) +#define WM_MK_RELEASE (WM_USER+102) static void push_task(Binding *binding, task_header_t *task, task_proc_t proc) { @@ -177,7 +178,8 @@ static void fill_stgmed_buffer(stgmed_buf_t *buf) static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - if(msg == WM_MK_CONTINUE) { + switch(msg) { + case WM_MK_CONTINUE: { Binding *binding = (Binding*)lParam; task_header_t *task; @@ -190,6 +192,15 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM IBinding_Release(BINDING(binding)); return 0; } + case WM_MK_RELEASE: { + tls_data_t *data = get_tls_data(); + + if(!--data->notif_hwnd_cnt) { + DestroyWindow(hwnd); + data->notif_hwnd = NULL; + } + } + } return DefWindowProcW(hwnd, msg, wParam, lParam); } @@ -197,12 +208,21 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM static HWND get_notif_hwnd(void) { static ATOM wnd_class = 0; - HWND hwnd; + tls_data_t *tls_data; static const WCHAR wszURLMonikerNotificationWindow[] = {'U','R','L',' ','M','o','n','i','k','e','r',' ', 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; + tls_data = get_tls_data(); + if(!tls_data) + return NULL; + + if(tls_data->notif_hwnd_cnt) { + tls_data->notif_hwnd_cnt++; + return tls_data->notif_hwnd; + } + if(!wnd_class) { static WNDCLASSEXW wndclass = { sizeof(wndclass), 0, @@ -219,13 +239,30 @@ static HWND get_notif_hwnd(void) wnd_class = 1; } - hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, - wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, - NULL, URLMON_hInstance, NULL); + tls_data->notif_hwnd = CreateWindowExW(0, wszURLMonikerNotificationWindow, + wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, + NULL, URLMON_hInstance, NULL); + if(tls_data->notif_hwnd) + tls_data->notif_hwnd_cnt++; - TRACE("hwnd = %p\n", hwnd); + TRACE("hwnd = %p\n", tls_data->notif_hwnd); - return hwnd; + return tls_data->notif_hwnd; +} + +static void release_notif_hwnd(HWND hwnd) +{ + tls_data_t *data = get_tls_data(); + + if(!data || data->notif_hwnd != hwnd) { + PostMessageW(data->notif_hwnd, WM_MK_RELEASE, 0, 0); + return; + } + + if(!--data->notif_hwnd_cnt) { + DestroyWindow(data->notif_hwnd); + data->notif_hwnd = NULL; + } } static void dump_BINDINFO(BINDINFO *bi) @@ -957,8 +994,8 @@ static ULONG WINAPI Binding_Release(IBinding *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if (This->notif_hwnd) - DestroyWindow( This->notif_hwnd ); + if(This->notif_hwnd) + release_notif_hwnd(This->notif_hwnd); if(This->mon) IMoniker_Release(This->mon); if(This->callback) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 8561937..3203753 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -36,9 +36,88 @@ LONG URLMON_refCount = 0; HINSTANCE URLMON_hInstance = 0; static HMODULE hCabinet = NULL; +static DWORD urlmon_tls; static void init_session(BOOL); +static struct list tls_list = LIST_INIT(tls_list); + +static CRITICAL_SECTION tls_cs; +static CRITICAL_SECTION_DEBUG tls_cs_dbg = +{ + 0, 0, &tls_cs, + { &tls_cs_dbg.ProcessLocksList, &tls_cs_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": tls") } +}; + +static CRITICAL_SECTION tls_cs = { &tls_cs_dbg, -1, 0, 0, 0, 0 }; + +tls_data_t *get_tls_data(void) +{ + tls_data_t *data; + + if(!urlmon_tls) { + DWORD tls = TlsAlloc(); + tls = InterlockedCompareExchange((LONG*)&urlmon_tls, tls, 0); + if(tls != urlmon_tls) + TlsFree(tls); + } + + data = TlsGetValue(urlmon_tls); + if(!data) { + data = heap_alloc_zero(sizeof(tls_data_t)); + if(!data) + return NULL; + + EnterCriticalSection(&tls_cs); + list_add_tail(&tls_list, &data->entry); + LeaveCriticalSection(&tls_cs); + + TlsSetValue(urlmon_tls, data); + } + + return data; +} + +static void free_tls_list(void) +{ + tls_data_t *data; + + if(!urlmon_tls) + return; + + while(!list_empty(&tls_list)) { + data = LIST_ENTRY(list_head(&tls_list), tls_data_t, entry); + list_remove(&data->entry); + heap_free(data); + } + + TlsFree(urlmon_tls); +} + +static void detach_thread(void) +{ + tls_data_t *data; + + if(!urlmon_tls) + return; + + data = TlsGetValue(urlmon_tls); + if(!data) + return; + + EnterCriticalSection(&tls_cs); + list_remove(&data->entry); + LeaveCriticalSection(&tls_cs); + + if(data->notif_hwnd) { + WARN("notif_hwnd not destroyed\n"); + DestroyWindow(data->notif_hwnd); + } + + heap_free(data); +} + /*********************************************************************** * DllMain (URLMON.init) */ @@ -48,7 +127,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) switch(fdwReason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); URLMON_hInstance = hinstDLL; init_session(TRUE); break; @@ -58,8 +136,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) FreeLibrary(hCabinet); hCabinet = NULL; init_session(FALSE); + free_tls_list(); URLMON_hInstance = 0; break; + + case DLL_THREAD_DETACH: + detach_thread(); + break; } return TRUE; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 1ee2eec..aa2f276 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -34,6 +34,7 @@ #include "wininet.h" #include "wine/unicode.h" +#include "wine/list.h" extern HINSTANCE URLMON_hInstance; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); @@ -106,6 +107,15 @@ HRESULT protocol_lock_request(Protocol*); HRESULT protocol_unlock_request(Protocol*); void protocol_close_connection(Protocol*); +typedef struct { + HWND notif_hwnd; + DWORD notif_hwnd_cnt; + + struct list entry; +} tls_data_t; + +tls_data_t *get_tls_data(void); + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Dmitry Timoshkov : winedump: Add an ability to dump font files.
by Alexandre Julliard May 11, 2009

May 11, 2009

Module: wine Branch: master Commit: 60482be24bca109601008df0113b64858dd45863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60482be24bca109601008df01… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 11 20:56:23 2009 +0900 winedump: Add an ability to dump font files. --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 1 + tools/winedump/font.c | 139 ++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 4 +- 4 files changed, 144 insertions(+), 1 deletions(-) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 6f7f1d2..34445ad 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ dos.c \ dump.c \ emf.c \ + font.c \ le.c \ lib.c \ lnk.c \ diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 9c8f2ff..e882c3c 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -242,6 +242,7 @@ dumpers[] = {SIG_MDMP, get_kind_mdmp, mdmp_dump}, {SIG_LNK, get_kind_lnk, lnk_dump}, {SIG_EMF, get_kind_emf, emf_dump}, + {SIG_FNT, get_kind_fnt, fnt_dump}, {SIG_UNKNOWN, NULL, NULL} /* sentinel */ }; diff --git a/tools/winedump/font.c b/tools/winedump/font.c new file mode 100644 index 0000000..76710b8 --- /dev/null +++ b/tools/winedump/font.c @@ -0,0 +1,139 @@ +/* + * Dump a font file + * + * Copyright 2009 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif +#include <fcntl.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" +#include "winnt.h" + +#include "winedump.h" + +#include <pshpack1.h> +typedef struct +{ + INT16 dfType; + INT16 dfPoints; + INT16 dfVertRes; + INT16 dfHorizRes; + INT16 dfAscent; + INT16 dfInternalLeading; + INT16 dfExternalLeading; + BYTE dfItalic; + BYTE dfUnderline; + BYTE dfStrikeOut; + INT16 dfWeight; + BYTE dfCharSet; + INT16 dfPixWidth; + INT16 dfPixHeight; + BYTE dfPitchAndFamily; + INT16 dfAvgWidth; + INT16 dfMaxWidth; + BYTE dfFirstChar; + BYTE dfLastChar; + BYTE dfDefaultChar; + BYTE dfBreakChar; + INT16 dfWidthBytes; + LONG dfDevice; + LONG dfFace; + LONG dfBitsPointer; + LONG dfBitsOffset; + BYTE dfReserved; + /* Fields, introduced for Windows 3.x fonts */ + LONG dfFlags; + INT16 dfAspace; + INT16 dfBspace; + INT16 dfCspace; + LONG dfColorPointer; + LONG dfReserved1[4]; +} FONTINFO16; + +typedef struct +{ + SHORT dfVersion; /* Version */ + LONG dfSize; /* Total File Size */ + char dfCopyright[60]; /* Copyright notice */ + FONTINFO16 fi; /* FONTINFO structure */ +} WINFNT; +#include <poppack.h> + +/* FIXME: recognize and dump also NE/PE wrapped fonts */ + +enum FileSig get_kind_fnt(void) +{ + const WINFNT *fnt = PRD(0, sizeof(WINFNT)); + if (fnt && (fnt->dfVersion == 0x200 || fnt->dfVersion == 0x300) && + PRD(0, fnt->dfSize) != NULL) + return SIG_FNT; + return SIG_UNKNOWN; +} + +void fnt_dump(void) +{ + const WINFNT *fnt = PRD(0, sizeof(WINFNT)); + + printf("dfVersion %#x, dfSize %d bytes, dfCopyright %.60s\n", + fnt->dfVersion, fnt->dfSize, fnt->dfCopyright); + printf("dfType %d\n" + "dfPoints %d\n" + "dfVertRes %d\n" + "dfHorizRes %d\n" + "dfAscent %d\n" + "dfInternalLeading %d\n" + "dfExternalLeading %d\n" + "dfItalic %d\n" + "dfUnderline %d\n" + "dfStrikeOut %d\n" + "dfWeight %d\n" + "dfCharSet %d\n" + "dfPixWidth %d\n" + "dfPixHeight %d\n" + "dfPitchAndFamily %#x\n" + "dfAvgWidth %d\n" + "dfMaxWidth %d\n" + "dfFirstChar %#x\n" + "dfLastChar %#x\n" + "dfDefaultChar %#x\n" + "dfBreakChar %#x\n" + "dfWidthBytes %d\n", + fnt->fi.dfType, fnt->fi.dfPoints, fnt->fi.dfVertRes, fnt->fi.dfHorizRes, + fnt->fi.dfAscent, fnt->fi.dfInternalLeading, fnt->fi.dfExternalLeading, + fnt->fi.dfItalic, fnt->fi.dfUnderline, fnt->fi.dfStrikeOut, fnt->fi.dfWeight, + fnt->fi.dfCharSet, fnt->fi.dfPixWidth, fnt->fi.dfPixHeight, fnt->fi.dfPitchAndFamily, + fnt->fi.dfAvgWidth, fnt->fi.dfMaxWidth, fnt->fi.dfFirstChar, fnt->fi.dfLastChar, + fnt->fi.dfDefaultChar, fnt->fi.dfBreakChar, fnt->fi.dfWidthBytes); +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index f71103e..4b89842 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -217,7 +217,7 @@ char *str_toupper (char *str); const char *get_machine_str(int mach); /* file dumping functions */ -enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, SIG_EMF}; +enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, SIG_EMF, SIG_FNT}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -252,6 +252,8 @@ enum FileSig get_kind_emf(void); void emf_dump( void ); enum FileSig get_kind_pdb(void); void pdb_dump(void); +enum FileSig get_kind_fnt(void); +void fnt_dump( void ); int codeview_dump_symbols(const void* root, unsigned long size); int codeview_dump_types_from_offsets(const void* table, const DWORD* offsets, unsigned num_types); int codeview_dump_types_from_block(const void* table, unsigned long len);

1 0

Nikolay Sivov : comctl32/listview: Add LVN_INCREMENTALSEARCH definitions.
by Alexandre Julliard May 11, 2009

May 11, 2009

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

Aric Stewart : msctf: Implement ITfKeystrokeMgr::AdviseKeyEventSink.
by Alexandre Julliard May 11, 2009

May 11, 2009

Module: wine Branch: master Commit: f20c4d69c95ad42fb299a648fcef3f333a90caad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20c4d69c95ad42fb299a648f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 8 08:50:59 2009 -0500 msctf: Implement ITfKeystrokeMgr::AdviseKeyEventSink. --- dlls/msctf/msctf.c | 46 +++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf_internal.h | 4 +++ dlls/msctf/tests/inputprocessor.c | 6 ++++- dlls/msctf/threadmgr.c | 33 +++++++++++++++++++++++++- 4 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index c8dd486..55a8075 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -55,6 +55,7 @@ typedef struct { TF_LANGUAGEPROFILE LanguageProfile; ITfTextInputProcessor *pITfTextInputProcessor; ITfThreadMgr *pITfThreadMgr; + ITfKeyEventSink *pITfKeyEventSink; TfClientId tid; } ActivatedTextService; @@ -378,6 +379,7 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) actsvr->pITfTextInputProcessor = NULL; actsvr->LanguageProfile = *lp; actsvr->LanguageProfile.fActive = TRUE; + actsvr->pITfKeyEventSink = NULL; /* get TIP category */ if (SUCCEEDED(CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr))) @@ -456,6 +458,50 @@ HRESULT deactivate_textservices(void) return S_OK; } +CLSID get_textservice_clsid(TfClientId tid) +{ + AtsEntry *ats; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + if (ats->ats->tid == tid) + return ats->ats->LanguageProfile.clsid; + return GUID_NULL; +} + +HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown **sink) +{ + AtsEntry *ats; + + if (!IsEqualCLSID(iid,&IID_ITfKeyEventSink)) + return E_NOINTERFACE; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + if (ats->ats->tid == tid) + { + *sink = (IUnknown*)ats->ats->pITfKeyEventSink; + return S_OK; + } + + return E_FAIL; +} + +HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) +{ + AtsEntry *ats; + + if (!IsEqualCLSID(iid,&IID_ITfKeyEventSink)) + return E_NOINTERFACE; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + if (ats->ats->tid == tid) + { + ats->ats->pITfKeyEventSink = (ITfKeyEventSink*)sink; + return S_OK; + } + + return E_FAIL; +} + /************************************************************************* * MSCTF DllMain */ diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 433b79e..0df88de 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -47,5 +47,9 @@ extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp); extern HRESULT activate_textservices(ITfThreadMgr *tm); extern HRESULT deactivate_textservices(void); +extern CLSID get_textservice_clsid(TfClientId tid); +extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink); +extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink); + extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */ diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 7ba9140..4ea2ec9 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -405,8 +405,12 @@ static void test_KeystrokeMgr(void) test_KEV_OnSetFocus = SINK_EXPECTED; hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); - todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n"); + ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n"); todo_wine 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); + ok(hr == E_INVALIDARG,"Wrong return, expected E_INVALIDARG\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2afee39..e8743ec 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -78,6 +78,8 @@ typedef struct tagACLMulti { ITfDocumentMgr *focus; LONG activationCount; + ITfKeyEventSink *forgroundKeyEventSink; + struct list CurrentPreservedKeys; /* kept as separate lists to reduce unnecessary iterations */ @@ -509,8 +511,35 @@ static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface, TfClientId tid, ITfKeyEventSink *pSink, BOOL fForeground) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + CLSID textservice; + ITfKeyEventSink *check = NULL; + + TRACE("(%p) %x %p %i\n",This,tid,pSink,fForeground); + + if (!tid || !pSink) + return E_INVALIDARG; + + textservice = get_textservice_clsid(tid); + if (IsEqualCLSID(&GUID_NULL,&textservice)) + return E_INVALIDARG; + + get_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown**)&check); + if (check != NULL) + return CONNECT_E_ADVISELIMIT; + + if (FAILED(IUnknown_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) + return E_INVALIDARG; + + set_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown*)check); + + if (fForeground) + { + if (This->forgroundKeyEventSink) + ITfKeyEventSink_Release(This->forgroundKeyEventSink); + ITfKeyEventSink_AddRef(check); + This->forgroundKeyEventSink = check; + } + return S_OK; } static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface,

1 0

Aric Stewart : msctf: Implement ITfKeystrokeMgr::GetForeground.
by Alexandre Julliard May 11, 2009

May 11, 2009

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

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

May 11, 2009

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

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

May 11, 2009

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

Aric Stewart : msctf: Implement ITfKeystrokeMgr::UnadviseKeyEventSink.
by Alexandre Julliard May 11, 2009

May 11, 2009

Module: wine Branch: master Commit: 161fa4bc3044c00b57a0f4db33716bda939855d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161fa4bc3044c00b57a0f4db3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 8 08:51:07 2009 -0500 msctf: Implement ITfKeystrokeMgr::UnadviseKeyEventSink. --- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msctf/threadmgr.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4ea2ec9..5ab645d 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -437,7 +437,7 @@ static void test_KeystrokeMgr(void) ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); hr = ITfKeystrokeMgr_UnadviseKeyEventSink(keymgr,tid); - todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); + ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); ITfKeystrokeMgr_Release(keymgr); ITfKeyEventSink_Release(sink); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index e8743ec..5ee08dd 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -546,8 +546,31 @@ static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface, TfClientId tid) { ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + CLSID textservice; + ITfKeyEventSink *check = NULL; + TRACE("(%p) %x\n",This,tid); + + if (!tid) + return E_INVALIDARG; + + textservice = get_textservice_clsid(tid); + if (IsEqualCLSID(&GUID_NULL,&textservice)) + return E_INVALIDARG; + + get_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown**)&check); + + if (!check) + return CONNECT_E_NOCONNECTION; + + set_textservice_sink(tid, &IID_ITfKeyEventSink, NULL); + ITfKeyEventSink_Release(check); + + if (This->forgroundKeyEventSink == check) + { + ITfKeyEventSink_Release(This->forgroundKeyEventSink); + This->forgroundKeyEventSink = NULL; + } + return S_OK; } static HRESULT WINAPI KeystrokeMgr_GetForeground(ITfKeystrokeMgr *iface,

1 0

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

May 11, 2009

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