wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Zebediah Figura : http.sys: Create a stub request queue device.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: d3658f262e950222938907713c1b8d295d7ff615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3658f262e95022293890771… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:30:12 2019 -0500 http.sys: Create a stub request queue device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index ed19c00..aca2940 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -23,14 +23,61 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "winioctl.h" #include "ddk/wdm.h" #include "wine/debug.h" +static HANDLE directory_obj; +static DEVICE_OBJECT *device_obj; + WINE_DEFAULT_DEBUG_CHANNEL(http); +static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) +{ + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) +{ + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static void WINAPI unload(DRIVER_OBJECT *driver) +{ + IoDeleteDevice(device_obj); + NtClose(directory_obj); +} + NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; + static const WCHAR directory_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p',0}; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + NTSTATUS ret; + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + RtlInitUnicodeString(&string, directory_nameW); + attr.ObjectName = &string; + if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) + ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); + + RtlInitUnicodeString(&string, device_nameW); + if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) + { + ERR("Failed to create request queue device, status %#x.\n", ret); + NtClose(directory_obj); + return ret; + } + + driver->MajorFunction[IRP_MJ_CREATE] = dispatch_create; + driver->MajorFunction[IRP_MJ_CLOSE] = dispatch_close; + driver->DriverUnload = unload; + return STATUS_SUCCESS; }

1 0

Zebediah Figura : http.sys: New stub driver.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 128dd3be7536f4869b51be1958d01c7ed1e6441d URL: https://source.winehq.org/git/wine.git/?a=commit;h=128dd3be7536f4869b51be19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:30:11 2019 -0500 http.sys: New stub driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/http.sys/Makefile.in | 6 ++++++ dlls/http.sys/http.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/http.sys/http.sys.spec | 1 + loader/wine.inf.in | 11 +++++++++++ 6 files changed, 57 insertions(+) diff --git a/configure b/configure index a87fef5..c64dc5a 100755 --- a/configure +++ b/configure @@ -1340,6 +1340,7 @@ enable_hid enable_hidclass_sys enable_hlink enable_hnetcfg +enable_http_sys enable_httpapi enable_iccvid enable_icmp @@ -20307,6 +20308,7 @@ wine_fn_config_makefile dlls/hlink enable_hlink wine_fn_config_makefile dlls/hlink/tests enable_tests wine_fn_config_makefile dlls/hnetcfg enable_hnetcfg wine_fn_config_makefile dlls/hnetcfg/tests enable_tests +wine_fn_config_makefile dlls/http.sys enable_http_sys wine_fn_config_makefile dlls/httpapi enable_httpapi wine_fn_config_makefile dlls/httpapi/tests enable_tests wine_fn_config_makefile dlls/iccvid enable_iccvid diff --git a/configure.ac b/configure.ac index 1711c01..0d0ba2f 100644 --- a/configure.ac +++ b/configure.ac @@ -3290,6 +3290,7 @@ WINE_CONFIG_MAKEFILE(dlls/hlink) WINE_CONFIG_MAKEFILE(dlls/hlink/tests) WINE_CONFIG_MAKEFILE(dlls/hnetcfg) WINE_CONFIG_MAKEFILE(dlls/hnetcfg/tests) +WINE_CONFIG_MAKEFILE(dlls/http.sys) WINE_CONFIG_MAKEFILE(dlls/httpapi) WINE_CONFIG_MAKEFILE(dlls/httpapi/tests) WINE_CONFIG_MAKEFILE(dlls/iccvid) diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in new file mode 100644 index 0000000..449ebae --- /dev/null +++ b/dlls/http.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = http.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -Wl,--subsystem,native -mno-cygwin + +C_SRCS = \ + http.c diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c new file mode 100644 index 0000000..ed19c00 --- /dev/null +++ b/dlls/http.sys/http.c @@ -0,0 +1,36 @@ +/* + * HTTP server driver + * + * Copyright 2019 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(http); + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + return STATUS_SUCCESS; +} diff --git a/dlls/http.sys/http.sys.spec b/dlls/http.sys/http.sys.spec new file mode 100644 index 0000000..76421d7 --- /dev/null +++ b/dlls/http.sys/http.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ea647f6..e835466 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -119,6 +119,7 @@ AddReg=\ [DefaultInstall.Services] AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService @@ -135,6 +136,7 @@ AddService=Winmgmt,0,WinmgmtService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService @@ -151,6 +153,7 @@ AddService=Winmgmt,0,WinmgmtService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService @@ -3434,6 +3437,14 @@ ServiceType=16 StartType=3 ErrorControl=1 +[HTTPService] +Description="HTTP server" +DisplayName="HTTP" +ServiceBinary="%12%\http.sys" +ServiceType=1 +StartType=3 +ErrorControl=1 + [MSIService] Description="MSI Installer Server" DisplayName="MSIServer"

1 0

Jacek Caban : vbscript: Fix handling null argument in CStr.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: fb5b0c64639c056d55e14011a3b4e6f2d83e7cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5b0c64639c056d55e14011… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:22:46 2019 +0200 vbscript: Fix handling null argument in CStr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 17759b8..0797403 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -528,6 +528,9 @@ static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI TRACE("%s\n", debugstr_variant(arg)); + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_string(arg, &str); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index cbffcf4..93cf7f8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -129,6 +129,14 @@ TestCStr 3, "3" if isEnglishLang then TestCStr 3.5, "3.5" if isEnglishLang then TestCStr true, "True" +sub testCStrError() + on error resume next + Error.clear() + CStr(null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testCStrError() + Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120))

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

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/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

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

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

Richard Pospesel : widl: Add the typedef to the type library if the aliasee is an anonymous UDT.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 4b1dfa60371a69f978455edc52a2a1cfef33eb4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1dfa60371a69f978455edc… Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 21 11:18:09 2019 -0500 widl: Add the typedef to the type library if the aliasee is an anonymous UDT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47050 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8496109..59875a5 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1895,7 +1895,11 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) { if (!type->name) + { type->name = gen_name(); + if (!is_attr(attrs, ATTR_PUBLIC)) + attrs = append_attr(attrs, make_attr(ATTR_PUBLIC)); + } /* replace existing attributes when generating a typelib */ if (do_typelib)

1 0

Zebediah Figura : widl: Write public typedefs into the typelib if they are referenced directly.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 96e11d51bae0ef323c32fd0ba1668be0d0283092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e11d51bae0ef323c32fd0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 11:18:08 2019 -0500 widl: Write public typedefs into the typelib if they are referenced directly. I.e. write "apple_t" into the typelib given the following snippet: typedef [public] struct { ... } apple_t; library { interface IFoo { HRESULT a(apple_t arg); } } 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/write_msft.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 5d5fd89..e972a26 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -763,6 +763,7 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion); static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls); static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface); +static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *dispinterface); /**************************************************************************** @@ -973,7 +974,7 @@ static int encode_type( chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", type->name, type_get_type(type)); - switch (type_get_type(type)) + switch (type_get_type_detect_alias(type)) { case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: @@ -991,6 +992,9 @@ static int encode_type( case TYPE_COCLASS: add_coclass_typeinfo(typelib, type); break; + case TYPE_ALIAS: + add_typedef_typeinfo(typelib, type); + break; default: error("encode_type: VT_USERDEFINED - unhandled type %d\n", type_get_type(type));

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019