Signed-off-by: Zhiyi Zhang zzhang@codeweavers.com --- dlls/comdlg32/colordlg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 7ab5efd0962..d5254736b24 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -523,6 +523,7 @@ static void CC_PaintCross(CCPRIV *infoPtr) int wc = GetDialogBaseUnits() * 3 / 4; RECT rect; POINT point, p; + HRGN region; HPEN hPen; int x, y;
@@ -531,7 +532,9 @@ static void CC_PaintCross(CCPRIV *infoPtr)
GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); - SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); + region = CreateRectRgnIndirect(&rect); + SelectClipRgn(hDC, region); + DeleteObject(region);
point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=86213
Your paranoid android.
=== debiant2 (32 bit report) ===
user32: win.c:3079: Test succeeded inside todo block: Focus should be on child 004100BA, not 004100BA win.c:10097: Test failed: Expected foreground window 0, got 01420082 win.c:10103: Test failed: Expected foreground window 000E013E, got 01420082
=== debiant2 (32 bit Chinese:China report) ===
comctl32: combo.c:1286: Test failed: Test 0, expected list height to be 480, got 464 combo.c:1286: Test failed: Test 1, expected list height to be 560, got 464
user32: win.c:3079: Test succeeded inside todo block: Focus should be on child 004100BA, not 004100BA
=== debiant2 (32 bit WoW report) ===
user32: win.c:3079: Test succeeded inside todo block: Focus should be on child 004100BA, not 004100BA
=== debiant2 (64 bit WoW report) ===
comctl32: combo.c:1286: Test failed: Test 0, expected list height to be 480, got 464 combo.c:1286: Test failed: Test 1, expected list height to be 560, got 464
user32: win.c:3079: Test succeeded inside todo block: Focus should be on child 004100BA, not 004100BA win.c:10767: Test failed: 000D012E: expected prev 0041013C, got 00000000 win.c:10781: Test failed: hwnd should NOT be topmost win.c:10783: Test failed: 000D012E: expected NOT topmost win.c:10727: Test failed: 1: hwnd 000D012E is still topmost