November 2021 - Wine-Commits

Ivo Ivanov : dinput: Send only the reports that have been modified.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 0059dc2567ada71242a5aba94b047a51266bd0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0059dc2567ada71242a5aba9… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:48 2021 +0100 dinput: Send only the reports that have been modified. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52061 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 71 ++++++++++++++++++++++++++++------------------ dlls/dinput8/tests/hid.c | 32 --------------------- 2 files changed, 44 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0059dc2567ada71242a5…

1 0

Jan Sikorski : ntdll: Save status from attaching dependencies in process_attach().
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 064dd051d80f1353fcb4af91cd0d78e936d1f7c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064dd051d80f1353fcb4af91… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Nov 22 14:59:48 2021 +0100 ntdll: Save status from attaching dependencies in process_attach(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5cf538f3319..c6d9689f408 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1552,7 +1552,7 @@ static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ) if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); /* Recursively attach all DLLs this one depends on */ - walk_node_dependencies( node, lpReserved, process_attach ); + status = walk_node_dependencies( node, lpReserved, process_attach ); if (!wm->ldr.InInitializationOrderLinks.Flink) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList,

1 0

Eric Pouech : dbghelp/dwarf: Don't unmap the fmap of a DWZ module twice.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 441838b7b2be48b0a74dca8b2ae0e3d1f9b12318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=441838b7b2be48b0a74dca8b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:13 2021 +0100 dbghelp/dwarf: Don't unmap the fmap of a DWZ module twice. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9d60aeb5ad4..67440e97fe8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -4131,7 +4131,6 @@ static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) image_unmap_section(&dwz->sectmap[section_line]); image_unmap_section(&dwz->sectmap[section_ranges]); - image_unmap_file(dwz->fmap); HeapFree(GetProcessHeap(), 0, dwz); }

1 0

Eric Pouech : dbghelp: Protect against missing compiland when adding global function.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 0bbb161c41dd6dcb505ddef40d18d32065925341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bbb161c41dd6dcb505ddef4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:19:59 2021 +0100 dbghelp: Protect against missing compiland when adding global function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52045 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 435d94bc8eb..2443dbf7e73 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -353,8 +353,11 @@ struct symt_function* symt_new_function(struct module* module, init_function_or_inlinesite(sym, module, SymTagFunction, &compiland->symt, name, addr, size, sig_type); sym->next_inlinesite = NULL; /* first of list */ symt_add_module_ht(module, (struct symt_ht*)sym); - p = vector_add(&compiland->vchildren, &module->pool); - *p = &sym->symt; + if (compiland) + { + p = vector_add(&compiland->vchildren, &module->pool); + *p = &sym->symt; + } } return sym; }

1 0

Ivo Ivanov : dinput: Mark effect parameters as modified when duration is set.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 13aea4844a9a7c301fdc3591e46560ab93008c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aea4844a9a7c301fdc3591… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:49 2021 +0100 dinput: Mark effect parameters as modified when duration is set. Even if it doesn't actually change. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52061 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput8/tests/hid.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 62856cefa44..99436bd8b05 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2554,7 +2554,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa if (flags & DIEP_DURATION) { - if (impl->params.dwDuration != params->dwDuration) impl->modified |= DIEP_DURATION; + impl->modified |= DIEP_DURATION; impl->params.dwDuration = params->dwDuration; } if (flags & DIEP_GAIN) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 4159c3edd90..0c63ed835e8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6471,6 +6471,15 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + desc = expect_desc; + desc.dwDuration = INFINITE; + desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER, + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD|DIEP_DURATION|DIEP_TRIGGERBUTTON ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + set_hid_expect( file, expect_update, sizeof(expect_update) ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); + ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); + wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ desc = expect_desc; desc.lpEnvelope = &envelope;

1 0

André Zwing : ucrtbase/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 191a67d3bf148891904c0be3dd3d8acdeca73206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191a67d3bf148891904c0be3… Author: André Zwing <nerv(a)dawncrow.de> Date: Sun Nov 21 18:05:29 2021 +0100 ucrtbase/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 7693304e612..940db8e4dbf 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -105,7 +105,8 @@ static void test_thread_library_reference(char *thread_dll, ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); - ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + ret = FreeLibrary(dll); + ok(ret, "Failed to free the library: %u\n", GetLastError()); ret = WaitForSingleObject(args.confirm_running, 200); ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); @@ -113,7 +114,8 @@ static void test_thread_library_reference(char *thread_dll, ret = WaitForSingleObject(detach_event, 0); ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError()); - ok(SetEvent(args.past_free), "Failed to signal event: %d\n", GetLastError()); + ret = SetEvent(args.past_free); + ok(ret, "Failed to signal event: %d\n", GetLastError()); if (beginthread_method == use_beginthreadex) {

1 0

Zebediah Figura : wined3d: Allow OpenGL indirect dispatch buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 3220ea243102c382e2f45539b83ab8c2e65db428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3220ea243102c382e2f45539… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 19 17:23:48 2021 -0600 wined3d: Allow OpenGL indirect dispatch buffer objects to be suballocated from a larger buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 69eb13f3027..4ba5b04cad9 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4342,7 +4342,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(indirect->buffer->buffer_object); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, bo_gl->id)); - GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); + GL_EXTCALL(glDispatchComputeIndirect(bo_gl->b.buffer_offset + (GLintptr)indirect->offset)); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); wined3d_context_gl_reference_bo(context_gl, bo_gl); }

1 0

Alexandre Julliard : makefiles: Don't append .fake extension to fake dlls.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 62d335053f7ce675a6ae92b6a9f128ad3e9d4c0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d335053f7ce675a6ae92b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 20 13:07:47 2021 +0100 makefiles: Don't append .fake extension to fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ------ dlls/ntdll/unix/loader.c | 11 +---------- dlls/setupapi/fakedll.c | 27 ++++++++------------------- tools/makedep.c | 11 ++++------- tools/widl/widl.c | 2 -- 5 files changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a754579bf54..5cf538f3319 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2788,9 +2788,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; - RtlAppendUnicodeToString( new_name, L".fake" ); - status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) goto done; new_name->Length = len; RtlAppendUnicodeToString( new_name, L"\\programs\\" ); @@ -2799,9 +2796,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; - RtlAppendUnicodeToString( new_name, L".fake" ); - status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3d26da194e4..00b07edb1f3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1720,16 +1720,6 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, SECTION_IMAGE_INFORMATION info; enum loadorder loadorder; - /* remove .fake extension if present */ - if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) - { - static const WCHAR fakeW[] = {'.','f','a','k','e',0}; - WCHAR *ext = wcsrchr( filename, '.' ); - - TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); - if (ext && !wcsicmp( ext, fakeW )) *ext = 0; - } - init_unicode_string( &nt_name, filename ); loadorder = get_load_order( &nt_name ); @@ -1742,6 +1732,7 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, } else if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) { + TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; loadorder = LO_BUILTIN; /* builtin with no fallback since mapping a fake dll is not useful */ } diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8ff29fb4f92..a4b8df4dfb4 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -253,8 +253,7 @@ static int read_file( const WCHAR *name, void **data, SIZE_T *size ) st.st_size - header_size ) == st.st_size - header_size) { *data = file_buffer; - if ((lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) || - (lstrlenW(name) > 7 && !wcscmp( name + lstrlenW(name) - 7, L"16.fake" ))) + if (lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) extract_16bit_image( nt, data, size ); ret = 1; } @@ -432,11 +431,11 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) len = lstrlenW( name ); if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + len + 1; while ((path = enum_load_path( i++ ))) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += ARRAY_SIZE(pe_dir) + len + ARRAY_SIZE(L".fake"); + maxlen += ARRAY_SIZE(pe_dir) + len + 1; if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return NULL; - pos = maxlen - len - ARRAY_SIZE(L".fake"); + pos = maxlen - len - 1; lstrcpyW( file + pos, name ); file[--pos] = '\\'; @@ -451,8 +450,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, L"\\dlls", 5 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; /* now as a program */ ptr = file + pos; @@ -463,8 +460,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, L"\\programs", 9 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; } file[pos + len + 1] = 0; @@ -888,7 +883,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, BOOL delete, struct list *delay_copy ) { int ret; SIZE_T size; @@ -899,7 +894,6 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL de WCHAR *end = name + lstrlenW(name); SIZE_T len = end - name; - if (ext) lstrcpyW( end, ext ); if (!(ret = read_file( file, &data, &size ))) { *end = 0; @@ -987,16 +981,11 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, { lstrcatW( name, L"\\" ); lstrcatW( name, data.name ); - if (wcschr( data.name, '.' )) /* module possibly already has an extension */ - { - if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; - } + if (wcschr( data.name, '.' ) && install_fake_dll( dest, file, delete, &delay_copy )) + continue; lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, delete, &delay_copy ); + install_fake_dll( dest, file, delete, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -1014,7 +1003,7 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + 1; for (i = 0; (path = enum_load_path(i)); i++) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll.fake" */ + maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll" */ if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return FALSE; if (!(dest = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(dirname) + max_dll_name_len) * sizeof(WCHAR) ))) diff --git a/tools/makedep.c b/tools/makedep.c index 99f824d5f8b..acc8f49bfba 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2731,9 +2731,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, for (i = 0; i < source->importlibdeps.count; i++) { struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); - const char *module = submake->module; - if (*dll_ext && !submake->is_cross) module = strmake( "%s.fake", module ); - output_filename( obj_dir_path( submake, module )); + output_filename( obj_dir_path( submake, submake->module )); } output( "\n" ); } @@ -3221,11 +3219,10 @@ static void output_fake_module( struct makefile *make ) if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); - add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d%s/%s", pe_dir, make->module )); + strarray_add( &make->all_targets, make->module ); + add_install_rule( make, make->module, make->module, strmake( "d%s/%s", pe_dir, make->module )); - output( "%s.fake:", obj_dir_path( make, make->module )); + output( "%s:", obj_dir_path( make, make->module )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->res_files ); output_filename( tools_path( make, "winebuild" )); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index aa73601233f..0b5f07236f0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -688,8 +688,6 @@ int open_typelib( const char *name ) if (strendswith( name, ".dll" )) namelen -= 4; TRYOPEN( strmake( "%.*s/%.*s/%s", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], namelen, name, name )); - TRYOPEN( strmake( "%.*s/%.*s/%s.fake", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], - namelen, name, name )); } else {

1 0

Alexandre Julliard : makefiles: Don't use bundled libraries to build native programs.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 53e207fde0a62850eaf6b2316788a6729f47a55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e207fde0a62850eaf6b231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 22 18:32:35 2021 +0100 makefiles: Don't use bundled libraries to build native programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index bf8d3a126e3..d0dc9e3d01d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3404,7 +3404,8 @@ static void output_shared_lib( struct makefile *make ) strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, make->object_files ); @@ -3518,7 +3519,10 @@ static void output_programs( struct makefile *make ) if (!objs.count) objs = make->object_files; if (!strarray_exists( &all_libs, "-nodefaultlibs" )) - strarray_addall( &all_libs, add_unix_libraries( make, &deps )); + { + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + } output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs );

1 0

Matteo Bruni : Revert "ntdll: Implement NtYieldExecution() as usleep().".
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 3203f056687f62e3d74604da0efb6183989dfab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3203f056687f62e3d74604da… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:28 2021 +0100 Revert "ntdll: Implement NtYieldExecution() as usleep().". Rémi found a regression caused by that patch. His analysis suggests that it's probably correct for NtYieldExecution() to map to sched_yield(). Let's revert the patch and fix the issue in a slightly different way. This reverts commit b1a79c6b9c3ada0c34b1411b60879962f1815e4d. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 ++++++++-- configure.ac | 3 ++- dlls/ntdll/unix/sync.c | 6 +++++- include/config.h.in | 3 +++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 7b215627241..ae5c8e2734e 100755 --- a/configure +++ b/configure @@ -1512,7 +1512,6 @@ enable_msv1_0 enable_msvcirt enable_msvcm80 enable_msvcm90 -enable_msvcp_win enable_msvcp100 enable_msvcp110 enable_msvcp120 @@ -1524,6 +1523,7 @@ enable_msvcp70 enable_msvcp71 enable_msvcp80 enable_msvcp90 +enable_msvcp_win enable_msvcr100 enable_msvcr110 enable_msvcr120 @@ -19085,6 +19085,12 @@ if test "x$ac_cv_func_proc_pidinfo" = xyes then : printf "%s\n" "#define HAVE_PROC_PIDINFO 1" >>confdefs.h +fi +ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield" +if test "x$ac_cv_func_sched_yield" = xyes +then : + printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h + fi ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle" if test "x$ac_cv_func_setproctitle" = xyes @@ -21595,7 +21601,6 @@ wine_fn_config_makefile dlls/msvcirt enable_msvcirt wine_fn_config_makefile dlls/msvcirt/tests enable_tests wine_fn_config_makefile dlls/msvcm80 enable_msvcm80 wine_fn_config_makefile dlls/msvcm90 enable_msvcm90 -wine_fn_config_makefile dlls/msvcp_win enable_msvcp_win wine_fn_config_makefile dlls/msvcp100 enable_msvcp100 wine_fn_config_makefile dlls/msvcp100/tests enable_tests wine_fn_config_makefile dlls/msvcp110 enable_msvcp110 @@ -21614,6 +21619,7 @@ wine_fn_config_makefile dlls/msvcp71 enable_msvcp71 wine_fn_config_makefile dlls/msvcp80 enable_msvcp80 wine_fn_config_makefile dlls/msvcp90 enable_msvcp90 wine_fn_config_makefile dlls/msvcp90/tests enable_tests +wine_fn_config_makefile dlls/msvcp_win enable_msvcp_win wine_fn_config_makefile dlls/msvcr100 enable_msvcr100 wine_fn_config_makefile dlls/msvcr100/tests enable_tests wine_fn_config_makefile dlls/msvcr110 enable_msvcr110 diff --git a/configure.ac b/configure.ac index 5074ee14833..9c0c8d25d29 100644 --- a/configure.ac +++ b/configure.ac @@ -1948,6 +1948,7 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ + sched_yield \ setproctitle \ setprogname \ sigprocmask \ @@ -3133,7 +3134,6 @@ WINE_CONFIG_MAKEFILE(dlls/msvcirt) WINE_CONFIG_MAKEFILE(dlls/msvcirt/tests) WINE_CONFIG_MAKEFILE(dlls/msvcm80) WINE_CONFIG_MAKEFILE(dlls/msvcm90) -WINE_CONFIG_MAKEFILE(dlls/msvcp_win) WINE_CONFIG_MAKEFILE(dlls/msvcp100) WINE_CONFIG_MAKEFILE(dlls/msvcp100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp110) @@ -3152,6 +3152,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp71) WINE_CONFIG_MAKEFILE(dlls/msvcp80) WINE_CONFIG_MAKEFILE(dlls/msvcp90) WINE_CONFIG_MAKEFILE(dlls/msvcp90/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp_win) WINE_CONFIG_MAKEFILE(dlls/msvcr100) WINE_CONFIG_MAKEFILE(dlls/msvcr100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr110) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7f71b737045..829add0be2d 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1447,8 +1447,12 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, */ NTSTATUS WINAPI NtYieldExecution(void) { - usleep(0); +#ifdef HAVE_SCHED_YIELD + sched_yield(); return STATUS_SUCCESS; +#else + return STATUS_NO_YIELD_PERFORMED; +#endif } diff --git a/include/config.h.in b/include/config.h.in index 0c843a0423c..0fe50e8ce7c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -443,6 +443,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_yield' function. */ +#undef HAVE_SCHED_YIELD + /* Define to 1 if `cmd' is a member of `scsireq_t'. */ #undef HAVE_SCSIREQ_T_CMD

1 0