- Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d: Move descriptor heap tracking to d3d12_command_list_set_descriptor_table().
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: vkd3d Branch: master Commit: 9187a417336386e364ad502a705ee805dbd41928 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9187a417336386e364ad502a705ee… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue May 2 15:59:02 2023 +1000 vkd3d: Move descriptor heap tracking to d3d12_command_list_set_descriptor_table(). This is the simplest way to gather this information when command lists are executed later. --- libs/vkd3d/command.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1aeae451..058e292c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3186,6 +3186,20 @@ static void command_list_flush_vk_heap_updates(struct d3d12_command_list *list) } } +static void command_list_add_descriptor_heap(struct d3d12_command_list *list, struct d3d12_descriptor_heap *heap) +{ + if (!contains_heap(list->descriptor_heaps, list->descriptor_heap_count, heap)) + { + if (list->descriptor_heap_count == ARRAY_SIZE(list->descriptor_heaps)) + { + /* Descriptors can be written after binding. */ + FIXME("Flushing descriptor updates while list %p is not closed.\n", list); + command_list_flush_vk_heap_updates(list); + } + list->descriptor_heaps[list->descriptor_heap_count++] = heap; + } +} + static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *list, enum vkd3d_pipeline_bind_point bind_point, struct d3d12_descriptor_heap *heap) { @@ -3210,18 +3224,6 @@ static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *l bindings->sampler_heap_id = heap->serial_id; } - if (!contains_heap(list->descriptor_heaps, list->descriptor_heap_count, heap)) - { - if (list->descriptor_heap_count == ARRAY_SIZE(list->descriptor_heaps)) - { - /* Descriptors can be written after binding. */ - FIXME("Flushing descriptor updates while list %p is not closed.\n", list); - command_list_flush_vk_heap_updates(list); - list->descriptor_heap_count = 0; - } - list->descriptor_heaps[list->descriptor_heap_count++] = heap; - } - vkd3d_mutex_lock(&heap->vk_sets_mutex); for (set = 0; set < ARRAY_SIZE(heap->vk_descriptor_sets); ++set) @@ -4444,6 +4446,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l WARN("Descriptor heap %p is not shader visible.\n", descriptor_heap); return; } + command_list_add_descriptor_heap(list, descriptor_heap); bindings->descriptor_tables[index] = desc; bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index;

1 0

Alexandre Julliard : Wine release 8.13
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: website Branch: master Commit: 097ae75c000e7b489ffec2ff3850d15c84c38d4a URL: https://gitlab.winehq.org/winehq/winehq/-/commit/097ae75c000e7b489ffec2ff38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 22:40:33 2023 +0200 Wine release 8.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023072101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023072101.xml b/news/en/2023072101.xml new file mode 100644 index 00000000..32dac634 --- /dev/null +++ b/news/en/2023072101.xml @@ -0,0 +1,16 @@ +<news> +<date>July 21, 2023</date> +<title>Wine 8.13 Released</title> +<body> + The Wine development release 8.13 is now available. + <a href="{$root}/announce/8.13">What's new</a> in this release: +<ul> + <li>Wow64 support in WineGStreamer.</li> + <li>WeakMap support in JScript.</li> + <li>Georgian translation.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.13 : Alexandre Julliard : Release 8.13
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: refs/tags/wine-8.13 Tag: 8fb1d322ef33b9c480c87336107563e30a2b553b URL: https://gitlab.winehq.org/wine/wine/-/tags/8fb1d322ef33b9c480c87336107563e3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 22:37:54 2023 +0200 Release 8.13

1 0

Paul Gofman : user32/tests: Change display mode for correct monitor in check_preferred_mode().
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: a7ba20867974c5e377c283f155dbd129250521c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7ba20867974c5e377c283f155dbd1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 21 13:13:19 2023 -0600 user32/tests: Change display mode for correct monitor in check_preferred_mode(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55065 --- dlls/user32/tests/monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 429a55eb277..cf48f825ad9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1710,7 +1710,7 @@ static void check_preferred_mode(const DISPLAYCONFIG_TARGET_PREFERRED_MODE *mode dm2.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; dm2.dmPelsWidth = 1024; dm2.dmPelsHeight = 768; - lret = ChangeDisplaySettingsW(&dm2, 0); + lret = ChangeDisplaySettingsExW(gdi_device_name, &dm2, NULL, 0, 0); if (lret != DISP_CHANGE_SUCCESSFUL) { skip("Can't change display settings, skipping test.\n"); @@ -1725,7 +1725,7 @@ static void check_preferred_mode(const DISPLAYCONFIG_TARGET_PREFERRED_MODE *mode ok(mode2.width == mode->width, "got %u, expected %u.\n", mode2.width, mode->width); ok(mode2.height == mode->height, "got %u, expected %u.\n", mode2.height, mode->height); - lret = ChangeDisplaySettingsW(&dm, 0); + lret = ChangeDisplaySettingsExW(gdi_device_name, &dm, NULL, 0, 0); ok(lret == DISP_CHANGE_SUCCESSFUL, "got %ld.\n", lret); }

1 0

Alexandre Julliard : Release 8.13.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: eac34b9c85e1d6da483eb64094fa0b316d1b01a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/eac34b9c85e1d6da483eb64094fa0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 22:25:58 2023 +0200 Release 8.13. --- ANNOUNCE | 913 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 7 + VERSION | 2 +- configure | 18 +- 4 files changed, 463 insertions(+), 477 deletions(-)

1 0

Jacek Caban : win32u/tests: Add tests for handling LPARAM in window procs and hooks.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: de0738f9257263a1e14678f6fdba73f0eeab0f0d URL: https://gitlab.winehq.org/wine/wine/-/commit/de0738f9257263a1e14678f6fdba73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 21 00:42:30 2023 +0200 win32u/tests: Add tests for handling LPARAM in window procs and hooks. --- dlls/win32u/tests/win32u.c | 409 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 408 insertions(+), 1 deletion(-)

1 0

Piotr Caban : msvcrt: Set sname_match in locale_to_sname when returning cached result.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 4a4f138fe9542e1bee240f3b98a3ab91afa842e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a4f138fe9542e1bee240f3b98a3ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 21 17:44:02 2023 +0200 msvcrt: Set sname_match in locale_to_sname when returning cached result. --- dlls/msvcrt/locale.c | 6 ++++-- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 854ec6e7158..153c4fb1c7d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -341,8 +341,9 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m if (!strcmp(locale, data->cached_locale)) { if (codepage) *codepage = data->cached_cp; - if (sname) - wcsncpy(sname, data->cached_sname, sname_size); + if (sname_match) + *sname_match = data->cached_sname_match; + wcsncpy(sname, data->cached_sname, sname_size); return TRUE; } @@ -441,6 +442,7 @@ BOOL locale_to_sname(const char *locale, unsigned short *codepage, BOOL *sname_m if (strlen(locale) < sizeof(data->cached_locale)) { strcpy(data->cached_locale, locale); data->cached_cp = locale_cp; + data->cached_sname_match = is_sname; wcscpy(data->cached_sname, sname); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 42c41c2200c..155db86bf02 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -170,6 +170,7 @@ struct __thread_data { int processing_throw; frame_info *frame_info_head; void *unk8[6]; + BOOL cached_sname_match; WCHAR cached_sname[LOCALE_NAME_MAX_LENGTH]; int unk9[2]; DWORD cached_cp;

1 0

Piotr Caban : msvcrt: Improve locale_to_sname error handling.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: f93f31dec58affa33d770a163490e760ed9991ee URL: https://gitlab.winehq.org/wine/wine/-/commit/f93f31dec58affa33d770a163490e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 21 16:48:13 2023 +0200 msvcrt: Improve locale_to_sname error handling. --- dlls/msvcrt/locale.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7e94d7bf2a8..854ec6e7158 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1333,22 +1333,16 @@ static pthreadlocinfo create_locinfo(int category, memcpy(buf, locale, p-locale); buf[p-locale] = '\0'; locale_found = locale_to_sname(buf, &cp[i], &sname_match, wbuf, LOCALE_NAME_MAX_LENGTH); - locale_sname[i] = wcsdup(wbuf); - if(sname_match) { - locale_name[i] = locale; - locale_len[i] = p-locale; - } } else { locale_found = locale_to_sname(locale, &cp[i], &sname_match, wbuf, LOCALE_NAME_MAX_LENGTH); - locale_sname[i] = wcsdup(wbuf); - if(sname_match) { - locale_name[i] = locale; - locale_len[i] = strlen(locale); - } } - if(!locale_found || !locale_sname[i]) + if(!locale_found || !(locale_sname[i] = wcsdup(wbuf))) goto fail; + if(sname_match) { + locale_name[i] = locale; + locale_len[i] = p ? p-locale : strlen(locale); + } } if(!p || *(p+1)!='L' || *(p+2)!='C' || *(p+3)!='_')

1 0

Billy Laws : ntdll: Avoid storing a second ctx copy in the aarch64 raise trampoline.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: a9d0988d01d26bfe8dfa4e841edfb05303323009 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9d0988d01d26bfe8dfa4e841edfb0… Author: Billy Laws <blaws05(a)gmail.com> Date: Wed Jul 19 22:34:31 2023 +0100 ntdll: Avoid storing a second ctx copy in the aarch64 raise trampoline. CFI directives allow the context that was stored on the stack by raise_func_trampoline to be used to unwind to any exception handlers as required when dispatching an exception. However, as the dispatcher may change its input context in e.g. BTCpuResetToConsistentState and these changes also need to be used when unwinding, have the trampoline CFI directly refer to the input context rather than a copy of it. --- dlls/ntdll/unix/dwarf.h | 2 + dlls/ntdll/unix/signal_arm64.c | 88 ++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 47 deletions(-) diff --git a/dlls/ntdll/unix/dwarf.h b/dlls/ntdll/unix/dwarf.h index de9b1b02499..88c6991747f 100644 --- a/dlls/ntdll/unix/dwarf.h +++ b/dlls/ntdll/unix/dwarf.h @@ -1050,6 +1050,8 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state, #elif defined(__aarch64__) +#define DW_OP_x28 DW_OP_breg28 + #define DW_REG_x19 19 #define DW_REG_x20 20 #define DW_REG_x21 21 diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d98268bcd54..6dbc3fd5a59 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -185,6 +185,7 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *conte struct frame_state state_stack[MAX_SAVED_STATES]; int aug_z_format = 0; unsigned char lsda_encoding = DW_EH_PE_omit; + DWORD64 prev_x28 = context->X28; memset( &info, 0, sizeof(info) ); info.state_stack = state_stack; @@ -274,13 +275,13 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *conte context->Pc = context->Lr; if (bases->func == (void *)raise_func_trampoline) { - /* raise_func_trampoline has a full CONTEXT stored on the stack; - * restore the original Lr value from there. The function we unwind - * to might be a leaf function that hasn't backed up its own original - * Lr value on the stack. + /* raise_func_trampoline has a pointer to a full CONTEXT stored in x28; + * restore the original Lr value from there. The function we unwind to + * might be a leaf function that hasn't backed up its own original Lr + * value on the stack. * We could also just restore the full context here without doing * unw_step at all. */ - const CONTEXT *next_ctx = (const CONTEXT *) *frame; + const CONTEXT *next_ctx = (const CONTEXT *)prev_x28; context->Lr = next_ctx->Lr; } @@ -314,6 +315,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX unw_cursor_t cursor; unw_proc_info_t info; int rc; + DWORD64 prev_x28 = context->X28; #ifdef __APPLE__ rc = unw_getcontext( &unw_context ); @@ -420,13 +422,13 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; if (info.start_ip == (unw_word_t)raise_func_trampoline) { - /* raise_func_trampoline has a full CONTEXT stored on the stack; - * restore the original Lr value from there. The function we unwind - * to might be a leaf function that hasn't backed up its own original - * Lr value on the stack. + /* raise_func_trampoline has a pointer to a full CONTEXT stored in x28; + * restore the original Lr value from there. The function we unwind to + * might be a leaf function that hasn't backed up its own original Lr + * value on the stack. * We could also just restore the full context here without doing * unw_step at all. */ - const CONTEXT *next_ctx = (const CONTEXT *) *frame; + const CONTEXT *next_ctx = (const CONTEXT *)prev_x28; context->Lr = next_ctx->Lr; } @@ -950,48 +952,40 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /* Note, unwind_builtin_dll above has hardcoded assumptions on how this - * function stores things on the stack; if modified, modify that one in + * function stores a CONTEXT pointer in x28; if modified, modify that one in * sync as well. */ __ASM_GLOBAL_FUNC( raise_func_trampoline, - "stp x29, x30, [sp, #-0x30]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 48\n\t") - __ASM_CFI(".cfi_offset 29, -48\n\t") - __ASM_CFI(".cfi_offset 30, -40\n\t") - "stp x0, x1, [sp, #0x10]\n\t" - "str x2, [sp, #0x20]\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + "str x28, [sp, #0x10]\n\t" + __ASM_CFI(".cfi_def_cfa_offset 32\n\t") + __ASM_CFI(".cfi_offset 29, -32\n\t") + __ASM_CFI(".cfi_offset 30, -24\n\t") + __ASM_CFI(".cfi_offset 28, -16\n\t") "mov x29, sp\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") __ASM_CFI(".cfi_remember_state\n\t") - - /* Memcpy the context onto the stack */ - "sub sp, sp, #0x390\n\t" - "mov x0, sp\n\t" - "mov x2, #0x390\n\t" - "bl " __ASM_NAME("memcpy") "\n\t" - __ASM_CFI(".cfi_def_cfa 31, 0\n\t") - __ASM_CFI(".cfi_escape 0x0f,0x04,0x8f,0x80,0x02,0x06\n\t") /* CFA, DW_OP_breg31 + 0x100, DW_OP_deref */ - __ASM_CFI(".cfi_escape 0x10,0x13,0x03,0x8f,0xa0,0x01\n\t") /* x19, DW_OP_breg31 + 0xA0 */ - __ASM_CFI(".cfi_escape 0x10,0x14,0x03,0x8f,0xa8,0x01\n\t") /* x20 */ - __ASM_CFI(".cfi_escape 0x10,0x15,0x03,0x8f,0xb0,0x01\n\t") /* x21 */ - __ASM_CFI(".cfi_escape 0x10,0x16,0x03,0x8f,0xb8,0x01\n\t") /* x22 */ - __ASM_CFI(".cfi_escape 0x10,0x17,0x03,0x8f,0xc0,0x01\n\t") /* x23 */ - __ASM_CFI(".cfi_escape 0x10,0x18,0x03,0x8f,0xc8,0x01\n\t") /* x24 */ - __ASM_CFI(".cfi_escape 0x10,0x19,0x03,0x8f,0xd0,0x01\n\t") /* x25 */ - __ASM_CFI(".cfi_escape 0x10,0x1a,0x03,0x8f,0xd8,0x01\n\t") /* x26 */ - __ASM_CFI(".cfi_escape 0x10,0x1b,0x03,0x8f,0xe0,0x01\n\t") /* x27 */ - __ASM_CFI(".cfi_escape 0x10,0x1c,0x03,0x8f,0xe8,0x01\n\t") /* x28 */ - __ASM_CFI(".cfi_escape 0x10,0x1d,0x03,0x8f,0xf0,0x01\n\t") /* x29 */ - __ASM_CFI(".cfi_escape 0x10,0x1e,0x03,0x8f,0x88,0x02\n\t") /* x30 = pc */ - __ASM_CFI(".cfi_escape 0x10,0x48,0x03,0x8f,0x90,0x03\n\t") /* d8 */ - __ASM_CFI(".cfi_escape 0x10,0x49,0x03,0x8f,0x98,0x03\n\t") /* d9 */ - __ASM_CFI(".cfi_escape 0x10,0x4a,0x03,0x8f,0xa0,0x03\n\t") /* d10 */ - __ASM_CFI(".cfi_escape 0x10,0x4b,0x03,0x8f,0xa8,0x03\n\t") /* d11 */ - __ASM_CFI(".cfi_escape 0x10,0x4c,0x03,0x8f,0xb0,0x03\n\t") /* d12 */ - __ASM_CFI(".cfi_escape 0x10,0x4d,0x03,0x8f,0xb8,0x03\n\t") /* d13 */ - __ASM_CFI(".cfi_escape 0x10,0x4e,0x03,0x8f,0xc0,0x03\n\t") /* d14 */ - __ASM_CFI(".cfi_escape 0x10,0x4f,0x03,0x8f,0xc8,0x03\n\t") /* d15 */ - "ldp x0, x1, [x29, #0x10]\n\t" - "ldr x2, [x29, #0x20]\n\t" + "mov x28, x1\n\t" + __ASM_CFI_REG_IS_AT2(x19, x28, 0xa0, 0x01) + __ASM_CFI_REG_IS_AT2(x20, x28, 0xa8, 0x01) + __ASM_CFI_REG_IS_AT2(x21, x28, 0xb0, 0x01) + __ASM_CFI_REG_IS_AT2(x22, x28, 0xb8, 0x01) + __ASM_CFI_REG_IS_AT2(x23, x28, 0xc0, 0x01) + __ASM_CFI_REG_IS_AT2(x24, x28, 0xc8, 0x01) + __ASM_CFI_REG_IS_AT2(x25, x28, 0xd0, 0x01) + __ASM_CFI_REG_IS_AT2(x26, x28, 0xd8, 0x01) + __ASM_CFI_REG_IS_AT2(x27, x28, 0xe0, 0x01) + __ASM_CFI_REG_IS_AT2(x28, x28, 0xe8, 0x01) + __ASM_CFI_REG_IS_AT2(x29, x28, 0xf0, 0x01) + __ASM_CFI_CFA_IS_AT2(x28, 0x80, 0x02) + __ASM_CFI_REG_IS_AT2(x30, x28, 0x88, 0x02) + __ASM_CFI_REG_IS_AT2(v8, x28, 0x90, 0x03) + __ASM_CFI_REG_IS_AT2(v9, x28, 0x98, 0x03) + __ASM_CFI_REG_IS_AT2(v10, x28, 0xa0, 0x03) + __ASM_CFI_REG_IS_AT2(v11, x28, 0xa8, 0x03) + __ASM_CFI_REG_IS_AT2(v12, x28, 0xb0, 0x03) + __ASM_CFI_REG_IS_AT2(v13, x28, 0xb8, 0x03) + __ASM_CFI_REG_IS_AT2(v14, x28, 0xc8, 0x03) + __ASM_CFI_REG_IS_AT2(v15, x28, 0xc8, 0x03) "blr x2\n\t" __ASM_CFI(".cfi_restore_state\n\t") "brk #1")

1 0

Piotr Caban : services: Exit early in process_send_start_message if ConnectNamedPipe fails.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 93736efa8011fcda9c189dee02321775a87edbf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/93736efa8011fcda9c189dee023217… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 21 15:36:05 2023 +0200 services: Exit early in process_send_start_message if ConnectNamedPipe fails. HasOverlappedIoCompleted returns true after CancelIo call. --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 2db74f99e0f..b45022eaec8 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -1153,7 +1153,7 @@ static DWORD process_send_start_message(struct process_entry *process, BOOL shar handles[1] = process->process; if (WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ) != WAIT_OBJECT_0) CancelIo(process->control_pipe); - if (!HasOverlappedIoCompleted( &overlapped )) + if (!GetOverlappedResult(process->control_pipe, &overlapped, &len, FALSE)) { WINE_ERR("service %s failed to start\n", wine_dbgstr_w(name)); return ERROR_SERVICE_REQUEST_TIMEOUT;

1 0