wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Aric Stewart : msctf: Define the TF_MOD_* Constants.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: a98ac9a6122f3eb95fc6fd50b6b6f14a5522e0c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98ac9a6122f3eb95fc6fd50b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:47 2009 -0500 msctf: Define the TF_MOD_* Constants. --- include/msctf.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 4c0d486..a78552d 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -38,6 +38,18 @@ typedef [uuid(7213778c-7bb0-4270-b050-6189ee594e97)] DWORD TfEditCookie; typedef [uuid(de403c21-89fd-4f85-8b87-64584d063fbc)] DWORD TfClientId; typedef [uuid(88a9c478-f3ec-4763-8345-cd9250443f8d)] DWORD TfGuidAtom; +cpp_quote("#define TF_MOD_ALT 0x0001") +cpp_quote("#define TF_MOD_CONTROL 0x0002") +cpp_quote("#define TF_MOD_SHIFT 0x0004") +cpp_quote("#define TF_MOD_RALT 0x0008") +cpp_quote("#define TF_MOD_RCONTROL 0x0010") +cpp_quote("#define TF_MOD_RSHIFT 0x0020") +cpp_quote("#define TF_MOD_LALT 0x0040") +cpp_quote("#define TF_MOD_LCONTROL 0x0080") +cpp_quote("#define TF_MOD_LSHIFT 0x0100") +cpp_quote("#define TF_MOD_ON_KEYUP 0x0200") +cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs;

1 0

Aric Stewart : msctf: Define ITfKeyEventSink.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 0730d4ae24cb9d68bdb305c341753d68856a4607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0730d4ae24cb9d68bdb305c34… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:45 2009 -0500 msctf: Define ITfKeyEventSink. --- include/msctf.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index a0708ab..4c0d486 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -592,3 +592,44 @@ interface ITfKeystrokeMgr : IUnknown [in] REFGUID rguid, [out] BOOL *pfEaten); }; + +[ + object, + local, + uuid(aa80e7f5-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfKeyEventSink : IUnknown +{ + HRESULT OnSetFocus( + [in] BOOL fForeground); + + HRESULT OnTestKeyDown( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnTestKeyUp( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnKeyDown( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnKeyUp( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnPreservedKey( + [in] ITfContext *pic, + [in] REFGUID rguid, + [out] BOOL *pfEaten); +};

1 0

Aric Stewart : msctf: Add ITfKeystrokeMgr framework to ThreadMgr.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 987387c7c8c88095e1b45d0dc4ce99fecf0c2912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987387c7c8c88095e1b45d0dc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:43 2009 -0500 msctf: Add ITfKeystrokeMgr framework to ThreadMgr. --- dlls/msctf/threadmgr.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 82 +++++++++++++++++++++++ 2 files changed, 250 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index f6f9be4..2d43a19 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -59,6 +59,7 @@ typedef struct tagThreadMgrSink { typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; + const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ @@ -79,6 +80,11 @@ static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); } +static inline ThreadMgr *impl_from_ITfKeystrokeMgrVtbl(ITfKeystrokeMgr *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,KeystrokeMgrVtbl)); +} + static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); @@ -153,6 +159,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, { *ppvOut = &This->SourceVtbl; } + else if (IsEqualIID(iid, &IID_ITfKeystrokeMgr)) + { + *ppvOut = &This->KeystrokeMgrVtbl; + } if (*ppvOut) { @@ -409,6 +419,163 @@ static const ITfSourceVtbl ThreadMgr_SourceVtbl = }; /***************************************************** + * ITfKeystrokeMgr functions + *****************************************************/ + +static HRESULT WINAPI KeystrokeMgr_QueryInterface(ITfKeystrokeMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI KeystrokeMgr_AddRef(ITfKeystrokeMgr *iface) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI KeystrokeMgr_Release(ITfKeystrokeMgr *iface) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +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; +} + +static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface, + TfClientId tid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetForeground(ITfKeystrokeMgr *iface, + CLSID *pclsid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_TestKeyDown(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_TestKeyUp(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_KeyDown(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_KeyUp(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetPreservedKey(ITfKeystrokeMgr *iface, + ITfContext *pic, const TF_PRESERVEDKEY *pprekey, GUID *pguid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_IsPreservedKey(ITfKeystrokeMgr *iface, + REFGUID rguid, const TF_PRESERVEDKEY *pprekey, BOOL *pfRegistered) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface, + TfClientId tid, REFGUID rguid, const TF_PRESERVEDKEY *prekey, + const WCHAR *pchDesc, ULONG cchDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, + REFGUID rguid, const TF_PRESERVEDKEY *pprekey) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_SetPreservedKeyDescription(ITfKeystrokeMgr *iface, + REFGUID rguid, const WCHAR *pchDesc, ULONG cchDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetPreservedKeyDescription(ITfKeystrokeMgr *iface, + REFGUID rguid, BSTR *pbstrDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_SimulatePreservedKey(ITfKeystrokeMgr *iface, + ITfContext *pic, REFGUID rguid, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfKeystrokeMgrVtbl ThreadMgr_KeystrokeMgrVtbl = +{ + KeystrokeMgr_QueryInterface, + KeystrokeMgr_AddRef, + KeystrokeMgr_Release, + + KeystrokeMgr_AdviseKeyEventSink, + KeystrokeMgr_UnadviseKeyEventSink, + KeystrokeMgr_GetForeground, + KeystrokeMgr_TestKeyDown, + KeystrokeMgr_TestKeyUp, + KeystrokeMgr_KeyDown, + KeystrokeMgr_KeyUp, + KeystrokeMgr_GetPreservedKey, + KeystrokeMgr_IsPreservedKey, + KeystrokeMgr_PreserveKey, + KeystrokeMgr_UnpreserveKey, + KeystrokeMgr_SetPreservedKeyDescription, + KeystrokeMgr_GetPreservedKeyDescription, + KeystrokeMgr_SimulatePreservedKey +}; + +/***************************************************** * ITfThreadMgrEventSink functions (internal) *****************************************************/ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) @@ -550,6 +717,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->SourceVtbl = &ThreadMgr_SourceVtbl; + This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); diff --git a/include/msctf.idl b/include/msctf.idl index c81c0da..a0708ab 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -56,6 +56,7 @@ interface ITfRangeBackup; interface IEnumTfLanguageProfiles; interface ITfEditRecord; interface ITfCompositionView; +interface ITfKeyEventSink; typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { @@ -66,6 +67,12 @@ typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE GUID guidProfile; } TF_LANGUAGEPROFILE; +typedef [uuid(77c12f95-b783-450d-879f-1cd2362c6521)] struct TF_PRESERVEDKEY +{ + UINT uVKey; + UINT uModifiers; +} TF_PRESERVEDKEY; + [ object, uuid(aa80e801-2021-11d2-93e0-0060b067b86e), @@ -510,3 +517,78 @@ interface ITfThreadMgrEventSink : IUnknown HRESULT OnPopContext( [in] ITfContext *pic); }; + +[ + object, + local, + uuid(aa80e7f0-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfKeystrokeMgr : IUnknown +{ + HRESULT AdviseKeyEventSink( + [in] TfClientId tid, + [in] ITfKeyEventSink *pSink, + [in] BOOL fForeground); + + HRESULT UnadviseKeyEventSink( + [in] TfClientId tid); + + HRESULT GetForeground( + [out] CLSID *pclsid); + + HRESULT TestKeyDown( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT TestKeyUp( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT KeyDown( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT KeyUp( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT GetPreservedKey( + [in] ITfContext *pic, + [in] const TF_PRESERVEDKEY *pprekey, + [out] GUID *pguid); + + HRESULT IsPreservedKey( + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *pprekey, + [out] BOOL *pfRegistered); + + HRESULT PreserveKey( + [in] TfClientId tid, + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *prekey, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc); + + HRESULT UnpreserveKey( + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *pprekey); + + HRESULT SetPreservedKeyDescription( + [in] REFGUID rguid, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc); + + HRESULT GetPreservedKeyDescription( + [in] REFGUID rguid, + [out] BSTR *pbstrDesc); + + HRESULT SimulatePreservedKey( + [in] ITfContext *pic, + [in] REFGUID rguid, + [out] BOOL *pfEaten); +};

1 0

Paul Vriens : shell32/tests: Fix some test failures on NT4.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 9ae14c8e3ae9f7d4fa8c9cac804ffcb2056fb15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae14c8e3ae9f7d4fa8c9cac8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 22 17:07:45 2009 +0200 shell32/tests: Fix some test failures on NT4. --- dlls/shell32/tests/shlfileop.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index ff060ba..540fd0d 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2063,21 +2063,27 @@ static void test_sh_new_link_info(void) set_curr_dir_path(linkto, "nosuchfile.txt\0"); set_curr_dir_path(destdir, "testdir2\0"); ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); - ok(ret == FALSE, "SHGetNewLinkInfoA succeeded\n"); + ok(ret == FALSE || + broken(ret == lstrlenA(result) + 1), /* NT4 */ + "SHGetNewLinkInfoA succeeded\n"); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); /* dest dir does not exist */ set_curr_dir_path(linkto, "test1.txt\0"); set_curr_dir_path(destdir, "nosuchdir\0"); ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); - ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(ret == TRUE || + broken(ret == lstrlenA(result) + 1), /* NT4 */ + "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); /* source file exists */ set_curr_dir_path(linkto, "test1.txt\0"); set_curr_dir_path(destdir, "testdir2\0"); ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); - ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(ret == TRUE || + broken(ret == lstrlenA(result) + 1), /* NT4 */ + "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); ok(CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, destdir, lstrlenA(destdir), result, lstrlenA(destdir)) == CSTR_EQUAL, @@ -2088,7 +2094,9 @@ static void test_sh_new_link_info(void) /* preferred target name already exists */ createTestFile(result); ret = SHGetNewLinkInfoA(linkto, destdir, result2, &mustcopy, 0); - ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(ret == TRUE || + broken(ret == lstrlenA(result2) + 1), /* NT4 */ + "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); ok(CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, destdir, lstrlenA(destdir), result2, lstrlenA(destdir)) == CSTR_EQUAL,

1 0

Hans Leidekker : kernel32: Improve GetVolumePathName stub.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 9b9d8dc3e89f17b88bcc62e51b111475361e5940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9d8dc3e89f17b88bcc62e51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 22 12:47:06 2009 +0200 kernel32: Improve GetVolumePathName stub. --- dlls/kernel32/volume.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 9addeab..31490b9 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1406,9 +1406,19 @@ BOOL WINAPI GetDiskFreeSpaceA( LPCSTR root, LPDWORD cluster_sectors, */ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD buflen) { + BOOL ret; + WCHAR *filenameW = NULL, *volumeW; + FIXME("(%s, %p, %d), stub!\n", debugstr_a(filename), volumepathname, buflen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) return FALSE; + if (!(volumeW = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return FALSE; + + if ((ret = GetVolumePathNameW( filenameW, volumeW, buflen ))) + FILE_name_WtoA( volumeW, -1, volumepathname, buflen ); + + HeapFree( GetProcessHeap(), 0, volumeW ); + return ret; } /*********************************************************************** @@ -1416,8 +1426,18 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl */ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD buflen) { + const WCHAR *p = filename; + FIXME("(%s, %p, %d), stub!\n", debugstr_w(filename), volumepathname, buflen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\' && buflen >= 4) + { + volumepathname[0] = p[0]; + volumepathname[1] = ':'; + volumepathname[2] = '\\'; + volumepathname[3] = 0; + return TRUE; + } return FALSE; }

1 0

Aric Stewart : msctf: Make use of generated cookies in sinks to allow 64 bit compatibility.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d7c154a8db0d743340eb210a8715eb2b8dfed8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c154a8db0d743340eb210a8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 11:14:19 2009 -0500 msctf: Make use of generated cookies in sinks to allow 64 bit compatibility. --- dlls/msctf/context.c | 12 ++++++++++-- dlls/msctf/msctf_internal.h | 4 ++++ dlls/msctf/threadmgr.c | 12 ++++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 2fc651f..38d8ad6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -382,7 +382,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, return CONNECT_E_CANNOTCONNECT; } list_add_head(&This->pTextEditSink ,&es->entry); - *pdwCookie = (DWORD)es; + *pdwCookie = generate_Cookie(COOKIE_MAGIC_CONTEXTSINK, es); } else { @@ -396,10 +396,18 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { - ContextSink *sink = (ContextSink*)pdwCookie; + ContextSink *sink; Context *This = impl_from_ITfSourceVtbl(iface); + TRACE("(%p) %x\n",This,pdwCookie); + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK) + return E_INVALIDARG; + + sink = (ContextSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + list_remove(&sink->entry); free_sink(sink); diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 06499f1..a9f7982 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -20,6 +20,10 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H + +#define COOKIE_MAGIC_TMSINK 0x0010 +#define COOKIE_MAGIC_CONTEXTSINK 0x0020 + extern DWORD tlsIndex; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index a73beee..f6f9be4 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -365,7 +365,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, return CONNECT_E_CANNOTCONNECT; } list_add_head(&This->ThreadMgrEventSink,&tms->entry); - *pdwCookie = (DWORD)tms; + *pdwCookie = generate_Cookie(COOKIE_MAGIC_TMSINK, tms); } else { @@ -380,10 +380,18 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { - ThreadMgrSink *sink = (ThreadMgrSink*)pdwCookie; + ThreadMgrSink *sink; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); + TRACE("(%p) %x\n",This,pdwCookie); + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) + return E_INVALIDARG; + + sink = (ThreadMgrSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + list_remove(&sink->entry); free_sink(sink);

1 0

André Hentschel : winemaker: Remove unused function.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: e8a5325196cf570011df81d66d6c7d7a907f2492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a5325196cf570011df81d66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 22 18:37:00 2009 +0200 winemaker: Remove unused function. --- tools/winemaker | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 43efecc..ed9c5e5 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -397,28 +397,6 @@ sub is_absolute($) } ## -# Performs a binary search looking for the specified item -sub bsearch($$) -{ - my $array=$_[0]; - my $item=$_[1]; - my $last=@{$array}-1; - my $first=0; - - while ($first<=$last) { - my $index=int(($first+$last)/2); - my $cmp=@$array[$index] cmp $item; - if ($cmp<0) { - $first=$index+1; - } elsif ($cmp>0) { - $last=$index-1; - } else { - return $index; - } - } -} - -## # Retrieves the contents of the specified directory. # We either get it from the directories hashtable which acts as a # cache, or use opendir, readdir, closedir and store the result

1 0

Nikolay Sivov : comctl32/tests: Existing items aren' t resorted after LVS_SORTASCENDING added.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d30df7de0634bd064a7ea7a866e695681a83c4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30df7de0634bd064a7ea7a86… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 23 16:10:49 2009 +0400 comctl32/tests: Existing items aren't resorted after LVS_SORTASCENDING added. --- dlls/comctl32/tests/listview.c | 85 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6482c74..8fcf0f4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1578,6 +1578,9 @@ static void test_sorting(void) HWND hwnd; LVITEMA item = {0}; DWORD r; + LONG_PTR style; + static CHAR names[][4] = {"A", "B", "C", "D"}; + CHAR buff[10]; hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -1627,6 +1630,88 @@ static void test_sorting(void) expect(LVIS_SELECTED, r); DestroyWindow(hwnd); + + /* switch to LVS_SORTASCENDING when some items added */ + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 0; + item.pszText = names[1]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(0, r); + + item.mask = LVIF_TEXT; + item.iItem = 1; + item.iSubItem = 0; + item.pszText = names[2]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(1, r); + + item.mask = LVIF_TEXT; + item.iItem = 2; + item.iSubItem = 0; + item.pszText = names[0]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(2, r); + + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SORTASCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_SORTASCENDING, "Expected LVS_SORTASCENDING to be set\n"); + + /* no sorting performed when switched to LVS_SORTASCENDING */ + item.mask = LVIF_TEXT; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[1]) == 0, "Expected '%s', got '%s'\n", names[1], buff); + + item.iItem = 1; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[2]) == 0, "Expected '%s', got '%s'\n", names[2], buff); + + item.iItem = 2; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[0]) == 0, "Expected '%s', got '%s'\n", names[0], buff); + + /* adding new item doesn't resort list */ + item.mask = LVIF_TEXT; + item.iItem = 3; + item.iSubItem = 0; + item.pszText = names[3]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(3, r); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + todo_wine ok(lstrcmp(buff, names[1]) == 0, "Expected '%s', got '%s'\n", names[1], buff); + + item.iItem = 1; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + todo_wine ok(lstrcmp(buff, names[2]) == 0, "Expected '%s', got '%s'\n", names[2], buff); + + item.iItem = 2; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + todo_wine ok(lstrcmp(buff, names[0]) == 0, "Expected '%s', got '%s'\n", names[0], buff); + + item.iItem = 3; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[3]) == 0, "Expected '%s', got '%s'\n", names[3], buff); + + DestroyWindow(hwnd); } static void test_ownerdata(void)

1 0

Alexandre Julliard : include: Add defines for 32-bit dbghelp functions on 64-bit.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d3bfd6d5707fb5de780db4604e969943a9e2ab40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bfd6d5707fb5de780db4604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 14:24:45 2009 +0200 include: Add defines for 32-bit dbghelp functions on 64-bit. --- include/dbghelp.h | 139 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 98 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3bfd6d5707fb5de780db…

1 0

Nicolas Le Cam : msi/tests: Fix package test when run on a different drive than C:\.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 8b348fca27c7e49062dd8a4af251f315e87123a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b348fca27c7e49062dd8a4af… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:38:23 2009 +0200 msi/tests: Fix package test when run on a different drive than C:\. --- dlls/msi/tests/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 12127ee..ccc9208 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8768,7 +8768,7 @@ static void test_appsearch_drlocator(void) ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + search_absolute_directory(path, CURR_DIR + 3); r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
67
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 April 2009