July 2020 - Wine-commits - list.winehq.org

Jacek Caban : kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputCharacterW.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: bf6a803e04db1c466c9e7b1fd44e17ee10b17381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6a803e04db1c466c9e7b1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:22 2020 +0200 kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputCharacterW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1df084fab9..4468d713d9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -446,7 +446,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterA( HANDLE handle, CHAR c BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR ch, DWORD length, COORD coord, DWORD *written ) { - BOOL ret; + struct condrv_fill_output_params params; TRACE( "(%p,%s,%d,(%dx%d),%p)\n", handle, debugstr_wn(&ch, 1), length, coord.X, coord.Y, written ); @@ -457,19 +457,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR } *written = 0; - SERVER_START_REQ( fill_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_TEXT; - req->wrap = TRUE; - req->data.ch = ch; - req->count = length; - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; - return ret; + + params.mode = CHAR_INFO_MODE_TEXT; + params.x = coord.X; + params.y = coord.Y; + params.count = length; + params.wrap = TRUE; + params.ch = ch; + params.attr = 0; + return console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), + written, sizeof(written), NULL ); } HANDLE get_console_wait_handle( HANDLE handle )

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputAttribute.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 440e31a73212382362cf64982de8ecf2d579cdb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=440e31a73212382362cf6498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:28 2020 +0200 kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in FillConsoleOutputAttribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 4468d713d9..49259857af 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -400,7 +400,7 @@ DWORD WINAPI CtrlRoutine( void *arg ) BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputAttribute( HANDLE handle, WORD attr, DWORD length, COORD coord, DWORD *written ) { - BOOL ret; + struct condrv_fill_output_params params; TRACE( "(%p,%d,%d,(%dx%d),%p)\n", handle, attr, length, coord.X, coord.Y, written ); @@ -411,19 +411,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputAttribute( HANDLE handle, WORD at } *written = 0; - SERVER_START_REQ( fill_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_ATTR; - req->wrap = TRUE; - req->data.attr = attr; - req->count = length; - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; - return ret; + + params.mode = CHAR_INFO_MODE_ATTR; + params.x = coord.X; + params.y = coord.Y; + params.count = length; + params.wrap = TRUE; + params.ch = 0; + params.attr = attr; + return console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), + written, sizeof(written), NULL ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in fill_console_output.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: a07aa965e5d3c2f4a46387ad911ef1c8500e2107 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07aa965e5d3c2f4a46387ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:35 2020 +0200 kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in fill_console_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 49259857af..27918d8370 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -163,19 +163,16 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count ) /* helper function for ScrollConsoleScreenBufferW */ static void fill_console_output( HANDLE handle, int i, int j, int len, CHAR_INFO *fill ) { - SERVER_START_REQ( fill_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->x = i; - req->y = j; - req->count = len; - req->wrap = FALSE; - req->data.ch = fill->Char.UnicodeChar; - req->data.attr = fill->Attributes; - wine_server_call_err( req ); - } - SERVER_END_REQ; + struct condrv_fill_output_params params; + + params.mode = CHAR_INFO_MODE_TEXTATTR; + params.x = i; + params.y = j; + params.count = len; + params.wrap = FALSE; + params.ch = fill->Char.UnicodeChar; + params.attr = fill->Attributes; + console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), NULL, 0, NULL ); } /* helper function for GetLargestConsoleWindowSize */

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_FILL_OUTPUT in CONSOLE_FillLineUniform.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: dce5b9add1f9221c176e47c920e247ceeb70632c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dce5b9add1f9221c176e47c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:43 2020 +0200 kernel32: Use IOCTL_CONDRV_FILL_OUTPUT in CONSOLE_FillLineUniform. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f294b15635..f75a894717 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -947,19 +947,16 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber */ void CONSOLE_FillLineUniform(HANDLE hConsoleOutput, int i, int j, int len, LPCHAR_INFO lpFill) { - SERVER_START_REQ( fill_console_output ) - { - req->handle = console_handle_unmap(hConsoleOutput); - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->x = i; - req->y = j; - req->count = len; - req->wrap = FALSE; - req->data.ch = lpFill->Char.UnicodeChar; - req->data.attr = lpFill->Attributes; - wine_server_call_err( req ); - } - SERVER_END_REQ; + struct condrv_fill_output_params params; + + params.mode = CHAR_INFO_MODE_TEXTATTR; + params.x = i; + params.y = j; + params.count = len; + params.wrap = FALSE; + params.ch = lpFill->Char.UnicodeChar; + params.attr = lpFill->Attributes; + DeviceIoControl( hConsoleOutput, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), NULL, 0, NULL, NULL ); } /******************************************************************

1 0

Jacek Caban : server: Remove no longer needed fill_console_output request.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 35352575e4e8d9fc753dad583f2b24ed999ec8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=35352575e4e8d9fc753dad58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:59 2020 +0200 server: Remove no longer needed fill_console_output request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 7 +++++++ include/wine/server_protocol.h | 32 +------------------------------- server/console.c | 20 -------------------- server/protocol.def | 21 --------------------- server/request.h | 13 ------------- server/trace.c | 26 -------------------------- tools/make_requests | 1 - 7 files changed, 8 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35352575e4e8d9fc753d…

1 0

Myah Caron : ntdll/tests: Add test to check if GetTickCount is updated after sleeping.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 4617f83fcf0a34fe41b0e38dde1567195395efca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4617f83fcf0a34fe41b0e38d… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Jul 13 17:08:38 2020 +0000 ntdll/tests: Add test to check if GetTickCount is updated after sleeping. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839..a00d507e4e 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -199,7 +199,7 @@ static void test_user_shared_data_time(void) { KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; ULONGLONG t1, t2, t3; - int i = 0; + int i = 0, changed = 0; i = 0; do @@ -253,6 +253,15 @@ static void test_user_shared_data_time(void) "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } + + for (i = 0; i < 100; i++) + { + t1 = GetTickCount(); + Sleep(1); + t2 = GetTickCount(); + if (t1 != t2) changed++; + } + todo_wine ok(changed >= 90, "tick count isn't updated after sleeping one millisecond (%d%% correct)\n", changed); } START_TEST(time)

1 0

Matteo Bruni : wined3d: Fix / update reported driver model version.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: a76475909d362abc8c6ec31588fedcdf0e9c7dbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a76475909d362abc8c6ec315… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 14 14:10:32 2020 +0200 wined3d: Fix / update reported driver model version. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 454125c146..45f3f61f2f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,20 +198,26 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/* Certain applications (Steam) complain if we report an outdated driver version. In general, - * reporting a driver version is moot because we are not the Windows driver, and we have different - * bugs, features, etc. +/* Certain applications (e.g. Steam) complain if we report an outdated driver + * version. * * The driver version has the form "x.y.z.w". * - * "x" is the Windows version the driver is meant for: + * "x" is the Windows version / driver model the driver is meant for: * 4 -> 95/98/NT4 * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Windows 7 - * 9 -> Windows 8 - * 10 -> Windows 10 + * 6 -> XP + * 7 -> Vista - WDDM 1.0 + * 8 -> Windows 7 - WDDM 1.1 + * 9 -> Windows 8 - WDDM 1.2 + * 10 -> Windows 8.1 - WDDM 1.3 + * 20 -> Windows 10 - WDDM 2.0 + * 21 -> Windows 10 Anniversary Update - WDDM 2.1 + * 22 -> Windows 10 Creators Update - WDDM 2.2 + * 23 -> Windows 10 Fall Creators Update - WDDM 2.3 + * 24 -> Windows 10 April 2018 Update - WDDM 2.4 + * 25 -> Windows 10 October 2018 Update - WDDM 2.5 + * 26 -> Windows 10 May 2019 Update - WDDM 2.6 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -705,20 +711,25 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_os_version = 8; driver_model = DRIVER_MODEL_NT6X; } + else if (os_version.dwMinorVersion == 2) + { + driver_os_version = 9; + driver_model = DRIVER_MODEL_NT6X; + } else { if (os_version.dwMinorVersion > 3) { - FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } - driver_os_version = 9; + driver_os_version = 10; driver_model = DRIVER_MODEL_NT6X; } break; case 10: - driver_os_version = 10; + driver_os_version = 26; driver_model = DRIVER_MODEL_NT6X; break;

1 0

Matteo Bruni : wined3d: Automatically assign reported driver D3D version / feature level.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 905a52b3b6654c90198713d2847bbeb8f6490d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905a52b3b6654c90198713d2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 14 14:10:33 2020 +0200 wined3d: Automatically assign reported driver D3D version / feature level. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 29 ++++----- dlls/wined3d/adapter_vk.c | 19 +++--- dlls/wined3d/directx.c | 135 ++++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 5 +- 4 files changed, 123 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=905a52b3b6654c901987…

1 0

Matteo Bruni : wined3d: Update reported AMD RX driver version.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 4a274314ffdf2e8730bcfc0b697af22bc6173fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a274314ffdf2e8730bcfc0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 14 14:10:34 2020 +0200 wined3d: Update reported AMD RX driver version. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dff8219270..53fdf3168b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -265,7 +265,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 1280}, - {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 10, 1474}, + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 15002, 61}, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp

1 0

Matteo Bruni : wined3d: Update reported NVIDIA driver version for Fermi+ GPUs.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 6d229621016ed58b2ceebdf915ce971f936bdc9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d229621016ed58b2ceebdf9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 14 14:10:35 2020 +0200 wined3d: Update reported NVIDIA driver version for Fermi+ GPUs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 186 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 96 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d229621016ed58b2cee…

1 0