January 2022 - Wine-commits

Huw Davies : widl: Remove the uuid_t typedef which causes conflicts on macOS.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: f8adbf35ca94f7b457ad967aa6a161f6613b21c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8adbf35ca94f7b457ad967a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 25 07:45:39 2022 +0000 widl: Remove the uuid_t typedef which causes conflicts on macOS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 2 +- tools/widl/header.c | 14 +++++++------- tools/widl/parser.l | 4 ++-- tools/widl/parser.y | 6 +++--- tools/widl/proxy.c | 4 ++-- tools/widl/register.c | 18 +++++++++--------- tools/widl/server.c | 2 +- tools/widl/typegen.c | 2 +- tools/widl/typelib.c | 2 +- tools/widl/typelib_struct.h | 8 ++++---- tools/widl/typetree.c | 8 ++++---- tools/widl/utils.h | 2 +- tools/widl/widl.c | 8 ++++---- tools/widl/widltypes.h | 10 +++++----- tools/widl/write_msft.c | 20 ++++++++++---------- 15 files changed, 55 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f8adbf35ca94f7b457ad…

1 0

Zhiyi Zhang : user32: Avoid recalculating the non-client hit-test value for NC_HandleNCMouseMove().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 2e81e5779ddb7edccd0cf915afc0c1edd3c45d4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e81e5779ddb7edccd0cf915… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 25 15:58:44 2022 +0800 user32: Avoid recalculating the non-client hit-test value for NC_HandleNCMouseMove(). The wParam in WM_NCMOUSEMOVE messages already contains the non-client hit-test value. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 7 +------ dlls/user32/nonclient.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 2b3d405ae69..ce14d13171f 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -171,7 +171,7 @@ 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_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) 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; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 44675c7b8e7..abb73e73ca8 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -246,12 +246,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa 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 ); - } + return NC_HandleNCMouseMove( hwnd, wParam, lParam ); case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index b47616bb639..639cca707fb 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -635,22 +635,24 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) return HTNOWHERE; } -LRESULT NC_HandleNCMouseMove(HWND hwnd, POINT pt) +LRESULT NC_HandleNCMouseMove(HWND hwnd, WPARAM wParam, LPARAM lParam) { - LONG hittest; RECT rect; + POINT pt; - TRACE("hwnd=%p pt=%s\n", hwnd, wine_dbgstr_point(&pt)); + TRACE("hwnd=%p wparam=%#lx lparam=%#lx\n", hwnd, wParam, lParam); - hittest = NC_HandleNCHitTest(hwnd, pt); - if (hittest != HTHSCROLL && hittest != HTVSCROLL) + if (wParam != HTHSCROLL && wParam != HTVSCROLL) return 0; WIN_GetRectangles(hwnd, COORDS_CLIENT, &rect, NULL); + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); ScreenToClient(hwnd, &pt); pt.x -= rect.left; pt.y -= rect.top; - SCROLL_HandleScrollEvent(hwnd, hittest == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); + SCROLL_HandleScrollEvent(hwnd, wParam == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); return 0; }

1 0

Zhiyi Zhang : user32/tests: Test painting standard scroll bars in hovered state.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: b9110622be5a4bd31aa24a28d78283a2c1a5a948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9110622be5a4bd31aa24a28… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 25 15:58:51 2022 +0800 user32/tests: Test painting standard scroll bars in hovered state. Mostly to test that standard scroll bars doesn't get painted in hovered state if they weren't previously painted by DefWinProcA/W(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0156987f529..ed90c5fbe5f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1132,12 +1132,42 @@ static void wine_AdjustWindowRectExForDpi( RECT *rect, LONG style, BOOL menu, LO InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE)); } +static int offset; + +static LRESULT CALLBACK test_standard_scrollbar_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch (msg) + { + case WM_NCPAINT: + { + HRGN region; + RECT rect; + + GetWindowRect(hwnd, &rect); + region = CreateRectRgn(rect.left, rect.top, rect.right, rect.bottom - offset); + DefWindowProcA(hwnd, msg, (WPARAM)region, lp); + DeleteObject(region); + return 0; + } + default: + return DefWindowProcA(hwnd, msg, wp, lp); + } +} + static void test_nonclient_area(HWND hwnd) { + BOOL (WINAPI *pIsThemeActive)(void); + POINT point, old_cursor_pos; + COLORREF color, old_color; + BOOL is_theme_active; DWORD style, exstyle; RECT rc_window, rc_client, rc; + HWND child, parent; + HMODULE uxtheme; + WNDCLASSA cls; BOOL menu; LRESULT ret; + HDC hdc; style = GetWindowLongA(hwnd, GWL_STYLE); exstyle = GetWindowLongA(hwnd, GWL_EXSTYLE); @@ -1189,6 +1219,98 @@ static void test_nonclient_area(HWND hwnd) ok(EqualRect(&rc, &rc_client), "synthetic rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, client=%s, calc=%s\n", style, exstyle, menu, wine_dbgstr_rect(&rc_client), wine_dbgstr_rect(&rc)); + + /* Test standard scroll bars */ + uxtheme = LoadLibraryA("uxtheme.dll"); + ok(!!uxtheme, "Failed to load uxtheme.dll, error %u.\n", GetLastError()); + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %u.\n", GetLastError()); + is_theme_active = pIsThemeActive(); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = DefWindowProcA; + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(LTGRAY_BRUSH); + cls.lpszClassName = "TestStandardScrollbarParentClass"; + RegisterClassA(&cls); + + cls.lpfnWndProc = test_standard_scrollbar_proc; + cls.hbrBackground = GetStockObject(GRAY_BRUSH); + cls.lpszClassName = "TestStandardScrollbarClass"; + RegisterClassA(&cls); + + parent = CreateWindowA("TestStandardScrollbarParentClass", "parent", WS_POPUP | WS_VISIBLE, 100, + 100, 100, 100, NULL, NULL, 0, NULL); + ok(!!parent, "Failed to create a parent window, error %u.\n", GetLastError()); + GetCursorPos(&old_cursor_pos); + + /* Place the cursor on the standard scroll bar arrow button when not painting it at all. + * Expects the standard scroll bar not to appear before and after the cursor position change */ + offset = GetSystemMetrics(SM_CYHSCROLL); + child = CreateWindowA("TestStandardScrollbarClass", "test", WS_CHILD | WS_HSCROLL | WS_VISIBLE, + 0, 0, 50, 50, parent, NULL, 0, NULL); + ok(!!child, "Failed to create a test window, error %u.\n", GetLastError()); + hdc = GetDC(parent); + ok(!!hdc, "GetDC failed, error %d.\n", GetLastError()); + + SetCursorPos(0, 0); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + old_color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + ok(old_color == 0xc0c0c0, "Expected color %#x, got %#x.\n", 0xc0c0c0, old_color); + + point.x = 50 - GetSystemMetrics(SM_CXVSCROLL) / 2; + point.y = 50 - GetSystemMetrics(SM_CYHSCROLL) / 2; + ClientToScreen(child, &point); + SetCursorPos(point.x, point.y); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + todo_wine + ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color); + + ReleaseDC(parent, hdc); + DestroyWindow(child); + + /* Place the cursor on standard scroll bar arrow button when painting 1 pixel of the scroll bar. + * Expects the scroll bar to appear after the cursor position change */ + offset = GetSystemMetrics(SM_CYHSCROLL) - 1; + child = CreateWindowA("TestStandardScrollbarClass", "test", WS_CHILD | WS_HSCROLL | WS_VISIBLE, + 0, 0, 50, 50, parent, NULL, 0, NULL); + ok(!!child, "Failed to create a test window, error %u.\n", GetLastError()); + hdc = GetDC(parent); + ok(!!hdc, "GetDC failed, error %d.\n", GetLastError()); + + SetCursorPos(0, 0); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + old_color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + + point.x = 50 - GetSystemMetrics(SM_CXVSCROLL) / 2; + point.y = 50 - GetSystemMetrics(SM_CYHSCROLL) / 2; + ClientToScreen(child, &point); + SetCursorPos(point.x, point.y); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + if (is_theme_active) + ok(color != old_color || broken(color == old_color), /* Win 10 1507 64-bit */ + "Got unexpected color %#x.\n", color); + else + todo_wine + ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color); + + SetCursorPos(old_cursor_pos.x, old_cursor_pos.y); + ReleaseDC(parent, hdc); + DestroyWindow(parent); + UnregisterClassA("TestStandardScrollbarClass", GetModuleHandleA(0)); + UnregisterClassA("TestStandardScrollbarParentClass", GetModuleHandleA(0)); + FreeLibrary(uxtheme); } static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam)

1 0

Zhiyi Zhang : user32: Draw standard scroll bars in hovered state only when they were previously painted by DefWinProc().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 78ac7ae24d9abf4aa6ae44a50636cc963691e8f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ac7ae24d9abf4aa6ae44a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 25 15:58:59 2022 +0800 user32: Draw standard scroll bars in hovered state only when they were previously painted by DefWinProc(). When an application handles WM_NCPAINT by itself, standard scroll bars are not drawn even if WS_HSCROLL or WS_VSCROLL is used. In this case, when handling WM_NCMOUSEMOVE, DefWinProc() shouldn't repaint standard scroll bars to reflect hovered state, otherwise, DefWinProc() draws over the custom non-client area painted by the application. This is also the behavior on XP. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51900 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 13 ++++++++++++- dlls/user32/scroll.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/win.c | 1 - dlls/user32/user_private.h | 1 + 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 41c0bb3c6e1..63a8e840998 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -639,6 +639,7 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) { HRGN whole_rgn = get_update_region( hwnd, flags, child ); HRGN client_rgn = 0; + DWORD style; if (child) hwnd = *child; @@ -678,7 +679,17 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) /* NOTE: WM_NCPAINT allows wParam to be 1 */ { - if (*flags & UPDATE_NONCLIENT) SendMessageW( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); + if (*flags & UPDATE_NONCLIENT) + { + /* Mark standard scroll bars as not painted before sending WM_NCPAINT */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (style & WS_HSCROLL) + SCROLL_SetStandardScrollPainted( hwnd, SB_HORZ, FALSE ); + if (style & WS_VSCROLL) + SCROLL_SetStandardScrollPainted( hwnd, SB_VERT, FALSE ); + + SendMessageW( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); + } if (whole_rgn > (HRGN)1) DeleteObject( whole_rgn ); } SetThreadDpiAwarenessContext( context ); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a17495d9ff0..a3f0becbbd6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -39,6 +39,7 @@ typedef struct INT maxVal; /* Maximum scroll-bar value */ INT page; /* Page size of scroll bar (Win32) */ UINT flags; /* EnableScrollBar flags */ + BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ } SCROLLBAR_INFO, *LPSCROLLBAR_INFO; /* data for window that has (one or two) scroll bars */ @@ -643,6 +644,29 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } +void SCROLL_SetStandardScrollPainted( HWND hwnd, INT bar, BOOL painted ) +{ + LPSCROLLBAR_INFO info; + + if (bar != SB_HORZ && bar != SB_VERT) + return; + + info = SCROLL_GetInternalInfo( hwnd, bar, FALSE ); + if (info) + info->painted = painted; +} + +static BOOL SCROLL_IsStandardScrollPainted( HWND hwnd, INT bar ) +{ + LPSCROLLBAR_INFO info; + + if (bar != SB_HORZ && bar != SB_VERT) + return FALSE; + + info = SCROLL_GetInternalInfo( hwnd, bar, FALSE ); + return info ? info->painted : FALSE; +} + /*********************************************************************** * SCROLL_DrawScrollBar * @@ -653,9 +677,9 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ BOOL draw_interior ) { INT arrow_size, thumb_size, thumb_pos; + RECT rect, clip_box, intersect; BOOL vertical; DWORD style; - RECT rect; if (!(hwnd = WIN_GetFullHandle( hwnd ))) return; @@ -682,6 +706,13 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ GetCapture()); user_api->pScrollBarDraw( hwnd, hdc, bar, hit_test, tracking_info, draw_arrows, draw_interior, &rect, arrow_size, thumb_pos, thumb_size, vertical ); + + if (bar == SB_HORZ || bar == SB_VERT) + { + GetClipBox( hdc, &clip_box ); + if (IntersectRect(&intersect, &rect, &clip_box)) + SCROLL_SetStandardScrollPainted( hwnd, bar, TRUE ); + } } void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) @@ -899,7 +930,13 @@ 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 || msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) + /* For standard scroll bars, hovered state gets painted only when the scroll bar was + * previously painted by DefWinProc(). If an application handles WM_NCPAINT by itself, then + * the scrollbar shouldn't be repainted here to avoid overwriting the application painted + * content */ + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE + || ((msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) + && SCROLL_IsStandardScrollPainted( hwnd, nBar))) SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ed90c5fbe5f..cb6b61e59c0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1269,7 +1269,6 @@ static void test_nonclient_area(HWND hwnd) RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); - todo_wine ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color); ReleaseDC(parent, hdc); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7a9845adeb9..3b542ea1452 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -308,5 +308,6 @@ LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HID void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL) DECLSPEC_HIDDEN; +void SCROLL_SetStandardScrollPainted(HWND hwnd, INT bar, BOOL visible); #endif /* __WINE_USER_PRIVATE_H */

1 0

Zhiyi Zhang : uxtheme: Search TMT_IMAGEFILE1~7 first when drawing background for parts without glyph images.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 4311a993ddddbafab475e2c523d51722d7ce9810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4311a993ddddbafab475e2c5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 25 16:00:17 2022 +0800 uxtheme: Search TMT_IMAGEFILE1~7 first when drawing background for parts without glyph images. Try TMT_IMAGEFILE first when drawing part background and the part contains glyph images. Otherwise, search TMT_IMAGEFILE1~7 and then TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE. This behavior can be verified by drawing scroll bar arrow buttons, where TMT_IMAGEFILE is used for background despite TMT_IMAGEFILE1 being present and TMT_IMAGEFILE1 is used for glyphs despite TMT_IMAGEFILE is present. For parts without glyph images, TMT_IMAGEFILE1~7 are always searched first, then try TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE. Fix the size grip on status control not being painted when using builtin Light theme. The status gripper part uses TMT_IMAGEFILE1~7 and doesn't have TMT_IMAGEFILE. So when UXTHEME_SelectImage() tries to query TMT_IMAGEFILE for status gripper, it falls back to using status class TMT_IMAGEFILE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 4aac46f3fed..709cf522d00 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -185,20 +185,23 @@ static int imagefile_index_to_property(int index) static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, int *imageDpi) { - PTHEME_PROPERTY tp; - int imageselecttype = IST_NONE; + int imageselecttype = IST_NONE, glyphtype = GT_NONE; + PTHEME_PROPERTY tp = NULL; int i; - int image; - if(glyph) - image = TMT_GLYPHIMAGEFILE; - else - image = TMT_IMAGEFILE; if (imageDpi) *imageDpi = 96; - if((tp=MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, image))) - return tp; + /* Try TMT_IMAGEFILE first when drawing part background and the part contains glyph images. + * Otherwise, search TMT_IMAGEFILE1~7 and then TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE */ + if (!glyph) + { + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_GLYPHTYPE, &glyphtype); + if (glyphtype == GT_IMAGEGLYPH && + (tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE))) + return tp; + } + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGESELECTTYPE, &imageselecttype); if(imageselecttype == IST_DPI) { @@ -223,7 +226,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } /* If an image couldn't be selected, choose the first one */ - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } else if(imageselecttype == IST_SIZE) { POINT size = {pRect->right-pRect->left, pRect->bottom-pRect->top}; @@ -270,9 +273,13 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } /* If an image couldn't be selected, choose the smallest one */ - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } - return NULL; + + if (!tp) + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, + glyph ? TMT_GLYPHIMAGEFILE : TMT_IMAGEFILE); + return tp; } /***********************************************************************

1 0

Zhiyi Zhang : uxtheme: Do not resize source image even if destination is smaller than sizing margins.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 7bc708df3522d35f0bfd507a67b4e2abfc76b5ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc708df3522d35f0bfd507a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 25 16:00:23 2022 +0800 uxtheme: Do not resize source image even if destination is smaller than sizing margins. This partially reverts 2b650fa, which resizes source image if destination is smaller than its sizing margins. Resizing the source image may result in the destination image missing some edges because of StretchBlt() calls. Same StretchBlt() calls also produce similar results on Windows. So it seems that Windows don't resize the source image and only resize the margins to try to keep the edges crisp. Fix scroll bar thumb missing edges when it's too small. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 709cf522d00..75db466967c 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -711,9 +711,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, const DTBGOPTS *pOptions) { HRESULT hr = S_OK; - HBITMAP bmpSrc, bmpSrcResized = NULL; + HBITMAP bmpSrc; HGDIOBJ oldSrc; - HDC hdcSrc, hdcOrigSrc = NULL; + HDC hdcSrc; RECT rcSrc; RECT rcDst; POINT dstSize; @@ -777,33 +777,17 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); - /* Resize source image if destination smaller than margins */ + /* Resize sizing margins if destination is smaller */ if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; - srcSize.y = dstSize.y; } if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; - srcSize.x = dstSize.x; } - - hdcOrigSrc = hdcSrc; - hdcSrc = CreateCompatibleDC(NULL); - bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); - SelectObject(hdcSrc, bmpSrcResized); - - /* Use ALPHABLEND_NONE because the image is getting resized, rather than blended with the target */ - UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, ALPHABLEND_NONE, 0); - - rcSrc.left = 0; - rcSrc.top = 0; - rcSrc.right = srcSize.x; - rcSrc.bottom = srcSize.y; } hdcDst = hdc; @@ -910,8 +894,6 @@ draw_error: } SelectObject(hdcSrc, oldSrc); DeleteDC(hdcSrc); - if (bmpSrcResized) DeleteObject(bmpSrcResized); - if (hdcOrigSrc) DeleteDC(hdcOrigSrc); *pRect = rcDst; return hr; }

1 0

Michael Stefaniuc : dmsynth: Implement the sink Init method.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 83064d150000056e40319fb37fd1b62ddc4166c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83064d150000056e40319fb3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 00:25:06 2022 +0100 dmsynth: Implement the sink Init method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 1 + dlls/dmsynth/synthsink.c | 6 +++++- dlls/dmsynth/tests/dmsynth.c | 2 ++ dlls/dmusic/port.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 2a2e88c8e88..aabf1f56904 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -77,6 +77,7 @@ struct IDirectMusicSynthSinkImpl { LONG ref; IReferenceClock *latency_clock; IReferenceClock *master_clock; + IDirectMusicSynth *synth; /* No reference hold! */ BOOL active; }; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 72fd671a415..9d7096a032b 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -96,7 +96,11 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *ifac { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - FIXME("(%p)->(%p): stub\n", This, synth); + TRACE("(%p)->(%p)\n", This, synth); + + /* Not holding a reference to avoid circular dependencies. + The synth will release the sink during the synth's destruction. */ + This->synth = synth; return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 1e3e20829b7..e27d8abdb26 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -131,6 +131,8 @@ static void test_dmsynth(void) ref_clock_sink = get_refcount(clock_sink); /* This will Init() the SynthSink and finish initializing the Synth */ + hr = IDirectMusicSynthSink_Init(dmsynth_sink2, NULL); + ok(hr == S_OK, "IDirectMusicSynthSink_Init returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink2); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 31b3b764e02..7fe72563bb0 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -195,10 +195,10 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) if (!ref) { dmusic_remove_port(This->parent, iface); + IDirectMusicSynthSink_Release(This->synth_sink); IDirectMusicSynth_Activate(This->synth, FALSE); IDirectMusicSynth_Close(This->synth); IDirectMusicSynth_Release(This->synth); - IDirectMusicSynthSink_Release(This->synth_sink); if (This->dsbuffer) IDirectSoundBuffer_Release(This->dsbuffer); if (This->dsound)

1 0

Alexandre Julliard : server: Define a server-side structure for LUID_AND_ATTRIBUTES.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 7d7322671ca51feecfede56ad12650c0b211f65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d7322671ca51feecfede56a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 11:55:40 2022 +0100 server: Define a server-side structure for LUID_AND_ATTRIBUTES. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 32 ++++---- server/protocol.def | 30 ++++--- server/registry.c | 6 +- server/request.h | 2 +- server/security.h | 50 ++++++------ server/token.c | 172 ++++++++++++++++++----------------------- server/trace.c | 23 +++--- tools/make_requests | 2 +- 8 files changed, 154 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d7322671ca51feecfed…

1 0

Alexandre Julliard : server: Define a server-side structure for SID_AND_ATTRIBUTES.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: bf3442fab68938010be63340c7955d09d62cbb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3442fab68938010be63340… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:03:14 2022 +0100 server: Define a server-side structure for SID_AND_ATTRIBUTES. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/server/token.c b/server/token.c index f9aea331329..b940df61aef 100644 --- a/server/token.c +++ b/server/token.c @@ -64,6 +64,12 @@ const struct luid SeManageVolumePrivilege = { 28, 0 }; const struct luid SeImpersonatePrivilege = { 29, 0 }; const struct luid SeCreateGlobalPrivilege = { 30, 0 }; +struct sid_attrs +{ + const SID *sid; + unsigned int attrs; +}; + #define SID_N(n) struct /* same fields as struct SID */ \ { \ BYTE Revision; \ @@ -86,9 +92,6 @@ static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHO static const SID_N(5) domain_users_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, DOMAIN_GROUP_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; -static const PSID security_local_sid = (PSID)&local_sid; -static const PSID security_interactive_sid = (PSID)&interactive_sid; -static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; @@ -541,7 +544,7 @@ static void token_destroy( struct object *obj ) * allocated. */ static struct token *create_token( unsigned int primary, unsigned int session_id, const SID *user, - const SID_AND_ATTRIBUTES *groups, unsigned int group_count, + const struct sid_attrs *groups, unsigned int group_count, const struct luid_attr *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, const struct luid *modified_id, @@ -581,7 +584,7 @@ static struct token *create_token( unsigned int primary, unsigned int session_id /* copy groups */ for (i = 0; i < group_count; i++) { - size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ); + size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[groups[i].sid->SubAuthorityCount] ); struct group *group = mem_alloc( size ); if (!group) @@ -589,12 +592,12 @@ static struct token *create_token( unsigned int primary, unsigned int session_id release_object( token ); return NULL; } - memcpy( &group->sid, groups[i].Sid, security_sid_len( groups[i].Sid )); + memcpy( &group->sid, groups[i].sid, security_sid_len( groups[i].sid )); group->enabled = TRUE; group->def = TRUE; - group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0; - group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0; - group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0; + group->logon = (groups[i].attrs & SE_GROUP_LOGON_ID) != 0; + group->mandatory = (groups[i].attrs & SE_GROUP_MANDATORY) != 0; + group->owner = (groups[i].attrs & SE_GROUP_OWNER) != 0; group->resource = FALSE; group->deny_only = FALSE; list_add_tail( &token->groups, &group->entry ); @@ -878,13 +881,13 @@ struct token *token_create_admin( unsigned primary, int impersonation_level, int }; /* note: we don't include non-builtin groups here for the user - * telling us these is the job of a client-side program */ - const SID_AND_ATTRIBUTES admin_groups[] = + const struct sid_attrs admin_groups[] = { - { security_world_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, + { &world_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { &local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { &interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { &authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { (SID *)&domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },

1 0

Francois Gouget : testbot/SetWinLocale: Explicitly set ResetAllSettings=true for <gs:Locale>.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: tools Branch: master Commit: b39de48b1c804c4985dd89b1599a5a3da154915f URL: https://source.winehq.org/git/tools.git/?a=commit;h=b39de48b1c804c4985dd89b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 25 16:46:29 2022 +0100 testbot/SetWinLocale: Explicitly set ResetAllSettings=true for <gs:Locale>. The ResetAllSettings default value is probably true but that is not documented. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 73b09eb..8d8f866 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -753,7 +753,8 @@ if ($KeyboardIds) if ($OptLocale) { push @Config, " <gs:UserLocale>", - " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", + " <gs:Locale Name='$OptLocale' SetAsCurrent='true' ResetAllSettings='true'>", + " </gs:Locale>", " </gs:UserLocale>"; } push @Config, "</gs:GlobalizationServices>";

1 0