wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Francois Gouget : dbghelp: Make symt_get_best_at() static.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: edcff4046c5aa70c047c1a523a93a5cc5782fb44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edcff4046c5aa70c047c1a52… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:41:20 2018 +0100 dbghelp: Make symt_get_best_at() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c9585c5..96a1f87 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -851,7 +851,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* neede by symt_find_nearest */ -int symt_get_best_at(struct module* module, int idx_sorttab) +static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; int idx_sorttab_orig = idx_sorttab;

1 0

Michael Stefaniuc : shell32: Use SetRect() instead of open coding it.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: db850cd75817d1a7e41a6ad044d6866488e267ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=db850cd75817d1a7e41a6ad0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 7 21:57:15 2018 +0100 shell32: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 2d5a30a..637104c 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -314,9 +314,7 @@ static void update_layout(ExplorerBrowserImpl *This) if(navpane_width_actual) { - This->navpane.rc.left = This->navpane.rc.top = 0; - This->navpane.rc.right = navpane_width_actual; - This->navpane.rc.bottom = rc.bottom; + SetRect(&This->navpane.rc, 0, 0, navpane_width_actual, rc.bottom); if(!This->navpane.hwnd_splitter) initialize_navpane(This, This->hwnd_main, &This->navpane.rc); @@ -324,10 +322,8 @@ static void update_layout(ExplorerBrowserImpl *This) else ZeroMemory(&This->navpane.rc, sizeof(RECT)); - This->sv_rc.left = navpane_width_actual; - This->sv_rc.top = 0; - This->sv_rc.right = This->sv_rc.left + shellview_width_actual; - This->sv_rc.bottom = rc.bottom; + SetRect(&This->sv_rc, navpane_width_actual, 0, navpane_width_actual + shellview_width_actual, + rc.bottom); } static void size_panes(ExplorerBrowserImpl *This)

1 0

Waritnan Sookbuntherng : comctl32/status: Checking size grip bounds in x-axis only.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: 0f12fa1e432360431392ece417ae9ad02cb00647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f12fa1e432360431392ece4… Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Date: Mon Dec 10 09:52:10 2018 +0000 comctl32/status: Checking size grip bounds in x-axis only. Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 3bf72fa..6ea7d9e 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 b7b5fb2..c7d9989 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);

1 0

Waritnan Sookbuntherng : comctl32/status: Hide size grip when the parent window is maximized.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: 1bb95af322543a644fb82004ae8a9450dd41d7ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb95af322543a644fb82004… Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Date: Mon Dec 10 09:52:10 2018 +0000 comctl32/status: Hide size grip when the parent window is maximized. Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 cb27ee8..3bf72fa 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 00db9f6..b7b5fb2 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);

1 0

Waritnan Sookbuntherng : comctl32/tests: Test status bar size grip behavior and bounds.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: d8428406c629672387bad5a00e8f779fc86bf7b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8428406c629672387bad5a0… Author: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Date: Mon Dec 10 09:52:09 2018 +0000 comctl32/tests: Test status bar size grip behavior and bounds. Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 d78bd20..00db9f6 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(); }

1 0

Alexandre Julliard : dinput/tests: Try harder to avoid spurious keyboard input.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: d62ac319d2850acd81b14627476660340a32abd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d62ac319d2850acd81b14627… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 14:58:57 2018 +0100 dinput/tests: Try harder to avoid spurious keyboard input. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 8ee22fa..e8dfb4f 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -411,6 +411,8 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) if (!PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE)) { + U(in).ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &in, sizeof(in)); win_skip("failed to queue keyboard event\n"); break; } @@ -471,6 +473,7 @@ static void keyboard_tests(DWORD version) hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); + SetForegroundWindow( hwnd ); if (hwnd) {

1 0

Alex Henrie : wineps.drv: Make constant 'glyph_def' static.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: 2bd84420a09094b0b04d67f3130563bbbc1b07a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd84420a09094b0b04d67f3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:43:02 2018 -0700 wineps.drv: Make constant 'glyph_def' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/type42.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index c808ddb..451cceb 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -291,7 +291,7 @@ BOOL T42_download_glyph(PHYSDEV dev, DOWNLOAD *pdl, DWORD index, char *buf; TYPE42 *t42; - const char glyph_def[] = + static const char glyph_def[] = "/%s findfont exch 1 index\n" "havetype42gdir\n" "{/GlyphDirectory get begin %d exch def end}\n"

1 0

Dmitry Timoshkov : gdi32: Trace full contents of DOCINFO in StartDoc.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: 7933f7beefed39fb6fb15358ee64f804938e0fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7933f7beefed39fb6fb15358… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 15:16:21 2018 +0300 gdi32: Trace full contents of DOCINFO in StartDoc. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 3cfdc47..d2f4076 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;

1 0

Dmitry Timoshkov : gdi32/tests: Add a simple test for printing to a PostScript device.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: 9ad2d036aae7c5cd2663a02f1dff10709a827ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ad2d036aae7c5cd2663a02f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 7 15:16:17 2018 +0300 gdi32/tests: Add a simple test for printing to a PostScript device. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 5eec74a..3179c97 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(); }

1 0

Francois Gouget : rpcrt4/tests: Make create_server_process() static.
by Alexandre Julliard 10 Dec '18

10 Dec '18

Module: wine Branch: master Commit: 83d1f1a3be53de861c5bad331759b85591f7bc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83d1f1a3be53de861c5bad33… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 9 01:42:03 2018 +0100 rpcrt4/tests: Make create_server_process() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 587dc45..89cf514 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1973,7 +1973,7 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcStringFree\n"); } -HANDLE create_server_process(void) +static HANDLE create_server_process(void) { SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; HANDLE ready_event;

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
36
Older →

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 December 2018