wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Aric Stewart : ups10: Implement Single Adjustment Positioning: Format 2.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: ea9f2266de2c5518609581568d3332355878075c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9f2266de2c5518609581568… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 17 07:21:05 2012 -0500 ups10: Implement Single Adjustment Positioning: Format 2. --- dlls/usp10/opentype.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 9ffdf28..fcdc9a4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -335,6 +335,14 @@ typedef struct { typedef struct { WORD PosFormat; WORD Coverage; + WORD ValueFormat; + WORD ValueCount; + WORD Value[1]; +} GPOS_SinglePosFormat2; + +typedef struct { + WORD PosFormat; + WORD Coverage; WORD ValueFormat1; WORD ValueFormat2; WORD PairSetCount; @@ -1086,7 +1094,7 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD * const GPOS_SinglePosFormat1 *spf1; WORD offset = GET_BE_WORD(look->SubTable[j]); spf1 = (const GPOS_SinglePosFormat1*)((const BYTE*)look+offset); - if (GET_BE_WORD(spf1->PosFormat == 1)) + if (GET_BE_WORD(spf1->PosFormat) == 1) { offset = GET_BE_WORD(spf1->Coverage); if (GSUB_is_glyph_covered((const BYTE*)spf1+offset, glyphs[glyph_index]) != -1) @@ -1098,8 +1106,30 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD * TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); } } + else if (GET_BE_WORD(spf1->PosFormat) == 2) + { + int index; + const GPOS_SinglePosFormat2 *spf2; + spf2 = (const GPOS_SinglePosFormat2*)spf1; + offset = GET_BE_WORD(spf2->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)spf2+offset, glyphs[glyph_index]); + if (index != -1) + { + int size; + GPOS_ValueRecord ValueRecord = {0,0,0,0,0,0,0,0}; + WORD ValueFormat = GET_BE_WORD(spf2->ValueFormat); + size = GPOS_get_value_record(ValueFormat, spf2->Value, &ValueRecord); + if (index > 0) + { + offset = size * index; + GPOS_get_value_record(ValueFormat, &spf2->Value[offset], &ValueRecord); + } + GPOS_get_value_record_offsets((const BYTE*)spf2, &ValueRecord, ValueFormat, ppem, ptAdjust, ptAdvance); + TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); + } + } else - FIXME("Single Adjustment Positioning: Format 2 Unhandled\n"); + FIXME("Single Adjustment Positioning: Format %i Unhandled\n",GET_BE_WORD(spf1->PosFormat)); } }

1 0

Jacek Caban : mshtml: Ignore navigation failures from detached bindings.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: da7e0e38e8298df727dea69caab300323ac3d15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7e0e38e8298df727dea69ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 17 13:17:49 2012 +0200 mshtml: Ignore navigation failures from detached bindings. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2edb470..ecc8ef3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1339,7 +1339,7 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) BSTR unk; HRESULT hres; - if(!This->is_doc_channel) + if(!This->is_doc_channel || !This->bsc.window) return; outer_window = This->bsc.window->base.outer_window;

1 0

André Hentschel : msvcrt: Add bsearch_s implementation by reusing code and tests from ntdll.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f320f6cf4843eab3d22b60674808e4e3de964b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f320f6cf4843eab3d22b60674… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 16 20:36:10 2012 +0200 msvcrt: Add bsearch_s implementation by reusing code and tests from ntdll. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/misc.c | 27 +++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index bf3a068..70bcbd0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1434,7 +1434,7 @@ @ cdecl atoi(str) msvcrt.atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch -@ stub bsearch_s +@ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8686359..d758176 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1290,7 +1290,7 @@ @ cdecl atoi(str) msvcrt.atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch -@ stub bsearch_s +@ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6aefe20..5c27fca 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1285,7 +1285,7 @@ @ cdecl atoi(str) msvcrt.atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch -@ stub bsearch_s +@ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index dc15472..92945ae 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -72,6 +72,8 @@ static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static void (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, const void *, const void *), void *); +static void* (__cdecl *p_bsearch_s)(const void *, const void *, size_t, size_t, + int (__cdecl *compare)(void *, const void *, const void *), void *); static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); @@ -134,6 +136,7 @@ static void* (WINAPI *pEncodePointer)(void *); static int cb_called[4]; static int g_qsort_s_context_counter; +static int g_bsearch_s_context_counter; static inline int almost_equal_f(float f1, float f2) { @@ -250,6 +253,7 @@ static BOOL init(void) SET(p_itoa_s, "_itoa_s"); SET(p_wcsncat_s,"wcsncat_s" ); SET(p_qsort_s, "qsort_s"); + SET(p_bsearch_s, "bsearch_s"); SET(p_controlfp_s, "_controlfp_s"); SET(p_atoflt, "_atoflt"); SET(p_set_abort_behavior, "_set_abort_behavior"); @@ -750,6 +754,49 @@ static void test_qsort_s(void) ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); } +static void test_bsearch_s(void) +{ + int arr[7] = { 1, 3, 4, 8, 16, 23, 42 }; + int *x, l, i, j = 1; + + errno = 0xdeadbeef; + SET_EXPECT(invalid_parameter_handler); + x = p_bsearch_s(NULL, NULL, 0, 0, NULL, NULL); + ok(x == NULL, "Expected bsearch_s to return NULL, got %p\n", x); + CHECK_CALLED(invalid_parameter_handler); + + g_bsearch_s_context_counter = 0; + SET_EXPECT(invalid_parameter_handler); + x = p_bsearch_s(&l, arr, j, 0, intcomparefunc, &g_bsearch_s_context_counter); + ok(x == NULL, "Expected bsearch_s to return NULL, got %p\n", x); + ok(g_bsearch_s_context_counter == 0, "callback shouldn't have been called\n"); + CHECK_CALLED(invalid_parameter_handler); + + g_bsearch_s_context_counter = 0; + SET_EXPECT(invalid_parameter_handler); + x = p_bsearch_s(&l, arr, j, sizeof(arr[0]), NULL, &g_bsearch_s_context_counter); + ok(x == NULL, "Expected bsearch_s to return NULL, got %p\n", x); + ok(g_bsearch_s_context_counter == 0, "callback shouldn't have been called\n"); + CHECK_CALLED(invalid_parameter_handler); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); + + /* just try all array sizes */ + for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { + for (i=0;i<j;i++) { + l = arr[i]; + g_bsearch_s_context_counter = 0; + x = p_bsearch_s(&l, arr, j, sizeof(arr[0]), intcomparefunc, &g_bsearch_s_context_counter); + ok (x == &arr[i], "bsearch_s did not find %d entry in loopsize %d.\n", i, j); + ok(g_bsearch_s_context_counter > 0, "callback wasn't called\n"); + } + l = 4242; + g_bsearch_s_context_counter = 0; + x = p_bsearch_s(&l, arr, j, sizeof(arr[0]), intcomparefunc, &g_bsearch_s_context_counter); + ok (x == NULL, "bsearch_s did find 4242 entry in loopsize %d.\n", j); + ok(g_bsearch_s_context_counter > 0, "callback wasn't called\n"); + } +} + static void test_controlfp_s(void) { unsigned int cur; @@ -1162,6 +1209,7 @@ START_TEST(msvcr90) test__itoa_s(); test_wcsncat_s(); test_qsort_s(); + test_bsearch_s(); test_controlfp_s(); test__atoflt(); test__set_abort_behavior(); diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d40e38f..8f2c111 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -124,6 +124,33 @@ void* CDECL _lsearch(const void* match, void* start, } /********************************************************************* + * bsearch_s (msvcrt.@) + */ +void* CDECL MSVCRT_bsearch_s(const void *key, const void *base, + MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (__cdecl *compare)(void *, const void *, const void *), void *ctx) +{ + ssize_t min = 0; + ssize_t max = nmemb - 1; + + if (!MSVCRT_CHECK_PMT(size != 0) || !MSVCRT_CHECK_PMT(compare != NULL)) + return NULL; + + while (min <= max) + { + ssize_t cursor = (min + max) / 2; + int ret = compare(ctx, key,(const char *)base+(cursor*size)); + if (!ret) + return (char*)base+(cursor*size); + if (ret < 0) + max = cursor - 1; + else + min = cursor + 1; + } + return NULL; +} + +/********************************************************************* * _chkesp (MSVCRT.@) * * Trap to a debugger if the value of the stack pointer has changed. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 04ef9ad..934c247 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1226,7 +1226,7 @@ @ cdecl atoi(str) ntdll.atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch -# stub bsearch_s(ptr ptr long long ptr ptr) +@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil

1 0

Alistair Leslie-Hughes : mmcndmgr: Implement IMMCVersionInfo.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f857ad522555586c1f223bbf49d6f1214257b551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f857ad522555586c1f223bbf4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 20 22:29:35 2012 +1100 mmcndmgr: Implement IMMCVersionInfo. --- configure | 1 + configure.ac | 1 + dlls/mmcndmgr/mmcndmgr.c | 123 +++++++++++++++++++++++++++++++++++++-- dlls/mmcndmgr/tests/Makefile.in | 7 ++ dlls/mmcndmgr/tests/mmcndmgr.c | 66 +++++++++++++++++++++ 5 files changed, 193 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 5be9da3..77aea78 100755 --- a/configure +++ b/configure @@ -15296,6 +15296,7 @@ wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang implib wine_fn_config_test dlls/mlang/tests mlang_test wine_fn_config_dll mmcndmgr enable_mmcndmgr +wine_fn_config_test dlls/mmcndmgr/tests mmcndmgr_test wine_fn_config_dll mmdevapi enable_mmdevapi wine_fn_config_test dlls/mmdevapi/tests mmdevapi_test wine_fn_config_dll mmdevldr.vxd enable_win16 diff --git a/configure.ac b/configure.ac index 52ef054..50e5513 100644 --- a/configure.ac +++ b/configure.ac @@ -2701,6 +2701,7 @@ WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[implib]) WINE_CONFIG_TEST(dlls/mlang/tests) WINE_CONFIG_DLL(mmcndmgr) +WINE_CONFIG_TEST(dlls/mmcndmgr/tests) WINE_CONFIG_DLL(mmdevapi) WINE_CONFIG_TEST(dlls/mmdevapi/tests) WINE_CONFIG_DLL(mmdevldr.vxd,enable_win16) diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c index 2a7e0d4..4449233 100644 --- a/dlls/mmcndmgr/mmcndmgr.c +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -30,21 +30,134 @@ #include "wine/debug.h" #include "wine/library.h" +#include "initguid.h" #include "mmc.h" WINE_DEFAULT_DEBUG_CHANNEL(mmc); static HINSTANCE MMC_hInstance; -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +static HRESULT WINAPI mmcversion_QueryInterface(IMMCVersionInfo *iface, REFIID riid, void **ppv) { - FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!ppv) - return E_INVALIDARG; + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - return E_NOTIMPL; + if ( IsEqualGUID( riid, &IID_IMMCVersionInfo ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppv = iface; + } + else + { + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IMMCVersionInfo_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI mmcversion_AddRef(IMMCVersionInfo *iface) +{ + return 2; +} + +static ULONG WINAPI mmcversion_Release(IMMCVersionInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI mmcversion_GetMMCVersion(IMMCVersionInfo *iface, LONG *pVersionMajor, LONG *pVersionMinor) +{ + TRACE("(%p, %p, %p): stub\n", iface, pVersionMajor, pVersionMinor); + + if(pVersionMajor) + *pVersionMajor = 3; + + if(pVersionMinor) + *pVersionMinor = 0; + + return S_OK; +} + +static const struct IMMCVersionInfoVtbl mmcversionVtbl = +{ + mmcversion_QueryInterface, + mmcversion_AddRef, + mmcversion_Release, + mmcversion_GetMMCVersion +}; + +static IMMCVersionInfo mmcVersionInfo = { &mmcversionVtbl }; + +/*********************************************************** + * ClassFactory implementation + */ +typedef HRESULT (*CreateInstanceFunc)(IUnknown*,REFIID,void**); + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID riid, void **ppvObject) +{ + if(IsEqualGUID(&IID_IClassFactory, riid) || IsEqualGUID(&IID_IUnknown, riid)) { + IClassFactory_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + + WARN("not supported iid %s\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return IMMCVersionInfo_QueryInterface(&mmcVersionInfo, riid, ppv); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; } +static const IClassFactoryVtbl MMCClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory MMCVersionInfoFactory = { &MMCClassFactoryVtbl }; + +HRESULT WINAPI DllGetClassObject( REFCLSID riid, REFIID iid, LPVOID *ppv ) +{ + TRACE("%s %s %p\n", debugstr_guid(riid), debugstr_guid(iid), ppv ); + + if( IsEqualCLSID( riid, &CLSID_MMCVersionInfo )) + { + TRACE("(CLSID_MMCVersionInfo %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&MMCVersionInfoFactory, iid, ppv); + } + + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( MMC_hInstance ); diff --git a/dlls/mmcndmgr/tests/Makefile.in b/dlls/mmcndmgr/tests/Makefile.in new file mode 100644 index 0000000..1220069 --- /dev/null +++ b/dlls/mmcndmgr/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = mmcndmgr.dll +IMPORTS = ole32 shlwapi uuid + +C_SRCS = \ + mmcndmgr.c + +@MAKE_TEST_RULES@ diff --git a/dlls/mmcndmgr/tests/mmcndmgr.c b/dlls/mmcndmgr/tests/mmcndmgr.c new file mode 100644 index 0000000..07d905e --- /dev/null +++ b/dlls/mmcndmgr/tests/mmcndmgr.c @@ -0,0 +1,66 @@ +/* + * + * Copyright 2011 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "dispex.h" + +#include "wine/test.h" + +#include <initguid.h> +#include <mmc.h> + +static void test_get_version(void) +{ + IMMCVersionInfo * ver_info = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MMCVersionInfo, NULL, CLSCTX_INPROC_SERVER, &IID_IMMCVersionInfo, (void**)&ver_info); + if (hr != S_OK) + { + trace("MMCVersionInfo interface not registered.\n"); + } + else + { + LONG lMajor, lMinor; + + hr = IMMCVersionInfo_GetMMCVersion(ver_info, &lMajor, &lMinor); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + if (hr == S_OK) + trace("MMC Version is %d.%d\n", lMajor, lMinor); + } + + if (ver_info) + { + IMMCVersionInfo_Release(ver_info); + } +} + + +START_TEST(mmcndmgr) +{ + CoInitialize(NULL); + + test_get_version(); + + CoUninitialize(); +}

1 0

Daniel Jelinski : comctl32/treeview: Fix the position reported by WM_CONTEXTMENU.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: baed448fc779dffbdf9b50a679213b98afb38806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baed448fc779dffbdf9b50a67… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 21:27:14 2012 +0200 comctl32/treeview: Fix the position reported by WM_CONTEXTMENU. --- dlls/comctl32/treeview.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0b118b7..79de8aa 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4259,12 +4259,9 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) SetFocus(infoPtr->hwnd); if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK)) { - /* Change to screen coordinate for WM_CONTEXTMENU */ - ClientToScreen(infoPtr->hwnd, &ht.pt); - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ SendMessageW(infoPtr->hwndNotify, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); + (WPARAM)infoPtr->hwnd, (LPARAM)GetMessagePos()); } }

1 0

Daniel Jelinski : comctl32/treeview: Send WM_CONTEXTMENU only to parent window.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 067d528855940fd169366829736578ff808c56ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=067d528855940fd1693668297… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:53:09 2012 +0200 comctl32/treeview: Send WM_CONTEXTMENU only to parent window. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b784924..0b118b7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4263,7 +4263,7 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) ClientToScreen(infoPtr->hwnd, &ht.pt); /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + SendMessageW(infoPtr->hwndNotify, WM_CONTEXTMENU, (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); } }

1 0

Daniel Jelinski : comctl32/treeview: Inlined TREEVIEW_RButtonUp.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 5e86d843374333558d362fa9f5d379ac2e4e1d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e86d843374333558d362fa9f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:47:45 2012 +0200 comctl32/treeview: Inlined TREEVIEW_RButtonUp. --- dlls/comctl32/treeview.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 88c1ff4..b784924 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -208,7 +208,6 @@ static VOID TREEVIEW_Invalidate(const TREEVIEW_INFO *, const TREEVIEW_ITEM *); static LRESULT TREEVIEW_DoSelectItem(TREEVIEW_INFO *, INT, HTREEITEM, INT); static VOID TREEVIEW_SetFirstVisible(TREEVIEW_INFO *, TREEVIEW_ITEM *, BOOL); static LRESULT TREEVIEW_EnsureVisible(TREEVIEW_INFO *, HTREEITEM, BOOL); -static LRESULT TREEVIEW_RButtonUp(const TREEVIEW_INFO *, const POINT *); static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel); static VOID TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr); static LRESULT TREEVIEW_HScroll(TREEVIEW_INFO *, WPARAM); @@ -4260,7 +4259,12 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) SetFocus(infoPtr->hwnd); if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK)) { - TREEVIEW_RButtonUp(infoPtr, &ht.pt); + /* Change to screen coordinate for WM_CONTEXTMENU */ + ClientToScreen(infoPtr->hwnd, &ht.pt); + + /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ + SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); } } @@ -4268,23 +4272,6 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } static LRESULT -TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) -{ - TVHITTESTINFO ht; - - ht.pt = *pPt; - - /* Change to screen coordinate for WM_CONTEXTMENU */ - ClientToScreen(infoPtr->hwnd, &ht.pt); - - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); - return 0; -} - - -static LRESULT TREEVIEW_CreateDragImage(TREEVIEW_INFO *infoPtr, LPARAM lParam) { TREEVIEW_ITEM *dragItem = (HTREEITEM)lParam;

1 0

Daniel Jelinski : comctl32/treeview: Send WM_CONTEXTMENU everywhere, not just over items.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: c7212f8262a6aeac9856a1d22668bca0fc47dd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7212f8262a6aeac9856a1d22… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:42:33 2012 +0200 comctl32/treeview: Send WM_CONTEXTMENU everywhere, not just over items. --- dlls/comctl32/treeview.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e55c941..88c1ff4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4274,17 +4274,12 @@ TREEVIEW_RButtonUp(const TREEVIEW_INFO *infoPtr, const POINT *pPt) ht.pt = *pPt; - TREEVIEW_HitTest(infoPtr, &ht); - - if (ht.hItem) - { - /* Change to screen coordinate for WM_CONTEXTMENU */ - ClientToScreen(infoPtr->hwnd, &ht.pt); + /* Change to screen coordinate for WM_CONTEXTMENU */ + ClientToScreen(infoPtr->hwnd, &ht.pt); - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); - } + /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ + SendMessageW(infoPtr->hwnd, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); return 0; }

1 0

Daniel Jelinski : comctl32/treeview: Fix NM_RCLICK behavior.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 602dea1e12c1c89d3fdf0499a079f488fe93cb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602dea1e12c1c89d3fdf0499a… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 20:11:38 2012 +0200 comctl32/treeview: Fix NM_RCLICK behavior. --- dlls/comctl32/treeview.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 9e28ee2..e55c941 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4257,9 +4257,11 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } else { - TREEVIEW_RButtonUp(infoPtr, &ht.pt); SetFocus(infoPtr->hwnd); - TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK); + if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK)) + { + TREEVIEW_RButtonUp(infoPtr, &ht.pt); + } } return 0;

1 0

Daniel Jelinski : comctl32/treeview: Clean up mouse tracking code.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 7e56fd38d831ab9b565677f1a204a7f8b554633a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e56fd38d831ab9b565677f1a… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 19:53:40 2012 +0200 comctl32/treeview: Clean up mouse tracking code. --- dlls/comctl32/treeview.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8c93f8c..9e28ee2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4043,8 +4043,6 @@ TREEVIEW_TrackMouse(const TREEVIEW_INFO *infoPtr, POINT pt) else if (msg.message >= WM_LBUTTONDOWN && msg.message <= WM_RBUTTONDBLCLK) { - if (msg.message == WM_RBUTTONUP) - TREEVIEW_RButtonUp(infoPtr, &pt); break; } @@ -4259,6 +4257,7 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } else { + TREEVIEW_RButtonUp(infoPtr, &ht.pt); SetFocus(infoPtr->hwnd); TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK); }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
72
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 July 2012