December 2018 - Wine-Devel - list.winehq.org

[PATCH] testbot/WineRunReconfig: Don't fail if the idle snapshot does not exist.
by Francois Gouget Dec. 10, 2018

Dec. 10, 2018

This simplifies recovery if an error occurred in a previous run that resulted in the snapshot being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c903ae3695..11f92c8498 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -458,23 +458,28 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq 'completed') { - Debug(Elapsed($Start), " Deleting the old ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) + my $Domain = $VM->GetDomain(); + my $IdleSnapshot = $VM->IdleSnapshot; + if ($Domain->HasSnapshot($IdleSnapshot)) { - # It's not clear if the snapshot is still usable. Rather than try to figure - # it out now, let the next task deal with it. - FatalError("Could not remove the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n", "retry"); + Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->RemoveSnapshot(); + if (defined $ErrMessage) + { + # It's not clear if the snapshot is still usable. Rather than try to + # figure it out now, let the next task deal with it. + FatalError("Could not remove the $IdleSnapshot snapshot: $ErrMessage\n", "retry"); + } } - Debug(Elapsed($Start), " Recreating the ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->CreateSnapshot(); + Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->CreateSnapshot(); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. - FatalError("Could not recreate the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); + FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } } -- 2.19.2

1 0

[PATCH resend 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu Dec. 10, 2018

Dec. 10, 2018

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway. Note that the float doesn't help with overflow either. As you can see, it gets assigned to cLineScroll (which is integer) and then gets multiplied back by WHEEL_DELTA, so if the float were to help with overflow, it would overflow on the next line anyway... Anyway, overflow is extremely unlikely (and probably impossible in practice) since WHEEL_DELTA is just 120, and it was already vulnerable to overflow currently. dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..9f56a2f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2012,9 +2012,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2025,10 +2027,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.19.1

2 8

[PATCH 3/5] wineps.drv: Add stubs for escapes required by Adobe PageMaker.
by Dmitry Timoshkov Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 7 ------- dlls/wineps.drv/escape.c | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3179c97e46..82cf200f4c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1402,9 +1402,7 @@ static void print_something(HDC hdc) strcpy(buf, "deadbeef"); ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); -todo_wine ok(ret == 1, "DOWNLOADHEADER failed\n"); -todo_wine ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); @@ -1464,22 +1462,18 @@ static void test_pscript_printer_dc(void) query = DOWNLOADFACE; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADFACE is not supported\n"); query = OPENCHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "OPENCHANNEL is not supported\n"); query = DOWNLOADHEADER; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADHEADER is not supported\n"); query = CLOSECHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "CLOSECHANNEL is not supported\n"); query = POSTSCRIPT_PASSTHROUGH; @@ -1487,7 +1481,6 @@ todo_wine ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); -todo_wine ok(ret == 1, "GETFACENAME failed\n"); trace("face name: %s\n", buf); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 43bbe18bb5..44d790b298 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -97,14 +97,55 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, case CLIP_TO_PATH: case END_PATH: /*case DRAWPATTERNRECT:*/ + + /* PageMaker checks for it */ + case DOWNLOADHEADER: + + /* PageMaker doesn't check for DOWNLOADFACE and GETFACENAME but + * uses them, they are supposed to be supported by any PS printer. + */ + case DOWNLOADFACE: + + /* PageMaker checks for these as a part of process of detecting + * a "fully compatible" PS printer, but doesn't actually use them. + */ + case OPENCHANNEL: + case CLOSECHANNEL: return TRUE; + /* Windows PS driver reports 0, but still supports this escape */ + case GETFACENAME: + return FALSE; /* suppress the FIXME below */ + default: FIXME("QUERYESCSUPPORT(%d) - not supported.\n", num); return FALSE; } } + case OPENCHANNEL: + FIXME("OPENCHANNEL: stub\n"); + return 1; + + case CLOSECHANNEL: + FIXME("CLOSECHANNEL: stub\n"); + return 1; + + case DOWNLOADHEADER: + FIXME("DOWNLOADHEADER: stub\n"); + /* should return name of the downloaded procset */ + *(char *)out_data = 0; + return 1; + + case GETFACENAME: + FIXME("GETFACENAME: stub\n"); + lstrcpynA(out_data, "Courier", cbOutput); + return 1; + + case DOWNLOADFACE: + FIXME("DOWNLOADFACE: stub\n"); + return 1; + case MFCOMMENT: { FIXME("MFCOMMENT(%p, %d)\n", in_data, cbInput); -- 2.19.2

2 1

[PATCH 2/5] gdi32: Trace full contents of DOCINFO in StartDoc.
by Dmitry Timoshkov Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/printdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 3cfdc477e6..d2f4076746 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -72,9 +72,9 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) INT ret; DC *dc = get_dc_ptr( hdc ); - TRACE("DocName = %s Output = %s Datatype = %s\n", + TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n", debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), - debugstr_w(doc->lpszDatatype)); + debugstr_w(doc->lpszDatatype), doc->fwType); if(!dc) return SP_ERROR; -- 2.19.2

2 1

[PATCH 1/5] gdi32/tests: Add a simple test for printing to a PostScript device.
by Dmitry Timoshkov Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 124 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5eec74a72c..3179c97e46 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -2,7 +2,7 @@ * Unit tests for dc functions * * Copyright (c) 2005 Huw Davies - * Copyright (c) 2005 Dmitry Timoshkov + * Copyright (c) 2005,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1375,6 +1375,127 @@ static void test_printer_dc(void) DeleteObject( bmp ); } +static void print_something(HDC hdc) +{ + static const char psadobe[10] = "%!PS-Adobe"; + char buf[1024], *p; + char temp_path[MAX_PATH], file_name[MAX_PATH]; + DOCINFOA di; + DWORD ret; + HANDLE hfile; + + GetTempPathA(sizeof(temp_path), temp_path); + GetTempFileNameA(temp_path, "ps", 0, file_name); + + di.cbSize = sizeof(di); + di.lpszDocName = "Let's dance"; + di.lpszOutput = file_name; + di.lpszDatatype = NULL; + di.fwType = 0; + ret = StartDocA(hdc, &di); + ok(ret > 0, "StartDoc failed: %d\n", ret); + + strcpy(buf + 2, "\n% ===> before DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + strcpy(buf, "deadbeef"); + ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); +todo_wine + ok(ret == 1, "DOWNLOADHEADER failed\n"); +todo_wine + ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); + + strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + ret = EndDoc(hdc); + ok(ret == 1, "EndDoc failed\n"); + + hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + memset(buf, 0, sizeof(buf)); + ret = ReadFile(hfile, buf, sizeof(buf), &ret, NULL); + ok(ret, "ReadFile failed\n"); + CloseHandle(hfile); + + /* skip the HP PCL language selector */ + buf[sizeof(buf) - 1] = 0; + p = buf; + while (*p) + { + if (!(p[0] == 0x1b && p[1] == '%') && memcmp(p, "@PJL", 4) != 0) + break; + + p = strchr(p, '\n'); + if (!p) break; + + while (*p == '\r' || *p == '\n') p++; + } +todo_wine + ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); + + DeleteFileA(file_name); +} + +static void test_pscript_printer_dc(void) +{ + HDC hdc; + char buf[256]; + DWORD query, ret; + + hdc = create_printer_dc(100, FALSE); + + if (!hdc) return; + + if (!is_postscript_printer(hdc)) + { + skip("Default printer is not a PostScript device\n"); + DeleteDC( hdc ); + return; + } + + query = GETFACENAME; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(!ret, "GETFACENAME is supported\n"); + + query = DOWNLOADFACE; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADFACE is not supported\n"); + + query = OPENCHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "OPENCHANNEL is not supported\n"); + + query = DOWNLOADHEADER; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADHEADER is not supported\n"); + + query = CLOSECHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "CLOSECHANNEL is not supported\n"); + + query = POSTSCRIPT_PASSTHROUGH; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); + + ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); +todo_wine + ok(ret == 1, "GETFACENAME failed\n"); + trace("face name: %s\n", buf); + + print_something(hdc); + + DeleteDC(hdc); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1389,4 +1510,5 @@ START_TEST(dc) test_desktop_colorres(); test_gamma(); test_printer_dc(); + test_pscript_printer_dc(); } -- 2.19.2

2 1

[PATCH v4 2/3] comctl32/status: Hide size grip when the parent window is maximized.
by Waritnan Sookbuntherng Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v4: Update test. --- dlls/comctl32/status.c | 6 ++++-- dlls/comctl32/tests/status.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cb27ee868c..3bf72fa577 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 00db9f6737..b7b5fb273e 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -682,7 +682,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); /* maximized with right-to-left */ SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); @@ -705,7 +705,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); SetWindowLongA(g_hMainWnd, GWL_STYLE, style); DestroyWindow(hwndStatus); -- 2.19.1

1 0

[PATCH v4 3/3] comctl32/status: Checking size grip bounds in x-axis only.
by Waritnan Sookbuntherng Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add this commit for checking bounds inclusively. v3: Determine bounds using x-axis only. v4: Update test. --- dlls/comctl32/status.c | 5 +---- dlls/comctl32/tests/status.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3bf72fa577..6ea7d9e997 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1009,10 +1009,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index b7b5fb273e..c7d9989218 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -615,17 +615,17 @@ static void test_sizegrip(void) /* check bounds when not maximized */ r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); expect(HTBOTTOMRIGHT, r); @@ -638,17 +638,17 @@ static void test_sizegrip(void) rc.right = pt.x; r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); expect(HTBOTTOMLEFT, r); -- 2.19.1

1 0

[PATCH v4 1/3] comctl32/tests: Test status bar size grip behavior and bounds.
by Waritnan Sookbuntherng Dec. 10, 2018

Dec. 10, 2018

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add tests. v3: Cover more points. v4: Remove unused leftover uxtheme include and remove macros from the test. --- dlls/comctl32/tests/status.c | 126 +++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..00db9f6737 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -586,6 +586,131 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + LONG style; + RECT rc, rcClient; + POINT pt; + int width, r; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + style = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + width = GetSystemMetrics(SM_CXVSCROLL); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + /* check bounds when not maximized */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + expect(HTBOTTOMRIGHT, r); + + /* not maximized and right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + expect(HTBOTTOMLEFT, r); + + /* maximize with left-to-right */ + SetWindowLongA(g_hMainWnd, GWL_STYLE, style|WS_MAXIMIZE); + SetWindowLongA(hwndStatus, GWL_EXSTYLE, 0); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + /* maximized with right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + SetWindowLongA(g_hMainWnd, GWL_STYLE, style); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +745,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

1 0

[PATCH] riched32: On VK_RETURN don't add newline into text
by Fabian Maurer Dec. 9, 2018

Dec. 9, 2018

This fixes an old regression when VK_RETURN handling was implemented Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23282 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/riched20/editor.c | 2 -- dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ dlls/riched32/tests/editor.c | 19 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..a9956d5d2f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2637,8 +2637,6 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) else if (!editor->bEmulateVersion10) ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); ME_CommitCoalescingUndo(editor); SetCursor(NULL); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e134..b3e8c75fa4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8920,6 +8920,24 @@ static void test_EM_SELECTIONTYPE(void) DestroyWindow(hwnd); } +static void test_VK_RETURN(void) +{ + HWND hwnd_richedit = new_richedit(NULL); + char buffer[100]; + GETTEXTEX gettex = {sizeof(buffer)}; + int len; + + SendMessageW(hwnd_richedit, WM_CHAR, 'T', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + SendMessageW(hwnd_richedit, WM_CHAR, 'S', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + + len = SendMessageA(hwnd_richedit, EM_GETTEXTEX, &gettex, buffer); + + ok(len == 4, "Got %d\n", len); + ok(strcmp(buffer, "T\rS\r") == 0, "Got %s\n", buffer); +} + START_TEST( editor ) { BOOL ret; @@ -8995,6 +9013,7 @@ START_TEST( editor ) test_eop_char_fmt(); test_para_numbering(); test_EM_SELECTIONTYPE(); + test_VK_RETURN(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7751d2b402..8cb28fa773 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1412,6 +1412,24 @@ static void test_EM_SETSEL(void) DestroyWindow(hwndRichEdit); } +static void test_VK_RETURN(void) +{ + HWND hwnd_richedit = new_richedit(NULL); + char buffer[100]; + GETTEXTEX gettex = {sizeof(buffer)}; + int len; + + SendMessageW(hwnd_richedit, WM_CHAR, 'T', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + SendMessageW(hwnd_richedit, WM_CHAR, 'S', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + + len = SendMessageA(hwnd_richedit, EM_GETTEXTEX, &gettex, buffer); + + ok(len == 2, "Got %d\n", len); + ok(strcmp(buffer, "TS") == 0, "Got %s\n", buffer); +} + START_TEST( editor ) { MSG msg; @@ -1440,6 +1458,7 @@ START_TEST( editor ) test_enter(); test_EM_EXSETSEL(); test_EM_SETSEL(); + test_VK_RETURN(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging. -- 2.19.2

2 2

[PATCH] kernel32: Implement RaiseFailFastException
by André Hentschel Dec. 9, 2018

Dec. 9, 2018

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/except.c | 35 +++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/ntstatus.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index c4f7fafabb6..ba195d92835 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -413,6 +413,41 @@ static inline BOOL check_resource_write( void *addr ) } +/******************************************************************* + * UnhandledExceptionFilter (KERNEL32.@) + */ +void WINAPI RaiseFailFastException(EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags) +{ + EXCEPTION_RECORD rec; + CONTEXT ctx; + + if (!context) + { + ctx.ContextFlags = CONTEXT_FULL; + NtGetContextThread(GetCurrentThread(), &ctx); + context = &ctx; + } + + if (!record) + { + rec.ExceptionCode = STATUS_FAIL_FAST_EXCEPTION; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = RaiseFailFastException; + rec.NumberParameters = 0; + record = &rec; + } + + if (!NtCurrentTeb()->Peb->BeingDebugged) + { + EXCEPTION_POINTERS epointers; + + epointers.ExceptionRecord = record; + epointers.ContextRecord = context; + start_debugger_atomic(&epointers); + } +} + /******************************************************************* * UnhandledExceptionFilter (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ae7bc886c51..31be1f59785 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1182,7 +1182,7 @@ @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall RaiseFailFastException(ptr ptr long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA diff --git a/include/ntstatus.h b/include/ntstatus.h index 735b6c2c41c..d2f08af3283 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -939,6 +939,7 @@ #define STATUS_INVALID_TASK_INDEX ((NTSTATUS) 0xC0000501) #define STATUS_THREAD_ALREADY_IN_TASK ((NTSTATUS) 0xC0000502) #define STATUS_CALLBACK_BYPASS ((NTSTATUS) 0xC0000503) +#define STATUS_FAIL_FAST_EXCEPTION ((NTSTATUS) 0xC0000602) #define STATUS_PORT_CLOSED ((NTSTATUS) 0xC0000700) #define STATUS_MESSAGE_LOST ((NTSTATUS) 0xC0000701) #define STATUS_INVALID_MESSAGE ((NTSTATUS) 0xC0000702) -- 2.17.1

2 1