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

Richard Pospesel : widl: Respect wire-marshal typedefs in type libraries.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 57f697e137e099837d8ed3eb00cd2814bfc135df URL: https://source.winehq.org/git/wine.git/?a=commit;h=57f697e137e099837d8ed3eb… Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 21 11:18:10 2019 -0500 widl: Respect wire-marshal typedefs in type libraries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47041 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 3 ++- tools/widl/write_msft.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 4f6b4fc..79e72e0 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -129,7 +129,8 @@ unsigned short get_type_vt(type_t *t) if (vt) return vt; } - if (type_is_alias(t) && is_attr(t->attrs, ATTR_PUBLIC)) + if (type_is_alias(t) && + (is_attr(t->attrs, ATTR_PUBLIC) || is_attr(t->attrs, ATTR_WIREMARSHAL))) return VT_USERDEFINED; switch (type_get_type(t)) { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index e972a26..0e6ef08 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -967,9 +967,22 @@ static int encode_type( } else { - /* typedef'd types without public attribute aren't included in the typelib */ - while (type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type_alias_get_aliasee_type(type); + /* Typedefs without the [public] attribute aren't included in the + * typelib, unless the aliasee is an anonymous UDT or the typedef + * is wire-marshalled. In the latter case the wire-marshal type, + * which may be a non-public alias, is used instead. */ + while (type_is_alias(type)) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + { + type = get_attrp(type->attrs, ATTR_WIREMARSHAL); + break; + } + else if (!is_attr(type->attrs, ATTR_PUBLIC)) + type = type_alias_get_aliasee_type(type); + else + break; + } chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", type->name, type_get_type(type));

1 0

Bernhard belacker : cmd.exe: Command type with multiple files should print filenames to stderr.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 4684e1a9c67039be1504af0f836c13e5045b14d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4684e1a9c67039be1504af0f… Author: Bernhard belacker <bernhardu(a)mailbox.org> Date: Tue Aug 20 15:46:37 2019 +0200 cmd.exe: Command type with multiple files should print filenames to stderr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46983 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 10 +++++++++- programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 62ae19a..cd5f744 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4561,8 +4561,8 @@ void WCMD_type (WCHAR *args) { errorlevel = 1; } else { if (writeHeaders) { - static const WCHAR fmt[] = {'\n','%','1','\n','\n','\0'}; - WCMD_output(fmt, thisArg); + static const WCHAR fmt[] = {'\n','%','1','\n','\n','\n','\0'}; + WCMD_output_stderr(fmt, thisArg); } while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f4dfc9f..a992cda 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -875,7 +875,15 @@ type ."\foobaz" echo ---2 type ".\foobaz" echo ---3 -del foobaz +echo foo> foobay +echo ---4 +type foobaz foobay > foobax 2> foobaw +echo ---5 +type foobax +echo ---6 +type foobaw +echo ---7 +del foobaz foobay foobax foobaw echo ------------ Testing NUL ------------ md foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d78d91a..488c8e6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -659,6 +659,20 @@ bar ---2 bar ---3 +---4 +---5 +bar +foo +---6 + +foobaz + + + +foobay + + +---7 ------------ Testing NUL ------------ bar bar

1 0

Jacek Caban : vbscript/tests: Fix tests on recent win10.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 17fb70efe6d94e8f1b4504fd32e29ab5e48280bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=17fb70efe6d94e8f1b4504fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:21:53 2019 +0200 vbscript/tests: Fix tests on recent win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 88ec994..15a8f10 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -696,7 +696,6 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Jacek Caban : vbscript: Return correct error when builtin call argument count is invalid.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 6cc7b0e8d5013bdc492ff1f31c2c2aa82351b30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc7b0e8d5013bdc492ff1f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:22:18 2019 +0200 vbscript: Return correct error when builtin call argument count is invalid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 22 ++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8ebbfb6..b252d58 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -237,6 +237,17 @@ Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 2) = 4, "UBound(x) = " & UBound(x)) +sub testUBoundError() + on error resume next + call Err.clear() + call UBound() + call ok(Err.number = 450, "Err.number = " & Err.number) + call Err.clear() + call UBound(arr, 1, 2) + call ok(Err.number = 450, "Err.number = " & Err.number) +end sub +call testUBoundError() + Dim newObject Set newObject = New ValClass newObject.myval = 1 @@ -494,6 +505,17 @@ TestStrComp "ABC", Empty, 1, 1 TestStrComp vbNull, vbNull, 1, 0 TestStrComp "", vbNull, 1, -1 +sub testStrCompError() + on error resume next + call Err.clear() + call StrComp() + call ok(Err.number = 450, "Err.number = " & Err.number) + call Err.clear() + call StrComp("a", "a", 0, 1) + call ok(Err.number = 450, "Err.number = " & Err.number) +end sub +call testStrCompError() + Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) Call ok(Len("") = 0, "Len() = " & Len("")) Call ok(Len(1) = 1, "Len(1) = " & Len(1)) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d781dbc..a907f40 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -232,8 +232,8 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f argn = arg_cnt(dp); if(argn < prop->min_args || argn > (prop->max_args ? prop->max_args : prop->min_args)) { - FIXME("invalid number of arguments\n"); - return E_FAIL; + WARN("invalid number of arguments\n"); + return MAKE_VBSERROR(VBSE_FUNC_ARITY_MISMATCH); } assert(argn < ARRAY_SIZE(args));

1 0

Jacek Caban : vbscript: Add Asc implementation.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: c9a606faf6d3950b0e300780485ee6a2b48e7936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9a606faf6d3950b0e300780… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:22:33 2019 +0200 vbscript: Add Asc implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 28 ++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 61df982..17759b8 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1371,8 +1371,32 @@ static HRESULT Global_ChrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR conv_str = NULL, str; + HRESULT hres = S_OK; + + TRACE("(%s)\n", debugstr_variant(arg)); + + switch(V_VT(arg)) { + case VT_NULL: + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + case VT_EMPTY: + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + case VT_BSTR: + str = V_BSTR(arg); + break; + default: + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + if(!SysStringLen(str) || *str >= 0x100) + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + else if(res) + hres = return_short(res, *str); + SysFreeString(conv_str); + return hres; } /* The function supports only single-byte and double-byte character sets. It diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index b252d58..cbffcf4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1453,4 +1453,40 @@ Call testRGBError(&h4d&, -2, &h2f&, 5) Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) +sub testAsc(arg, expected) + dim x + x = Asc(arg) + call ok(x = expected, "x = " & x & " expected " & expected) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) +end sub + +sub testAscError() + on error resume next + call Err.clear() + call Asc(null) + Call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Asc(empty) + Call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Asc() + Call ok(Err.number = 450, "Err.number = " & Err.number) + call Err.clear() + call Asc(Chr(260)) + Call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Asc("") + Call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testAsc("T", 84) +call testAsc("test", 116) +call testAsc("3", 51) +call testAsc(3, 51) +call testAsc(" ", 32) +call testAsc(Chr(255), 255) +call testAsc(Chr(0), 0) +if isEnglishLang then testAsc true, 84 +call testAscError() + Call reportSuccess()

1 0

Zebediah Figura : httpapi/tests: Add tests for version 1 request queues.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 8a125eb000c21d80554722c9e0402177a2993131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a125eb000c21d80554722c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:05:18 2019 -0500 httpapi/tests: Add tests for version 1 request queues. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/Makefile.in | 2 +- dlls/httpapi/tests/httpapi.c | 852 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 834 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a125eb000c21d805547…

1 0

Zebediah Figura : ntoskrnl.exe: Use a manual-reset event for remove locks.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 83493a72bc1bc36dd6776c0b45f51afdcc471ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=83493a72bc1bc36dd6776c0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:05:53 2019 -0500 ntoskrnl.exe: Use a manual-reset event 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/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 4ab8b49..7aed1d0 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1205,7 +1205,7 @@ void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, 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 ); + KeInitializeEvent( &lock->Common.RemoveEvent, NotificationEvent, FALSE ); lock->Common.Removed = FALSE; lock->Common.IoCount = 0; }

1 0

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

21 Aug '19

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/tests: Add tests for remove locks.
by Alexandre Julliard 21 Aug '19

21 Aug '19

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 : widl: Check for redefinition of named user types.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: a58e4cc07cfa3c521f1cb6708f48d2755f369938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a58e4cc07cfa3c521f1cb670… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 20 22:28:24 2019 -0500 widl: Check for redefinition of named user types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index faa5820..524d005 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -285,6 +285,8 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined t->details.enumeration->enums = enums; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of enum %s\n", name); return t; } @@ -311,6 +313,8 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va t->details.structure->fields = fields; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of struct %s\n", name); return t; } @@ -336,6 +340,8 @@ type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t t->details.structure->fields = fields; t->defined = TRUE; } + else if (defined) + error_loc("redefinition of union %s\n", name); return t; } @@ -367,6 +373,8 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio t->details.structure->fields = append_var(t->details.structure->fields, union_field); t->defined = TRUE; } + else + error_loc("redefinition of union %s\n", name); return t; }

1 0