November 2020 - Wine-commits

Sven Baars : gdi32/tests: Fix a compiler warning.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: ca96e04637a2b562ac8abd87bd8673232b76440e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca96e04637a2b562ac8abd87… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Nov 9 15:07:13 2020 +0100 gdi32/tests: Fix a compiler warning. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4c8b1cbb91b..d3ec971dce0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1330,17 +1330,16 @@ static void test_GetCharABCWidths(void) memset(&lf, 0, sizeof(lf)); lf.lfHeight = 20; - switch(i) + if (i == 1) { - case 1: strcpy(lf.lfFaceName, "Tahoma"); code = 'a'; - break; - case 2: + } + else + { strcpy(lf.lfFaceName, "Times New Roman"); lf.lfItalic = TRUE; code = 'f'; - break; } if (!is_truetype_font_installed(lf.lfFaceName)) {

1 0

Jacek Caban : conhost/tests: Silence debug output in child process if std output is a console.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 87a9d790abc95e6479af97aff7e88df240fb7e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a9d790abc95e6479af97af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:11 2020 +0100 conhost/tests: Silence debug output in child process if std output is a console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 4eb85a17a01..9b1ab77dc0b 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1402,7 +1402,11 @@ START_TEST(tty) if (argc > 3) { HANDLE pipe; + DWORD mode; sscanf(argv[3], "%p", &pipe); + /* if std output is console, silence debug output so it does not interfere with tests */ + if (GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode)) + winetest_debug = 0; child_process(pipe); return; }

1 0

Jacek Caban : server: Support unbound console input device.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 4e4872d59d0124544ad0bd8b446be8195ae8e780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e4872d59d0124544ad0bd8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:18 2020 +0100 server: Support unbound console input device. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 3 +-- server/console.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f812b2b9a55..ed5550bb0b6 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -237,8 +237,7 @@ static BOOL init_console_std_handles( BOOL override_all ) if (override_all || !GetStdHandle( STD_INPUT_HANDLE )) { - /* FIXME: Use unbound console handle */ - RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\CurrentIn" ); + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\Input" ); status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, diff --git a/server/console.c b/server/console.c index ebcc8beb97c..bc93809ab97 100644 --- a/server/console.c +++ b/server/console.c @@ -283,6 +283,36 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; +static void input_device_dump( struct object *obj, int verbose ); +static struct object *input_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); +static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *input_device_get_fd( struct object *obj ); + +static const struct object_ops input_device_ops = +{ + sizeof(struct object), /* size */ + input_device_dump, /* dump */ + console_device_get_type, /* get_type */ + input_device_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + input_device_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + input_device_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + struct console_connection { struct object obj; /* object header */ @@ -1065,6 +1095,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; + static const WCHAR inputW[] = {'I','n','p','u','t'}; static const WCHAR screen_bufferW[] = {'S','c','r','e','e','n','B','u','f','f','e','r'}; static const WCHAR serverW[] = {'S','e','r','v','e','r'}; @@ -1096,6 +1127,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return grab_object( obj ); } + if (name->len == sizeof(inputW) && !memcmp( name->str, inputW, name->len )) + { + name->len = 0; + return alloc_object( &input_device_ops ); + } + if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) { if (!current->process->console) @@ -1141,6 +1178,37 @@ static struct object *console_device_open_file( struct object *obj, unsigned int return is_output ? grab_object( current->process->console->active ) : grab_object( current->process->console ); } +static void input_device_dump( struct object *obj, int verbose ) +{ + fputs( "console Input device\n", stderr ); +} + +static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + if (!current->process->console) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return add_queue( &current->process->console->obj, entry ); +} + +static struct fd *input_device_get_fd( struct object *obj ) +{ + if (!current->process->console) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return get_obj_fd( &current->process->console->obj ); +} + +static struct object *input_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + struct object *create_console_device( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) {

1 0

Jacek Caban : server: Support unbound console output device.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: d8d2b8a38d6a04f19f3774e860e32c7859bc0fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d2b8a38d6a04f19f3774e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:23 2020 +0100 server: Support unbound console output device. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 3 +- server/console.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 13e17e14e4c..f621c5f6a8d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4035,7 +4035,6 @@ static void test_AllocConsole_child(void) ok(GetStdHandle(STD_OUTPUT_HANDLE) == prev_output, "GetStdHandle(STD_OUTPUT_HANDLE) = %p\n", GetStdHandle(STD_OUTPUT_HANDLE)); ok(GetStdHandle(STD_ERROR_HANDLE) == prev_error, "GetStdHandle(STD_ERROR_HANDLE) = %p\n", GetStdHandle(STD_ERROR_HANDLE)); res = GetConsoleMode(unbound_output, &mode); - todo_wine ok(!res && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode failed: %u\n", GetLastError()); res = AllocConsole(); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index ed5550bb0b6..9fc34e3c9bc 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -254,8 +254,7 @@ static BOOL init_console_std_handles( BOOL override_all ) if (std_out && std_err) return TRUE; } - /* FIXME: Use unbound console handle */ - RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\CurrentOut" ); + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\Output" ); status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, diff --git a/server/console.c b/server/console.c index bc93809ab97..a290e0647e4 100644 --- a/server/console.c +++ b/server/console.c @@ -313,6 +313,36 @@ static const struct object_ops input_device_ops = no_destroy /* destroy */ }; +static void output_device_dump( struct object *obj, int verbose ); +static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *output_device_get_fd( struct object *obj ); +static struct object *output_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); + +static const struct object_ops output_device_ops = +{ + sizeof(struct object), /* size */ + output_device_dump, /* dump */ + console_device_get_type, /* get_type */ + output_device_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + output_device_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + output_device_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + struct console_connection { struct object obj; /* object header */ @@ -1096,6 +1126,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; static const WCHAR inputW[] = {'I','n','p','u','t'}; + static const WCHAR outputW[] = {'O','u','t','p','u','t'}; static const WCHAR screen_bufferW[] = {'S','c','r','e','e','n','B','u','f','f','e','r'}; static const WCHAR serverW[] = {'S','e','r','v','e','r'}; @@ -1133,6 +1164,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return alloc_object( &input_device_ops ); } + if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len )) + { + name->len = 0; + return alloc_object( &output_device_ops ); + } + if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) { if (!current->process->console) @@ -1209,6 +1246,38 @@ static struct object *input_device_open_file( struct object *obj, unsigned int a return grab_object( obj ); } +static void output_device_dump( struct object *obj, int verbose ) +{ + fputs( "console Output device\n", stderr ); +} + +static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + if (!current->process->console || !current->process->console->active) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return add_queue( &current->process->console->obj, entry ); +} + +static struct fd *output_device_get_fd( struct object *obj ) +{ + if (!current->process->console || !current->process->console->active) + { + set_error( STATUS_ACCESS_DENIED ); + return NULL; + } + + return get_obj_fd( &current->process->console->active->obj ); +} + +static struct object *output_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + struct object *create_console_device( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) {

1 0

Jacek Caban : kernel32/tests: Add more unbound console handles tests.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: b0eaf439d1fab53f1c239e4cfde411b00ac6d44e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0eaf439d1fab53f1c239e4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:30 2020 +0100 kernel32/tests: Add more unbound console handles tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 61 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f621c5f6a8d..a306a5144a3 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -84,6 +84,25 @@ static void init_function_pointers(void) #undef KERNEL32_GET_PROC } +static HANDLE create_unbound_handle(BOOL output, BOOL test_status) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + IO_STATUS_BLOCK iosb; + UNICODE_STRING name; + HANDLE handle; + NTSTATUS status; + + attr.ObjectName = &name; + attr.Attributes = OBJ_INHERIT; + RtlInitUnicodeString( &name, output ? L"\\Device\\ConDrv\\Output" : L"\\Device\\ConDrv\\Input" ); + status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | + FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + if (test_status) ok(!status, "NtCreateFile failed: %#x\n", status); + return status ? NULL : handle; +} + /* FIXME: this could be optimized on a speed point of view */ static void resetContent(HANDLE hCon, COORD sbSize, BOOL content) { @@ -993,9 +1012,9 @@ static void testWaitForConsoleInput(HANDLE input_handle) static void test_wait(HANDLE input, HANDLE orig_output) { + HANDLE output, unbound_output, unbound_input; LARGE_INTEGER zero; INPUT_RECORD ir; - HANDLE output; DWORD res, count; NTSTATUS status; BOOL ret; @@ -1016,12 +1035,19 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); FlushConsoleInputBuffer(input); + unbound_output = create_unbound_handle(TRUE, TRUE); + unbound_input = create_unbound_handle(FALSE, TRUE); + res = WaitForSingleObject(input, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_output, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_input, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); @@ -1038,6 +1064,10 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_output, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_input, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); @@ -1048,6 +1078,8 @@ static void test_wait(HANDLE input, HANDLE orig_output) ret = SetConsoleActiveScreenBuffer(orig_output); ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + CloseHandle(unbound_input); + CloseHandle(unbound_output); CloseHandle(output); } @@ -1386,12 +1418,6 @@ static void test_CreateFileW(void) ret = CreateFileW(cf_table[index].input ? L"\\??\\CONIN$" : L"\\??\\CONOUT$", cf_table[index].access, FILE_SHARE_READ|FILE_SHARE_WRITE, &sa, cf_table[index].creation, FILE_ATTRIBUTE_NORMAL, NULL); - if (!index && ret == INVALID_HANDLE_VALUE) - { - win_skip("Skipping NT path tests, not supported on this Windows version\n"); - skip_nt = TRUE; - continue; - } if (cf_table[index].gle) ok(ret == INVALID_HANDLE_VALUE && GetLastError() == cf_table[index].gle, "CreateFileW to returned %p %u for index %d\n", ret, GetLastError(), index); @@ -3749,14 +3775,15 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { + HANDLE handle, unbound_output = NULL; + DWORD size, mode; WCHAR title[16]; - HANDLE handle; - DWORD size; HWND hwnd; UINT cp; BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); + if (!skip_nt) unbound_output = create_unbound_handle(TRUE, TRUE); ret = FreeConsole(); ok(ret, "FreeConsole failed: %u\n", GetLastError()); @@ -3836,6 +3863,12 @@ static void test_FreeConsole(void) SetStdHandle( STD_INPUT_HANDLE, NULL ); handle = GetConsoleInputWaitHandle(); ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); + + ret = GetConsoleMode(unbound_output, &mode); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "GetConsoleMode returned %x %u\n", ret, GetLastError()); + + CloseHandle(unbound_output); } static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) @@ -4241,7 +4274,7 @@ static void test_pseudo_console(void) START_TEST(console) { - HANDLE hConIn, hConOut, revert_output = NULL; + HANDLE hConIn, hConOut, revert_output = NULL, unbound_output; BOOL ret, test_current; CONSOLE_SCREEN_BUFFER_INFO sbi; BOOL using_pseudo_console; @@ -4329,6 +4362,13 @@ START_TEST(console) } } + unbound_output = create_unbound_handle(TRUE, FALSE); + if (!unbound_output) + { + win_skip("Skipping NT path tests, not supported on this Windows version\n"); + skip_nt = TRUE; + } + if (test_current) { HANDLE sb; @@ -4449,4 +4489,5 @@ START_TEST(console) } else if (revert_output) SetConsoleActiveScreenBuffer(revert_output); + CloseHandle(unbound_output); }

1 0

Jacek Caban : kernelbase: Remove no longer needed console handle handling from create_process_params.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 6b5a2637422085ebf90f6edf6906f1ea307faa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5a2637422085ebf90f6edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:38 2020 +0100 kernelbase: Remove no longer needed console handle handling from create_process_params. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 57f0721f397..7689e1adf28 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -215,20 +215,6 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdError = NtCurrentTeb()->Peb->ProcessParameters->hStdError; } - if (flags & CREATE_NEW_CONSOLE) - { - /* this is temporary (for console handles). We have no way to control that the handle is invalid in child process otherwise */ - if (is_console_handle(params->hStdInput)) params->hStdInput = INVALID_HANDLE_VALUE; - if (is_console_handle(params->hStdOutput)) params->hStdOutput = INVALID_HANDLE_VALUE; - if (is_console_handle(params->hStdError)) params->hStdError = INVALID_HANDLE_VALUE; - } - else - { - if (is_console_handle(params->hStdInput)) params->hStdInput = (HANDLE)((UINT_PTR)params->hStdInput & ~3); - if (is_console_handle(params->hStdOutput)) params->hStdOutput = (HANDLE)((UINT_PTR)params->hStdOutput & ~3); - if (is_console_handle(params->hStdError)) params->hStdError = (HANDLE)((UINT_PTR)params->hStdError & ~3); - } - params->dwX = startup->dwX; params->dwY = startup->dwY; params->dwXSize = startup->dwXSize;

1 0

Nikolay Sivov : mfplat/tests: Remove a couple of failing tests.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 37aa12e7c808fd47f515dbb509813cce7fd4df7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=37aa12e7c808fd47f515dbb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 16:56:58 2020 +0300 mfplat/tests: Remove a couple of failing tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4f5cf268d2a..c9a01644c6b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -502,15 +502,6 @@ static void test_source_resolver(void) &obj_type, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, - &obj_type, (IUnknown **)&mediasource); - ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - if (hr == S_OK) IMFMediaSource_Release(mediasource); - - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_BYTESTREAM, NULL, - &obj_type, (IUnknown **)&mediasource); - ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - IMFByteStream_Release(stream); /* Create from URL. */

1 0

Alistair Leslie-Hughes : xaudio2_9: Add version resource.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: fa6d22b976214ff4dfb32b431500b4cd1f7610a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa6d22b976214ff4dfb32b43… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:59 2020 +1100 xaudio2_9: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50101 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_9/Makefile.in | 2 ++ dlls/xaudio2_9/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in index 1a1982781a1..86f7b99e5eb 100644 --- a/dlls/xaudio2_9/Makefile.in +++ b/dlls/xaudio2_9/Makefile.in @@ -14,3 +14,5 @@ C_SRCS = \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/xaudio2_9/version.rc b/dlls/xaudio2_9/version.rc new file mode 100644 index 00000000000..606abad0600 --- /dev/null +++ b/dlls/xaudio2_9/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Alsitair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine xaudio2_9" +#define WINE_FILENAME_STR "xaudio2_9.dll" +#define WINE_FILEVERSION 10,0,19041,1 +#define WINE_FILEVERSION_STR "10.0.19041.1" +#define WINE_PRODUCTVERSION 10,0,19041,1 +#define WINE_PRODUCTVERSION_STR "10.0.19041.1" + +#include "wine/wine_common_ver.rc"

1 0

Michael Stefaniuc : start: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 6e8af61f101519624df5528930b58e0784f0614c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8af61f101519624df55289… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:56 2020 +0100 start: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 107 ++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e8af61f101519624df5…

1 0

Michael Stefaniuc : wintab32: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 783d71366a28f664370c34191634fdc7500d7d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=783d71366a28f664370c3419… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:57 2020 +0100 wintab32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/wintab32.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 98ce2bc1739..d56706b4223 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); HWND hwndDefault = NULL; -static const WCHAR - WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; static CRITICAL_SECTION_DEBUG csTablet_debug = { 0, 0, &csTablet, @@ -62,34 +60,26 @@ static VOID TABLET_Register(void) wndClass.cbWndExtra = 0; wndClass.hCursor = NULL; wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); - wndClass.lpszClassName = WC_TABLETCLASSNAME; + wndClass.lpszClassName = L"WineTabletClass"; RegisterClassW(&wndClass); } static VOID TABLET_Unregister(void) { - UnregisterClassW(WC_TABLETCLASSNAME, NULL); + UnregisterClassW(L"WineTabletClass", NULL); } static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -97,7 +87,7 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -105,8 +95,6 @@ static HMODULE load_graphics_driver(void) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - static const WCHAR name[] = {'T','a','b','l','e','t',0}; - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { @@ -114,7 +102,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) TRACE("Initialization\n"); DisableThreadLibraryCalls(hInstDLL); TABLET_Register(); - hwndDefault = CreateWindowW(WC_TABLETCLASSNAME, name, + hwndDefault = CreateWindowW(L"WineTabletClass", L"Tablet", WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); if (hwndDefault) {

1 0