wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Andrey Gusev : riched20: Use debugstr_guid() in TRACE() messages.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: c43aebd79b8f29c1f3e3fb11ffaa999952d4dc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43aebd79b8f29c1f3e3fb11f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:03:31 2016 +0300 riched20: Use debugstr_guid() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a2f23c9..77e7b57 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1603,7 +1603,7 @@ static HRESULT WINAPI ITextRange_fnGetIDsOfNames(ITextRange *me, REFIID riid, LP ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextRange_tid, &ti); @@ -1621,8 +1621,8 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextRange_tid, &ti); if (SUCCEEDED(hr)) @@ -2601,8 +2601,8 @@ static HRESULT WINAPI TextFont_GetIDsOfNames(ITextFont *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextFont_tid, &ti); if (SUCCEEDED(hr)) @@ -2625,8 +2625,8 @@ static HRESULT WINAPI TextFont_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextFont_tid, &ti); if (SUCCEEDED(hr)) @@ -3383,8 +3383,8 @@ static HRESULT WINAPI TextPara_GetIDsOfNames(ITextPara *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); hr = get_typeinfo(ITextPara_tid, &ti); if (SUCCEEDED(hr)) @@ -3407,8 +3407,9 @@ static HRESULT WINAPI TextPara_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(ITextPara_tid, &ti); if (SUCCEEDED(hr)) @@ -3884,8 +3885,8 @@ ITextDocument_fnGetIDsOfNames(ITextDocument* me, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextDocument_tid, &ti); if (SUCCEEDED(hr)) @@ -3902,8 +3903,9 @@ ITextDocument_fnInvoke(ITextDocument* me, DISPID dispIdMember, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(ITextDocument_tid, &ti); if (SUCCEEDED(hr)) @@ -4218,7 +4220,7 @@ static HRESULT WINAPI ITextSelection_fnGetIDsOfNames(ITextSelection *me, REFIID ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextSelection_tid, &ti); @@ -4242,7 +4244,7 @@ static HRESULT WINAPI ITextSelection_fnInvoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextSelection_tid, &ti);

1 0

Michael Stefaniuc : dmime: Use debugstr_guid() to trace a REFIID.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 07cee87e8f42b36d3494715fd75991cd83e32708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cee87e8f42b36d3494715fd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 26 10:43:03 2016 +0200 dmime: Use debugstr_guid() to trace a REFIID. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 8b5d3e2..d1befcf 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1198,7 +1198,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) { IDirectMusicPerformance8Impl *obj; - TRACE("(%p,%p)\n", lpcGUID, ppobj); + TRACE("(%s, %p)\n", debugstr_guid(lpcGUID), ppobj); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPerformance8Impl)); if (NULL == obj) {

1 0

Michael Stefaniuc : dmusic: Use debugstr_guid to trace some GUIDs.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 253bffafba6ceea8b2da87875fdcbdc0c5a51108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253bffafba6ceea8b2da87875… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 26 10:42:02 2016 +0200 dmusic: Use debugstr_guid to trace some GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/clock.c | 2 +- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/port.c | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 46a035f..7fd1d8f 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -123,7 +123,7 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO IReferenceClockImpl* clock; HRESULT hr; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); clock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IReferenceClockImpl)); if (!clock) { diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 09a7f53..67900b3 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -405,7 +405,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU IDirectMusic8Impl *dmusic; HRESULT ret; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); *ret_iface = NULL; if (unkouter) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index f886d52..d919c10 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -678,7 +678,8 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT hr = E_FAIL; int i; - TRACE("(%p,%p,%p,%p,%p,%d)\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d)\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); *object = NULL; @@ -762,14 +763,16 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; } HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; }

1 0

Alexandre Julliard : ntdll: Implement the SectionImageInformation class of NtQuerySection.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 6f0979b9830a303f41ac953013d2805f4b63eccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f0979b9830a303f41ac95301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 19:38:50 2016 +0900 ntdll: Implement the SectionImageInformation class of NtQuerySection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 67 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/virtual.c | 11 ++++++ dlls/ntdll/virtual.c | 62 ++++++++++++++++++++++++++-------- include/wine/server_protocol.h | 29 +++++++++++++--- server/mapping.c | 76 +++++++++++++++++++++++++++--------------- server/protocol.def | 26 +++++++++++++-- server/request.h | 8 ++--- server/trace.c | 24 +++++++++++-- 8 files changed, 249 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f0979b9830a303f41ac9…

1 0

Alexandre Julliard : ntdll: Implement the SectionBasicInformation class of NtQuerySection.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 2602df14d84051db53081afe34dfc93e434c1252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2602df14d84051db53081afe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 14:43:02 2016 +0900 ntdll: Implement the SectionBasicInformation class of NtQuerySection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 19 ++++++- dlls/kernel32/tests/virtual.c | 124 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/nt.c | 19 ------- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/virtual.c | 35 ++++++++++++ server/mapping.c | 6 ++ 6 files changed, 182 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2602df14d84051db53081…

1 0

Alexandre Julliard : server: Store the section flags separately from the protection.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 1ddc63605110295251d83b595cca58fb5ad864a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddc63605110295251d83b595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 14:20:02 2016 +0900 server: Store the section flags separately from the protection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 20 +++++++++----------- include/wine/server_protocol.h | 8 +++++--- include/winnt.h | 3 +++ server/mapping.c | 42 +++++++++++++++++++++++------------------- server/protocol.def | 4 +++- server/request.h | 14 ++++++++------ server/trace.c | 4 +++- 7 files changed, 54 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ddc63605110295251d83…

1 0

Andrey Gusev : cabinet: Use debugstr_a() in TRACE() message.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: c622b461bbb83a196713f7df113fd9b61387c8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c622b461bbb83a196713f7df1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jul 25 11:47:15 2016 +0300 cabinet: Use debugstr_a() in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/cabinet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index ef6698d..5a1ae06 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -333,7 +333,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) HFDI hfdi; char *str, *end, *path = NULL, *name = NULL; - TRACE("(%p, %s)\n", dest, szCabName); + TRACE("(%p, %s)\n", dest, debugstr_a(szCabName)); hfdi = FDICreate(mem_alloc, mem_free,

1 0

Nikolay Sivov : comctl32/monthcal: Implement MCS_NOSELCHANGEONNAV style.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 5d0a02db69b63ffa77a0a5e43c7f5bf6d2a9019f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0a02db69b63ffa77a0a5e43… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 00:13:45 2016 +0300 comctl32/monthcal: Implement MCS_NOSELCHANGEONNAV style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 18 ++++++++++++------ include/commctrl.rh | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 36acb41..0fef638 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1969,7 +1969,7 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) } /* no valid range check performed */ -static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) +static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta, BOOL keep_selection) { INT i, selIdx = -1; @@ -1982,8 +1982,11 @@ static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) MONTHCAL_GetMonth(&infoPtr->calendars[i].month, delta); } + if (keep_selection) + return; + /* selection is always shifted to first calendar */ - if(infoPtr->dwStyle & MCS_MULTISELECT) + if (infoPtr->dwStyle & MCS_MULTISELECT) { SYSTEMTIME range[2]; @@ -2004,6 +2007,7 @@ static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { INT delta = infoPtr->delta ? infoPtr->delta : MONTHCAL_GetCalCount(infoPtr); + BOOL keep_selection; SYSTEMTIME st; TRACE("%s\n", direction == DIRECTION_BACKWARD ? "back" : "fwd"); @@ -2022,9 +2026,11 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct if(!MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) return; - MONTHCAL_Scroll(infoPtr, direction == DIRECTION_BACKWARD ? -delta : delta); + keep_selection = infoPtr->dwStyle & MCS_NOSELCHANGEONNAV; + MONTHCAL_Scroll(infoPtr, direction == DIRECTION_BACKWARD ? -delta : delta, keep_selection); MONTHCAL_NotifyDayState(infoPtr); - MONTHCAL_NotifySelectionChange(infoPtr); + if (!keep_selection) + MONTHCAL_NotifySelectionChange(infoPtr); } static LRESULT @@ -2212,7 +2218,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) if (MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) { - MONTHCAL_Scroll(infoPtr, delta); + MONTHCAL_Scroll(infoPtr, delta, FALSE); MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifySelectionChange(infoPtr); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); @@ -2851,7 +2857,7 @@ MONTHCAL_Notify(MONTHCAL_INFO *infoPtr, NMHDR *hdr) if (hdr->hwndFrom == infoPtr->hWndYearUpDown && nmud->iDelta) { /* year value limits are set up explicitly after updown creation */ - MONTHCAL_Scroll(infoPtr, 12 * nmud->iDelta); + MONTHCAL_Scroll(infoPtr, 12 * nmud->iDelta, FALSE); MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifySelectionChange(infoPtr); } diff --git a/include/commctrl.rh b/include/commctrl.rh index b778ee7..aac1746 100644 --- a/include/commctrl.rh +++ b/include/commctrl.rh @@ -187,6 +187,7 @@ #define MCS_NOTODAYCIRCLE 0x0008 #define MCS_NOTRAILINGDATES 0x0040 #define MCS_SHORTDAYSOFWEEK 0x0080 +#define MCS_NOSELCHANGEONNAV 0x0100 /* Datetime Control */ #define DTS_SHORTDATEFORMAT 0x0000

1 0

Nikolay Sivov : comctl32/treeview: Set hot item when hovering over item, not entire row.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: d73d6b209353dbb2f6e2e2880c18f6eaf4a137f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73d6b209353dbb2f6e2e2880… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 23:03:19 2016 +0300 comctl32/treeview: Set hot item when hovering over item, not entire row. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ae17413..a703ae7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3635,7 +3635,7 @@ TREEVIEW_HitTestPoint(const TREEVIEW_INFO *infoPtr, POINT pt) return item; } -static LRESULT +static TREEVIEW_ITEM * TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) { TREEVIEW_ITEM *item; @@ -3670,14 +3670,14 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) if (status) { lpht->flags = status; - return 0; + return NULL; } item = TREEVIEW_HitTestPoint(infoPtr, lpht->pt); if (!item) { lpht->flags = TVHT_NOWHERE; - return 0; + return NULL; } if (x >= item->textOffset + item->textWidth) @@ -3708,7 +3708,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) lpht->hItem = item; TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); - return (LRESULT)item; + return item; } /* Item Label Editing ***************************************************/ @@ -4131,7 +4131,7 @@ TREEVIEW_LButtonDoubleClick(TREEVIEW_INFO *infoPtr, LPARAM lParam) hit.pt.x = (short)LOWORD(lParam); hit.pt.y = (short)HIWORD(lParam); - item = (TREEVIEW_ITEM *)TREEVIEW_HitTest(infoPtr, &hit); + item = TREEVIEW_HitTest(infoPtr, &hit); if (!item) return 0; TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, item)); @@ -5331,9 +5331,9 @@ TREEVIEW_MouseLeave (TREEVIEW_INFO * infoPtr) static LRESULT TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) { - POINT pt; TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; @@ -5358,18 +5358,21 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) _TrackMouseEvent(&trackinfo); } - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - - item = TREEVIEW_HitTestPoint(infoPtr, pt); + ht.pt.x = (short)LOWORD(lParam); + ht.pt.y = (short)HIWORD(lParam); - if (item != infoPtr->hotItem) + item = TREEVIEW_HitTest(infoPtr, &ht); + if ((item != infoPtr->hotItem) || !(ht.flags & TVHT_ONITEM)) { /* redraw old hot item */ TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); - infoPtr->hotItem = item; - /* redraw new hot item */ - TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + infoPtr->hotItem = NULL; + if (item && (ht.flags & TVHT_ONITEM)) + { + infoPtr->hotItem = item; + /* redraw new hot item */ + TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + } } return 0; @@ -5508,14 +5511,14 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - POINT pt; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; NMMOUSE nmmouse; - GetCursorPos(&pt); - ScreenToClient(infoPtr->hwnd, &pt); + GetCursorPos(&ht.pt); + ScreenToClient(infoPtr->hwnd, &ht.pt); - item = TREEVIEW_HitTestPoint(infoPtr, pt); + item = TREEVIEW_HitTest(infoPtr, &ht); memset(&nmmouse, 0, sizeof(nmmouse)); if (item) @@ -5529,7 +5532,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; - if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) + if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && (ht.flags & TVHT_ONITEM)) { SetCursor(infoPtr->hcurHand); return 0; @@ -5673,7 +5676,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_GetVisibleCount(infoPtr); case TVM_HITTEST: - return TREEVIEW_HitTest(infoPtr, (LPTVHITTESTINFO)lParam); + return (LRESULT)TREEVIEW_HitTest(infoPtr, (TVHITTESTINFO*)lParam); case TVM_INSERTITEMA: case TVM_INSERTITEMW:

1 0

Andrew Eikum : winepulse.drv: Downgrade failed server connection message to WARN.
by Alexandre Julliard 26 Jul '16

26 Jul '16

Module: wine Branch: master Commit: 87754283becca7aef8f90af1d584d47ad25d8324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87754283becca7aef8f90af1d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 25 13:00:14 2016 -0500 winepulse.drv: Downgrade failed server connection message to WARN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 5bf534e..32db0d1 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -304,7 +304,7 @@ static void pulse_contextcallback(pa_context *c, void *userdata) break; case PA_CONTEXT_FAILED: - ERR("Context failed: %s\n", pa_strerror(pa_context_errno(c))); + WARN("Context failed: %s\n", pa_strerror(pa_context_errno(c))); break; } pthread_cond_signal(&pulse_cond);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
68
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 2016