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

Zebediah Figura : widl: Create exactly one type_t object per named enum type.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 0aa6049c8d46dd6d4e92c30f7b0380d1e5f46af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa6049c8d46dd6d4e92c30f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:39 2019 -0500 widl: Create exactly one type_t object per named enum type. Based on a patch by Richard Pospesel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47035 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a7fd561..faa5820 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -265,25 +265,27 @@ type_t *type_new_void(void) type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums) { - type_t *tag_type = name ? find_type(name, namespace, tsENUM) : NULL; - type_t *t = make_type(TYPE_ENUM); - t->name = name; - t->namespace = namespace; - - if (tag_type && tag_type->details.enumeration) - t->details.enumeration = tag_type->details.enumeration; - else if (defined) + type_t *t = NULL; + + if (name) + t = find_type(name, namespace,tsENUM); + + if (!t) + { + t = make_type(TYPE_ENUM); + t->name = name; + t->namespace = namespace; + if (name) + reg_type(t, name, namespace, tsENUM); + } + + if (!t->defined && defined) { t->details.enumeration = xmalloc(sizeof(*t->details.enumeration)); t->details.enumeration->enums = enums; t->defined = TRUE; } - if (name) - { - if (defined) - reg_type(t, name, namespace, tsENUM); - } return t; }

1 0

Isira Seneviratne : cabinet/tests: Alter string declaration to include null terminator.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 6054f2cc6e2eb4ebef547eef3b41822b1b280640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6054f2cc6e2eb4ebef547eef… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Aug 18 16:32:34 2019 +0530 cabinet/tests: Alter string declaration to include null terminator. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/tests/fdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 1f1c6e2..732f816 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -776,7 +776,7 @@ static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb) static UINT CDECL fdi_mem_write(INT_PTR hf, void *pv, UINT cb) { - static const char expected[12] = "Hello World!"; + static const char expected[] = "Hello World!"; trace("mem_write(%#lx,%p,%u)\n", hf, pv, cb);

1 0

Sven Baars : windowscodecs/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 4321cd9d7e69cac0156679f6147597ef45e57562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4321cd9d7e69cac0156679f6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Aug 18 23:24:32 2019 +0200 windowscodecs/tests: Fix a memory leak (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43387 Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b434648..a955702 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3029,6 +3029,7 @@ static void test_queryreader(void) ok(hr == E_INVALIDARG, "got %#x\n", hr); IWICMetadataQueryReader_Release(new_reader); + PropVariantClear(&value); } else if (value.vt == VT_LPSTR) ok(!lstrcmpA(U(value).pszVal, test_data[i].str_value), "%u: expected %s, got %s\n",

1 0

Zebediah Figura : widl: Create exactly one type_t object per named union type.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 833639bd09a9df278a56553ced4b080699dc5313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=833639bd09a9df278a56553c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 21:17:38 2019 -0500 widl: Create exactly one type_t object per named union type. Based on a patch by Richard Pospesel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 38 ------------------------------ tools/widl/typetree.c | 63 ++++++++++++++++++++++++++++++++------------------ tools/widl/widltypes.h | 1 - 3 files changed, 41 insertions(+), 61 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9db8ebd..a52afc7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -50,10 +50,6 @@ struct _import_t int import_performed; }; -typelist_t incomplete_types = LIST_INIT(incomplete_types); - -static void fix_incomplete_types(type_t *complete_type); - static str_list_t *append_str(str_list_t *list, char *str); static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); static attr_list_t *append_attr_list(attr_list_t *new_list, attr_list_t *old_list); @@ -1880,41 +1876,9 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in nt->t = t; nt->next = namespace->type_hash[hash]; namespace->type_hash[hash] = nt; - if ((t == tsUNION)) - fix_incomplete_types(type); return type; } -static int is_incomplete(const type_t *t) -{ - return !t->defined && - (type_get_type_detect_alias(t) == TYPE_STRUCT || - type_get_type_detect_alias(t) == TYPE_UNION || - type_get_type_detect_alias(t) == TYPE_ENCAPSULATED_UNION); -} - -void add_incomplete(type_t *t) -{ - struct typenode *tn = xmalloc(sizeof *tn); - tn->type = t; - list_add_tail(&incomplete_types, &tn->entry); -} - -static void fix_incomplete_types(type_t *complete_type) -{ - struct typenode *tn, *next; - - LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) - { - if (type_is_equal(complete_type, tn->type)) - { - tn->type->details.structure = complete_type->details.structure; - list_remove(&tn->entry); - free(tn); - } - } -} - static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, attr_list_t *attrs) { declarator_t *decl; @@ -1966,8 +1930,6 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at cur = type_new_alias(&name->declspec, name->name); cur->attrs = attrs; - if (is_incomplete(cur)) - add_incomplete(cur); reg_type(cur, cur->name, current_namespace, 0); } } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 05e9684..a7fd561 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -283,8 +283,6 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined { if (defined) reg_type(t, name, namespace, tsENUM); - else - add_incomplete(t); } return t; } @@ -317,36 +315,57 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields) { - type_t *tag_type = name ? find_type(name, NULL, tsUNION) : NULL; - type_t *t = make_type(TYPE_UNION); - t->name = name; - if (tag_type && tag_type->details.structure) - t->details.structure = tag_type->details.structure; - else if (defined) + type_t *t = NULL; + + if (name) + t = find_type(name, NULL, tsUNION); + + if (!t) + { + t = make_type(TYPE_UNION); + t->name = name; + if (name) + reg_type(t, name, NULL, tsUNION); + } + + if (!t->defined && defined) { t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; t->defined = TRUE; } - if (name) - { - if (defined) - reg_type(t, name, NULL, tsUNION); - else - add_incomplete(t); - } + return t; } type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases) { - type_t *t = get_type(TYPE_ENCAPSULATED_UNION, name, NULL, tsUNION); - if (!union_field) union_field = make_var( xstrdup("tagged_union") ); - union_field->declspec.type = type_new_nonencapsulated_union(NULL, TRUE, cases); - t->details.structure = xmalloc(sizeof(*t->details.structure)); - t->details.structure->fields = append_var( NULL, switch_field ); - t->details.structure->fields = append_var( t->details.structure->fields, union_field ); - t->defined = TRUE; + type_t *t = NULL; + + if (name) + t = find_type(name, NULL, tsUNION); + + if (!t) + { + t = make_type(TYPE_ENCAPSULATED_UNION); + t->name = name; + if (name) + reg_type(t, name, NULL, tsUNION); + } + t->type_type = TYPE_ENCAPSULATED_UNION; + + if (!t->defined) + { + if (!union_field) + union_field = make_var(xstrdup("tagged_union")); + union_field->declspec.type = type_new_nonencapsulated_union(NULL, TRUE, cases); + + t->details.structure = xmalloc(sizeof(*t->details.structure)); + t->details.structure->fields = append_var(NULL, switch_field); + t->details.structure->fields = append_var(t->details.structure->fields, union_field); + t->defined = TRUE; + } + return t; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7a7bd89..5e28329 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -596,7 +596,6 @@ type_t *find_type(const char *name, struct namespace *namespace, int t); type_t *make_type(enum type_type type); type_t *get_type(enum type_type type, char *name, struct namespace *namespace, int t); type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, int t); -void add_incomplete(type_t *t); var_t *make_var(char *name); var_list_t *append_var(var_list_t *list, var_t *var);

1 0

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

Aug. 20, 2019

Module: wine Branch: master Commit: afe444f75a53bd988ee1316674761d0c5aaff35b URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe444f75a53bd988ee13166… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:47 2019 -0500 ntoskrnl.exe: Implement IoInitializeRemoveLockEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47623 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ----------- dlls/ntoskrnl.exe/sync.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fe66b3d..20cee6c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3050,17 +3050,6 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) return FALSE; } - -/***************************************************** - * IoInitializeRemoveLockEx (NTOSKRNL.EXE.@) - */ -VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK lock, ULONG tag, - ULONG maxmin, ULONG high, ULONG size) -{ - FIXME("(%p %u %u %u %u) stub\n", lock, tag, maxmin, high, size); -} - - /***************************************************** * IoAcquireRemoveLockEx (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index ea4165c..0b2ca6f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1195,3 +1195,17 @@ ULONG WINAPI ExIsResourceAcquiredSharedLite( ERESOURCE *resource ) return ret; } + +/*********************************************************************** + * IoInitializeRemoveLockEx (NTOSKRNL.EXE.@) + */ +void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, + ULONG max_minutes, ULONG max_count, ULONG size ) +{ + TRACE("lock %p, tag %#x, max_minutes %u, max_count %u, size %u.\n", + lock, tag, max_minutes, max_count, size); + + KeInitializeEvent( &lock->Common.RemoveEvent, SynchronizationEvent, FALSE ); + lock->Common.Removed = FALSE; + lock->Common.IoCount = 0; +}

1 0

Benedikt Bär : ucrtbase: Add more functions for Star Citizen 3.6.1.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 6ed6d33ec252eff8eb6584b288271927826ac86e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ed6d33ec252eff8eb6584b2… Author: Benedikt Bär <beniwtv(a)relamp.tk> Date: Fri Aug 16 20:22:19 2019 +0200 ucrtbase: Add more functions for Star Citizen 3.6.1. Signed-off-by: Benedikt Bär <beniwtv(a)relamp.tk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 10 +++++----- dlls/ucrtbase/ucrtbase.spec | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d496889..1d5e2f8 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -840,7 +840,7 @@ @ stub _o__wfullpath @ stub _o__wgetcwd @ stub _o__wgetdcwd -@ stub _o__wgetenv +@ cdecl _o__wgetenv(wstr) ucrtbase._o__wgetenv @ stub _o__wgetenv_s @ stub _o__wmakepath @ stub _o__wmakepath_s @@ -857,7 +857,7 @@ @ stub _o__wrmdir @ stub _o__wsearchenv @ stub _o__wsearchenv_s -@ stub _o__wsetlocale +@ cdecl _o__wsetlocale(long wstr) ucrtbase._o__wsetlocale @ stub _o__wsopen_dispatch @ stub _o__wsopen_s @ stub _o__wspawnv @@ -913,7 +913,7 @@ @ stub _o_atanhf @ stub _o_atanhl @ cdecl _o_atof(str) ucrtbase._o_atof -@ stub _o_atoi +@ cdecl _o_atoi(str) ucrtbase._o_atoi @ stub _o_atol @ stub _o_atoll @ stub _o_bsearch @@ -922,7 +922,7 @@ @ cdecl _o_calloc(long long) ucrtbase._o_calloc @ stub _o_cbrt @ stub _o_cbrtf -@ stub _o_ceil +@ cdecl _o_ceil(double) ucrtbase._o_ceil @ stub _o_ceilf @ stub _o_clearerr @ stub _o_clearerr_s @@ -952,7 +952,7 @@ @ stub _o_fgets @ stub _o_fgetwc @ stub _o_fgetws -@ stub _o_floor +@ cdecl _o_floor(double) ucrtbase._o_floor @ stub _o_floorf @ stub _o_fma @ stub _o_fmaf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6684742..070f0d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1504,7 +1504,7 @@ @ stub _o__wfullpath @ stub _o__wgetcwd @ stub _o__wgetdcwd -@ stub _o__wgetenv +@ cdecl _o__wgetenv(wstr) MSVCRT__wgetenv @ stub _o__wgetenv_s @ stub _o__wmakepath @ stub _o__wmakepath_s @@ -1521,7 +1521,7 @@ @ stub _o__wrmdir @ stub _o__wsearchenv @ stub _o__wsearchenv_s -@ stub _o__wsetlocale +@ cdecl _o__wsetlocale(long wstr) MSVCRT__wsetlocale @ stub _o__wsopen_dispatch @ stub _o__wsopen_s @ stub _o__wspawnv @@ -1577,7 +1577,7 @@ @ stub _o_atanhf @ stub _o_atanhl @ cdecl _o_atof(str) MSVCRT_atof -@ stub _o_atoi +@ cdecl _o_atoi(str) MSVCRT_atoi @ stub _o_atol @ stub _o_atoll @ stub _o_bsearch @@ -1586,7 +1586,7 @@ @ cdecl _o_calloc(long long) MSVCRT_calloc @ stub _o_cbrt @ stub _o_cbrtf -@ stub _o_ceil +@ cdecl _o_ceil(double) MSVCRT_ceil @ stub _o_ceilf @ stub _o_clearerr @ stub _o_clearerr_s @@ -1616,7 +1616,7 @@ @ stub _o_fgets @ stub _o_fgetwc @ stub _o_fgetws -@ stub _o_floor +@ cdecl _o_floor(double) MSVCRT_floor @ stub _o_floorf @ stub _o_fma @ stub _o_fmaf

1 0

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

Aug. 20, 2019

Module: wine Branch: master Commit: c0b05a2c74af6ce9276ae932a94465d95e5f7d43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0b05a2c74af6ce9276ae932… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:50 2019 -0500 ntoskrnl.exe: Implement IoReleaseRemoveLockAndWaitEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/sync.c | 19 +++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6be5990..91bd7da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3805,14 +3805,6 @@ void WINAPI KeFlushQueuedDpcs(void) } /********************************************************************* - * IoReleaseRemoveLockAndWaitEx (NTOSKRNL.@) - */ -void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG size) -{ - FIXME("stub: %p %p %u\n", lock, tag, size); -} - -/********************************************************************* * DbgQueryDebugFilterState (NTOSKRNL.@) */ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 7f4d263..4ab8b49 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1239,3 +1239,22 @@ void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) else if (count < 0) ERR("Lock %p is not acquired!\n", lock); } + +/*********************************************************************** + * IoReleaseRemoveLockAndWaitEx (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) +{ + LONG count; + + TRACE("lock %p, tag %p, size %u.\n", lock, tag, size); + + lock->Common.Removed = TRUE; + + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) + KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); + else if (count < 0) + ERR("Lock %p is not acquired!\n", lock); + else + KeWaitForSingleObject( &lock->Common.RemoveEvent, Executive, KernelMode, FALSE, NULL ); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5e2e119..21c9539 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1603,6 +1603,7 @@ void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); +void WINAPI IoReleaseRemoveLockAndWaitEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

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

Aug. 20, 2019

Module: wine Branch: master Commit: 9d899c753afb36823720a6c2e8e1098c65012e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d899c753afb36823720a6c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 19 22:27:49 2019 -0500 ntoskrnl.exe: Implement IoReleaseRemoveLockEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 15 +++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3128c35..230c8d6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -448,7 +448,7 @@ @ stdcall IoRegisterShutdownNotification(ptr) @ stdcall IoReleaseCancelSpinLock(long) @ stdcall IoReleaseRemoveLockAndWaitEx(ptr ptr long) -@ stub IoReleaseRemoveLockEx +@ stdcall IoReleaseRemoveLockEx(ptr ptr long) @ stub IoReleaseVpbSpinLock @ stub IoRemoveShareAccess @ stub IoReportDetectedDevice diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index f54fe2a..7f4d263 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1224,3 +1224,18 @@ NTSTATUS WINAPI IoAcquireRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, InterlockedIncrement( &lock->Common.IoCount ); return STATUS_SUCCESS; } + +/*********************************************************************** + * IoReleaseRemoveLockEx (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) +{ + LONG count; + + TRACE("lock %p, tag %p, size %u.\n", lock, tag, size); + + if (!(count = InterlockedDecrement( &lock->Common.IoCount ))) + KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); + else if (count < 0) + ERR("Lock %p is not acquired!\n", lock); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index da200c5..5e2e119 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1603,6 +1603,7 @@ void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); +void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);

1 0

Alistair Leslie-Hughes : dbgeng: Support interfaces IDebugClient2-7.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 3d7d3dc3ae3cd20b7499d6f2d1b251ed91d988f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7d3dc3ae3cd20b7499d6f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 20 04:35:48 2019 +0000 dbgeng: Support interfaces IDebugClient2-7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44958 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 478 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 426 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d7d3dc3ae3cd20b7499…

1 0

Alexandre Julliard : winedump: Add dumping for exception info for ARM64.
by Alexandre Julliard Aug. 20, 2019

Aug. 20, 2019

Module: wine Branch: master Commit: 509e8d2093c4a54ce29a4cc668fc1318114b93ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=509e8d2093c4a54ce29a4cc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 20 20:21:57 2019 +0200 winedump: Add dumping for exception info for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 358 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=509e8d2093c4a54ce29a…

1 0