August 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz: Reimplement AM_RENDEREX_RENDERTOEXISTINGRENDERERS by forbidding renderers from IFilterMapper2::EnumMatchingFilters().
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 0beda8a480d4e5ced02841f0410c0724f7fb39d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0beda8a480d4e5ced02841f0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 15 16:43:35 2020 -0500 quartz: Reimplement AM_RENDEREX_RENDERTOEXISTINGRENDERERS by forbidding renderers from IFilterMapper2::EnumMatchingFilters(). Primarily to avoid unnecessarily creating filters like the VMR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 2c32b3bc43..4cef1004bd 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1130,7 +1130,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source, IBaseFilter *filter, IPin *middle_sink, IPin *sink, - BOOL render_to_existing, BOOL allow_renderers, unsigned int recursion_depth) + BOOL render_to_existing, unsigned int recursion_depth) { BOOL any = FALSE, all = TRUE; IPin *middle_source, *peer; @@ -1195,7 +1195,7 @@ static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source, if (!sink) { - if (all && (any || allow_renderers)) + if (all) return S_OK; if (any) return VFW_S_PARTIAL_RENDER; @@ -1209,7 +1209,7 @@ err: static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, IBaseFilter *filter, IPin *sink, BOOL render_to_existing, - BOOL allow_renderers, unsigned int recursion_depth) + unsigned int recursion_depth) { IEnumPins *sink_enum; IPin *filter_sink; @@ -1223,7 +1223,7 @@ static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, while (IEnumPins_Next(sink_enum, 1, &filter_sink, NULL) == S_OK) { hr = autoplug_through_sink(graph, source, filter, filter_sink, sink, - render_to_existing, allow_renderers, recursion_depth); + render_to_existing, recursion_depth); IPin_Release(filter_sink); if (SUCCEEDED(hr)) { @@ -1271,7 +1271,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { if (SUCCEEDED(hr = autoplug_through_filter(graph, source, filter->filter, - sink, render_to_existing, TRUE, recursion_depth))) + sink, render_to_existing, recursion_depth))) return hr; } @@ -1295,8 +1295,9 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, DeleteMediaType(mt); - if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, 0, FALSE, - MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL))) + if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, + 0, FALSE, MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, + render_to_existing, 0, NULL, NULL, NULL))) goto out; while (IEnumMoniker_Next(enummoniker, 1, &moniker, NULL) == S_OK) @@ -1346,8 +1347,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink, continue; } - hr = autoplug_through_filter(graph, source, filter, sink, - render_to_existing, !render_to_existing, recursion_depth); + hr = autoplug_through_filter(graph, source, filter, sink, render_to_existing, recursion_depth); if (SUCCEEDED(hr)) { IBaseFilter_Release(filter);

1 0

Martin Storsjo : winebuild: Use the right arm64 page/pageoff relocation syntax for darwin.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 849d08b0aed1b256ac459347cb488ef3db5ce3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849d08b0aed1b256ac459347… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:54:14 2020 +0300 winebuild: Use the right arm64 page/pageoff relocation syntax for darwin. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 34 ++++++++++++++++++---------------- tools/winebuild/spec32.c | 4 ++-- tools/winebuild/utils.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e1d2e5edf8..03715af956 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -291,6 +291,8 @@ extern const char *get_asm_export_section(void); extern const char *get_asm_rodata_section(void); extern const char *get_asm_rsrc_section(void); extern const char *get_asm_string_section(void); +extern const char *arm64_page( const char *sym ); +extern const char *arm64_pageoff( const char *sym ); extern void output_function_size( const char *name ); extern void output_gnu_stack_note(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index da9ad62022..751335f36f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -761,8 +761,8 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); break; case CPU_ARM64: - output( "\tadrp x9, %s\n", table ); - output( "\tadd x9, x9, #:lo12:%s\n", table ); + output( "\tadrp x9, %s\n", arm64_page( table ) ); + output( "\tadd x9, x9, #%s\n", arm64_pageoff( table ) ); if (pos & 0xf000) output( "\tadd x9, x9, #%u\n", pos & 0xf000 ); if (pos & 0x0f00) output( "\tadd x9, x9, #%u\n", pos & 0x0f00 ); if (pos & 0x00f0) output( "\tadd x9, x9, #%u\n", pos & 0x00f0 ); @@ -1080,8 +1080,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); output( "\tmov x29, sp\n" ); - output( "\tadrp x9, %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tadd x9, x9, #:lo12:%s\n", asm_name("__wine_spec_delay_load") ); + output( "\tadrp x9, %s\n", arm64_page( asm_name("__wine_spec_delay_load") ) ); + output( "\tadd x9, x9, #%s\n", arm64_pageoff( asm_name("__wine_spec_delay_load") ) ); output( "\tblr x9\n" ); output( "\tmov x9, x0\n" ); output( "\tldp x29, x30, [sp],#16\n" ); @@ -1367,17 +1367,19 @@ void output_stubs( DLLSPEC *spec ) else output( "\t.long %u\n", odp->ordinal ); break; case CPU_ARM64: - output( "\tadrp x0, .L__wine_spec_file_name\n" ); - output( "\tadd x0, x0, #:lo12:.L__wine_spec_file_name\n" ); + output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_file_name") ); + output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_file_name") ); if (exp_name) { - output( "\tadrp x1, .L%s_string\n", name ); - output( "\tadd x1, x1, #:lo12:.L%s_string\n", name ); + char *sym = strmake( ".L%s_string", name ); + output( "\tadrp x1, %s\n", arm64_page( sym ) ); + output( "\tadd x1, x1, #%s\n", arm64_pageoff( sym ) ); + free( sym ); } else output( "\tmov x1, %u\n", odp->ordinal ); - output( "\tadrp x2, %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "\tadd x2, x2, #:lo12:%s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tadrp x2, %s\n", arm64_page( asm_name("__wine_spec_unimplemented_stub") ) ); + output( "\tadd x2, x2, #%s\n", arm64_pageoff( asm_name("__wine_spec_unimplemented_stub") ) ); output( "\tblr x2\n" ); break; default: @@ -1627,8 +1629,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tldr x20, [x19]\n" ); /* prev frame */ output( "\tstr x20, [sp, #88]\n" ); output( "\tstr x29, [x19]\n" ); /* syscall frame */ - output( "\tadrp x16, .Lsyscall_args\n" ); - output( "\tadd x16, x16, #:lo12:.Lsyscall_args\n" ); + output( "\tadrp x16, %s\n", arm64_page(".Lsyscall_args") ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff(".Lsyscall_args") ); output( "\tldrb w9, [x16, x8]\n" ); output( "\tsubs x9, x9, #64\n" ); output( "\tbls 2f\n" ); @@ -1640,8 +1642,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tldr x10, [x11, x9]\n" ); output( "\tstr x10, [sp, x9]\n" ); output( "\tcbnz x9, 1b\n" ); - output( "2:\tadrp x16, .Lsyscall_table\n" ); - output( "\tadd x16, x16, #:lo12:.Lsyscall_table\n" ); + output( "2:\tadrp x16, %s\n", arm64_page(".Lsyscall_table") ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff(".Lsyscall_table") ); output( "\tldr x16, [x16, x8, lsl 3]\n" ); output( "\tblr x16\n" ); output( "\tmov sp, x29\n" ); @@ -1741,8 +1743,8 @@ void output_syscalls( DLLSPEC *spec ) case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); output( "\tmov x8, #%u\n", i ); - output( "\tadrp x16, %s\n", asm_name("__wine_syscall_dispatcher") ); - output( "\tldr x16, [x16, #:lo12:%s]\n", asm_name("__wine_syscall_dispatcher") ); + output( "\tadrp x16, %s\n", arm64_page( asm_name("__wine_syscall_dispatcher") ) ); + output( "\tldr x16, [x16, #%s]\n", arm64_pageoff( asm_name("__wine_syscall_dispatcher") ) ); output( "\tblr x16\n"); output( "\tldp x29, x30, [sp], #16\n" ); output( "\tret\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c85249b2a9..efb136a8e6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -339,8 +339,8 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tstp x8, x9, [SP,#-16]!\n" ); output( "\tmov w1, #%u\n", odp->u.func.args_str_offset << 16 ); if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); - output( "\tadrp x0, .L__wine_spec_relay_descr\n"); - output( "\tadd x0, x0, #:lo12:.L__wine_spec_relay_descr\n"); + output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_relay_descr") ); + output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_relay_descr") ); output( "\tldr x3, [x0, #8]\n"); output( "\tblr x3\n"); output( "\tadd SP, SP, #16\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 07ef2ed298..1af42f1000 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1291,3 +1291,35 @@ const char *get_asm_string_section(void) default: return ".section .rodata"; } } + +const char *arm64_page( const char *sym ) +{ + static char *buffer; + + switch (target_platform) + { + case PLATFORM_APPLE: + free( buffer ); + buffer = strmake( "%s(a)PAGE", sym ); + return buffer; + default: + return sym; + } +} + +const char *arm64_pageoff( const char *sym ) +{ + static char *buffer; + + free( buffer ); + switch (target_platform) + { + case PLATFORM_APPLE: + buffer = strmake( "%s(a)PAGEOFF", sym ); + break; + default: + buffer = strmake( ":lo12:%s", sym ); + break; + } + return buffer; +}

1 0

Francois Gouget : winapi: Update win16.api.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: fb5cd3cf16322c4e06fa3ed29e2375e2ee82f7b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5cd3cf16322c4e06fa3ed2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 18 12:22:37 2020 +0200 winapi: Update win16.api. Wine no longer has winedos16.dll and wprocs.dll and display.drv, keyboard.drv and mouse.drv have a .drv extension, not a .dll one. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/win16.api | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index ea646c9ec8..5e78e544da 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -217,7 +217,7 @@ LPSTR WORD -%%display.dll +%%display.drv %long @@ -362,7 +362,7 @@ INT16 UINT16 WORD -%%keyboard.dll +%%keyboard.drv %long @@ -628,7 +628,7 @@ MMRESULT16 UINT16 WORD -%%mouse.dll +%%mouse.drv %ptr @@ -1408,12 +1408,6 @@ CONTEXT86 * void -%%winedos16.dll - -%void - -void - %%wineps16.drv %long @@ -1556,13 +1550,3 @@ HWTHOOK16 INT16 UINT16 WPARAM16 - -%%wprocs.dll - -%ptr - -CONTEXT86 * - -%void - -void

1 0

Jacek Caban : server: Use passed console handle to inherit console for created process.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 30596feb03098b392bd5078a1a2d390567681b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30596feb03098b392bd5078a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:08:36 2020 +0200 server: Use passed console handle to inherit console for created process. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 1 + server/console.c | 37 +++++++++++++------------------------ server/process.c | 2 +- server/process.h | 2 +- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 58fba52415..936eed4d18 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -193,6 +193,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = (HANDLE)1; /* KERNEL32_CONSOLE_ALLOC */ + else if (!(flags & DETACHED_PROCESS)) params->ConsoleHandle = NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle; if (startup->dwFlags & STARTF_USESTDHANDLES) { diff --git a/server/console.c b/server/console.c index 54b7a74382..4509905c2c 100644 --- a/server/console.c +++ b/server/console.c @@ -620,40 +620,29 @@ int free_console( struct process *process ) * 2/ parent is a renderer which launches process, and process should attach to the console * rendered by parent */ -obj_handle_t inherit_console( struct thread *parent_thread, struct process *parent, struct process *process, +obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, struct process *process, obj_handle_t hconin ) { - int done = 0; + struct console_input *console = NULL; + + if (handle && !(console = (struct console_input *)get_handle_obj( current->process, handle, 0, + &console_input_ops ))) + return 0; /* if parent is a renderer, then attach current process to its console * a bit hacky.... */ - if (hconin && parent_thread) + if (!console && hconin && parent_thread) { - struct console_input *console; - /* FIXME: should we check some access rights ? */ - if ((console = (struct console_input *)get_handle_obj( parent, hconin, - 0, &console_input_ops ))) - { - if (console->renderer == parent_thread) - { - process->console = (struct console_input *)grab_object( console ); - process->console->num_proc++; - done = 1; - } - release_object( console ); - } - else clear_error(); /* ignore error */ - } - /* otherwise, if parent has a console, attach child to this console */ - if (!done && parent->console) - { - process->console = (struct console_input *)grab_object( parent->console ); - process->console->num_proc++; + if (!(console = (struct console_input *)get_handle_obj( parent_thread->process, hconin, + 0, &console_input_ops ))) + clear_error(); /* ignore error */ } + if (!console) return 0; - if (!process->console) return 0; + process->console = console; + console->num_proc++; return alloc_handle( process, process->console, SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, 0 ); } diff --git a/server/process.c b/server/process.c index 61ba1549e9..c1bdb591f6 100644 --- a/server/process.c +++ b/server/process.c @@ -1224,7 +1224,7 @@ DECL_HANDLER(new_process) * like if hConOut and hConIn are console handles, then they should be on the same * physical console */ - info->data->console = inherit_console( parent_thread, parent, + info->data->console = inherit_console( parent_thread, info->data->console, process, req->inherit_all ? info->data->hstdin : 0 ); } diff --git a/server/process.h b/server/process.h index 3944a67d57..0fdf070b78 100644 --- a/server/process.h +++ b/server/process.h @@ -131,7 +131,7 @@ extern void detach_debugged_processes( struct thread *debugger ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); /* console functions */ -extern obj_handle_t inherit_console( struct thread *parent_thread, struct process *parent, +extern obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, struct process *process, obj_handle_t hconin ); extern int free_console( struct process *process ); extern struct thread *console_get_renderer( struct console_input *console );

1 0

Jacek Caban : wineconsole: Make sure that console process is not attached to another console.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: ca30fa5cb42f3f7d69590cbf4f74dcb58987c730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca30fa5cb42f3f7d69590cbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:08:11 2020 +0200 wineconsole: Make sure that console process is not attached to another console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1104963f0f..76e1d17dd6 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -853,6 +853,9 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh int ret = 1; struct wc_init wci; + /* make sure we're not connected to inherited console */ + FreeConsole(); + if ((ret = WINECON_ParseOptions(lpCmdLine, &wci)) != 0) { printf_res(ret & 0xffff);

1 0

Andrew Eikum : winepulse: Don't rely on pulseaudio callbacks for timing.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: a10824a03cb7ad1a2a1987433c5ad832dcdf6962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a10824a03cb7ad1a2a198743… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 17 10:38:18 2020 -0500 winepulse: Don't rely on pulseaudio callbacks for timing. Contains contributions from Mark Harmstone and Zhiyi Zhang. Some devices, especially USB devices, have very irregular timing or very long periods. Some Windows applications (The Witcher 3) are built to expect regular, short period times, and so would underrun when the device timing didn't match their expectations. This patch decouples the Windows-side timing from the OS-side timing so we can meet those applications' requirements. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 613 +++++++++++++++++++----------------------- 1 file changed, 279 insertions(+), 334 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a10824a03cb7ad1a2a19…

1 0

Gijs Vermeulen : shell32: Free original_dos_name with correct function in TRASH_GetDetails() (Coverity).
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 48038508f5ee0b5670a3a0fa2377938ab6bbca6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=48038508f5ee0b5670a3a0fa… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 18 16:12:07 2020 +0200 shell32: Free original_dos_name with correct function in TRASH_GetDetails() (Coverity). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/trash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 93b4ee4588..f34b106bd6 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -662,7 +662,7 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN if (original_dos_name != NULL) { lstrcpynW(data->cFileName, original_dos_name, MAX_PATH); - SHFree(original_dos_name); + heap_free(original_dos_name); } else {

1 0

Dmitry Timoshkov : kernelbase: Native machine is optional for IsWow64Process2.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 3786462a568b6827d1ba1cc1ab2ced117817dcf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3786462a568b6827d1ba1cc1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 18 17:59:01 2020 +0300 kernelbase: Native machine is optional for IsWow64Process2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49716 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 15 +++++++++++++++ dlls/kernelbase/process.c | 11 ++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index eaa5da2e95..3162ba3c53 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2238,6 +2238,12 @@ static void test_IsWow64Process2(void) ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); ok(native_machine == expect_native, "got %#x\n", native_machine); + SetLastError(0xdeadbeef); + machine = 0xdead; + ret = pIsWow64Process2(pi.hProcess, &machine, NULL); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); + ret = TerminateProcess(pi.hProcess, 0); ok(ret, "TerminateProcess error\n"); @@ -2263,6 +2269,15 @@ static void test_IsWow64Process2(void) ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); ok(native_machine == expect_native, "got %#x\n", native_machine); } + + SetLastError(0xdeadbeef); + machine = 0xdead; + ret = pIsWow64Process2(GetCurrentProcess(), &machine, NULL); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + if (is_wow64) + ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); + else + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); } static void test_SystemInfo(void) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 936eed4d18..2b9b1c019e 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -899,8 +899,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, if (wow64) { - GetNativeSystemInfo( &si ); - if (process != GetCurrentProcess()) { #if defined(__i386__) || defined(__x86_64__) @@ -916,15 +914,22 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); *machine = nt->FileHeader.Machine; } + + if (!native_machine) return TRUE; + + GetNativeSystemInfo( &si ); } else { + *machine = IMAGE_FILE_MACHINE_UNKNOWN; + + if (!native_machine) return TRUE; + #ifdef _WIN64 GetSystemInfo( &si ); #else GetNativeSystemInfo( &si ); #endif - *machine = IMAGE_FILE_MACHINE_UNKNOWN; } switch (si.u.s.wProcessorArchitecture)

1 0

Jacek Caban : server: Remove no longer used set_console_input_info.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 2a62242747aa17a1a4ad7443b0ace900f72682c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a62242747aa17a1a4ad7443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:51 2020 +0200 server: Remove no longer used set_console_input_info. 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 | 33 +---------------------------- server/console.c | 48 ------------------------------------------ server/protocol.def | 22 ------------------- server/request.h | 12 ----------- server/trace.c | 17 --------------- 6 files changed, 8 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a62242747aa17a1a4ad…

1 0

Gijs Vermeulen : fsutil: Initialize ret in hardlink() (Coverity).
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 5e300f063305ae3c199a7284dcd24a0d99a17131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e300f063305ae3c199a7284… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Aug 17 18:59:10 2020 +0200 fsutil: Initialize ret in hardlink() (Coverity). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/main.c | 2 +- programs/fsutil/tests/fsutil.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index bde07ac2df..0bc8817b88 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -97,7 +97,7 @@ static int create_hardlink(int argc, WCHAR *argv[]) static int hardlink(int argc, WCHAR *argv[]) { - int ret; + int ret = 0; if (argc > 2) { diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 9867788274..1111b5b2fe 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -63,6 +63,12 @@ static void test_hardlink(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to create a file\n"); CloseHandle(hfile); + rc = runcmd("fsutil"); + ok(rc == 0, "failed to run fsutil\n"); + + rc = runcmd("fsutil hardlink"); + ok(rc == 0, "failed to run fsutil hardlink\n"); + rc = runcmd("fsutil hardlink create link file"); ok(rc == 0, "failed to create a hardlink\n");

1 0