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

Alexandre Julliard : winecrt0: Add .seh annotations for x86_64.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 8af4e177f3c6f0e8df35cfebb7221665012250e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af4e177f3c6f0e8df35cfeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 10:48:25 2019 +0200 winecrt0: Add .seh annotations for x86_64. Based on a patch by Rémi Bernon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index df7315e..3a0ecfe 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -117,11 +117,15 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "subq $0x20,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x20\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movq %r8,%r9\n\t" /* retval = final target */ "movq %rdx,%r8\n\t" /* record */ "leaq __wine_unwind_trampoline(%rip),%rdx\n\t" /* target = trampoline */

1 0

Alexandre Julliard : ntdll: Add .seh annotations for x86_64.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: b96d15e1b0914002dc37d55fcd35e2de4094d4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96d15e1b0914002dc37d55f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:52 2019 +0200 ntdll: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 5 ++++- dlls/ntdll/signal_x86_64.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 1deb2b7..04957ac 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -777,9 +777,12 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne extern INT_PTR WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ); __ASM_GLOBAL_FUNC( relay_call, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "leaq -0x48(%rbp),%rsp\n\t" "andq $~15,%rsp\n\t" @@ -831,7 +834,7 @@ __ASM_GLOBAL_FUNC( relay_call, __ASM_CFI(".cfi_same_value %rsi\n\t") "movq -8(%rbp),%rdi\n\t" __ASM_CFI(".cfi_same_value %rdi\n\t") - "movq %rbp,%rsp\n\t" + "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2c26bd5..bf30815 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1797,6 +1797,8 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, extern void set_full_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_full_cpu_context, "subq $40,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x40\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 40\n\t") "ldmxcsr 0x34(%rdi)\n\t" /* context->MxCsr */ "movw 0x38(%rdi),%ax\n\t" /* context->SegCs */ @@ -3733,11 +3735,15 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec ); __ASM_GLOBAL_FUNC( call_consolidate_callback, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "subq $0x20,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x20\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movq %rcx,0x10(%rbp)\n\t" __ASM_CFI(".cfi_remember_state\n\t") __ASM_CFI(".cfi_escape 0x0f,0x07,0x76,0x10,0x06,0x23,0x98,0x01,0x06\n\t") /* CFA */ @@ -3763,7 +3769,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, "movq %r8,%rcx\n\t" "callq *%rdx\n\t" __ASM_CFI(".cfi_restore_state\n\t") - "movq %rbp,%rsp\n\t" + "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") @@ -4110,9 +4116,11 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, * RtlRaiseException (NTDLL.@) */ __ASM_GLOBAL_FUNC( RtlRaiseException, - "movq %rcx,8(%rsp)\n\t" "sub $0x4f8,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x4f8\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x4f8\n\t") + "movq %rcx,0x500(%rsp)\n\t" "leaq 0x20(%rsp),%rcx\n\t" "call " __ASM_NAME("RtlCaptureContext") "\n\t" "leaq 0x20(%rsp),%rdx\n\t" /* context pointer */ @@ -4269,6 +4277,8 @@ extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void * void *relay ); __ASM_GLOBAL_FUNC( start_thread, "subq $56,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 56\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") "movq %rbp,48(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %rbp,48\n\t")

1 0

Alexandre Julliard : oleaut32: Add .seh annotations for x86_64.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 7b82fa1990c1c9e6ccdd7b635f6fcdaa54ad7c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b82fa1990c1c9e6ccdd7b63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 10:43:19 2019 +0200 oleaut32: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 09b669e..b13f6dc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6358,14 +6358,19 @@ extern DWORD_PTR CDECL call_method( void *func, int nb_args, const DWORD_PTR *ar extern double CDECL call_double_method( void *func, int nb_args, const DWORD_PTR *args ); __ASM_GLOBAL_FUNC( call_method, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "pushq %rsi\n\t" + __ASM_SEH(".seh_pushreg %rsi\n\t") __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") "pushq %rdi\n\t" + __ASM_SEH(".seh_pushreg %rdi\n\t") __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movq %rcx,%rax\n\t" "movq $4,%rcx\n\t" "cmp %rcx,%rdx\n\t"

1 0

Alexandre Julliard : kernel32: Add .seh annotations for x86_64.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 3ca42e0a9795e271558472e43fda09a93853634c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ca42e0a9795e271558472e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:59 2019 +0200 kernel32: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index acfc365..24fb9e3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -980,11 +980,15 @@ extern FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ); __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "subq $0x40,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x40\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movaps %xmm0,-0x10(%rbp)\n\t" "movaps %xmm1,-0x20(%rbp)\n\t" "movaps %xmm2,-0x30(%rbp)\n\t" @@ -994,7 +998,7 @@ __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "movaps -0x30(%rbp), %xmm2\n\t" "movaps -0x20(%rbp), %xmm1\n\t" "movaps -0x10(%rbp), %xmm0\n\t" - "movq %rbp,%rsp\n\t" + "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t")

1 0

Richard Pospesel : widl: Fail compilation if an incomplete union or enum is used in a remoted field.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 181cafcd52a29b6e8600119f104ea603b311f551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=181cafcd52a29b6e8600119f… Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Aug 20 22:28:25 2019 -0500 widl: Fail compilation if an incomplete union or enum is used in a remoted field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a52afc7..072e138 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2573,10 +2573,15 @@ static void check_field_common(const type_t *container_type, type = type_array_get_element_type(type); more_to_do = TRUE; break; + case TGT_ENUM: + type = type_get_real_type(type); + if (!type_is_complete(type)) + { + error_loc_info(&arg->loc_info, "undefined type declaration \"enum %s\"\n", type->name); + } case TGT_USER_TYPE: case TGT_IFACE_POINTER: case TGT_BASIC: - case TGT_ENUM: case TGT_RANGE: /* nothing to do */ break; @@ -2601,10 +2606,15 @@ static void check_remoting_fields(const var_t *var, type_t *type) if (type_is_complete(type)) fields = type_struct_get_fields(type); else - error_loc_info(&var->loc_info, "undefined type declaration %s\n", type->name); + error_loc_info(&var->loc_info, "undefined type declaration \"struct %s\"\n", type->name); } else if (type_get_type(type) == TYPE_UNION || type_get_type(type) == TYPE_ENCAPSULATED_UNION) - fields = type_union_get_cases(type); + { + if (type_is_complete(type)) + fields = type_union_get_cases(type); + else + error_loc_info(&var->loc_info, "undefined type declaration \"union %s\"\n", type->name); + } if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) if (field->declspec.type) check_field_common(type, type->name, field);

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add tests for remove locks.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 2b6cf134c7aff14b33f2e704b392c2b09797fa44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6cf134c7aff14b33f2e704… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:05:55 2019 -0500 ntoskrnl.exe/tests: Add tests for remove locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 55 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c275e67..2b3a32b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -427,16 +427,33 @@ static void WINAPI mutex_thread(void *arg) PsTerminateSystemThread(STATUS_SUCCESS); } +static KEVENT remove_lock_ready; + +static void WINAPI remove_lock_thread(void *arg) +{ + IO_REMOVE_LOCK *lock = arg; + NTSTATUS ret; + + ret = IoAcquireRemoveLockEx(lock, NULL, "", 1, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + KeSetEvent(&remove_lock_ready, 0, FALSE); + + IoReleaseRemoveLockAndWaitEx(lock, NULL, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + PsTerminateSystemThread(STATUS_SUCCESS); +} + static void test_sync(void) { + static const ULONG wine_tag = 0x454e4957; /* WINE */ KSEMAPHORE semaphore, semaphore2; KEVENT manual_event, auto_event, *event; KTIMER timer; + IO_REMOVE_LOCK remove_lock; LARGE_INTEGER timeout; OBJECT_ATTRIBUTES attr; + HANDLE handle, thread; void *objs[2]; NTSTATUS ret; - HANDLE handle; int i; KeInitializeEvent(&manual_event, NotificationEvent, FALSE); @@ -719,6 +736,42 @@ static void test_sync(void) ok(ret == 0, "got %#x\n", ret); KeCancelTimer(&timer); + + /* remove locks */ + + IoInitializeRemoveLockEx(&remove_lock, wine_tag, 0, 0, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + + ret = IoAcquireRemoveLockEx(&remove_lock, NULL, "", 1, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + + IoReleaseRemoveLockEx(&remove_lock, NULL, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + + ret = IoAcquireRemoveLockEx(&remove_lock, NULL, "", 1, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + + ret = IoAcquireRemoveLockEx(&remove_lock, NULL, "", 1, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + + KeInitializeEvent(&remove_lock_ready, SynchronizationEvent, FALSE); + thread = create_thread(remove_lock_thread, &remove_lock); + ret = wait_single(&remove_lock_ready, -1000 * 10000); + ok(!ret, "got %#x\n", ret); + ret = wait_single_handle(thread, -50 * 10000); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + ret = IoAcquireRemoveLockEx(&remove_lock, NULL, "", 1, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ok(ret == STATUS_DELETE_PENDING, "got %#x\n", ret); + + IoReleaseRemoveLockEx(&remove_lock, NULL, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ret = wait_single_handle(thread, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + IoReleaseRemoveLockEx(&remove_lock, NULL, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ret = wait_single_handle(thread, -10000 * 10000); + ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + + ret = IoAcquireRemoveLockEx(&remove_lock, NULL, "", 1, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK)); + ok(ret == STATUS_DELETE_PENDING, "got %#x\n", ret); } static void test_call_driver(DEVICE_OBJECT *device)

1 0

Zebediah Figura : ntoskrnl.exe: Don' t signal the remove lock event unless the lock is in the removed state.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 59f72d87c500b1f7e9d1dbe5fe8f143dea073b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f72d87c500b1f7e9d1dbe5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:05:54 2019 -0500 ntoskrnl.exe: Don't signal the remove lock event unless the lock is in the removed state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 7aed1d0..365ddc0 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1234,7 +1234,7 @@ void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) TRACE("lock %p, tag %p, size %u.\n", lock, tag, size); - if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) + if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed) KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); else if (count < 0) ERR("Lock %p is not acquired!\n", lock); @@ -1251,10 +1251,10 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG lock->Common.Removed = TRUE; - if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) + if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed) KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); else if (count < 0) ERR("Lock %p is not acquired!\n", lock); - else + else if (count > 0) KeWaitForSingleObject( &lock->Common.RemoveEvent, Executive, KernelMode, FALSE, NULL ); }

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoAcquireRemoveLockEx().
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 2a92951769be921db460245b163ad280974c854b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a92951769be921db460245b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:48 2019 -0500 ntoskrnl.exe: Implement IoAcquireRemoveLockEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ------------- dlls/ntoskrnl.exe/sync.c | 15 +++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 20cee6c..6be5990 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3051,19 +3051,6 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) } /***************************************************** - * IoAcquireRemoveLockEx (NTOSKRNL.EXE.@) - */ - -NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag, - LPCSTR file, ULONG line, ULONG lock_size) -{ - FIXME("(%p, %p, %s, %u, %u): stub\n", lock, tag, debugstr_a(file), line, lock_size); - - return STATUS_NOT_IMPLEMENTED; -} - - -/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 0b2ca6f..f54fe2a 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1209,3 +1209,18 @@ void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, lock->Common.Removed = FALSE; lock->Common.IoCount = 0; } + +/*********************************************************************** + * IoAcquireRemoveLockEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoAcquireRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, + const char *file, ULONG line, ULONG size ) +{ + TRACE("lock %p, tag %p, file %s, line %u, size %u.\n", lock, tag, debugstr_a(file), line, size); + + if (lock->Common.Removed) + return STATUS_DELETE_PENDING; + + InterlockedIncrement( &lock->Common.IoCount ); + return STATUS_SUCCESS; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 864c0c9..da200c5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1565,6 +1565,7 @@ void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI IoAcquireCancelSpinLock(KIRQL*); +NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN);

1 0

Steven Bell : kernel32: Add stub implementation of EnumSystemFirmwareTables.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: d97f33f0344777de561e0fc3e4e3039778e166f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97f33f0344777de561e0fc3… Author: Steven Bell <bell.steven(a)gmail.com> Date: Mon Aug 19 10:10:06 2019 -0700 kernel32: Add stub implementation of EnumSystemFirmwareTables. A recent change to the game Everquest adds a call to EnumSystemFirmwareTables. Signed-off-by: Steven Bell <bell.steven(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-sysinfo-l1-2-0.spec | 2 +- .../api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dlls/kernel32/cpu.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec index 9b05674..1103427 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -1,4 +1,4 @@ -@ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) kernel32.EnumSystemFirmwareTables @ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA @ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW @ stdcall GetLocalTime(ptr) kernel32.GetLocalTime diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec index 6da2f25..9a89b4b 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -1,5 +1,5 @@ @ stub DnsHostnameToComputerNameExW -@ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) kernel32.EnumSystemFirmwareTables @ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA @ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW @ stdcall GetLocalTime(ptr) kernel32.GetLocalTime diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 7668a10..3f4f6c6 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -365,3 +365,13 @@ UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, void *buffer, DWORD HeapFree(GetProcessHeap(), 0, sfti); return buffer_size; } + + +/*********************************************************************** + * EnumSystemFirmwareTables (KERNEL32.@) + */ +UINT WINAPI EnumSystemFirmwareTables(DWORD provider, void *buffer, DWORD size) +{ + FIXME("(0x%08x, %p, %d)\n", provider, buffer, size); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 016c302..fb8e4c9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -418,7 +418,7 @@ @ stdcall EnumResourceTypesW(long ptr long) @ stdcall EnumSystemCodePagesA(ptr long) @ stdcall EnumSystemCodePagesW(ptr long) -# @ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) @ stdcall EnumSystemGeoID(long long ptr) @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7021447..7dff3ed 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -312,7 +312,7 @@ @ stdcall EnumResourceTypesExA(long ptr long long long) @ stdcall EnumResourceTypesExW(long ptr long long long) @ stdcall EnumSystemCodePagesW(ptr long) kernel32.EnumSystemCodePagesW -# @ stub EnumSystemFirmwareTables +@ stdcall EnumSystemFirmwareTables(long ptr long) kernel32.EnumSystemFirmwareTables @ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) kernel32.EnumSystemLanguageGroupsW @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA

1 0

Zebediah Figura : widl: Track whether the type has been defined yet in the statement_t and var_t structures.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 55234f65a8c5dbd5b3cb08775d9267e8724e63b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55234f65a8c5dbd5b3cb0877… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:36 2019 -0500 widl: Track whether the type has been defined yet in the statement_t and var_t structures. Based on a patch by Richard Pospesel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47149 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 37 +++++++++++++++++++------------------ tools/widl/parser.y | 10 +++++++--- tools/widl/widltypes.h | 3 +++ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c20fe69..61fadcf 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -43,7 +43,7 @@ user_type_list_t user_type_list = LIST_INIT(user_type_list); context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); -static void write_type_def_or_decl(FILE *f, const decl_spec_t *t, int field, const char *name); +static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declonly, const char *name); static void indent(FILE *h, int delta) { @@ -252,7 +252,7 @@ static void write_fields(FILE *h, var_list_t *fields) default: ; } - write_type_def_or_decl(h, &v->declspec, TRUE, name); + write_type_v(h, &v->declspec, TRUE, v->declonly, name); fprintf(h, ";\n"); } } @@ -328,7 +328,8 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else { switch (type_get_type_detect_alias(t)) { case TYPE_ENUM: - if (!declonly && t->defined && !t->written) { + if (!declonly && !t->written) { + assert(t->defined); if (name) fprintf(h, "enum %s {\n", name); else fprintf(h, "enum {\n"); t->written = TRUE; @@ -341,7 +342,8 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i break; case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: - if (!declonly && t->defined && !t->written) { + if (!declonly && !t->written) { + assert(t->defined); if (name) fprintf(h, "struct %s {\n", name); else fprintf(h, "struct {\n"); t->written = TRUE; @@ -356,7 +358,8 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else fprintf(h, "struct %s", name ? name : ""); break; case TYPE_UNION: - if (!declonly && t->defined && !t->written) { + if (!declonly && !t->written) { + assert(t->defined); if (t->name) fprintf(h, "union %s {\n", t->name); else fprintf(h, "union {\n"); t->written = TRUE; @@ -547,12 +550,7 @@ static void write_type_v(FILE *h, const decl_spec_t *ds, int is_field, int declo write_type_right(h, t, is_field); } -static void write_type_def_or_decl(FILE *f, const decl_spec_t *t, int field, const char *name) -{ - write_type_v(f, t, field, FALSE, name); -} - -static void write_type_definition(FILE *f, type_t *t) +static void write_type_definition(FILE *f, type_t *t, int declonly) { int in_namespace = t->namespace && !is_global_namespace(t->namespace); int save_written = t->written; @@ -564,14 +562,14 @@ static void write_type_definition(FILE *f, type_t *t) write_namespace_start(f, t->namespace); } indent(f, 0); - write_type_left(f, &ds, NAME_DEFAULT, FALSE, TRUE); + write_type_left(f, &ds, NAME_DEFAULT, declonly, TRUE); fprintf(f, ";\n"); if(in_namespace) { t->written = save_written; write_namespace_end(f, t->namespace); fprintf(f, "extern \"C\" {\n"); fprintf(f, "#else\n"); - write_type_left(f, &ds, NAME_C, FALSE, TRUE); + write_type_left(f, &ds, NAME_C, declonly, TRUE); fprintf(f, ";\n"); fprintf(f, "#endif\n\n"); } @@ -805,10 +803,10 @@ static void write_generic_handle_routines(FILE *header) } } -static void write_typedef(FILE *header, type_t *type) +static void write_typedef(FILE *header, type_t *type, int declonly) { fprintf(header, "typedef "); - write_type_def_or_decl(header, type_alias_get_aliasee(type), FALSE, type->name); + write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name); fprintf(header, ";\n"); } @@ -852,7 +850,7 @@ static void write_declaration(FILE *header, const var_t *v) fprintf(header, "extern "); break; } - write_type_def_or_decl(header, &v->declspec, FALSE, v->name); + write_type_v(header, &v->declspec, FALSE, v->declonly, v->name); fprintf(header, ";\n\n"); } } @@ -1092,6 +1090,9 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i } else fprintf(h, ","); } + /* In theory we should be writing the definition using write_type_v(..., arg->declonly), + * but that causes redefinition in e.g. proxy files. In fact MIDL disallows + * defining UDTs inside of an argument list. */ write_type_decl(h, &arg->declspec, arg->name); if (method == 2) { const expr_t *expr = get_attrp(arg->attrs, ATTR_DEFAULTVALUE); @@ -1733,7 +1734,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons write_coclass(header, stmt->u.type); else { - write_type_definition(header, stmt->u.type); + write_type_definition(header, stmt->u.type, stmt->declonly); } break; case STMT_TYPEREF: @@ -1754,7 +1755,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons { const type_list_t *type_entry = stmt->u.type_list; for (; type_entry; type_entry = type_entry->next) - write_typedef(header, type_entry->type); + write_typedef(header, type_entry->type, stmt->declonly); break; } case STMT_LIBRARY: diff --git a/tools/widl/parser.y b/tools/widl/parser.y index afbe2b1..bdbd440 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -116,7 +116,7 @@ static statement_t *make_statement_pragma(const char *str); static statement_t *make_statement_cppquote(const char *str); static statement_t *make_statement_importlib(const char *str); static statement_t *make_statement_module(type_t *type); -static statement_t *make_statement_typedef(var_list_t *names); +static statement_t *make_statement_typedef(var_list_t *names, int declonly); static statement_t *make_statement_import(const char *str); static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt); static statement_list_t *append_statements(statement_list_t *, statement_list_t *); @@ -1115,7 +1115,7 @@ type: tVOID { $$ = type_new_void(); } typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list { $1 = append_attribs($1, $3); reg_typedefs($4, $5, check_typedef_attrs($1)); - $$ = make_statement_typedef($5); + $$ = make_statement_typedef($5, !$4->type->defined); } ; @@ -1546,6 +1546,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator v->declspec.type = decl->type; v->declspec.qualifier = decl->qualifier; v->attrs = attrs; + v->declonly = !type->defined; if (is_attr(type->attrs, ATTR_CALLCONV) && !is_func(type)) error_loc("calling convention applied to non-function type\n"); @@ -1750,6 +1751,7 @@ var_t *make_var(char *name) v->attrs = NULL; v->eval = NULL; init_loc_info(&v->loc_info); + v->declonly = FALSE; return v; } @@ -2912,6 +2914,7 @@ static statement_t *make_statement_type_decl(type_t *type) { statement_t *stmt = make_statement(STMT_TYPE); stmt->u.type = type; + stmt->declonly = !type->defined; return stmt; } @@ -2982,7 +2985,7 @@ static statement_t *make_statement_module(type_t *type) return stmt; } -static statement_t *make_statement_typedef(declarator_list_t *decls) +static statement_t *make_statement_typedef(declarator_list_t *decls, int declonly) { declarator_t *decl, *next; statement_t *stmt; @@ -2993,6 +2996,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls) stmt = make_statement(STMT_TYPEDEF); stmt->u.type_list = NULL; type_list = &stmt->u.type_list; + stmt->declonly = declonly; LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 3886360..7a7bd89 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -478,6 +478,8 @@ struct _var_t { struct _loc_info_t loc_info; + unsigned int declonly : 1; + /* parser-internal */ struct list entry; }; @@ -560,6 +562,7 @@ struct _statement_t { typelib_t *lib; type_list_t *type_list; } u; + unsigned int declonly : 1; /* for STMT_TYPE and STMT_TYPEDEF */ }; struct _warning_t {

1 0