[PATCH 0/5] MR1100: Comctl32 fixes
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/animate.c | 2 -- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index fff963a6baa..adac333b663 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -866,8 +866,6 @@ static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, co if (wStyleType != GWL_STYLE) return 0; infoPtr->dwStyle = lpss->styleNew; - - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index d9f07570fd0..5c2b0445fed 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1086,7 +1086,7 @@ static void test_WM_STYLECHANGED(void) } tests[] = { - {ANIMATE_CLASSA, wm_stylechanged_seq, TRUE}, + {ANIMATE_CLASSA, wm_stylechanged_seq}, {WC_BUTTONA, wm_stylechanged_seq}, {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, {WC_COMBOBOXEXA, wm_stylechanged_seq}, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1100
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 2 -- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 53c17798668..ce154aacbea 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1528,8 +1528,6 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU DestroyWindow(infoPtr->hUpdown); infoPtr->hUpdown = 0; } - - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5c2b0445fed..f9ec53d4ea9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1090,7 +1090,7 @@ static void test_WM_STYLECHANGED(void) {WC_BUTTONA, wm_stylechanged_seq}, {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, {WC_COMBOBOXEXA, wm_stylechanged_seq}, - {DATETIMEPICK_CLASSA, wm_stylechanged_seq, TRUE}, + {DATETIMEPICK_CLASSA, wm_stylechanged_seq}, {WC_EDITA, wm_stylechanged_seq}, {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, {HOTKEY_CLASSA, wm_stylechanged_seq}, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1100
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/syslink.c | 4 ---- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 011c8bdb8b2..8130bf19641 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1676,11 +1676,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_STYLECHANGED: if (wParam == GWL_STYLE) - { infoPtr->Style = ((LPSTYLESTRUCT)lParam)->styleNew; - - InvalidateRect(infoPtr->Self, NULL, TRUE); - } return 0; case WM_CREATE: diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index f9ec53d4ea9..203d0857ee9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1104,7 +1104,7 @@ static void test_WM_STYLECHANGED(void) {REBARCLASSNAMEA, wm_stylechanged_seq}, {WC_STATICA, wm_stylechanged_seq}, {STATUSCLASSNAMEA, wm_stylechanged_seq}, - {"SysLink", wm_stylechanged_seq, TRUE}, + {"SysLink", wm_stylechanged_seq}, {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq}, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1100
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tab.c | 1 - dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 1275381489a..8943d9dce7c 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3247,7 +3247,6 @@ static INT TAB_StyleChanged(TAB_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; TAB_SetItemBounds (infoPtr); - InvalidateRect(infoPtr->hwnd, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 203d0857ee9..c04e37ca2f3 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1105,7 +1105,7 @@ static void test_WM_STYLECHANGED(void) {WC_STATICA, wm_stylechanged_seq}, {STATUSCLASSNAMEA, wm_stylechanged_seq}, {"SysLink", wm_stylechanged_seq}, - {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, + {WC_TABCONTROLA, wm_stylechanged_seq}, {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1100
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/updown.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c04e37ca2f3..5613fba15f5 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1110,7 +1110,7 @@ static void test_WM_STYLECHANGED(void) {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, {WC_TREEVIEWA, wm_stylechanged_seq}, - {UPDOWN_CLASSA, wm_stylechanged_seq, TRUE}, + {UPDOWN_CLASSA, wm_stylechanged_seq}, {WC_SCROLLBARA, wm_stylechanged_seq}, }; diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index e07f9e7a9f2..1d00db275f2 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -955,10 +955,8 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case WM_STYLECHANGED: - if (wParam == GWL_STYLE) { + if (wParam == GWL_STYLE) infoPtr->dwStyle = ((LPSTYLESTRUCT)lParam)->styleNew; - InvalidateRect (infoPtr->Self, NULL, FALSE); - } break; case WM_THEMECHANGED: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1100
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125125 Your paranoid android. === build (build log) === error: patch failed: dlls/comctl32/propsheet.c:439 error: patch failed: dlls/comctl32/propsheet.c:448 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/comctl32/propsheet.c:439 error: patch failed: dlls/comctl32/propsheet.c:448 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/comctl32/propsheet.c:439 error: patch failed: dlls/comctl32/propsheet.c:448 Task: Patch failed to apply
On Wed Oct 19 08:05:59 2022 +0000, **** wrote:
Marvin replied on the mailing list: ``` Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125125 Your paranoid android. === build (build log) === error: patch failed: dlls/comctl32/propsheet.c:439 error: patch failed: dlls/comctl32/propsheet.c:448 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/comctl32/propsheet.c:439 error: patch failed: dlls/comctl32/propsheet.c:448 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/comctl32/propsheet.c:439 error: patch failed: dlls/comctl32/propsheet.c:448 Task: Patch failed to apply ``` The TestBots are building with the commits from MR1105.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1100#note_11260
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1100
participants (4)
-
Marvin -
Nikolay Sivov (＠nsivov) -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)