February 2021 - Wine-Commits

Rémi Bernon : include: Add Windows.Media.SpeechSynthesis.SpeechSynthesizer runtimeclass.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 02edba0f9d27d5130cc6398f2c0d2cb4e09cbfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02edba0f9d27d5130cc6398f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 10:37:22 2021 +0100 include: Add Windows.Media.SpeechSynthesis.SpeechSynthesizer runtimeclass. As an illustration for the newly supported attributes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechsynthesis.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index 502261f79c6..87497678f30 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -24,10 +24,16 @@ import "inspectable.idl"; import "windows.foundation.idl"; namespace Windows { + namespace Foundation { + interface IClosable; + } namespace Media { namespace SpeechSynthesis { typedef enum VoiceGender VoiceGender; interface IInstalledVoicesStatic; + interface IInstalledVoicesStatic2; + interface ISpeechSynthesizer; + interface ISpeechSynthesizer2; interface IVoiceInformation; runtimeclass VoiceInformation; } @@ -66,6 +72,20 @@ namespace Windows { { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Media.SpeechSynthesis.IInstalledVoicesStatic2, Windows.Foundation.UniversalApiContract, 5.0) + ] + runtimeclass SpeechSynthesizer + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer; + interface Windows.Foundation.IClosable; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizer2; + } } } }

1 0

Hugh McMaster : reg/tests: Add initial syntax tests for 'reg copy'.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 6cf0e7fe85ba2f9348cec4d4d555c5dac42033de URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf0e7fe85ba2f9348cec4d4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 9 22:52:45 2021 +1100 reg/tests: Add initial syntax tests for 'reg copy'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ea4e128da5a..afba8424c1a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -21,7 +21,8 @@ #include "wine/test.h" #define lok ok_(__FILE__,line) -#define KEY_BASE "Software\\Wine\\reg_test" +#define KEY_WINE "Software\\Wine" +#define KEY_BASE KEY_WINE "\\reg_test" #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 #define TODO_REG_TYPE (0x0001u) @@ -4684,6 +4685,82 @@ static void test_export(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); } +#define COPY_DEST KEY_WINE "\\reg_copy" + +static void test_copy(void) +{ + DWORD r; + + run_reg_exe("reg copy", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /h", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /? /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /? /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/f /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -4702,4 +4779,5 @@ START_TEST(reg) test_unicode_import_with_whitespace(); test_import_31(); test_export(); + test_copy(); }

1 0

Jacek Caban : include: Add relogger.idl file.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: fd6e23e5ef1fffca1e26e0a5b6a2548493952864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6e23e5ef1fffca1e26e0a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 14:33:17 2021 +0100 include: Add relogger.idl file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/relogger.idl | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f99280149fd..c1efee700fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -593,6 +593,7 @@ SOURCES = \ raserror.h \ reason.h \ regstr.h \ + relogger.idl \ restartmanager.h \ restrictederrorinfo.idl \ richedit.h \ diff --git a/include/relogger.idl b/include/relogger.idl new file mode 100644 index 00000000000..60e04512ee0 --- /dev/null +++ b/include/relogger.idl @@ -0,0 +1,184 @@ +/* + * Copyright 2021 Jacek Caban for CodeWeavers + * + * 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 + */ + +import "unknwn.idl"; +import "oaidl.idl"; +import "ocidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#endif + +typedef struct _EVENT_DESCRIPTOR +{ + USHORT Id; + UCHAR Version; + UCHAR Channel; + UCHAR Level; + UCHAR Opcode; + USHORT Task; + ULONGLONG Keyword; +} EVENT_DESCRIPTOR, *PEVENT_DESCRIPTOR; +typedef const EVENT_DESCRIPTOR *PCEVENT_DESCRIPTOR; + +typedef struct _EVENT_HEADER +{ + USHORT Size; + USHORT HeaderType; + USHORT Flags; + USHORT EventProperty; + ULONG ThreadId; + ULONG ProcessId; + LARGE_INTEGER TimeStamp; + GUID ProviderId; + EVENT_DESCRIPTOR EventDescriptor; + union { + struct { + ULONG KernelTime; + ULONG UserTime; + } DUMMYSTRUCTNAME; + ULONG64 ProcessorTime; + } DUMMYUNIONNAME; + GUID ActivityId; +} EVENT_HEADER, *PEVENT_HEADER; + +typedef struct _ETW_BUFFER_CONTEXT +{ + union { + struct { + UCHAR ProcessorNumber; + UCHAR Alignment; + } DUMMYSTRUCTNAME; + USHORT ProcessorIndex; + } DUMMYUNIONNAME; + USHORT LoggerId; +} ETW_BUFFER_CONTEXT, *PETW_BUFFER_CONTEXT; + +typedef struct _EVENT_HEADER_EXTENDED_DATA_ITEM +{ + USHORT Reserved1; + USHORT ExtType; + USHORT Linkage; + USHORT DataSize; + ULONGLONG DataPtr; +} EVENT_HEADER_EXTENDED_DATA_ITEM, *PEVENT_HEADER_EXTENDED_DATA_ITEM; + +typedef struct _EVENT_RECORD +{ + EVENT_HEADER EventHeader; + ETW_BUFFER_CONTEXT BufferContext; + USHORT ExtendedDataCount; + USHORT UserDataLength; + EVENT_HEADER_EXTENDED_DATA_ITEM *ExtendedData; + void *UserData; + void *UserContext; +} EVENT_RECORD, *PEVENT_RECORD; + +typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; + +[ + object, + uuid(8cc97f40-9028-4ff3-9b62-7d1f79ca7bcb), + local +] +interface ITraceEvent : IUnknown +{ + HRESULT Clone([out, retval] ITraceEvent **NewEvent); + + HRESULT GetUserContext([out, retval] void **UserContext); + + HRESULT GetEventRecord([out, retval] PEVENT_RECORD *EventRecord); + + HRESULT SetPayload([in, size_is(PayloadSize)] BYTE *Payload, + [in] ULONG PayloadSize); + + HRESULT SetEventDescriptor([in] PCEVENT_DESCRIPTOR EventDescriptor); + + HRESULT SetProcessId([in] ULONG ProcessId); + + HRESULT SetProcessorIndex([in] ULONG ProcessorIndex); + + HRESULT SetThreadId([in] ULONG ThreadId); + + HRESULT SetThreadTimes([in] ULONG KernelTime, + [in] ULONG UserTime); + + HRESULT SetActivityId([in] LPCGUID ActivityId); + + HRESULT SetTimeStamp([in] LARGE_INTEGER *TimeStamp); + + HRESULT SetProviderId([in] LPCGUID ProviderId); +} + +interface ITraceRelogger; + +[ + object, + uuid(3ed25501-593f-43e9-8f38-3ab46f5a4a52) +] +interface ITraceEventCallback : IUnknown +{ + HRESULT OnBeginProcessTrace([in] ITraceEvent *HeaderEvent, + [in] ITraceRelogger *Relogger); + + HRESULT OnFinalizeProcessTrace([in] ITraceRelogger *Relogger); + + HRESULT OnEvent([in] ITraceEvent *Event, + [in] ITraceRelogger *Relogger); +} + +[ + object, + uuid(f754ad43-3bcc-4286-8009-9c5da214e84e), + local +] +interface ITraceRelogger : IUnknown +{ + HRESULT AddLogfileTraceStream([in] BSTR LogfileName, + [in] void *UserContext, + [out, retval] TRACEHANDLE *TraceHandle); + + HRESULT AddRealtimeTraceStream([in] BSTR LoggerName, + [in] void *UserContext, + [out, retval] TRACEHANDLE *TraceHandle); + + HRESULT RegisterCallback([in] ITraceEventCallback *Callback); + + HRESULT Inject([in] ITraceEvent *Event); + + HRESULT CreateEventInstance([in] TRACEHANDLE TraceHandle, + [in] ULONG Flags, + [out, retval] ITraceEvent **Event); + + HRESULT ProcessTrace(); + + HRESULT SetOutputFilename([in] BSTR LogfileName); + + HRESULT SetCompressionMode([in] BOOLEAN CompressionMode); + + HRESULT Cancel(); +} + +[ + uuid(7b40792d-05ff-44c4-9058-f440c71f17d4), + threading(both) +] +coclass CTraceRelogger +{ + [default] interface ITraceRelogger; +}

1 0

Jacek Caban : mshtml: Move load_gecko() call from DllRegisterServer to DllInstall.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 5b362f07f67db5f90ac355c62a1f3d73658c4346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b362f07f67db5f90ac355c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 13:51:59 2021 +0100 mshtml: Move load_gecko() call from DllRegisterServer to DllInstall. With this patch, Wine will no longer ensure that Wine Gecko is available during prefix creation and update. We have shared Gecko installations and good support for installing Gecko on demand now. To ensure that Gecko is installed, one may use DllInstall with something like |regsvr32 -i mshtml|. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 642e2fdbffd..7ee26076513 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -524,9 +524,15 @@ DWORD WINAPI RNIGetCompatibleVersion(void) /*********************************************************************** * DllInstall (MSHTML.@) */ -HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL install, const WCHAR *cmdline) { - FIXME("stub %d %s: returning S_OK\n", bInstall, debugstr_w(cmdline)); + TRACE("(%x %s)\n", install, debugstr_w(cmdline)); + + if(cmdline && *cmdline) + FIXME("unsupported cmdline: %s\n", debugstr_w(cmdline)); + else if(install) + load_gecko(); + return S_OK; } @@ -669,9 +675,6 @@ HRESULT WINAPI DllRegisterServer(void) hres = __wine_register_resources( hInst ); if(SUCCEEDED(hres)) hres = register_server(TRUE); - if(SUCCEEDED(hres)) - load_gecko(); - return hres; }

1 0

Andrew Boyarshin : widl: Fix handling of output_name in option parsing.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 5423e0d9e6fc60300a042c3933716fbcf3334fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5423e0d9e6fc60300a042c39… Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Date: Tue Feb 9 13:38:50 2021 +0100 widl: Fix handling of output_name in option parsing. Do not overwrite explicitly stated paths, such as header_name or proxy_name. Instead, use output_name when specified as a fallback. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 99b24e86fdc..8da887ea636 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -831,19 +831,17 @@ int main(int argc,char *argv[]) set_everything(TRUE); } - if (!output_name) output_name = dup_basename(input_name, ".idl"); - if (do_header + do_typelib + do_proxies + do_client + - do_server + do_regscript + do_idfile + do_dlldata == 1) + do_server + do_regscript + do_idfile + do_dlldata == 1 && output_name) { - if (do_header) header_name = output_name; - else if (do_typelib) typelib_name = output_name; - else if (do_proxies) proxy_name = output_name; - else if (do_client) client_name = output_name; - else if (do_server) server_name = output_name; - else if (do_regscript) regscript_name = output_name; - else if (do_idfile) idfile_name = output_name; - else if (do_dlldata) dlldata_name = output_name; + if (do_header && !header_name) header_name = output_name; + else if (do_typelib && !typelib_name) typelib_name = output_name; + else if (do_proxies && !proxy_name) proxy_name = output_name; + else if (do_client && !client_name) client_name = output_name; + else if (do_server && !server_name) server_name = output_name; + else if (do_regscript && !regscript_name) regscript_name = output_name; + else if (do_idfile && !idfile_name) idfile_name = output_name; + else if (do_dlldata && !dlldata_name) dlldata_name = output_name; } if (!dlldata_name && do_dlldata)

1 0

Rémi Bernon : widl: Support WinRT requires keyword.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: daba929a521163d1cb49106425d5e6184bcf8e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=daba929a521163d1cb491064… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 10:37:21 2021 +0100 widl: Support WinRT requires keyword. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 16 +++++++++++++--- tools/widl/typetree.c | 34 +++++++++++++++++++++++++++++++++- tools/widl/typetree.h | 9 ++++++++- tools/widl/widltypes.h | 1 + 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 9b93a53b839..946dba84cd6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -298,6 +298,7 @@ static const struct keyword keywords[] = { {"pascal", tPASCAL, 0}, {"properties", tPROPERTIES, 0}, {"register", tREGISTER, 0}, + {"requires", tREQUIRES, 1}, {"runtimeclass", tRUNTIMECLASS, 1}, {"short", tSHORT, 0}, {"signed", tSIGNED, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b8c916f8336..a6128074f2d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -240,6 +240,7 @@ static typelib_t *current_typelib; %token tREADONLY tREF %token tREGISTER tREPRESENTAS %token tREQUESTEDIT +%token tREQUIRES %token tRESTRICTED %token tRETVAL %token tRUNTIMECLASS @@ -293,6 +294,7 @@ static typelib_t *current_typelib; %type <type> type unqualified_type qualified_type %type <ifref> class_interface %type <ifref_list> class_interfaces +%type <ifref_list> requires required_types %type <var> arg ne_union_field union_field s_field case enum enum_member declaration %type <var> funcdef %type <var_list> m_args arg_list args dispint_meths @@ -967,8 +969,16 @@ inherit: { $$ = NULL; } interface: tINTERFACE typename { $$ = type_interface_declare($2, current_namespace); } ; -interfacedef: attributes interface inherit - '{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $5); +required_types: + qualified_type { $$ = append_ifref(NULL, make_ifref($1)); } + | required_types ',' qualified_type { $$ = append_ifref($1, make_ifref($3)); } + +requires: { $$ = NULL; } + | tREQUIRES required_types { $$ = $2; } + ; + +interfacedef: attributes interface inherit requires + '{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $6, $4); check_async_uuid($$); } | dispinterfacedef semicolon_opt { $$ = $1; } @@ -2981,7 +2991,7 @@ static void check_async_uuid(type_t *iface) stmts = append_statement(stmts, make_statement_declaration(finish_func)); } - type_interface_define(async_iface, map_attrs(iface->attrs, async_iface_attrs), inherit, stmts); + type_interface_define(async_iface, map_attrs(iface->attrs, async_iface_attrs), inherit, stmts, NULL); iface->details.iface->async_iface = async_iface->details.iface->async_iface = async_iface; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index b3f0725f00e..3c2f183eb13 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -441,7 +441,7 @@ type_t *type_interface_declare(char *name, struct namespace *namespace) return type; } -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts) +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) { if (iface->defined) error_loc("interface %s already defined at %s:%d\n", @@ -457,6 +457,7 @@ type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit iface->details.iface->inherit = inherit; iface->details.iface->disp_inherit = NULL; iface->details.iface->async_iface = NULL; + iface->details.iface->requires = requires; iface->defined = TRUE; compute_method_indexes(iface); return iface; @@ -485,6 +486,7 @@ type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t if (!iface->details.iface->inherit) error_loc("IDispatch is undefined\n"); iface->details.iface->disp_inherit = NULL; iface->details.iface->async_iface = NULL; + iface->details.iface->requires = NULL; iface->defined = TRUE; compute_method_indexes(iface); return iface; @@ -504,6 +506,7 @@ type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *att if (!dispiface->details.iface->inherit) error_loc("IDispatch is undefined\n"); dispiface->details.iface->disp_inherit = iface; dispiface->details.iface->async_iface = NULL; + dispiface->details.iface->requires = NULL; dispiface->defined = TRUE; compute_method_indexes(dispiface); return dispiface; @@ -561,6 +564,9 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) { + ifref_t *ifref, *required, *tmp; + ifref_list_t *requires; + if (runtimeclass->defined) error_loc("runtimeclass %s already defined at %s:%d\n", runtimeclass->name, runtimeclass->loc_info.input_name, runtimeclass->loc_info.line_number); @@ -569,6 +575,28 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref runtimeclass->defined = TRUE; if (!type_runtimeclass_get_default_iface(runtimeclass)) error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); + + LIST_FOR_EACH_ENTRY(ifref, ifaces, ifref_t, entry) + { + /* FIXME: this should probably not be allowed, here or in coclass, */ + /* but for now there's too many places in Wine IDL where it is to */ + /* even print a warning. */ + if (!(ifref->iface->defined)) continue; + if (!(requires = type_iface_get_requires(ifref->iface))) continue; + LIST_FOR_EACH_ENTRY(required, requires, ifref_t, entry) + { + int found = 0; + + LIST_FOR_EACH_ENTRY(tmp, ifaces, ifref_t, entry) + if ((found = type_is_equal(tmp->iface, required->iface))) break; + + if (!found) + error_loc("interface '%s' also requires interface '%s', " + "but runtimeclass '%s' does not implement it.\n", + ifref->iface->name, required->iface->name, runtimeclass->name); + } + } + return runtimeclass; } @@ -593,8 +621,12 @@ type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs) int type_is_equal(const type_t *type1, const type_t *type2) { + if (type1 == type2) + return TRUE; if (type_get_type_detect_alias(type1) != type_get_type_detect_alias(type2)) return FALSE; + if (type1->namespace != type2->namespace) + return FALSE; if (type1->name && type2->name) return !strcmp(type1->name, type2->name); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8e04537ab4d..9866d2a1e98 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -53,7 +53,7 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); type_t *type_interface_declare(char *name, struct namespace *namespace); -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts); +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); type_t *type_dispinterface_declare(char *name); type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods); type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface); @@ -181,6 +181,13 @@ static inline type_t *type_iface_get_inherit(const type_t *type) return type->details.iface->inherit; } +static inline ifref_list_t *type_iface_get_requires(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); + return type->details.iface->requires; +} + static inline type_t *type_iface_get_async_iface(const type_t *type) { type = type_get_real_type(type); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index facfff21453..e22d425e85b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -386,6 +386,7 @@ struct iface_details struct _type_t *inherit; struct _type_t *disp_inherit; struct _type_t *async_iface; + ifref_list_t *requires; }; struct module_details

1 0

Rémi Bernon : widl: Support WinRT activatable attribute parsing.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 30129c2837244ecb8394ad47aa545818155a11cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=30129c2837244ecb8394ad47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 9 10:37:19 2021 +0100 widl: Support WinRT activatable attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8acc9c9590c..d726e76744e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -320,6 +320,7 @@ static const struct keyword keywords[] = { */ static const struct keyword attr_keywords[] = { + {"activatable", tACTIVATABLE, 1}, {"aggregatable", tAGGREGATABLE, 0}, {"agile", tAGILE, 1}, {"all_nodes", tALLNODES, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b43a1cdd5f2..eaeba90609d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -166,6 +166,7 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS +%token tACTIVATABLE %token tAGGREGATABLE %token tAGILE %token tALLNODES tALLOCATE tANNOTATION @@ -539,6 +540,7 @@ contract_req: decl_spec ',' contract_ver { if ($1->type->type_type != TYPE_APICO } attribute: { $$ = NULL; } + | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } @@ -2162,6 +2164,7 @@ struct allowed_attr struct allowed_attr allowed_attr[] = { /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C AC R <display name> } */ + /* ATTR_ACTIVATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "activatable" }, /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "aggregatable" }, /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 0fba33d6a09..5d4532d6434 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -69,6 +69,7 @@ typedef struct list warning_list_t; enum attr_type { + ATTR_ACTIVATABLE, ATTR_AGGREGATABLE, ATTR_ALLOCATE, ATTR_ANNOTATION,

1 0

Rémi Bernon : server: Grow rawinput buffer instead of allocating its maximum size.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 50798b1320b24e7c74d350853a895b16881c376d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50798b1320b24e7c74d35085… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 12:09:43 2021 +0100 server: Grow rawinput buffer instead of allocating its maximum size. Call of Duty: WWII call GetRawInputBuffer with very large client buffer, so the maximum buffer size may be large and it causes an unnecessary load on wineserver when it allocates and clears the reply buffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index ad886a3ba80..e47980a4aa8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3256,12 +3256,11 @@ DECL_HANDLER(get_rawinput_buffer) struct thread_input *input = current->queue->input; data_size_t size = 0, next_size = 0; struct list *ptr; - char *buf, *cur; - int count = 0; + char *buf, *cur, *tmp; + int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); if (!req->buffer_size) buf = NULL; - else if (!(buf = mem_alloc( get_reply_max_size() ))) - return; + else if (!(buf = mem_alloc( buf_size ))) return; cur = buf; ptr = list_head( &input->msg_list ); @@ -3276,6 +3275,17 @@ DECL_HANDLER(get_rawinput_buffer) next_size = req->rawinput_size; if (size + next_size > req->buffer_size) break; if (cur + sizeof(*data) > buf + get_reply_max_size()) break; + if (cur + sizeof(*data) > buf + buf_size) + { + buf_size += buf_size / 2; + if (!(tmp = realloc( buf, buf_size ))) + { + set_error( STATUS_NO_MEMORY ); + return; + } + cur = tmp + (cur - buf); + buf = tmp; + } memcpy(cur, data, sizeof(*data)); list_remove( &msg->entry );

1 0

Esme Povirk : mscoree: Update Wine Mono to 6.0.0.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: cae84e2b06fca691e3572d68a933a98b94962e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae84e2b06fca691e3572d68… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 8 15:13:32 2021 -0600 mscoree: Update Wine Mono to 6.0.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- dlls/mscoree/tests/comtest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index cfc51155f57..b2e726422da 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.1.1" +#define MONO_VERSION "6.0.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227" +#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index c9edc2d68d0..da587285cfe 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.1.1" +#define WINE_MONO_VERSION "6.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 4b2183bac3a..6c0d081cbd3 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -195,7 +195,7 @@ static void run_registry_test(run_type run) ok(hr == S_OK, "Got %x\n", hr); ok(i == 42, "Expected 42, got %d\n", i); hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); - todo_wine ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); + ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); if (hr == S_OK) IUnknown_Release(unk); ITest_Release(test); }

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk.Caption.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 14905720edf61dd16e9a09ff0bf8612775ba8cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14905720edf61dd16e9a09ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 9 10:12:54 2021 +0100 wbemprox: Implement Win32_LogicalDisk.Caption. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50643 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b86326327fb..498e3f6fc79 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -177,6 +177,7 @@ static const struct column col_ip4routetable[] = }; static const struct column col_logicaldisk[] = { + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"DriveType", CIM_UINT32 }, { L"FileSystem", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -585,6 +586,7 @@ struct record_ip4routetable }; struct record_logicaldisk { + const WCHAR *caption; const WCHAR *device_id; UINT32 drivetype; const WCHAR *filesystem; @@ -2501,6 +2503,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr rec = (struct record_logicaldisk *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), L"%c:", 'A' + i ); + rec->caption = heap_strdupW( device_id ); rec->device_id = heap_strdupW( device_id ); rec->drivetype = type; rec->filesystem = get_filesystem( root ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a0488f40e52..b5de00b5dec 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1905,6 +1905,33 @@ static void test_SystemRestore( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_LogicalDisk( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1955,6 +1982,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_LogicalDisk( services ); test_Win32_NetworkAdapter( services ); test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services );

1 0