September 2018 - Wine-Devel

Re: [PATCH 2/8] wsdapi/tests: Add test for duplicate message filtering.

by Owen Rudge

On 18/09/2018 08:35, Huw Davies wrote: > How much do we lose by not testing this feature? If there's no reliable > way to do it then it may be better to simply not. Not a massive amount - if we're accepting duplicate messages, it can occasionally manifest in other ways (as we saw with the tests running on your machine). I can drop this patch if that seems the best solution. Thanks, Owen

Sept. 18, 2018

Re: [PATCH] comctl32: Improve hit testing and invalidation for sub items.

by Zhiyi Zhang

On 2018/9/18 15:35, Jim Mussared wrote: > These fixes are for "Vectric Cut2D" which uses listview to show > document layers. See referenced bug for more details. The layer list > uses clickable subitems for: > - toggling visibility of the layer > - color swatch (click to edit color) > - menu (click to show the right-click menu) > (all of these are activated on mouse up) > > At the moment, the sub items are not clickable in Wine. Additionally, > they do not update when the layer changes state. > > This patch fixes three things: > - When hit testing, the sub items's coordinates are relative to the > item. So the mouse coordinate (opt) will be outside the bounds of the > item (rcBounds), and fail the hit test. > Skip this check when not doing a selection hit test (which applies to > mouse up). > - InvalidateItem only invalidates the region of the primary item. Now > also invalidate all sub-items. > - InvalidateSubItem calculated the position of the subitem > incorrectly (it's offset by the left edge of the main item). Please add tests for prove your point and you might want to split the patch. Thanks > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44794 > Signed-off-by: Jim Mussared <jim.mussared(a)gmail.com> > --- > dlls/comctl32/listview.c | 41 ++++++++++++++++++++++++---------------- > 1 file changed, 25 insertions(+), 16 deletions(-) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index 777b40f2fe..1440581f71 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -1725,38 +1725,46 @@ static inline BOOL is_redrawing(const > LISTVIEW_INFO *infoPtr) > > static inline void LISTVIEW_InvalidateRect(const LISTVIEW_INFO > *infoPtr, const RECT* rect) > { > - if(!is_redrawing(infoPtr)) return; > + if(!is_redrawing(infoPtr)) return; Formating issue. > TRACE(" invalidating rect=%s\n", wine_dbgstr_rect(rect)); > InvalidateRect(infoPtr->hwndSelf, rect, TRUE); > } > > -static inline void LISTVIEW_InvalidateItem(const LISTVIEW_INFO > *infoPtr, INT nItem) > -{ > - RECT rcBox; > - > - if (!is_redrawing(infoPtr) || nItem < 0 || nItem >= infoPtr->nItemCount) > - return; > - > - LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox); > - LISTVIEW_InvalidateRect(infoPtr, &rcBox); > -} You're changing the function. Please don't remove it and add it back somewhere else. It's making it difficult to compare. > - > static inline void LISTVIEW_InvalidateSubItem(const LISTVIEW_INFO > *infoPtr, INT nItem, INT nSubItem) > { > POINT Origin, Position; > RECT rcBox; > - > - if(!is_redrawing(infoPtr)) return; > + > + if(!is_redrawing(infoPtr)) return; Formating issue > assert (infoPtr->uView == LV_VIEW_DETAILS); > LISTVIEW_GetOrigin(infoPtr, &Origin); > LISTVIEW_GetItemOrigin(infoPtr, nItem, &Position); > LISTVIEW_GetHeaderRect(infoPtr, nSubItem, &rcBox); > rcBox.top = 0; > rcBox.bottom = infoPtr->nItemHeight; > - OffsetRect(&rcBox, Origin.x + Position.x, Origin.y + Position.y); > + OffsetRect(&rcBox, Origin.x, Origin.y + Position.y); > LISTVIEW_InvalidateRect(infoPtr, &rcBox); > } > > +static inline void LISTVIEW_InvalidateItem(const LISTVIEW_INFO > *infoPtr, INT nItem) > +{ > + RECT rcBox; > + > + if (!is_redrawing(infoPtr) || nItem < 0 || nItem >= infoPtr->nItemCount) > + return; > + > + LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox); > + LISTVIEW_InvalidateRect(infoPtr, &rcBox); > + > + /* Additionally invalidate all other sub-items. > + The first sub-item is handled by GetItemBox above. */ > + if (infoPtr->uView == LV_VIEW_DETAILS) { > + INT nSubItem; > + for (nSubItem = 1; nSubItem < > DPA_GetPtrCount(infoPtr->hdpaColumns); nSubItem++) > + LISTVIEW_InvalidateSubItem(infoPtr, nItem, nSubItem); > + } > +} > + > static inline void LISTVIEW_InvalidateList(const LISTVIEW_INFO *infoPtr) > { > LISTVIEW_InvalidateRect(infoPtr, NULL); > @@ -7741,8 +7749,9 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO > *infoPtr, LPLVHITTESTINFO lpht, > UnionRect(&rcBounds, &rcIcon, &rcLabel); > UnionRect(&rcBounds, &rcBounds, &rcState); > } > + > TRACE("rcBounds=%s\n", wine_dbgstr_rect(&rcBounds)); > - if (!PtInRect(&rcBounds, opt)) return -1; > + if (select && !PtInRect(&rcBounds, opt)) return -1; > > /* That's a special case - row rectangle is used as item rectangle and > returned flags contain all item parts. */ > -- > 2.19.0 > >

Sept. 18, 2018

Re: [PATCH] msi: Fix a typo.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Sept. 18, 2018

Re: [PATCH] comctl32: Improve hit testing and invalidation for sub items.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42156 Your paranoid android. === debian9 (build log) === error: corrupt patch at line 34 Task: Patch failed to apply

Sept. 18, 2018

Re: [PATCH 2/8] wsdapi/tests: Add test for duplicate message filtering.

by Huw Davies

On Mon, Sep 17, 2018 at 09:24:48PM +0100, Owen Rudge wrote: > On 13/09/2018 11:05, Huw Davies wrote: > > >> + Sleep(1000); > > > > Can't we poll for this? The tests are starting to take quite a long > > time to complete, and this doesn't help. > > I'm not sure there is a very good way of avoiding it. We're effectively > waiting for an extra 2 messages *not* to be received. We can easily test > when the first message has been received and processed of course, but > there's no way of identifying when the subsequent messages have been > received. WSD does not expose any kind of "duplicate message" notification > that we could listen for. > > What I could do is reduce the delay down from 1000ms to, say, 250ms. The UDP > messages are sent immediately rather than with a variable delay (as per WSD > itself), so they should be processed and dispatched quickly. In my tests > this works OK, but of course it could conceivably be more vulnerable to > sporadic failures on slow or very busy systems. How much do we lose by not testing this feature? If there's no reliable way to do it then it may be better to simply not. > I can also try to look at any other delays that are already present in the > tests and see if they can be reduced/eliminated once this series is > complete. That would be good in any case. Huw.

Sept. 18, 2018

[PATCH] comctl32: Improve hit testing and invalidation for sub items.

by Jim Mussared

These fixes are for "Vectric Cut2D" which uses listview to show document layers. See referenced bug for more details. The layer list uses clickable subitems for: - toggling visibility of the layer - color swatch (click to edit color) - menu (click to show the right-click menu) (all of these are activated on mouse up) At the moment, the sub items are not clickable in Wine. Additionally, they do not update when the layer changes state. This patch fixes three things: - When hit testing, the sub items's coordinates are relative to the item. So the mouse coordinate (opt) will be outside the bounds of the item (rcBounds), and fail the hit test. Skip this check when not doing a selection hit test (which applies to mouse up). - InvalidateItem only invalidates the region of the primary item. Now also invalidate all sub-items. - InvalidateSubItem calculated the position of the subitem incorrectly (it's offset by the left edge of the main item). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44794 Signed-off-by: Jim Mussared <jim.mussared(a)gmail.com> --- dlls/comctl32/listview.c | 41 ++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 777b40f2fe..1440581f71 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1725,38 +1725,46 @@ static inline BOOL is_redrawing(const LISTVIEW_INFO *infoPtr) static inline void LISTVIEW_InvalidateRect(const LISTVIEW_INFO *infoPtr, const RECT* rect) { - if(!is_redrawing(infoPtr)) return; + if(!is_redrawing(infoPtr)) return; TRACE(" invalidating rect=%s\n", wine_dbgstr_rect(rect)); InvalidateRect(infoPtr->hwndSelf, rect, TRUE); } -static inline void LISTVIEW_InvalidateItem(const LISTVIEW_INFO *infoPtr, INT nItem) -{ - RECT rcBox; - - if (!is_redrawing(infoPtr) || nItem < 0 || nItem >= infoPtr->nItemCount) - return; - - LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox); - LISTVIEW_InvalidateRect(infoPtr, &rcBox); -} - static inline void LISTVIEW_InvalidateSubItem(const LISTVIEW_INFO *infoPtr, INT nItem, INT nSubItem) { POINT Origin, Position; RECT rcBox; - - if(!is_redrawing(infoPtr)) return; + + if(!is_redrawing(infoPtr)) return; assert (infoPtr->uView == LV_VIEW_DETAILS); LISTVIEW_GetOrigin(infoPtr, &Origin); LISTVIEW_GetItemOrigin(infoPtr, nItem, &Position); LISTVIEW_GetHeaderRect(infoPtr, nSubItem, &rcBox); rcBox.top = 0; rcBox.bottom = infoPtr->nItemHeight; - OffsetRect(&rcBox, Origin.x + Position.x, Origin.y + Position.y); + OffsetRect(&rcBox, Origin.x, Origin.y + Position.y); LISTVIEW_InvalidateRect(infoPtr, &rcBox); } +static inline void LISTVIEW_InvalidateItem(const LISTVIEW_INFO *infoPtr, INT nItem) +{ + RECT rcBox; + + if (!is_redrawing(infoPtr) || nItem < 0 || nItem >= infoPtr->nItemCount) + return; + + LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox); + LISTVIEW_InvalidateRect(infoPtr, &rcBox); + + /* Additionally invalidate all other sub-items. + The first sub-item is handled by GetItemBox above. */ + if (infoPtr->uView == LV_VIEW_DETAILS) { + INT nSubItem; + for (nSubItem = 1; nSubItem < DPA_GetPtrCount(infoPtr->hdpaColumns); nSubItem++) + LISTVIEW_InvalidateSubItem(infoPtr, nItem, nSubItem); + } +} + static inline void LISTVIEW_InvalidateList(const LISTVIEW_INFO *infoPtr) { LISTVIEW_InvalidateRect(infoPtr, NULL); @@ -7741,8 +7749,9 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, UnionRect(&rcBounds, &rcIcon, &rcLabel); UnionRect(&rcBounds, &rcBounds, &rcState); } + TRACE("rcBounds=%s\n", wine_dbgstr_rect(&rcBounds)); - if (!PtInRect(&rcBounds, opt)) return -1; + if (select && !PtInRect(&rcBounds, opt)) return -1; /* That's a special case - row rectangle is used as item rectangle and returned flags contain all item parts. */ -- 2.19.0

Sept. 18, 2018

[PATCH resend] oleaut32: Add DECLSPEC_HOTPATCH to functions patched by MS Word 2010

by Alex Henrie

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/variant.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 20e8d73318..ae3bda668b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -270,7 +270,7 @@ static inline IMalloc *get_malloc(void) * See BSTR. * str may be NULL, in which case this function does nothing. */ -void WINAPI SysFreeString(BSTR str) +void WINAPI DECLSPEC_HOTPATCH SysFreeString(BSTR str) { bstr_cache_entry_t *cache_entry; bstr_t *bstr; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 1fa2a6d6fa..8781f3eaed 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -648,7 +648,7 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) * Success: S_OK. Any previous value in pVarg is freed and its type is set to VT_EMPTY. * Failure: DISP_E_BADVARTYPE, if the variant is not a valid variant type. */ -HRESULT WINAPI VariantClear(VARIANTARG* pVarg) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) { HRESULT hres; @@ -962,8 +962,8 @@ VariantCopyInd_Return: * The LCID used for the conversion is LOCALE_USER_DEFAULT. * See VariantChangeTypeEx. */ -HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, - USHORT wFlags, VARTYPE vt) +HRESULT WINAPI DECLSPEC_HOTPATCH VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, + USHORT wFlags, VARTYPE vt) { return VariantChangeTypeEx( pvargDest, pvargSrc, LOCALE_USER_DEFAULT, wFlags, vt ); } -- 2.19.0

Sept. 18, 2018

[PATCH resend] ntdll: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc

by Alex Henrie

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 44d49bca99..bdadc7932d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1662,7 +1662,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) * NOTES * This call does not SetLastError(). */ -PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) +void * WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) { ARENA_FREE *pArena; ARENA_INUSE *pInUse; @@ -1747,7 +1747,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) * Success: TRUE, if ptr is NULL or was freed successfully. * Failure: FALSE. */ -BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, ULONG flags, PVOID ptr ) +BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *ptr ) { ARENA_INUSE *pInUse; SUBHEAP *subheap; -- 2.19.0

Sept. 18, 2018

[PATCH resend] msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc

by Alex Henrie

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/heap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 7ea80a3a50..b4f11d8ef4 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -21,6 +21,7 @@ * handler and non atomic heap operations */ +#include "config.h" #include "msvcrt.h" #include "mtdll.h" #include "wine/debug.h" @@ -127,7 +128,7 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; @@ -169,7 +170,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi /********************************************************************* * ??3(a)YAXPAX@Z (MSVCRT.@) */ -void CDECL MSVCRT_operator_delete(void *mem) +void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); msvcrt_heap_free(mem); @@ -394,7 +395,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { MSVCRT_size_t bytes = count*size; @@ -420,7 +421,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) /********************************************************************* * free (MSVCRT.@) */ -void CDECL MSVCRT_free(void* ptr) +void CDECL DECLSPEC_HOTPATCH MSVCRT_free(void* ptr) { msvcrt_heap_free(ptr); } @@ -459,7 +460,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) /********************************************************************* * realloc (MSVCRT.@) */ -void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); if (size) return msvcrt_heap_realloc(0, ptr, size); -- 2.19.0

Sept. 18, 2018

[PATCH resend] kernel32: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc

by Alex Henrie

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index c7a15cdcbb..3362868ba0 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -314,7 +314,7 @@ SIZE_T WINAPI VirtualQueryEx( HANDLE process, LPCVOID addr, * Success: Starting address of mapped view. * Failure: NULL. */ -LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFile( HANDLE mapping, DWORD access, +void * WINAPI DECLSPEC_HOTPATCH MapViewOfFile( HANDLE mapping, DWORD access, DWORD offset_high, DWORD offset_low, SIZE_T count ) { return MapViewOfFileEx( mapping, access, offset_high, @@ -384,7 +384,7 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, * Failure: FALSE. * */ -BOOL WINAPI UnmapViewOfFile( LPCVOID addr ) +BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile( const void *addr ) { NTSTATUS status; -- 2.19.0

Sept. 18, 2018