July 2021 - Wine-commits - list.winehq.org

Francois Gouget : oleaut32: VarParseNumFromStr() accepts trailing currency symbols.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: e02a7e579cc48079d70f2ef00957255d28d119d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e02a7e579cc48079d70f2ef0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 20 14:02:12 2021 +0200 oleaut32: VarParseNumFromStr() accepts trailing currency symbols. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51450 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 16 ++++++++-------- dlls/oleaut32/variant.c | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 8a666281384..c0c20dcf10f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1642,7 +1642,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, but is allowed after the amount and can even be repeated! */ CONVERT("$11$$", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); EXPECT2(1,1); EXPECTRGB(2,FAILDIG); @@ -1688,7 +1688,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, unless explicitly allowed */ WCONVERT(wstr, NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL); - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); EXPECT2(1,1); EXPECTRGB(2,FAILDIG); @@ -2006,7 +2006,7 @@ static void test_VarParseNumFromStrFr(void) /* With flag, consumes all currency signs! "E12EE" */ WCONVERT(L"\x20ac\x31\x32\x20ac\x20ac", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); @@ -2025,12 +2025,12 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - EXPECTFAIL; + todo_wine EXPECTFAIL; } else { /* The others behave normally */ - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2039,7 +2039,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); + todo_wine_if(i==0) EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2060,7 +2060,7 @@ static void test_VarParseNumFromStrFr(void) /* With flag and decimal flag, consumes decimal point and following digits */ WCONVERT(L"12,1\x20ac", NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL); - todo_wine EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1); + EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1); EXPECT2(1,2); EXPECTRGB(2,1); EXPECTRGB(3,FAILDIG); @@ -2159,7 +2159,7 @@ static void test_VarParseNumFromStrMisc(void) /* Multi-character currencies can be repeated too "zl2zlzl" */ WCONVERT(L"z\x142\x32z\x142z\x142", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,7,0,0); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,7,0,0); EXPECT2(2,FAILDIG); lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 71c3204e0a0..208d5b63c8f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1941,6 +1941,14 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla lpszStr++; pNumprs->dwOutFlags |= NUMPRS_NEG; } + else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && + *lpszStr == chars.cCurrencyLocal && + (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) + { + pNumprs->dwOutFlags |= NUMPRS_CURRENCY; + cchUsed += chars.cCurrencyLocal2 ? 2 : 1; + lpszStr += chars.cCurrencyLocal2 ? 2 : 1; + } else break; }

1 0

Zhiyi Zhang : uxtheme: Move themed scroll bar to uxtheme.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: d9063802f2d74f4474f548d3f68d213b0caa6d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9063802f2d74f4474f548d3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 20 21:04:14 2021 +0800 uxtheme: Move themed scroll bar to uxtheme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/theming.c | 5 ---- dlls/user32/hook.c | 28 ++++++++++++++++++++++ dlls/user32/scroll.c | 13 ++++++---- dlls/user32/user32.spec | 4 ++-- dlls/user32/user_private.h | 3 +++ dlls/uxtheme/Makefile.in | 1 + .../theme_scrollbar.c => uxtheme/scrollbar.c} | 21 ++++++++-------- dlls/uxtheme/system.c | 18 ++++++++++++++ dlls/uxtheme/uxtheme.spec | 4 ++-- dlls/uxtheme/uxthemedll.h | 8 +++++++ include/winuser.h | 9 +++++++ 12 files changed, 89 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9063802f2d74f4474f5…

1 0

Zhiyi Zhang : uxtheme: Move themed dialog to uxtheme.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: b0e51ead0d1c2ba305ba22c77a6a84671c096e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0e51ead0d1c2ba305ba22c7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 20 21:04:24 2021 +0800 uxtheme: Move themed dialog to uxtheme. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51137 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 2 - dlls/comctl32/comctl32.h | 4 - dlls/comctl32/commctrl.c | 7 +- dlls/comctl32/theming.c | 157 --------------------- dlls/user32/defdlg.c | 35 +++-- dlls/user32/hook.c | 1 + dlls/user32/user_private.h | 1 + dlls/uxtheme/Makefile.in | 1 + dlls/{comctl32/theme_dialog.c => uxtheme/dialog.c} | 25 ++-- dlls/uxtheme/system.c | 1 + dlls/uxtheme/uxthemedll.h | 1 + include/winuser.h | 1 + 12 files changed, 45 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0e51ead0d1c2ba305ba…

1 0

Zhiyi Zhang : uxtheme: Support drawing themed standard scroll bars.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 0a83027e20ecddc3cb87d1ee6d9eca88f92b1897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a83027e20ecddc3cb87d1ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 20 21:04:33 2021 +0800 uxtheme: Support drawing themed standard scroll bars. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39821 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 22 --- dlls/user32/hook.c | 1 + dlls/user32/scroll.c | 47 ++++- dlls/user32/user_private.h | 3 + dlls/uxtheme/scrollbar.c | 460 ++++++--------------------------------------- dlls/uxtheme/system.c | 1 + dlls/uxtheme/uxthemedll.h | 4 + include/winuser.h | 26 +++ 8 files changed, 132 insertions(+), 432 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a83027e20ecddc3cb87…

1 0

Zhiyi Zhang : uxtheme: Support pressed state for themed scroll bars.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 8c38f02d230fe6101bd8cbbaa9e170e514cbdf07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c38f02d230fe6101bd8cbba… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 20 21:04:40 2021 +0800 uxtheme: Support pressed state for themed scroll bars. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/scrollbar.c | 67 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 40fdbf4b89a..386f0446049 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -75,12 +75,29 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES lowertrackstate = SCRBS_NORMAL; thumbstate = SCRBS_NORMAL; - if (hit_test == SCROLL_TOP_RECT) - uppertrackstate = SCRBS_HOT; - else if (hit_test == SCROLL_BOTTOM_RECT) - lowertrackstate = SCRBS_HOT; - else if (hit_test == SCROLL_THUMB) - thumbstate = SCRBS_HOT; + if (vertical == tracking_info->vertical && hit_test == tracking_info->hit_test + && GetCapture() == hwnd) + { + if (hit_test == SCROLL_TOP_RECT) + uppertrackstate = SCRBS_PRESSED; + else if (hit_test == SCROLL_BOTTOM_RECT) + lowertrackstate = SCRBS_PRESSED; + else if (hit_test == SCROLL_THUMB) + thumbstate = SCRBS_PRESSED; + } + else + { + if (hit_test == SCROLL_TOP_RECT) + uppertrackstate = SCRBS_HOT; + else if (hit_test == SCROLL_BOTTOM_RECT) + lowertrackstate = SCRBS_HOT; + else if (hit_test == SCROLL_THUMB) + thumbstate = SCRBS_HOT; + } + + /* Thumb is also shown as pressed when tracking */ + if (tracking_info->win == hwnd && tracking_info->bar == bar) + thumbstate = SCRBS_PRESSED; } if (bar == SB_CTL) @@ -96,10 +113,21 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES uparrowstate = ABS_UPNORMAL; downarrowstate = ABS_DOWNNORMAL; - if (hit_test == SCROLL_TOP_ARROW) - uparrowstate = ABS_UPHOT; - else if (hit_test == SCROLL_BOTTOM_ARROW) - downarrowstate = ABS_DOWNHOT; + if (vertical == tracking_info->vertical && hit_test == tracking_info->hit_test + && GetCapture() == hwnd) + { + if (hit_test == SCROLL_TOP_ARROW) + uparrowstate = ABS_UPPRESSED; + else if (hit_test == SCROLL_BOTTOM_ARROW) + downarrowstate = ABS_DOWNPRESSED; + } + else + { + if (hit_test == SCROLL_TOP_ARROW) + uparrowstate = ABS_UPHOT; + else if (hit_test == SCROLL_BOTTOM_ARROW) + downarrowstate = ABS_DOWNHOT; + } } partrect = *rect; @@ -150,10 +178,21 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES leftarrowstate = ABS_LEFTNORMAL; rightarrowstate = ABS_RIGHTNORMAL; - if (hit_test == SCROLL_TOP_ARROW) - leftarrowstate = ABS_LEFTHOT; - else if (hit_test == SCROLL_BOTTOM_ARROW) - rightarrowstate = ABS_RIGHTHOT; + if (vertical == tracking_info->vertical && hit_test == tracking_info->hit_test + && GetCapture() == hwnd) + { + if (hit_test == SCROLL_TOP_ARROW) + leftarrowstate = ABS_LEFTPRESSED; + else if (hit_test == SCROLL_BOTTOM_ARROW) + rightarrowstate = ABS_RIGHTPRESSED; + } + else + { + if (hit_test == SCROLL_TOP_ARROW) + leftarrowstate = ABS_LEFTHOT; + else if (hit_test == SCROLL_BOTTOM_ARROW) + rightarrowstate = ABS_RIGHTHOT; + } } partrect = *rect;

1 0

Zhiyi Zhang : uxtheme: Support scroll bar state tracking in non-client areas.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 883878e550d263fd9caedd4ba5ee8c142407c010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=883878e550d263fd9caedd4b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 20 21:12:15 2021 +0800 uxtheme: Support scroll bar state tracking in non-client areas. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 3 +++ dlls/user32/defwnd.c | 11 +++++++++++ dlls/user32/nonclient.c | 33 +++++++++++++++++++++++++++++++++ dlls/user32/scroll.c | 37 ++++++++++++++++++++++++++++++++++--- 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index bf32097f95c..2b3d405ae69 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -171,6 +171,8 @@ extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DE extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseMove( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; @@ -184,6 +186,7 @@ extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BO extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; +extern void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index a3d92e84aef..5eb056ebd9e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -245,6 +245,17 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCPAINT: return NC_HandleNCPaint( hwnd, (HRGN)wParam ); + case WM_NCMOUSEMOVE: + { + POINT pt; + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + return NC_HandleNCMouseMove( hwnd, pt ); + } + + case WM_NCMOUSELEAVE: + return NC_HandleNCMouseLeave( hwnd ); + case WM_NCHITTEST: { POINT pt; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 50ecb0c4e2e..02e6ad92320 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -635,6 +635,39 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) return HTNOWHERE; } +LRESULT NC_HandleNCMouseMove(HWND hwnd, POINT pt) +{ + LONG hittest; + RECT rect; + + TRACE("hwnd=%p pt=%s\n", hwnd, wine_dbgstr_point(&pt)); + + hittest = NC_HandleNCHitTest(hwnd, pt); + if (hittest != HTHSCROLL && hittest != HTVSCROLL) + return 0; + + WIN_GetRectangles(hwnd, COORDS_CLIENT, &rect, NULL); + ScreenToClient(hwnd, &pt); + pt.x -= rect.left; + pt.y -= rect.top; + SCROLL_HandleScrollEvent(hwnd, hittest == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); + return 0; +} + +LRESULT NC_HandleNCMouseLeave(HWND hwnd) +{ + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + POINT pt = {0, 0}; + + TRACE("hwnd=%p\n", hwnd); + + if (style & WS_HSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_HORZ, WM_NCMOUSELEAVE, pt); + if (style & WS_VSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_VERT, WM_NCMOUSELEAVE, pt); + + return 0; +} /****************************************************************************** * diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index c4c06476b9c..088e41eee43 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -751,7 +751,7 @@ static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) * 'pt' is the location of the mouse event in client (for SB_CTL) or * windows coordinates. */ -static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) +void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) { /* Previous mouse position for timer events */ static POINT prevPt; @@ -773,7 +773,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ); if (!infoPtr) return; if ((g_tracking_info.hit_test == SCROLL_NOWHERE) - && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE)) + && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE + && msg != WM_NCMOUSEMOVE && msg != WM_NCMOUSELEAVE)) return; if (nBar == SB_CTL && (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX))) @@ -841,6 +842,32 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; + case WM_NCMOUSEMOVE: + hittest = SCROLL_HitTest( hwnd, nBar, pt, vertical == g_tracking_info.vertical && GetCapture() == hwnd ); + prevPt = pt; + + if (nBar == SB_CTL) + break; + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + TrackMouseEvent( &tme ); + if (((tme.dwFlags & (TME_NONCLIENT | TME_LEAVE)) != (TME_NONCLIENT | TME_LEAVE)) || tme.hwndTrack != hwnd) + { + tme.dwFlags = TME_NONCLIENT | TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent( &tme ); + } + + break; + + case WM_NCMOUSELEAVE: + if (nBar == SB_CTL) + return; + + hittest = SCROLL_NOWHERE; + break; + case WM_MOUSELEAVE: if (nBar != SB_CTL) return; @@ -870,7 +897,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ - if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE) + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE || msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; @@ -1049,6 +1076,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) if (msg.message == WM_LBUTTONUP || msg.message == WM_MOUSEMOVE || msg.message == WM_MOUSELEAVE || + msg.message == WM_NCMOUSEMOVE || + msg.message == WM_NCMOUSELEAVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { pt.x = (short)LOWORD(msg.lParam) - rect.left; @@ -1383,6 +1412,8 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA } break; case WM_LBUTTONUP: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: case WM_MOUSEMOVE: case WM_MOUSELEAVE: case WM_SYSTIMER:

1 0

Ziqing Hui : include: Add the D2D12DAffineTransform definitions.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 1a731229437c0d27d1e0aaf6a8fd47b3c868e2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a731229437c0d27d1e0aaf6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 20 16:16:06 2021 +0200 include: Add the D2D12DAffineTransform definitions. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d2d1_1.idl | 1 + include/d2d1effects.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 61a74a210c9..46cb0f53a5e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ SOURCES = \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ + d2d1effects.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 257a970968f..fdec8ae5f9c 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -17,6 +17,7 @@ */ import "d2d1.idl"; +import "d2d1effects.idl"; interface ID2D1DeviceContext; interface ID2D1PathGeometry1; diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl new file mode 100644 index 00000000000..ee1dbe94728 --- /dev/null +++ b/include/d2d1effects.idl @@ -0,0 +1,46 @@ +/* + * Copyright 2021 Ziqing Hui for CodeWeavers + * + * 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 + */ + +cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") + +typedef enum D2D1_BORDER_MODE +{ + D2D1_BORDER_MODE_SOFT = 0x0, + D2D1_BORDER_MODE_HARD = 0x1, + D2D1_BORDER_MODE_FORCE_DWORD = 0xffffffff +} D2D1_BORDER_MODE; + +typedef enum D2D1_2DAFFINETRANSFORM_PROP +{ + D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE = 0x0, + D2D1_2DAFFINETRANSFORM_PROP_BORDER_MODE = 0x1, + D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX = 0x2, + D2D1_2DAFFINETRANSFORM_PROP_SHARPNESS = 0x3, + D2D1_2DAFFINETRANSFORM_PROP_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_PROP; + +typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE +{ + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE;

1 0

Alistair Leslie-Hughes : secur32: Set error flag on pull callback.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 8ed81720e81b20a134d9cd5c6bb50183752d9e82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ed81720e81b20a134d9cd5c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 20 10:17:53 2021 +1000 secur32: Set error flag on pull callback. Fixes a regression introduced in b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 Partial revert the pull_timeout function, which now return -1 and sets the transport error to try again. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51440 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcf38e3f23f..4d8109721ce 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,7 +292,15 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - return 0; + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T count = 0; + + TRACE("\n"); + + if (callbacks->get_buffer(t, &t->in, &count)) return 1; + pgnutls_transport_set_errno(s, EAGAIN); + return -1; } static BOOL CDECL schan_create_session(schan_session *session, schan_credentials *cred)

1 0

Zebediah Figura : quartz: Factor out more of AdviseTime() and AdvisePeriodic().
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 6c0ddfee9d94d4afa9cd391e580ab7494d4649ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0ddfee9d94d4afa9cd391e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 19 22:25:24 2021 -0500 quartz: Factor out more of AdviseTime() and AdvisePeriodic(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 74 +++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 24d8651aaba..cbe5f395258 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -169,8 +169,29 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) } } -static void notify_thread(struct system_clock *clock) +static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, + REFERENCE_TIME due_time, REFERENCE_TIME period, DWORD_PTR *cookie) { + struct advise_sink *sink; + + if (!handle) + return E_INVALIDARG; + + if (!cookie) + return E_POINTER; + + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + return E_OUTOFMEMORY; + + sink->handle = (HANDLE)handle; + sink->due_time = due_time; + sink->period = period; + sink->cookie = InterlockedIncrement(&cookie_counter); + + EnterCriticalSection(&clock->cs); + list_add_tail(&clock->sinks, &sink->entry); + LeaveCriticalSection(&clock->cs); + if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -178,6 +199,9 @@ static void notify_thread(struct system_clock *clock) clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); } SetEvent(clock->notify_event); + + *cookie = sink->cookie; + return S_OK; } static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) @@ -225,72 +249,28 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) { struct system_clock *clock = impl_from_IReferenceClock(iface); - struct advise_sink *sink; TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", clock, debugstr_time(base), debugstr_time(offset), event, cookie); - if (!event) - return E_INVALIDARG; - if (base + offset <= 0) return E_INVALIDARG; - if (!cookie) - return E_POINTER; - - if (!(sink = heap_alloc_zero(sizeof(*sink)))) - return E_OUTOFMEMORY; - - sink->handle = (HANDLE)event; - sink->due_time = base + offset; - sink->period = 0; - sink->cookie = InterlockedIncrement(&cookie_counter); - - EnterCriticalSection(&clock->cs); - list_add_tail(&clock->sinks, &sink->entry); - LeaveCriticalSection(&clock->cs); - - notify_thread(clock); - - *cookie = sink->cookie; - return S_OK; + return add_sink(clock, event, base + offset, 0, cookie); } static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) { struct system_clock *clock = impl_from_IReferenceClock(iface); - struct advise_sink *sink; TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", clock, debugstr_time(start), debugstr_time(period), semaphore, cookie); - if (!semaphore) - return E_INVALIDARG; - if (start <= 0 || period <= 0) return E_INVALIDARG; - if (!cookie) - return E_POINTER; - - if (!(sink = heap_alloc_zero(sizeof(*sink)))) - return E_OUTOFMEMORY; - - sink->handle = (HANDLE)semaphore; - sink->due_time = start; - sink->period = period; - sink->cookie = InterlockedIncrement(&cookie_counter); - - EnterCriticalSection(&clock->cs); - list_add_tail(&clock->sinks, &sink->entry); - LeaveCriticalSection(&clock->cs); - - notify_thread(clock); - - *cookie = sink->cookie; - return S_OK; + return add_sink(clock, semaphore, start, period, cookie); } static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR cookie)

1 0

Zebediah Figura : quartz: Use a condition variable to wake up the system clock advise thread.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 4df1a5831ca5b71c78c20fe2abca3b8b3d78389b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df1a5831ca5b71c78c20fe2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 19 22:25:25 2021 -0500 quartz: Use a condition variable to wake up the system clock advise thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cbe5f395258..597373a4112 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -42,10 +42,11 @@ struct system_clock IUnknown *outer_unk; LONG refcount; - BOOL thread_created; - HANDLE thread, notify_event, stop_event; + BOOL thread_created, thread_stopped; + HANDLE thread; REFERENCE_TIME last_time; CRITICAL_SECTION cs; + CONDITION_VARIABLE cv; struct list sinks; }; @@ -96,11 +97,12 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) { if (clock->thread) { - SetEvent(clock->stop_event); + EnterCriticalSection(&clock->cs); + clock->thread_stopped = TRUE; + LeaveCriticalSection(&clock->cs); + WakeConditionVariable(&clock->cv); WaitForSingleObject(clock->thread, INFINITE); CloseHandle(clock->thread); - CloseHandle(clock->notify_event); - CloseHandle(clock->stop_event); } clock->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&clock->cs); @@ -128,7 +130,6 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) struct system_clock *clock = param; struct advise_sink *sink, *cursor; REFERENCE_TIME current_time; - HANDLE handles[2] = {clock->stop_event, clock->notify_event}; TRACE("Starting advise thread for clock %p.\n", clock); @@ -162,10 +163,13 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) timeout = min(timeout, (sink->due_time - current_time) / 10000); } - LeaveCriticalSection(&clock->cs); - - if (WaitForMultipleObjects(2, handles, FALSE, timeout) == 0) + SleepConditionVariableCS(&clock->cv, &clock->cs, timeout); + if (clock->thread_stopped) + { + LeaveCriticalSection(&clock->cs); return 0; + } + LeaveCriticalSection(&clock->cs); } } @@ -194,11 +198,9 @@ static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { - clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); - clock->stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); } - SetEvent(clock->notify_event); + WakeConditionVariable(&clock->cv); *cookie = sink->cookie; return S_OK;

1 0