April 2021 - Wine-commits - list.winehq.org

Francois Gouget : winetest: Distinguish Windows 8 from Windows 8.1.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: tools Branch: master Commit: eff17bb56292a0c37da69fd314ab799d4c94a287 URL: https://source.winehq.org/git/tools.git/?a=commit;h=eff17bb56292a0c37da69fd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:43:50 2021 +0200 winetest: Distinguish Windows 8 from Windows 8.1. But keep both in the same Windows 8 group. Reformat %idmap so there is roughly one group per line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- winetest/gather | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 12df56a..613c151 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -354,7 +354,7 @@ my @idmatch = ( [ "win7", 2, 6, 1, 1, 0 ], [ "2008", 2, 6, 1, 3, 0 ], [ "win8", 2, 6, 2, undef, 0 ], - [ "win8", 2, 6, 3, undef, 0 ], + [ "win81", 2, 6, 3, undef, 0 ], [ "win10", 2, 10, 0, 1, 0 ], # [ "ce", 3, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, 0 ], diff --git a/winetest/gather b/winetest/gather index ae754d9..bb83c5e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -165,14 +165,23 @@ my %solaris = (name => "Solaris"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, +my @groups = (\%w95, \%w98, \%me, + \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, + \%vista, \%w2k8, \%win7, \%win8, + \%win10, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); # Map dissect's IDs to the above hashes -my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, win8=>\%win8, win10=>\%win10, - unknown=>\%unknown, wine=>\%wine, linux=>\%linux, mac=>\%mac, bsd=>\%bsd, - solaris=>\%solaris); +my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, + nt3 => \%nt3, nt4 => \%nt4, 2000 => \%w2k, + xp => \%xp, 2003 => \%w2k3, + vista => \%vista, 2008 => \%w2k8, + win7 => \%win7, + win8 => \%win8, win81 => \%win8, + win10 => \%win10, + unknown => \%unknown, + wine => \%wine, linux => \%linux, mac => \%mac, + bsd => \%bsd, solaris => \%solaris); #

1 0

Francois Gouget : winetest: Use a separate id for each Windows 10 version.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: tools Branch: master Commit: 89b68b2f2bd6abf5e78df50bda80a7fce70d3ac8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=89b68b2f2bd6abf5e78df50… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:43:59 2021 +0200 winetest: Use a separate id for each Windows 10 version. This allows showing the precise version on the Windows 10 group index. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 61 ++++++++++++++++++++++++++++++++++---------------------- winetest/gather | 11 +++++++--- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 613c151..43b2754 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -304,7 +304,7 @@ $line =~ /^Operating system version:\r?$/ or mydie "no OS header: $line"; $box->{data} .= "<h2>Operating system version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; -my ($wine, $wine_build, $major, $minor, $plid, $product, $host); +my ($wine, $wine_build, $major, $minor, $winbuild, $plid, $product, $host); while ($line = <IN> || "") { last if ($line !~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/); @@ -319,6 +319,8 @@ while ($line = <IN> || "") $major = $2; } elsif ($1 eq "dwMinorVersion") { $minor = $2; + } elsif ($1 eq "dwBuildNumber") { + $winbuild = $2; } elsif ($1 eq "PlatformId") { $plid = $2; } elsif ($1 eq "wProductType") { @@ -340,25 +342,35 @@ if (!defined $plid or !defined $major or !defined $minor or !defined $product) { my @idmatch = ( # Describes how to match a platform's version information # with a dissect platform id: - # dissect id plid major minor product prediluvian - [ "95", 1, 4, 0, undef, 1 ], - [ "98", 1, 4, 10, undef, 1 ], - [ "me", 1, 4, 90, undef, 1 ], - [ "nt3", 2, 3, 51, undef, 1 ], - [ "2000", 2, 5, 0, undef, 1 ], - [ "xp", 2, 5, 1, 1, 0 ], - [ "xp", 2, 5, 2, 1, 0 ], - [ "2003", 2, 5, 2, undef, 0 ], - [ "vista", 2, 6, 0, 1, 0 ], - [ "2008", 2, 6, 0, 3, 0 ], - [ "win7", 2, 6, 1, 1, 0 ], - [ "2008", 2, 6, 1, 3, 0 ], - [ "win8", 2, 6, 2, undef, 0 ], - [ "win81", 2, 6, 3, undef, 0 ], - [ "win10", 2, 10, 0, 1, 0 ], -# [ "ce", 3, undef, undef, undef, 0 ], - [ "unknown", 2, undef, undef, undef, 0 ], - [ "unknown", undef, undef, undef, undef, 1 ], + # dissect id plid major minor build product prediluvian + [ "95", 1, 4, 0, undef, undef, 1 ], + [ "98", 1, 4, 10, undef, undef, 1 ], + [ "me", 1, 4, 90, undef, undef, 1 ], + [ "nt3", 2, 3, 51, undef, undef, 1 ], + [ "2000", 2, 5, 0, undef, undef, 1 ], + [ "xp", 2, 5, 1, undef, 1, 0 ], + [ "xp", 2, 5, 2, undef, 1, 0 ], + [ "2003", 2, 5, 2, undef, undef, 0 ], + [ "vista", 2, 6, 0, undef, 1, 0 ], + [ "2008", 2, 6, 0, undef, 3, 0 ], + [ "win7", 2, 6, 1, undef, 1, 0 ], + [ "2008", 2, 6, 1, undef, 3, 0 ], + [ "win8", 2, 6, 2, undef, undef, 0 ], + [ "win81", 2, 6, 3, undef, undef, 0 ], + [ "win1507", 2, 10, 0, 10240, 1, 0 ], + [ "win1511", 2, 10, 0, 10586, 1, 0 ], + [ "win1607", 2, 10, 0, 14393, 1, 0 ], + [ "win1703", 2, 10, 0, 15063, 1, 0 ], + [ "win1709", 2, 10, 0, 16299, 1, 0 ], + [ "win1803", 2, 10, 0, 17134, 1, 0 ], + [ "win1809", 2, 10, 0, 17763, 1, 0 ], + [ "win1903", 2, 10, 0, 18362, 1, 0 ], + [ "win1909", 2, 10, 0, 18363, 1, 0 ], + [ "win2004", 2, 10, 0, 19041, 1, 0 ], + [ "win2009", 2, 10, 0, 19042, 1, 0 ], +# [ "ce", 3, undef, undef, undef, undef, 0 ], + [ "unknown", 2, undef, undef, undef, undef, 0 ], + [ "unknown", undef, undef, undef, undef, undef, 1 ], ); my ($version, $prediluvian); @@ -367,15 +379,16 @@ foreach my $entry (@idmatch) if ((!defined $entry->[1] or $entry->[1] eq $plid) and (!defined $entry->[2] or $entry->[2] eq $major) and (!defined $entry->[3] or $entry->[3] eq $minor) and - (!defined $entry->[4] or $entry->[4] eq $product)) + (!defined $entry->[4] or $entry->[4] eq $winbuild) and + (!defined $entry->[5] or $entry->[5] eq $product)) { $version = $entry->[0]; - $prediluvian = $entry->[5]; + $prediluvian = $entry->[6]; last; } } -# Give a little slack to the Windows 10 1709. -$maxfailedtests += 20 if ($version eq "win10"); +# Give a little slack to the latest Windows 10. +$maxfailedtests += 20 if ($version =~ /^win200[49]$/); if ($prediluvian and not $acceptprediluvianwin) { diff --git a/winetest/gather b/winetest/gather index bb83c5e..79bea91 100755 --- a/winetest/gather +++ b/winetest/gather @@ -167,8 +167,7 @@ my %wine = (name => "Wine"); # Define the order of version groups in the summary my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, - \%win10, + \%vista, \%w2k8, \%win7, \%win8, \%win10, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); # Map dissect's IDs to the above hashes @@ -178,7 +177,13 @@ my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, vista => \%vista, 2008 => \%w2k8, win7 => \%win7, win8 => \%win8, win81 => \%win8, - win10 => \%win10, + win1507 => \%win10, win1511 => \%win10, + win1607 => \%win10, win1703 => \%win10, + win1709 => \%win10, win1803 => \%win10, + win1809 => \%win10, win1903 => \%win10, + win1909 => \%win10, win2004 => \%win10, + win2009 => \%win10, + win10 => \%win10, # for backward compatibility unknown => \%unknown, wine => \%wine, linux => \%linux, mac => \%mac, bsd => \%bsd, solaris => \%solaris);

1 0

Hugh McMaster : reg: Allow /reg:32 and /reg:64 switches to be passed via the command line.
by Alexandre Julliard 08 Apr '21

08 Apr '21

1 0

Alistair Leslie-Hughes : ntdll: Stub NtQuerySystemInformation(SystemCodeIntegrityInformation).
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 3269da9b46eaec8e3ea263fc8ecfcd24d3d8b6e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3269da9b46eaec8e3ea263fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 7 23:44:38 2021 -0500 ntdll: Stub NtQuerySystemInformation(SystemCodeIntegrityInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49192 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 15 +++++++++++++++ include/winternl.h | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2b316095f4a..d3e380b8c32 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2827,6 +2827,21 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCodeIntegrityInformation: + { + SYSTEM_CODEINTEGRITY_INFORMATION *integrity_info = info; + + FIXME("SystemCodeIntegrityInformation, size %u, info %p, stub!\n", size, info); + + len = sizeof(SYSTEM_CODEINTEGRITY_INFORMATION); + + if (size < len) + integrity_info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); diff --git a/include/winternl.h b/include/winternl.h index 298ebbc2d36..7632cfcb999 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1698,6 +1698,27 @@ typedef enum _SYSTEM_INFORMATION_CLASS { #endif } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; +typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION +{ + ULONG Length; + ULONG CodeIntegrityOptions; +} SYSTEM_CODEINTEGRITY_INFORMATION, *PSYSTEM_CODEINTEGRITY_INFORMATION; + +#define CODEINTEGRITY_OPTION_ENABLED 0x0001 +#define CODEINTEGRITY_OPTION_TESTSIGN 0x0002 +#define CODEINTEGRITY_OPTION_UMCI_ENABLED 0x0004 +#define CODEINTEGRITY_OPTION_UMCI_AUDITMODE_ENABLED 0x0008 +#define CODEINTEGRITY_OPTION_UMCI_EXCLUSIONPATHS_ENABLED 0x0010 +#define CODEINTEGRITY_OPTION_TEST_BUILD 0x0020 +#define CODEINTEGRITY_OPTION_PREPRODUCTION_BUILD 0x0040 +#define CODEINTEGRITY_OPTION_DEBUGMODE_ENABLED 0x0080 +#define CODEINTEGRITY_OPTION_FLIGHT_BUILD 0x0100 +#define CODEINTEGRITY_OPTION_FLIGHTING_ENABLED 0x0200 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_ENABLED 0x0400 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_AUDITMODE_ENABLED 0x0800 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_STRICTMODE_ENABLED 0x1000 +#define CODEINTEGRITY_OPTION_HVCI_IUM_ENABLED 0x2000 + typedef enum _THREADINFOCLASS { ThreadBasicInformation = 0, ThreadTimes,

1 0

Nikolay Sivov : dxva2: Check content formats for software device in GetVideoProcessorRenderTargets().
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 0cd91a522ee39a92b6250e8342f02d9d1e7af0fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd91a522ee39a92b6250e83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 12:19:38 2021 +0300 dxva2: Check content formats for software device in GetVideoProcessorRenderTargets(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 8 ++++++- dlls/dxva2/tests/dxva2.c | 60 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 069f03d8077..8952de17b1e 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -399,7 +399,13 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - /* FIXME: filter some input formats */ + if (!(video_desc->Format == D3DFMT_A8R8G8B8 || + video_desc->Format == D3DFMT_X8R8G8B8 || + video_desc->Format == D3DFMT_YUY2)) + { + WARN("Unsupported content format %#x.\n", video_desc->Format); + return E_FAIL; + } if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) return E_OUTOFMEMORY; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index a49635e7596..1de1712d163 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -78,6 +78,14 @@ static void test_surface_desc(IDirect3DSurface9 *surface) ok(desc.Height == 64, "Unexpected height %u.\n", desc.Height); } +static void init_video_desc(DXVA2_VideoDesc *video_desc, D3DFORMAT format) +{ + memset(video_desc, 0, sizeof(*video_desc)); + video_desc->SampleWidth = 64; + video_desc->SampleHeight = 64; + video_desc->Format = format; +} + static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; @@ -92,11 +100,29 @@ static void test_device_manager(void) D3DFORMAT *formats; UINT token, count; IDirect3D9 *d3d; + unsigned int i; HWND window; GUID *guids; HRESULT hr; RECT rect; + static const D3DFORMAT rt_formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_YUY2, + }; + static const D3DFORMAT rt_unsupported_formats[] = + { + D3DFMT_A1R5G5B5, + D3DFMT_X1R5G5B5, + D3DFMT_A2R10G10B10, + D3DFMT_A8B8G8R8, + D3DFMT_X8B8G8R8, + D3DFMT_R5G6B5, + D3DFMT_UYVY, + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -316,22 +342,36 @@ static void test_device_manager(void) hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoProcessorService, (void **)&proc_service); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - memset(&video_desc, 0, sizeof(video_desc)); - video_desc.SampleWidth = 64; - video_desc.SampleHeight = 64; - video_desc.Format = D3DFMT_A8R8G8B8; + init_video_desc(&video_desc, D3DFMT_A8R8G8B8); hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count, "Unexpected format count %u.\n", count); CoTaskMemFree(guids); - count = 0; - hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, - &video_desc, &count, &formats); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count, "Unexpected format count %u.\n", count); - CoTaskMemFree(formats); + for (i = 0; i < ARRAY_SIZE(rt_formats); ++i) + { + init_video_desc(&video_desc, rt_formats[i]); + + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == S_OK, "Unexpected hr %#x, format %d.\n", hr, rt_formats[i]); + ok(count == 2, "Unexpected format count %u.\n", count); + if (count == 2) + ok(formats[0] == D3DFMT_X8R8G8B8 && formats[1] == D3DFMT_A8R8G8B8, "Unexpected formats %d,%d.\n", + formats[0], formats[1]); + CoTaskMemFree(formats); + } + + for (i = 0; i < ARRAY_SIZE(rt_unsupported_formats); ++i) + { + init_video_desc(&video_desc, rt_unsupported_formats[i]); + + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); + } IDirectXVideoProcessorService_Release(proc_service);

1 0

Nikolay Sivov : winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT for video types.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 800103d127c2c544e91ca3a82b45d5dda5768b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=800103d127c2c544e91ca3a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 12:20:29 2021 +0300 winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT for video types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 821657f8dd8..bb632c2cc2c 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -595,6 +595,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * IMFMediaType_SetUINT64(type, &MF_MT_FRAME_RATE, make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); + IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); return type; }

1 0

Nikolay Sivov : mfplat/tests: Add some more tests for IsCompressedFormat().
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 8511670b37214f95b37bb811118c673a7d84ea9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8511670b37214f95b37bb811… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 12:31:20 2021 +0300 mfplat/tests: Add some more tests for IsCompressedFormat(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..c33d540ba4b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -993,14 +993,28 @@ if(0) ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_COMPRESSED, 0); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + compressed = FALSE; + hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); + ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); + ok(compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_COMPRESSED, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + compressed = TRUE; hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(!compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_DeleteItem(mediatype, &MF_MT_COMPRESSED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); ok(hr == S_OK, "Failed to set GUID value, hr %#x.\n", hr);

1 0

Alexandre Julliard : configure: Fix package name for FAudio.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: f126809ec017570325b98abd797356ceba17e15e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f126809ec017570325b98abd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:45:18 2021 +0200 configure: Fix package name for FAudio. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50436 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index ccbbd943cfe..7d0cd5580fe 100755 --- a/configure +++ b/configure @@ -2728,8 +2728,8 @@ Some influential environment variables: SDL2_CFLAGS C compiler flags for sdl2, overriding pkg-config SDL2_LIBS Linker flags for sdl2, overriding pkg-config FAUDIO_CFLAGS - C compiler flags for faudio, overriding pkg-config - FAUDIO_LIBS Linker flags for faudio, overriding pkg-config + C compiler flags for FAudio, overriding pkg-config + FAUDIO_LIBS Linker flags for FAudio, overriding pkg-config CAPI20_CFLAGS C compiler flags for capi20, overriding pkg-config CAPI20_LIBS Linker flags for capi20, overriding pkg-config @@ -15145,19 +15145,19 @@ if test "x$with_faudio" != "xno" then if ${FAUDIO_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_CFLAGS=`$PKG_CONFIG --cflags faudio 2>/dev/null` + FAUDIO_CFLAGS=`$PKG_CONFIG --cflags FAudio 2>/dev/null` fi fi if ${FAUDIO_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_LIBS=`$PKG_CONFIG --libs faudio 2>/dev/null` + FAUDIO_LIBS=`$PKG_CONFIG --libs FAudio 2>/dev/null` fi fi FAUDIO_LIBS=${FAUDIO_LIBS:-"-lFAudio"} -$as_echo "$as_me:${as_lineno-$LINENO}: faudio cflags: $FAUDIO_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: faudio libs: $FAUDIO_LIBS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio cflags: $FAUDIO_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio libs: $FAUDIO_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FAUDIO_CFLAGS" for ac_header in FAudio.h diff --git a/configure.ac b/configure.ac index 59e20dfb029..cc63766a398 100644 --- a/configure.ac +++ b/configure.ac @@ -1724,7 +1724,7 @@ WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], dnl **** Check for FAudio **** if test "x$with_faudio" != "xno" then - WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, + WINE_PACKAGE_FLAGS(FAUDIO,[FAudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \

1 0

Alexandre Julliard : makefiles: Only allow includes and defines in pkg-config flags.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 4f04994ef47b5077e13c1b770ed0f818f59adcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f04994ef47b5077e13c1b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:43:13 2021 +0200 makefiles: Only allow includes and defines in pkg-config flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50811 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 +---------- configure.ac | 11 +---------- tools/makedep.c | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 7d0cd5580fe..6b183eb4898 100755 --- a/configure +++ b/configure @@ -14620,16 +14620,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstream $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" -ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" +ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } diff --git a/configure.ac b/configure.ac index cc63766a398..5c364bef0d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1608,16 +1608,7 @@ dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,, - [ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gst.h], + [AC_CHECK_HEADER([gst/gst.h], [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], diff --git a/tools/makedep.c b/tools/makedep.c index 8245a324279..0eef646479b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4263,7 +4263,7 @@ static void load_sources( struct makefile *make ) for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); - else + else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 )) strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));

1 0

Alexandre Julliard : ntdll: Add a WINEBOOTSTRAPMODE environment variable to allow loading non-existent builtins.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 446f7e3aa8a906c9213d92f1572e8373286c543a URL: https://source.winehq.org/git/wine.git/?a=commit;h=446f7e3aa8a906c9213d92f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 12:22:25 2021 +0200 ntdll: Add a WINEBOOTSTRAPMODE environment variable to allow loading non-existent builtins. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50905 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 12 ++++++------ dlls/ntdll/unix/env.c | 31 +++++++++++++++++++++++++------ dlls/ntdll/unix/loader.c | 16 ++++------------ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e1810bc5ab9..e919d7e2671 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1926,14 +1926,10 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, static void build_ntdll_module(void) { MEMORY_BASIC_INFORMATION meminfo; - FILE_BASIC_INFORMATION basic_info; UNICODE_STRING nt_name; - OBJECT_ATTRIBUTES attr; WINE_MODREF *wm; RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); - InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); - is_prefix_bootstrap = NtQueryAttributesFile( &attr, &basic_info) != STATUS_SUCCESS; NtQueryVirtualMemory( GetCurrentProcess(), build_ntdll_module, MemoryBasicInformation, &meminfo, sizeof(meminfo), NULL ); wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); @@ -2672,7 +2668,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - else if (is_prefix_bootstrap && !wcspbrk( search, L":/\\" )) + else if (is_prefix_bootstrap && !contains_path( search )) status = find_builtin_without_file( search, nt_name, pwm, mapping, image_info, id ); done: @@ -3498,10 +3494,14 @@ static void process_breakpoint(void) static void load_global_options(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING name_str; + UNICODE_STRING name_str, val_str; HANDLE hkey; ULONG value; + RtlInitUnicodeString( &name_str, L"WINEBOOTSTRAPMODE" ); + val_str.MaximumLength = 0; + is_prefix_bootstrap = RtlQueryEnvironmentVariable_U( NULL, &name_str, &val_str ) != STATUS_VARIABLE_NOT_FOUND; + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &name_str; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 10089a740c2..01d4f3ea418 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -64,6 +64,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); USHORT *uctable = NULL, *lctable = NULL; SIZE_T startup_info_size = 0; +BOOL is_prefix_bootstrap = FALSE; + +static const WCHAR bootstrapW[] = {'W','I','N','E','B','O','O','T','S','T','R','A','P','M','O','D','E'}; int main_argc = 0; char **main_argv = NULL; @@ -1211,6 +1214,18 @@ static WCHAR *find_env_var( WCHAR *env, SIZE_T size, const WCHAR *name, SIZE_T n return NULL; } +static WCHAR *get_env_var( WCHAR *env, SIZE_T size, const WCHAR *name, SIZE_T namelen ) +{ + WCHAR *ret = NULL, *var = find_env_var( env, size, name, namelen ); + + if (var) + { + var += namelen + 1; /* skip name */ + if ((ret = malloc( (wcslen(var) + 1) * sizeof(WCHAR) ))) wcscpy( ret, var ); + } + return ret; +} + /* set an environment variable, replacing it if it exists */ static void set_env_var( WCHAR **env, SIZE_T *pos, SIZE_T *size, const WCHAR *name, SIZE_T namelen, const WCHAR *value ) @@ -1889,29 +1904,32 @@ static inline WCHAR *get_dos_path( WCHAR *nt_path ) */ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) { + static const WCHAR valueW[] = {'1',0}; static const WCHAR pathW[] = {'P','A','T','H'}; RTL_USER_PROCESS_PARAMETERS *params = NULL; SIZE_T size, env_pos, env_size; - WCHAR *dst, *image, *cmdline, *p, *path = NULL; + WCHAR *dst, *image, *cmdline, *path, *bootstrap; WCHAR *env = get_initial_environment( &env_pos, &env_size ); WCHAR *curdir = get_initial_directory(); void *module = NULL; NTSTATUS status; /* store the initial PATH value */ - if ((p = find_env_var( env, env_pos, pathW, 4 ))) - { - path = malloc( (wcslen(p + 5) + 1) * sizeof(WCHAR) ); - wcscpy( path, p + 5 ); - } + path = get_env_var( env, env_pos, pathW, 4 ); add_dynamic_environment( &env, &env_pos, &env_size ); add_registry_environment( &env, &env_pos, &env_size ); + bootstrap = get_env_var( env, env_pos, bootstrapW, ARRAY_SIZE(bootstrapW) ); + set_env_var( &env, &env_pos, &env_size, bootstrapW, ARRAY_SIZE(bootstrapW), valueW ); + is_prefix_bootstrap = TRUE; env[env_pos] = 0; run_wineboot( env, env_pos ); /* reload environment now that wineboot has run */ set_env_var( &env, &env_pos, &env_size, pathW, 4, path ); /* reset PATH */ free( path ); + set_env_var( &env, &env_pos, &env_size, bootstrapW, ARRAY_SIZE(bootstrapW), bootstrap ); + is_prefix_bootstrap = !!bootstrap; + free( bootstrap ); add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; @@ -2012,6 +2030,7 @@ void init_startup_info(void) memcpy( env, (char *)info + info_size, env_size * sizeof(WCHAR) ); env_pos = env_size - 1; add_dynamic_environment( &env, &env_pos, &env_size ); + is_prefix_bootstrap = !!find_env_var( env, env_pos, bootstrapW, ARRAY_SIZE(bootstrapW) ); env[env_pos++] = 0; size = (sizeof(*params) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e362f5eb4db..cbafa0d8882 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1387,10 +1387,10 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) { static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','w','o','w','6','4'}; - BOOL is_prefix_bootstrap; unsigned int len; - struct stat st; - char *ntdll; + + /* only fake builtin existence during prefix bootstrap */ + if (!is_prefix_bootstrap) return FALSE; *machine = current_machine; if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && @@ -1413,15 +1413,7 @@ found: len = wcslen(system_dir); while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; - if (len != path->Length / sizeof(WCHAR)) return FALSE; - - /* if the corresponding ntdll exists, don't fake the existence of the builtin */ - ntdll = build_path( config_dir, *machine == IMAGE_FILE_MACHINE_I386 ? - "dosdevices/c:/windows/syswow64/ntdll.dll" : - "dosdevices/c:/windows/system32/ntdll.dll" ); - is_prefix_bootstrap = stat( ntdll, &st ) == -1; - free( ntdll ); - return is_prefix_bootstrap; + return (len == path->Length / sizeof(WCHAR)); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d0fa7a54f49..0f14e69f2be 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -120,6 +120,7 @@ extern const char **dll_paths DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; extern SIZE_T startup_info_size DECLSPEC_HIDDEN; +extern BOOL is_prefix_bootstrap DECLSPEC_HIDDEN; extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN;

1 0