January 2021 - Wine-Commits

Nikolay Sivov : mfmediaengine: Use consistent format for traces.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 21ae610d14f0d508c1b20c8af8516e118e00f4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ae610d14f0d508c1b20c8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:01 2021 +0300 mfmediaengine: Use consistent format for traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 8c3b4f41229..65f207bd4b5 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -952,7 +952,7 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) @@ -972,7 +972,7 @@ static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedIncrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -999,7 +999,7 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedDecrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) free_media_engine(engine); @@ -1978,7 +1978,7 @@ static IMFMediaEngineClassFactory media_engine_factory = { &media_engine_factory static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - TRACE("(%s, %p).\n", debugstr_guid(riid), obj); + TRACE("%s, %p.\n", debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) @@ -2005,7 +2005,7 @@ static ULONG WINAPI classfactory_Release(IClassFactory *iface) static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", outer, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), obj); *obj = NULL; @@ -2034,7 +2034,7 @@ static IClassFactory classfactory = { &class_factory_vtbl }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) { - TRACE("(%s, %s, %p).\n", debugstr_guid(clsid), debugstr_guid(riid), obj); + TRACE("%s, %s, %p.\n", debugstr_guid(clsid), debugstr_guid(riid), obj); if (IsEqualGUID(clsid, &CLSID_MFMediaEngineClassFactory)) return IClassFactory_QueryInterface(&classfactory, riid, obj);

1 0

Brendan Shanks : loader: On Mac, move the top-down allocations area down to avoid Rosetta regions.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 720611e28e750b42c7b8d7a2b72047e3027c1ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=720611e28e750b42c7b8d7a2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:45 2021 -0800 loader: On Mac, move the top-down allocations area down to avoid Rosetta regions. On Apple Silicon, Rosetta's shared cache starts at 0x7ffe00000000 and the runtime is mapped below that. Put the top-down allocation area below the runtime with plenty of room to spare. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e6..d86675538bb 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -79,7 +79,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ - { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Rémi Bernon : include: Add IWMPMedia2 interface to wmp.idl.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 90f0542f4341a38b82061f2ffde6e910fcdab514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f0542f4341a38b82061f2f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:52 2021 +0100 include: Add IWMPMedia2 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index b845865103d..2a438b00ce7 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -843,6 +843,18 @@ library WMPLib { HRESULT customUrl([out, retval] BSTR *pbstrCustomUrl); } + [ + odl, + uuid(ab7c88bb-143e-4ea4-acc3-e4350b2106c3), + dual, + oleautomation + ] + interface IWMPMedia2 : IWMPMedia + { + [id(0x0300), propget] + HRESULT error([out, retval] IWMPErrorItem **out); + } + [ odl, uuid(a12dcf7d-14ab-4c1b-a8cd-63909f06025b), @@ -1473,7 +1485,7 @@ library WMPLib { interface IWMPClosedCaption; interface IWMPDVD; interface IWMPControls2; - /* interface IWMPMedia2; */ + interface IWMPMedia2; /* interface IWMPMedia3; */ /* interface IWMPMetadataPicture; */ /* interface IWMPMetadataText; */

1 0

Rémi Bernon : include: Add IWmpControls2 interface to wmp.idl.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 6eb546c12ca8fe576d764caa3b3bfdc04bb154f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb546c12ca8fe576d764caa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:51 2021 +0100 include: Add IWmpControls2 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 8a146bdbea9..b845865103d 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,18 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(6f030d25-0890-480f-9775-1f7e40ab5b8e), + dual, + oleautomation + ] + interface IWMPControls2 : IWMPControls + { + [id(0x0040)] + HRESULT step([in] long lStep); + } + [ odl, uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), @@ -1460,7 +1472,7 @@ library WMPLib { /* interface IWMPErrorItem2; */ interface IWMPClosedCaption; interface IWMPDVD; - /* interface IWMPControls2; */ + interface IWMPControls2; /* interface IWMPMedia2; */ /* interface IWMPMedia3; */ /* interface IWMPMetadataPicture; */

1 0

Rémi Bernon : include: Add IWMPRemoteMediaServices interface to wmp.idl.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: af1181bbde5d6ef67f39d1a3ce58f400af0fb91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1181bbde5d6ef67f39d1a3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:50 2021 +0100 include: Add IWMPRemoteMediaServices interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/wmp.idl b/include/wmp.idl index 442b7021383..8a146bdbea9 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,22 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), + oleautomation + ] + interface IWMPRemoteMediaServices : IUnknown + { + HRESULT GetServiceType([out, retval] BSTR *type); + + HRESULT GetApplicationName([out, retval] BSTR *name); + + HRESULT GetScriptableObject([out, retval] BSTR *name, [out, retval] IDispatch **out); + + HRESULT GetCustomUIMode([out, retval] BSTR *file); + } + [ odl, uuid(9104d1ab-80c9-4fed-abf0-2e6417a6df14),

1 0

Rémi Bernon : include: Add IWMPMedia3 interface to wmp.idl.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 4b74eb09a6ebca81c79cce84a67a28ef995df7e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b74eb09a6ebca81c79cce84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:53 2021 +0100 include: Add IWMPMedia3 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 2a438b00ce7..ac2fa27effc 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -855,6 +855,21 @@ library WMPLib { HRESULT error([out, retval] IWMPErrorItem **out); } + [ + odl, + uuid(f118efc7-f03a-4fb4-99c9-1c02a5c1065b), + dual, + oleautomation + ] + interface IWMPMedia3 : IWMPMedia2 + { + [id(0x0301)] + HRESULT getAttributeCountByType([in] BSTR type, [in] BSTR language, [out, retval] long *out); + + [id(0x0302)] + HRESULT getItemInfoByType([in] BSTR type, [in] BSTR language, [in] long index, [out, retval] VARIANT *out); + } + [ odl, uuid(a12dcf7d-14ab-4c1b-a8cd-63909f06025b), @@ -1486,7 +1501,7 @@ library WMPLib { interface IWMPDVD; interface IWMPControls2; interface IWMPMedia2; - /* interface IWMPMedia3; */ + interface IWMPMedia3; /* interface IWMPMetadataPicture; */ /* interface IWMPMetadataText; */ /* interface IWMPSettings2; */

1 0

Matteo Bruni : vkd3d-compiler: Set default source type before handling --print-target-types.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: vkd3d Branch: master Commit: 5399f6fcc6cbf77a25b860eee9e500539df4fab6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5399f6fcc6cbf77a25b860e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 28 18:43:43 2021 +0100 vkd3d-compiler: Set default source type before handling --print-target-types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 94cce20..e98e713 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -480,14 +480,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } - if (options->print_target_types) - return true; - if (options->source_type == VKD3D_SHADER_SOURCE_NONE) options->source_type = options->preprocess_only ? VKD3D_SHADER_SOURCE_HLSL : VKD3D_SHADER_SOURCE_DXBC_TPF; if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + if (options->print_target_types) + return true; + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n",

1 0

Zebediah Figura : vkd3d-shader: Import the HLSL compiler from Wine.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: vkd3d Branch: master Commit: b523122ef3698c620a705d99aab2e6ba66877e87 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b523122ef3698c620a705d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 27 10:29:44 2021 -0600 vkd3d-shader: Import the HLSL compiler from Wine. This corresponds to Wine commit 9f9fec18799bf59df6211b7294f8d338caa7f4db. Note that for the moment, compilation messages have not been ported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 16 +- libs/vkd3d-shader/hlsl.c | 1672 +++++++++++++++++ libs/vkd3d-shader/hlsl.h | 644 +++++++ libs/vkd3d-shader/hlsl.l | 288 +++ libs/vkd3d-shader/hlsl.y | 2961 ++++++++++++++++++++++++++++++ libs/vkd3d-shader/trace.c | 9 + libs/vkd3d-shader/vkd3d_shader_main.c | 13 +- libs/vkd3d-shader/vkd3d_shader_private.h | 9 + 8 files changed, 5609 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b523122ef3698c620a7…

1 0

Matteo Bruni : vkd3d-compiler: Update usage message for the -x option.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: vkd3d Branch: master Commit: abe7051e99e79d18c10351aa4917cce317825031 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abe7051e99e79d18c10351a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 28 18:43:44 2021 +0100 vkd3d-compiler: Update usage message for the -x option. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e98e713..fb19a70 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -178,8 +178,10 @@ static void print_usage(const char *program_name) " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" - " -x <type> Specify the type of the source. Valid values are\n" - " 'dxbc-tpf' and 'none'.\n" + " -x <type> Specify the type of the source. Use --print-source-types\n" + " to list valid source types. The default source type is\n" + " 'dxbc-tpf' for compile operations, and 'hlsl' for\n" + " preprocess operations.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n"

1 0

Francois Gouget : testbot/TestWTBS: Automatically check the 'Task:' build and wine lines.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: tools Branch: master Commit: 6e74b064f686a77b36341f72eec86c33acf86c5b URL: https://source.winehq.org/git/tools.git/?a=commit;h=6e74b064f686a77b36341f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 05:03:04 2021 +0100 testbot/TestWTBS: Automatically check the 'Task:' build and wine lines. The automatic checks only cover the simple cases which is the majority, thus allowing to simplify the TestWTBS directives. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 6f78406..bc4e0d9 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -362,14 +362,43 @@ sub LoadTestInfo($) foreach my $TaskType (@$TaskTypes) { my $TaskInfo = $TestInfo->{$TaskType}; - if (!defined $TaskInfo->{$Field}) - { - $TaskInfo->{$Field} = $SrcVal; - } + next if (defined $TaskInfo->{$Field}); + # Copy arrays to avoid side-effects when adding built-in defaults + $TaskInfo->{$Field} = ref($SrcVal) eq "ARRAY" ? [ @$SrcVal ] : $SrcVal; } } } + # Automatically check the Task: lines in simple cases + # Make sure no test is run for build tasks + my $GrepV = ($TestInfo->{build}->{"report.GrepV"} ||= []); + push @$GrepV, '.'; + $GrepV = ($TestInfo->{build}->{"log.GrepV"} ||= []); + push @$GrepV, '^Task: tests$'; + if (($TestInfo->{build}->{Status} || "") =~ /^bad(?:build|patch)$/ or + $TestInfo->{build}->{HasTimeout}) + { + push @$GrepV, '^Task: ok$'; + } + else + { + my $Grep = ($TestInfo->{build}->{"log.Grep"} ||= []); + push @$Grep, '^Task: ok$'; + } + + # Note: Depending on where the timeout occurs, the wine task log may or + # may not have a 'Task: ok' line. + if (($TestInfo->{wine}->{Status} || "") eq "completed" and + !$TestInfo->{wine}->{HasTimeout}) + { + my $Grep = ($TestInfo->{wine}->{"log.Grep"} ||= []); + if (CheckValue($TestInfo->{wine}->{TestUnits})) + { + push @$Grep, '^Task: tests$'; + } + push @$Grep, '^Task: ok$'; + } + # Validate and fix the Grep* fields foreach my $GrepType ("Grep", "GrepV") {

1 0