wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Esme Povirk : diasymreader: Stub ISymUnmanagedDocumentWriter.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 0de459d0de38cb928adb1e08522bb1ff5f64bd18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de459d0de38cb928adb1e08… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Feb 8 13:21:33 2022 -0600 diasymreader: Stub ISymUnmanagedDocumentWriter. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 96 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 1820ccb51b0..3c07b77ab81 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -45,6 +45,11 @@ typedef struct SymWriter { WCHAR pdb_filename[MAX_PATH]; } SymWriter; +typedef struct SymDocumentWriter { + ISymUnmanagedDocumentWriter iface; + LONG ref; +} SymDocumentWriter; + static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface) { return CONTAINING_RECORD(iface, SymWriter, iface); @@ -55,6 +60,81 @@ static inline SymWriter *impl_from_IPdbWriter(IPdbWriter *iface) return CONTAINING_RECORD(iface, SymWriter, IPdbWriter_iface); } +static inline SymDocumentWriter *impl_from_ISymUnmanagedDocumentWriter(ISymUnmanagedDocumentWriter *iface) +{ + return CONTAINING_RECORD(iface, SymDocumentWriter, iface); +} + +static HRESULT WINAPI SymDocumentWriter_QueryInterface(ISymUnmanagedDocumentWriter *iface, REFIID iid, + void **ppv) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ISymUnmanagedDocumentWriter, iid)) + { + *ppv = &This->iface; + } + else + { + WARN("unknown interface %s\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI SymDocumentWriter_AddRef(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%lu\n", iface, ref); + + return ref; +} + +static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%lu\n", iface, ref); + + if (ref == 0) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI SymDocumentWriter_SetSource(ISymUnmanagedDocumentWriter *iface, ULONG32 sourceSize, + BYTE source[]) +{ + FIXME("(%p,%u,%p)\n", iface, sourceSize, source); + return S_OK; +} + +static HRESULT WINAPI SymDocumentWriter_SetChecksum(ISymUnmanagedDocumentWriter *iface, GUID algorithmID, + ULONG32 checkSumSize, BYTE checkSum[]) +{ + FIXME("(%p,%s,%u,%p)\n", iface, debugstr_guid(&algorithmID), checkSumSize, checkSum); + return S_OK; +} + +static const ISymUnmanagedDocumentWriterVtbl SymDocumentWriter_Vtbl = { + SymDocumentWriter_QueryInterface, + SymDocumentWriter_AddRef, + SymDocumentWriter_Release, + SymDocumentWriter_SetSource, + SymDocumentWriter_SetChecksum +}; + static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFIID iid, void **ppv) { @@ -117,9 +197,23 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons const GUID *language, const GUID *languageVendor, const GUID *documentType, ISymUnmanagedDocumentWriter** pRetVal) { + SymDocumentWriter *result; + FIXME("(%p,%s,%s,%s,%s,%p)\n", iface, debugstr_w(url), debugstr_guid(language), debugstr_guid(languageVendor), debugstr_guid(documentType), pRetVal); - return E_NOTIMPL; + + if (!pRetVal) + return E_POINTER; + + result = heap_alloc(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->iface.lpVtbl = &SymDocumentWriter_Vtbl; + result->ref = 1; + *pRetVal = &result->iface; + + return S_OK; } static HRESULT WINAPI SymWriter_SetUserEntryPoint(ISymUnmanagedWriter5 *iface, mdMethodDef entryMethod)

1 0

Nikolay Sivov : dbgeng/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 6c80346dbc8613f6093cca7843e47445fd12a6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c80346dbc8613f6093cca78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 9 13:19:29 2022 +0300 dbgeng/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/tests/Makefile.in | 1 - dlls/dbgeng/tests/dbgeng.c | 136 +++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c80346dbc8613f6093c…

1 0

Hans Leidekker : dnsapi: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 5a446236352d8adba7be33ebba85ad7199f7dd4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a446236352d8adba7be33eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 9 10:57:54 2022 +0100 dnsapi: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/Makefile.in | 1 - dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/main.c | 81 +++++++++++++++++-------------------------- dlls/dnsapi/query.c | 37 +++++++++----------- dlls/dnsapi/tests/Makefile.in | 1 - dlls/dnsapi/tests/name.c | 4 +-- dlls/dnsapi/tests/query.c | 63 +++++++++++++++++---------------- dlls/dnsapi/tests/record.c | 42 +++++++++++----------- 8 files changed, 106 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a446236352d8adba7be…

1 0

Hans Leidekker : bcrypt/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 5ce0e86d048faf532940eaf527d7a2543e392ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce0e86d048faf532940eaf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 9 10:57:53 2022 +0100 bcrypt/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/Makefile.in | 1 - dlls/bcrypt/tests/bcrypt.c | 1172 ++++++++++++++++++++--------------------- 2 files changed, 586 insertions(+), 587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ce0e86d048faf532940…

1 0

Zhiyi Zhang : comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill text background for group boxes.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: cb3b982148753f1d5b0485d1d075cab8965fa2cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb3b982148753f1d5b0485d1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:45:23 2022 +0800 comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill text background for group boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 ++++++++++++- dlls/comctl32/tests/misc.c | 3 +-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1349e10c4c0..2ce12252460 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2914,10 +2914,20 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; TEXTMETRICW textMetric; + HBRUSH brush; + HWND parent; + HRESULT hr; LONG style; int part; - HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); + /* DrawThemeParentBackground() is used for filling content background. The brush from + * WM_CTLCOLORSTATIC is used for filling text background */ + parent = GetParent(infoPtr->hwnd); + if (!parent) + parent = infoPtr->hwnd; + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + + hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { font = CreateFontIndirectW(&lf); if (!font) @@ -2969,6 +2979,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SelectClipRgn(hDC, textRegion); DeleteObject(textRegion); } + FillRect(hDC, &textRect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, part, state); } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c3de9e68c5a..dc9648c1bf0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -848,7 +848,7 @@ static void test_themed_background(void) {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_3STATE, checkbox_seq}, {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq}, - {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, + {WC_BUTTONA, BS_GROUPBOX, groupbox_seq}, {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, @@ -962,7 +962,6 @@ static void test_themed_background(void) /* WM_CTLCOLORSTATIC is used to fill text background */ color = GetPixel(hdc, 10, 10); - todo_wine ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); }

1 0

Zhiyi Zhang : comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill background for checkboxes and radio buttons.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: c69d3bb78115b6037edec8b396374a30b2ce6e27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69d3bb78115b6037edec8b3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:45:13 2022 +0800 comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill background for checkboxes and radio buttons. Fix radio buttons of Mupen64-RR-Lua input window having stale background. Mupen64-RR-Lua doesn't actually handle WM_ERASEBKGND even though it returns nonzero. And tests show that a WM_CTLCOLORSTATIC is sent and the returned brush is used for filling background, even painting over the content from DrawThemeParentBackground(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 5 +++++ dlls/comctl32/tests/misc.c | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 14b2200afed..1349e10c4c0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2796,6 +2796,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; NMCUSTOMDRAW nmcd; + HBRUSH brush; LRESULT cdrf; LOGFONTW lf; HWND parent; @@ -2859,6 +2860,10 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + /* Tests show that the brush from WM_CTLCOLORSTATIC is used for filling background after a + * DrawThemeParentBackground() call */ + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + FillRect(hDC, &client_rect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); if (cdrf & CDRF_NOTIFYPOSTERASE) { diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 09c5b3d6c40..c3de9e68c5a 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -843,14 +843,14 @@ static void test_themed_background(void) {ANIMATE_CLASSA, 0, empty_seq, TRUE}, {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq}, - {WC_BUTTONA, BS_CHECKBOX, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq, TRUE}, - {WC_BUTTONA, BS_3STATE, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq, TRUE}, + {WC_BUTTONA, BS_CHECKBOX, checkbox_seq}, + {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq}, + {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq}, + {WC_BUTTONA, BS_3STATE, checkbox_seq}, + {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq}, {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, - {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq, TRUE}, + {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_OWNERDRAW, ownerdrawbutton_seq}, {WC_BUTTONA, BS_SPLITBUTTON, splitbutton_seq}, @@ -950,7 +950,8 @@ static void test_themed_background(void) { /* WM_CTLCOLORSTATIC is used to fill background */ color = GetPixel(hdc, 40, 40); - todo_wine + /* BS_PUSHBOX is unimplemented on Wine */ + todo_wine_if(i == 11) ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); } else if (tests[i].seq == groupbox_seq)

1 0

Zhiyi Zhang : comctl32/button: Use the brush from WM_CTLCOLORBTN to fill background for push buttons.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 509d6a1d5f4ecfebb28dce33e7fc09540ae1403c URL: https://source.winehq.org/git/wine.git/?a=commit;h=509d6a1d5f4ecfebb28dce33… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:45:01 2022 +0800 comctl32/button: Use the brush from WM_CTLCOLORBTN to fill background for push buttons. The brush from WM_CTLCOLORBTN is used for filling background for push buttons after a DrawThemeParentBackground() call according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 7 +++++++ dlls/comctl32/tests/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 88b48a4a5c0..14b2200afed 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2729,6 +2729,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { RECT bgRect, labelRect, imageRect, textRect, focusRect; NMCUSTOMDRAW nmcd; + HBRUSH brush; LRESULT cdrf; HWND parent; @@ -2748,7 +2749,13 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + { DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + /* Tests show that the brush from WM_CTLCOLORBTN is used for filling background after a + * DrawThemeParentBackground() call */ + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + FillRect(hDC, &bgRect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); + } DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 72674ea5942..09c5b3d6c40 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -841,15 +841,15 @@ static void test_themed_background(void) tests[] = { {ANIMATE_CLASSA, 0, empty_seq, TRUE}, - {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq, TRUE}, - {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq, TRUE}, + {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq}, + {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq}, {WC_BUTTONA, BS_CHECKBOX, checkbox_seq, TRUE}, {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq, TRUE}, {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_3STATE, checkbox_seq, TRUE}, {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq, TRUE}, {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, - {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq, TRUE}, + {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_OWNERDRAW, ownerdrawbutton_seq},

1 0

Zhiyi Zhang : comctl32/trackbar: Always use brush from WM_CTLCOLORSTATIC to fill background.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 179117a6892401e7ee7f988b5b00341c0981213b URL: https://source.winehq.org/git/wine.git/?a=commit;h=179117a6892401e7ee7f988b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:44:53 2022 +0800 comctl32/trackbar: Always use brush from WM_CTLCOLORSTATIC to fill background. Fix the track bar of Mupen64-RR-Lua input window having black background. Mupen64-RR-Lua doesn't actually handle WM_ERASEBKGND even though it returns nonzero. And tests show that only WM_CTLCOLORSTATIC is sent when drawing themed trackbar background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/trackbar.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 3a1b5253b58..72674ea5942 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -883,7 +883,7 @@ static void test_themed_background(void) {WC_TABCONTROLA, 0, drawthemeparentbackground_seq, TRUE}, {TOOLBARCLASSNAMEA, 0, empty_seq, TRUE}, {TOOLTIPS_CLASSA, 0, empty_seq}, - {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq, TRUE}, + {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, {WC_TREEVIEWA, 0, treeview_seq}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6643752c043..f2cb2a07a8d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -899,6 +899,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) HBITMAP hOldBmp = 0, hOffScreenBmp = 0; NMCUSTOMDRAW nmcd; int gcdrf, icdrf; + HBRUSH brush; if (infoPtr->flags & TB_THUMBCHANGED) { TRACKBAR_UpdateThumb (infoPtr); @@ -943,14 +944,9 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) /* Erase background */ if (gcdrf == CDRF_DODEFAULT || notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) { - if (GetWindowTheme (infoPtr->hwndSelf)) { - DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); - } - else { - HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); - FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); - } + brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, (WPARAM)hdc, + (LPARAM)infoPtr->hwndSelf); + FillRect(hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); if (gcdrf != CDRF_DODEFAULT) notify_customdraw(infoPtr, &nmcd, CDDS_POSTERASE); }

1 0

Zhiyi Zhang : comctl32/tests: Add themed background tests.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 5c901a04b3b5e69db8019fb75631de4b057fb217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c901a04b3b5e69db8019fb7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:44:42 2022 +0800 comctl32/tests: Add themed background tests. Add themed background tests to determine whether DrawThemeParentBackground() or WM_CTLCOLOR* are used to draw themed background for comctl32 classes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 327 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c901a04b3b5e69db801…

1 0

Zhiyi Zhang : uxtheme: Use tab background as dialog texture for more WM_CTLCOLOR* messages.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 25daa0fa06e94bf26b82035023d5490eb49e0f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25daa0fa06e94bf26b820350… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:44:34 2022 +0800 uxtheme: Use tab background as dialog texture for more WM_CTLCOLOR* messages. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/dialog.c | 3 +++ dlls/uxtheme/tests/system.c | 15 ++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 87c2b7d1c13..b91e20f0f33 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -149,6 +149,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); return TRUE; } + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: case WM_CTLCOLORSTATIC: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 77a12f3fa44..c70e6c27361 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1854,7 +1854,6 @@ static void test_EnableThemeDialogTexture(void) } else { - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); } @@ -1863,7 +1862,6 @@ static void test_EnableThemeDialogTexture(void) ok(old_mode != 0, "SetBkMode failed.\n"); SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); /* Test that some WM_CTLCOLOR* messages change background color when dialog texture is on */ @@ -1879,24 +1877,18 @@ static void test_EnableThemeDialogTexture(void) memset(&log_brush, 0, sizeof(log_brush)); count = GetObjectA(brush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, log_brush.lbStyle); memset(&bmp, 0, sizeof(bmp)); count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); /* Test that DefDlgProcA/W() are hooked for some WM_CTLCOLOR* messages */ brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); brush2 = (HBRUSH)DefDlgProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); ok(brush2 == brush, "Expected the same brush.\n"); @@ -1905,24 +1897,21 @@ static void test_EnableThemeDialogTexture(void) /* Test that DefWindowProcA/W() are also hooked for some WM_CTLCOLOR* messages */ brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); if (msg != WM_CTLCOLORDLG) { brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg == WM_CTLCOLORSTATIC) + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg == WM_CTLCOLORSTATIC) + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); } else { brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022