November 2021 - Wine-commits

Zhiyi Zhang : comctl32/tests: Test WM_CTLCOLORSTATIC for static controls in a themed dialog.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: e17aedb2849278bb15dd2f67cd5610f83dc36212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e17aedb2849278bb15dd2f67… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:39:38 2021 +0800 comctl32/tests: Test WM_CTLCOLORSTATIC for static controls in a themed dialog. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 40a337b97b0..269dfbb49eb 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "commctrl.h" #include "resources.h" +#include "uxtheme.h" #include "wine/test.h" @@ -377,6 +378,96 @@ static void test_STM_SETIMAGE(void) DeleteEnhMetaFile(emf); } +static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + static HWND child; + + switch (msg) + { + case WM_INITDIALOG: + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, + (HMENU)100, 0, NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + return FALSE; + + case WM_CLOSE: + DestroyWindow(child); + return TRUE; + + default: + return FALSE; + } +} + +static void test_WM_CTLCOLORSTATIC(void) +{ + HTHEME (WINAPI *pGetWindowTheme)(HTHEME) = NULL; + HWND parent, dialog, child; + COLORREF color, old_color; + HDC child_hdc, dialog_hdc; + int mode, old_mode; + BOOL todo = FALSE; + HMODULE uxtheme; + HBRUSH brush; + + struct + { + DLGTEMPLATE tmplate; + WORD menu; + WORD class; + WORD title; + } temp = {{0}}; + + parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, + NULL); + ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + + temp.tmplate.style = WS_CHILD | WS_VISIBLE; + temp.tmplate.cx = 80; + temp.tmplate.cy = 80; + dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, test_WM_CTLCOLORSTATIC_proc, 0); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + child = GetDlgItem(dialog, 100); + ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); + + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pGetWindowTheme = (void*)GetProcAddress(uxtheme, "GetWindowTheme"); + if (pGetWindowTheme) + todo = !!pGetWindowTheme(dialog); + } + + dialog_hdc = GetDC(dialog); + child_hdc = GetDC(child); + PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); + + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(todo) + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + mode = SetBkMode(child_hdc, old_mode); + todo_wine_if(todo) + ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); + color = GetPixel(dialog_hdc, 40, 40); + todo_wine_if(todo) + ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); + + ReleaseDC(child, child_hdc); + ReleaseDC(dialog, dialog_hdc); + EndDialog(dialog, 0); + DestroyWindow(parent); + FreeLibrary(uxtheme); +} + START_TEST(static) { static const char classname[] = "testclass"; @@ -417,6 +508,7 @@ START_TEST(static) test_set_text(); test_set_image(); test_STM_SETIMAGE(); + test_WM_CTLCOLORSTATIC(); DestroyWindow(hMainWnd);

1 0

Zhiyi Zhang : uxtheme: Do not draw parent background when handling WM_CTLCOLORSTATIC for static controls.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 2f1bbd88edc82a41967692b8c339a4b9bb7231f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f1bbd88edc82a41967692b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:39:45 2021 +0800 uxtheme: Do not draw parent background when handling WM_CTLCOLORSTATIC for static controls. SetBkMode(TRANSPARENT) already indicates that the parent background should remain untouched. Drawing parent background destroys any previous content that applications drawn and some applications rely on the content being unchanged. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51914 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 1 - dlls/uxtheme/dialog.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 269dfbb49eb..99738f7b513 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -458,7 +458,6 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine_if(todo) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); color = GetPixel(dialog_hdc, 40, 40); - todo_wine_if(todo) ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); ReleaseDC(child, child_hdc); diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 043346b24e2..a949bfc6579 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -101,15 +101,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa HDC controlDC = (HDC)wParam; HWND controlWnd = (HWND)lParam; WCHAR controlClass[32]; - RECT rc; GetClassNameW (controlWnd, controlClass, ARRAY_SIZE(controlClass)); if (lstrcmpiW (controlClass, WC_STATICW) == 0) { - /* Static control - draw parent background and set text to - * transparent, so it looks right on tab pages. */ - GetClientRect (controlWnd, &rc); - DrawThemeParentBackground (controlWnd, controlDC, &rc); + SetBkColor(controlDC, GetSysColor(COLOR_BTNFACE)); SetBkMode (controlDC, TRANSPARENT); /* Return NULL brush since we painted the BG already */

1 0

Zhiyi Zhang : uxtheme: Fix loading a different theme when theming is on.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 3762a11c81455edee65881702c5c26ae5d3081b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3762a11c81455edee6588170… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:44:47 2021 +0800 uxtheme: Fix loading a different theme when theming is on. When a theme is already active and a user tries to activate another theme, the new theme configuration should be written to the registry so that it's still in effect after a wine reboot. Fix a regression introduced in d290362. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index ba579a02edc..bf72baccebb 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -446,10 +446,8 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) WARN("Failed to get LoadedBefore: %d\n", GetLastError()); RegCloseKey(hKey); } - if (loaded_before) - return MSSTYLES_SetActiveTheme(tf, FALSE); - if (ret) + if (!loaded_before && ret) UXTHEME_SaveUnthemedSystemMetrics(&metrics); } else {

1 0

Zhiyi Zhang : comctl32/button: Simplify focus rectangle calculation for drawing themed push buttons.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 3d3914bca0eb9d3646a6f9beb9fe20ec876dd230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3914bca0eb9d3646a6f9be… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:51:57 2021 +0800 comctl32/button: Simplify focus rectangle calculation for drawing themed push buttons. The focus rectangle is the same as the result from GetThemeBackgroundContentRect(). So there is no need to retrieve content margins and calculate it again. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index fbe060513d2..00f42322399 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2651,7 +2651,7 @@ cleanup: */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect; + RECT bgRect, textRect, focusRect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2661,6 +2661,8 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); + focusRect = textRect; + init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); parent = GetParent(infoPtr->hwnd); @@ -2698,20 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - RECT focusRect = bgRect; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - focusRect.left += margins.cxLeftWidth; - focusRect.top += margins.cyTopHeight; - focusRect.right -= margins.cxRightWidth; - focusRect.bottom -= margins.cyBottomHeight; - - DrawFocusRect( hDC, &focusRect ); - } + if (focused) DrawFocusRect(hDC, &focusRect); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)

1 0

Zhiyi Zhang : comctl32/button: Simplify focus rectangle calculation for drawing themed split buttons.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 5182c46cbe6015ebf3bb9330c7f1f4263cf88015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5182c46cbe6015ebf3bb9330… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:52:03 2021 +0800 comctl32/button: Simplify focus rectangle calculation for drawing themed split buttons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 00f42322399..2738a4caee5 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2861,7 +2861,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT rc, content_rect, push_rect, dropdown_rect; + RECT rc, content_rect, push_rect, dropdown_rect, focus_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2889,6 +2889,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { push_rect = rc; DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL); + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &focus_rect); } else { @@ -2909,6 +2910,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* The content rect should be the content area of the push button */ GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect); + focus_rect = content_rect; } if (cdrf & CDRF_NOTIFYPOSTERASE) @@ -2951,18 +2953,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - push_rect.left += margins.cxLeftWidth; - push_rect.top += margins.cyTopHeight; - push_rect.right -= margins.cxRightWidth; - push_rect.bottom -= margins.cyBottomHeight; - DrawFocusRect(hDC, &push_rect); - } + if (focused) DrawFocusRect(hDC, &focus_rect); } static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)

1 0

Zhiyi Zhang : comctl32/button: Add a get_box_rect() helper to calculation box rectangle.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: a161fa7789ba5b89db35102c0e6e977d4e38ec69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a161fa7789ba5b89db35102c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:52:10 2021 +0800 comctl32/button: Add a get_box_rect() helper to calculation box rectangle. get_box_rect() is introduced so that we don't need to duplicate the check box rectangle calculation when painting themed check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 130 +++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 63 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2738a4caee5..6a463cb3460 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1881,11 +1881,65 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) * Check Box & Radio Button Functions */ +/* Get adjusted check box or radio box rectangle */ +static RECT get_box_rect(LONG style, LONG ex_style, const RECT *content_rect, + const RECT *label_rect, BOOL has_label, SIZE box_size) +{ + RECT rect; + int delta; + + rect = *content_rect; + + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) + rect.left = rect.right - box_size.cx; + else + rect.right = rect.left + box_size.cx; + + /* Adjust box when label is valid */ + if (has_label) + { + rect.top = label_rect->top; + rect.bottom = label_rect->bottom; + } + + /* Box must have the correct height */ + delta = rect.bottom - rect.top - box_size.cy; + if ((style & BS_VCENTER) == BS_TOP) + { + if (delta <= 0) + rect.top -= -delta / 2 + 1; + + rect.bottom = rect.top + box_size.cy; + } + else if ((style & BS_VCENTER) == BS_BOTTOM) + { + if (delta <= 0) + rect.bottom += -delta / 2 + 1; + + rect.top = rect.bottom - box_size.cy; + } + else + { + if (delta > 0) + { + rect.bottom -= delta / 2 + 1; + rect.top = rect.bottom - box_size.cy; + } + else if (delta < 0) + { + rect.top -= -delta / 2 + 1; + rect.bottom = rect.top + box_size.cy; + } + } + + return rect; +} + static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rbox, labelRect, imageRect, textRect, client; + RECT rbox, labelRect, oldLabelRect, imageRect, textRect, client; HBRUSH hBrush; - int delta, text_offset, checkBoxWidth, checkBoxHeight; + int text_offset; UINT dtFlags; LRESULT cdrf; HFONT hFont; @@ -1893,6 +1947,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) LONG state = infoPtr->state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); + SIZE box_size; HWND parent; HRGN hrgn; @@ -1903,10 +1958,10 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } GetClientRect(infoPtr->hwnd, &client); - rbox = labelRect = client; + labelRect = client; - checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; - checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; + box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + box_size.cy = box_size.cx; if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset ); @@ -1920,15 +1975,13 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hrgn = set_control_clipping( hDC, &client ); if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) - { - labelRect.right -= checkBoxWidth + text_offset; - rbox.left = rbox.right - checkBoxWidth; - } + labelRect.right -= box_size.cx + text_offset; else - { - labelRect.left += checkBoxWidth + text_offset; - rbox.right = checkBoxWidth; - } + labelRect.left += box_size.cx + text_offset; + + oldLabelRect = labelRect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + rbox = get_box_rect(style, ex_style, &client, &labelRect, dtFlags != (UINT)-1L, box_size); init_custom_draw(&nmcd, infoPtr, hDC, &client); @@ -1946,16 +1999,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } /* Draw label */ - client = labelRect; - dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); - - /* Only adjust rbox when rtext is valid */ - if (dtFlags != (UINT)-1L) - { - rbox.top = labelRect.top; - rbox.bottom = labelRect.bottom; - } - /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); @@ -1977,45 +2020,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (state & BST_PUSHED) flags |= DFCS_PUSHED; if (style & WS_DISABLED) flags |= DFCS_INACTIVE; - /* rbox must have the correct height */ - delta = rbox.bottom - rbox.top - checkBoxHeight; - - if ((style & BS_VCENTER) == BS_TOP) - { - if (delta > 0) - rbox.bottom = rbox.top + checkBoxHeight; - else - { - rbox.top -= -delta / 2 + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - else if ((style & BS_VCENTER) == BS_BOTTOM) - { - if (delta > 0) - rbox.top = rbox.bottom - checkBoxHeight; - else - { - rbox.bottom += -delta / 2 + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - } - else /* Default */ - { - if (delta > 0) - { - int ofs = delta / 2; - rbox.bottom -= ofs + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - else if (delta < 0) - { - int ofs = -delta / 2; - rbox.top -= ofs + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - DrawFrameControl(hDC, &rbox, DFC_BUTTON, flags); } @@ -2035,7 +2039,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { labelRect.left--; labelRect.right++; - IntersectRect(&labelRect, &labelRect, &client); + IntersectRect(&labelRect, &labelRect, &oldLabelRect); DrawFocusRect(hDC, &labelRect); }

1 0

Loïc Rebmeister : loader: Create performance\winsat\datastore on prefix creation.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 2173d2dcc8f0b77d8c4ac40e1462029610f5c72c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2173d2dcc8f0b77d8c4ac40e… Author: Loïc Rebmeister <fox2code(a)gmail.com> Date: Wed Nov 3 23:06:31 2021 +0100 loader: Create performance\winsat\datastore on prefix creation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51968 Signed-off-by: Loïc Rebmeister <fox2code(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b1894dcba61..49f45e6eed3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2668,6 +2668,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ; create some directories first 10,help, 10,logs, +10,performance\winsat\datastore, 10,tasks, 10,temp, 11,catroot,

1 0

Alexandre Julliard : wldap32: Move the SASL callback to the Unix side.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 449fae545c915f04c20cd3b6830e077ada8df3f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=449fae545c915f04c20cd3b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 12:10:00 2021 +0100 wldap32: Move the SASL callback to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/bind.c | 32 -------------------------------- dlls/wldap32/libldap.c | 33 ++++++++++++++++++++++++++++----- dlls/wldap32/libldap.h | 30 ++++++++---------------------- dlls/wldap32/main.c | 6 +----- 4 files changed, 37 insertions(+), 64 deletions(-) diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index d45ed5d60e0..837612bf75f 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -138,38 +138,6 @@ exit: return ret; } -int CDECL sasl_interact_cb( void *ld, unsigned flags, void *defaults, void *interact ) -{ - SEC_WINNT_AUTH_IDENTITY_A *id = defaults; - struct sasl_interactU *sasl = interact; - - TRACE( "(%p, 0x%08x, %p, %p)\n", ld, flags, defaults, interact ); - - while (sasl->id != SASL_CB_LIST_END) - { - TRACE( "sasl->id = %04lx\n", sasl->id ); - - if (sasl->id == SASL_CB_GETREALM) - { - sasl->result = id->Domain; - sasl->len = id->DomainLength; - } - else if (sasl->id == SASL_CB_USER) - { - sasl->result = id->User; - sasl->len = id->UserLength; - } - else if (sasl->id == SASL_CB_PASS) - { - sasl->result = id->Password; - sasl->len = id->PasswordLength; - } - sasl++; - } - - return LDAP_SUCCESS; -} - /*********************************************************************** * ldap_bind_sW (WLDAP32.@) * diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index 495ea609059..d568c2daaae 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -59,8 +59,6 @@ C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) ); static LDAPMod *nullmods[] = { NULL }; -static const struct ldap_callbacks *callbacks; - static void * CDECL wrap_ber_alloc_t( int options ) { return ber_alloc_t( options ); @@ -553,8 +551,34 @@ static int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *me static int wrap_sasl_interact( LDAP *ld, unsigned int flags, void *defaults, void *interact ) { #ifdef HAVE_SASL_SASL_H - C_ASSERT( sizeof(struct sasl_interactU) == sizeof(struct sasl_interact) ); - return callbacks->sasl_interact( ld, flags, defaults, interact ); + struct sasl_interactive_bind_id *id = defaults; + struct sasl_interact *sasl = interact; + + TRACE( "(%p, 0x%08x, %p, %p)\n", ld, flags, defaults, interact ); + + while (sasl->id != SASL_CB_LIST_END) + { + TRACE( "sasl->id = %04lx\n", sasl->id ); + + if (sasl->id == SASL_CB_GETREALM) + { + sasl->result = id->domain; + sasl->len = id->domain_len; + } + else if (sasl->id == SASL_CB_USER) + { + sasl->result = id->user; + sasl->len = id->user_len; + } + else if (sasl->id == SASL_CB_PASS) + { + sasl->result = id->password; + sasl->len = id->password_len; + } + sasl++; + } + + return LDAP_SUCCESS; #endif return -1; } @@ -678,7 +702,6 @@ static const struct ldap_funcs funcs = NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) { if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; - callbacks = ptr_in; *(const struct ldap_funcs **)ptr_out = &funcs; return STATUS_SUCCESS; } diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index d0c37ab498d..e9736fc757f 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -83,22 +83,15 @@ typedef struct timevalU LONG_PTR tv_usec; } LDAP_TIMEVALU; -#ifndef SASL_CB_LIST_END -#define SASL_CB_LIST_END 0 -#define SASL_CB_USER 0x4001 -#define SASL_CB_PASS 0x4004 -#define SASL_CB_GETREALM 0x4008 -#endif - -typedef struct sasl_interactU +struct sasl_interactive_bind_id { - ULONG_PTR id; - const char *challenge; - const char *prompt; - const char *defresult; - const void *result; - unsigned int len; -} sasl_interact_tU; + unsigned char* user; + ULONG user_len; + unsigned char* domain; + ULONG domain_len; + unsigned char* password; + ULONG password_len; +}; struct ldap_funcs { @@ -179,11 +172,4 @@ struct ldap_funcs void (CDECL *fn_ldap_value_free_len)(struct bervalU **); }; -extern int CDECL sasl_interact_cb(void *, unsigned int, void *, void *) DECLSPEC_HIDDEN; - -struct ldap_callbacks -{ - int (CDECL *sasl_interact)(void *, unsigned int, void *, void *); -}; - extern const struct ldap_funcs *ldap_funcs; diff --git a/dlls/wldap32/main.c b/dlls/wldap32/main.c index c2fdf30f820..55a08c9bad5 100644 --- a/dlls/wldap32/main.c +++ b/dlls/wldap32/main.c @@ -31,10 +31,6 @@ HINSTANCE hwldap32; WINE_DEFAULT_DEBUG_CHANNEL(wldap32); const struct ldap_funcs *ldap_funcs = NULL; -const struct ldap_callbacks ldap_callbacks = -{ - sasl_interact_cb -}; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -45,7 +41,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: hwldap32 = hinst; DisableThreadLibraryCalls( hinst ); - if (__wine_init_unix_lib( hinst, reason, &ldap_callbacks, &ldap_funcs )) + if (__wine_init_unix_lib( hinst, reason, NULL, &ldap_funcs )) ERR( "No libldap support, expect problems\n" ); break; }

1 0

Alexandre Julliard : wldap32: Don't use varargs functions in the Unix library interface.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: cefd34fbdae8774227118cd3749479cc211df1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cefd34fbdae8774227118cd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 14:47:38 2021 +0100 wldap32: Don't use varargs functions in the Unix library interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 28 +++++------ dlls/wldap32/libldap.c | 130 ++----------------------------------------------- dlls/wldap32/libldap.h | 4 +- 3 files changed, 20 insertions(+), 142 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 7d37471c5c4..482de464234 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -334,26 +334,26 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) case 'i': { int i = va_arg( list, int ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, i ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, i, 0 ); break; } case 'o': case 's': { char *str = va_arg( list, char * ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, str ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)str, 0 ); break; } case 't': { unsigned int tag = va_arg( list, unsigned int ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, tag ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, tag, 0 ); break; } case 'v': { char **array = va_arg( list, char ** ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, array ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)array, 0 ); break; } case 'V': @@ -365,7 +365,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) ret = -1; break; } - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, arrayU ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)arrayU, 0 ); bvarrayfreeU( arrayU ); break; } @@ -374,7 +374,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) char *str = va_arg( list, char * ); int len = va_arg( list, int ); new_fmt[0] = 'B'; /* 'X' is deprecated */ - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, str, len ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)str, len ); break; } case 'n': @@ -382,7 +382,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) case '}': case '[': case ']': - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, 0, 0 ); break; default: @@ -431,7 +431,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) case 'a': { char *str, **ptr = va_arg( list, char ** ); - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &str )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &str, NULL )) == -1) break; *ptr = strdupU( str ); ldap_funcs->fn_ldap_memfree( str ); break; @@ -441,19 +441,19 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) case 'i': { int *i = va_arg( list, int * ); - ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, i ); + ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, i, NULL ); break; } case 't': { unsigned int *tag = va_arg( list, unsigned int * ); - ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, tag ); + ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, tag, NULL ); break; } case 'v': { char *str, **arrayU, **ptr, ***array = va_arg( list, char *** ); - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU, NULL )) == -1) break; *array = strarrayUtoU( arrayU ); ptr = arrayU; while ((str = *ptr)) @@ -478,7 +478,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) { struct berval **berval = va_arg( list, struct berval ** ); struct bervalU *bervalU; - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &bervalU )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &bervalU, NULL )) == -1) break; *berval = bervalUtoW( bervalU ); ldap_funcs->fn_ber_bvfree( bervalU ); break; @@ -487,7 +487,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) { struct berval ***array = va_arg( list, struct berval *** ); struct bervalU **arrayU; - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU, NULL )) == -1) break; *array = bvarrayUtoW( arrayU ); ldap_funcs->fn_ber_bvecfree( arrayU ); break; @@ -498,7 +498,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) case '}': case '[': case ']': - ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt ); + ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, NULL, NULL ); break; default: diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index d568c2daaae..02ba0e01675 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -163,140 +163,18 @@ static unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) return ret; } -static int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) +static int CDECL wrap_ber_printf( void *ber, char *fmt, ULONG_PTR arg1, ULONG_PTR arg2 ) { - int ret; - __ms_va_list args; - assert( strlen(fmt) == 1 ); - __ms_va_start( args, fmt ); - switch (fmt[0]) - { - case 'b': - case 'e': - case 'i': - { - int i = va_arg( args, int ); - ret = ber_printf( ber, fmt, i ); - break; - } - case 'o': - case 's': - { - char *str = va_arg( args, char * ); - ret = ber_printf( ber, fmt, str ); - break; - } - case 't': - { - unsigned int tag = va_arg( args, unsigned int ); - ret = ber_printf( ber, fmt, tag ); - break; - } - case 'v': - { - char **array = va_arg( args, char ** ); - ret = ber_printf( ber, fmt, array ); - break; - } - case 'V': - { - struct berval **array = va_arg( args, struct berval ** ); - ret = ber_printf( ber, fmt, array ); - break; - } - case 'B': - { - char *str = va_arg( args, char * ); - int len = va_arg( args, int ); - ret = ber_printf( ber, fmt, str, len ); - break; - } - case 'n': - case '{': - case '}': - case '[': - case ']': - ret = ber_printf( ber, fmt ); - break; - - default: - assert( 0 ); - } - __ms_va_end( args ); - return ret; + return ber_printf( ber, fmt, arg1, arg2 ); } -static int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) +static int CDECL wrap_ber_scanf( void *ber, char *fmt, void *arg1, void *arg2 ) { - int ret; - __ms_va_list args; - assert( strlen(fmt) == 1 ); - __ms_va_start( args, fmt ); - switch (fmt[0]) - { - case 'a': - { - char **str = va_arg( args, char ** ); - ret = ber_scanf( ber, fmt, str ); - break; - } - case 'b': - case 'e': - case 'i': - { - int *i = va_arg( args, int * ); - ret = ber_scanf( ber, fmt, i ); - break; - } - case 't': - { - unsigned int *tag = va_arg( args, unsigned int * ); - ret = ber_scanf( ber, fmt, tag ); - break; - } - case 'v': - { - char ***array = va_arg( args, char *** ); - ret = ber_scanf( ber, fmt, array ); - break; - } - case 'B': - { - char **str = va_arg( args, char ** ); - int *len = va_arg( args, int * ); - ret = ber_scanf( ber, fmt, str, len ); - break; - } - case 'O': - { - struct berval **berval = va_arg( args, struct berval ** ); - ret = ber_scanf( ber, fmt, berval ); - break; - } - case 'V': - { - struct berval ***array = va_arg( args, struct berval *** ); - ret = ber_scanf( ber, fmt, array ); - break; - } - case 'n': - case 'x': - case '{': - case '}': - case '[': - case ']': - ret = ber_scanf( ber, fmt ); - break; - - default: - assert( 0 ); - } - __ms_va_end( args ); - return ret; + return ber_scanf( ber, fmt, arg1, arg2 ); } static int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index e9736fc757f..aec1f13a754 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -105,8 +105,8 @@ struct ldap_funcs unsigned int (CDECL *fn_ber_next_element)(void *, unsigned int *, char *); unsigned int (CDECL *fn_ber_peek_tag)(void *, unsigned int *); unsigned int (CDECL *fn_ber_skip_tag)(void *, unsigned int *); - int (WINAPIV *fn_ber_printf)(void *, char *, ...); - int (WINAPIV *fn_ber_scanf)(void *, char *, ...); + int (CDECL *fn_ber_printf)(void *, char *, ULONG_PTR arg1, ULONG_PTR arg2 ); + int (CDECL *fn_ber_scanf)(void *, char *, void *arg1, void *arg2 ); int (CDECL *fn_ldap_abandon_ext)(void *, int, LDAPControlU **, LDAPControlU **); int (CDECL *fn_ldap_add_ext)(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **, ULONG *);

1 0

Alexandre Julliard : wldap32: Avoid returning pointers from the Unix interface functions.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 3cc3dd78e1fab3bd500a0510b3e78f21330406dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cc3dd78e1fab3bd500a0510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 18:04:14 2021 +0100 wldap32: Avoid returning pointers from the Unix interface functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 4 ++-- dlls/wldap32/dn.c | 6 ++--- dlls/wldap32/libldap.c | 60 ++++++++++++++++++++++++++++++-------------------- dlls/wldap32/libldap.h | 24 ++++++++++---------- dlls/wldap32/misc.c | 15 +++++-------- dlls/wldap32/option.c | 5 ++--- dlls/wldap32/value.c | 4 ++-- 7 files changed, 63 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cc3dd78e1fab3bd500a…

1 0