May 2020 - Wine-commits - list.winehq.org

Vladimir Panteleev : kernelbase: Fix GetEnvironmentVariableW return for empty variables.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: c4ef987429cef13bec1b7762bd70d99fee10670c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ef987429cef13bec1b7762… Author: Vladimir Panteleev <git(a)vladimir.panteleev.md> Date: Thu May 14 23:12:26 2020 +0200 kernelbase: Fix GetEnvironmentVariableW return for empty variables. Do the same thing as Vista and up. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48471 Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/environ.c | 20 ++++++++++++++++++++ dlls/kernelbase/process.c | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 5de7980bca..3c1563a331 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -168,6 +168,16 @@ static void test_GetSetEnvironmentVariableA(void) "%s should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d and buf=%s\n", name, ret_size, GetLastError(), buf); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableA(name, NULL, 0); + ok(ret_size == 1 || + broken(ret_size == 0), /* XP */ + "should return 1 for empty string but ret_size=%d GetLastError=%d\n", + ret_size, GetLastError()); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_MORE_DATA), /* XP */ + "should not fail with zero size but GetLastError=%d\n", GetLastError()); + /* Test the limits */ SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(NULL, NULL, 0); @@ -277,6 +287,16 @@ static void test_GetSetEnvironmentVariableW(void) ret_size, GetLastError()); ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string\n"); + SetLastError(0xdeadbeef); + ret_size = GetEnvironmentVariableW(name, NULL, 0); + ok(ret_size == 1 || + broken(ret_size == 0), /* XP */ + "should return 1 for empty string but ret_size=%d GetLastError=%d\n", + ret_size, GetLastError()); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_MORE_DATA), /* XP */ + "should not fail with zero size but GetLastError=%d\n", GetLastError()); + /* Test the limits */ SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(NULL, NULL, 0); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 7cad3e6678..67fcb5f04e 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1397,7 +1397,8 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableW( LPCWSTR name, LPWSTR val len = us_value.Length / sizeof(WCHAR); if (status == STATUS_BUFFER_TOO_SMALL) return len + 1; if (!set_ntstatus( status )) return 0; - if (size) val[len] = 0; + if (!size) return len + 1; + val[len] = 0; return len; }

1 0

Vincent Povirk : gdiplus: Don't set a palette when loading non-indexed images.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: ed2d0df4f78a7f73564fcc5cbf94a54e3475fe31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed2d0df4f78a7f73564fcc5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 14 20:51:09 2020 -0500 gdiplus: Don't set a palette when loading non-indexed images. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4fd7d95a9c..17cccf2b42 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -58,11 +58,11 @@ static const struct { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, - { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, - { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, 0 }, + { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, 0 }, + { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, 0 }, + { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, 0 }, + { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, 0 }, { NULL } }; @@ -82,7 +82,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT hr = WINCODEC_ERR_PALETTEUNAVAILABLE; if (frame) hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette); - if (hr != S_OK) + if (hr != S_OK && palette_type != 0) { TRACE("using predefined palette %#x\n", palette_type); hr = IWICPalette_InitializePredefined(wic_palette, palette_type, FALSE);

1 0

Vincent Povirk : gdiplus: Return an error retrieving the palette for a metafile.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 8b9cff6e7083042e46ee28cffa89a97c53d3a9a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9cff6e7083042e46ee28cf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 14 20:51:10 2020 -0500 gdiplus: Return an error retrieving the palette for a metafile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 17cccf2b42..cafe69d8f4 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2285,6 +2285,12 @@ GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage *image, INT *size) if(!image || !size) return InvalidParameter; + if (image->type == ImageTypeMetafile) + { + *size = 0; + return GenericError; + } + if (!image->palette || image->palette->Count == 0) *size = sizeof(ColorPalette); else

1 0

Vincent Povirk : gdiplus: Add tests for image palette size.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 606ba15ac57e33641503a38a4f00c1ce3feb96a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=606ba15ac57e33641503a38a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 14 20:51:11 2020 -0500 gdiplus: Add tests for image palette size. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f63346e1db..de6fad093d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3583,20 +3583,22 @@ static void test_image_properties(void) UINT prop_size2; /* if win7 behaves differently */ UINT prop_id; UINT prop_id2; /* if win7 behaves differently */ + INT palette_size; } td[] = { - { pngimage, sizeof(pngimage), ImageTypeBitmap, 4, ~0, 1, 20, 0x5110, 0x132 }, - { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2, ~0, 128, 0, 0x5090, 0x5091 }, - { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16, 0, 4, 0, 0xfe, 0 }, - { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0, 0, 0, 0, 0, 0 }, - { wmfimage, sizeof(wmfimage), ImageTypeMetafile, 0, 0, 0, 0, 0, 0 } + { pngimage, sizeof(pngimage), ImageTypeBitmap, 4, ~0, 1, 20, 0x5110, 0x132, 12 }, + { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2, ~0, 128, 0, 0x5090, 0x5091, 12 }, + { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16, 0, 4, 0, 0xfe, 0, 12 }, + { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0, 0, 0, 0, 0, 0, 16 }, + { wmfimage, sizeof(wmfimage), ImageTypeMetafile, 0, 0, 0, 0, 0, 0, -GenericError } }; GpStatus status; GpImage *image; UINT prop_count, prop_size, i; PROPID prop_id[16] = { 0 }; ImageType image_type; + INT palette_size; union { PropertyItem data; @@ -3617,6 +3619,21 @@ static void test_image_properties(void) ok(td[i].image_type == image_type, "%u: expected image_type %d, got %d\n", i, td[i].image_type, image_type); + palette_size = -1; + status = GdipGetImagePaletteSize(image, &palette_size); + if (td[i].palette_size >= 0) + { + ok(status == Ok, "%u: GdipGetImagePaletteSize error %d\n", i, status); + ok(td[i].palette_size == palette_size, "%u: expected palette_size %d, got %d\n", + i, td[i].palette_size, palette_size); + } + else + { + ok(status == -td[i].palette_size, "%u: GdipGetImagePaletteSize returned %d\n", i, status); + ok(palette_size == 0, "%u: expected palette_size 0, got %d\n", + i, palette_size); + } + status = GdipGetPropertyCount(image, &prop_count); ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status); todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage)

1 0

Alexandre Julliard : ntoskrnl.exe: Avoid a few more ntdll forwards.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: cb36b615e1008a4d14156f03e06d54469ccc2302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb36b615e1008a4d14156f03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 11:43:38 2020 +0200 ntoskrnl.exe: Avoid a few more ntdll forwards. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index cc3fe31b08..7d6baae31f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1016,7 +1016,7 @@ @ stub RtlCreateSystemVolumeInformationFolder @ stdcall RtlCreateUnicodeString(ptr wstr) @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) -@ stdcall RtlCustomCPToUnicodeN(ptr ptr long ptr str long) ntdll.RtlCustomCPToUnicodeN +@ stdcall RtlCustomCPToUnicodeN(ptr ptr long ptr str long) @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stub RtlDecompressChunks @ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) @@ -1104,7 +1104,7 @@ @ stdcall RtlImageNtHeader(long) @ stdcall RtlInitAnsiString(ptr str) @ stdcall RtlInitAnsiStringEx(ptr str) -@ stdcall RtlInitCodePageTable(ptr ptr) ntdll.RtlInitCodePageTable +@ stdcall RtlInitCodePageTable(ptr ptr) @ stdcall RtlInitString(ptr str) @ stdcall RtlInitUnicodeString(ptr wstr) @ stdcall RtlInitUnicodeStringEx(ptr wstr) @@ -1128,18 +1128,18 @@ @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringW(ptr ptr) -@ stdcall RtlIpv4StringToAddressA(str long ptr ptr) ntdll.RtlIpv4StringToAddressA -@ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) ntdll.RtlIpv4StringToAddressExA +@ stdcall RtlIpv4StringToAddressA(str long ptr ptr) +@ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) @ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) @ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr) @ stub RtlIpv6AddressToStringA @ stub RtlIpv6AddressToStringExA @ stub RtlIpv6AddressToStringExW @ stub RtlIpv6AddressToStringW -@ stdcall RtlIpv6StringToAddressA(str ptr ptr) ntdll.RtlIpv6StringToAddressA -@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr) ntdll.RtlIpv6StringToAddressExA +@ stdcall RtlIpv6StringToAddressA(str ptr ptr) +@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr) @ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) -@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr) ntdll.RtlIpv6StringToAddressW +@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr) @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) @@ -1250,7 +1250,7 @@ @ stdcall RtlUnicodeStringToInteger(ptr long ptr) @ stdcall RtlUnicodeStringToOemSize(ptr) @ stdcall RtlUnicodeStringToOemString(ptr ptr long) -@ stdcall RtlUnicodeToCustomCPN(ptr ptr long ptr wstr long) ntdll.RtlUnicodeToCustomCPN +@ stdcall RtlUnicodeToCustomCPN(ptr ptr long ptr wstr long) @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) @@ -1263,7 +1263,7 @@ @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToCountedOemString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToOemString(ptr ptr long) -@ stdcall RtlUpcaseUnicodeToCustomCPN(ptr ptr long ptr wstr long) ntdll.RtlUpcaseUnicodeToCustomCPN +@ stdcall RtlUpcaseUnicodeToCustomCPN(ptr ptr long ptr wstr long) @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr ptr long) @ stdcall RtlUpperChar(long)

1 0

Hans Leidekker : crypt32: Recognize 'Microsoft Root Certificate Authority 2010' when verifying the Microsoft root policy.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 403b83fdb11a696165c1c285f456216cd5b02b6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=403b83fdb11a696165c1c285… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 15 14:42:59 2020 +0200 crypt32: Recognize 'Microsoft Root Certificate Authority 2010' when verifying the Microsoft root policy. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 935fd6e344..4712024d3a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3660,6 +3660,44 @@ static BYTE msPubKey3[] = { 0x60,0x1e,0x7a,0x5b,0x38,0xc8,0x8f,0xbb,0x04,0x26,0x7c,0xd4,0x16,0x40,0xe5, 0xb6,0x6b,0x6c,0xaa,0x86,0xfd,0x00,0xbf,0xce,0xc1,0x35,0x02,0x03,0x01,0x00, 0x01 }; +/* from Microsoft Root Certificate Authority 2010 */ +static BYTE msPubKey4[] = { +0x30,0x82,0x02,0x0a,0x02,0x82,0x02,0x01,0x00,0xb9,0x08,0x9e,0x28,0xe4,0xe4, +0xec,0x06,0x4e,0x50,0x68,0xb3,0x41,0xc5,0x7b,0xeb,0xae,0xb6,0x8e,0xaf,0x81, +0xba,0x22,0x44,0x1f,0x65,0x34,0x69,0x4c,0xbe,0x70,0x40,0x17,0xf2,0x16,0x7b, +0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39,0xf4,0x1b,0xa8,0xad,0x92,0x90,0x1e,0xcb, +0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10,0x2e,0x3c,0x05,0x8d,0x8a,0x6d,0x24, +0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50,0x9c,0x15,0xa5,0x17,0x74,0x88, +0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4,0x6f,0x28,0x78,0xce,0x5c, +0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe,0xa1,0x9a,0x2c,0x96,0x15, +0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31,0x11,0xc4,0x28,0x36,0x94, +0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00,0xb2,0x5b,0x0c,0xe6,0x96, +0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b,0xd7,0xcb,0xb7,0x21,0x62, +0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a,0x46,0x98,0xc0,0x9b,0xc0, +0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a,0x8e,0xf2,0x9f,0x18,0x89, +0xe4,0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5,0x0e,0xd8,0x6f,0x9c,0xed, +0xe2,0x45,0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81,0x45,0xe3,0xaa,0x21,0x40, +0x26,0xa1,0x72,0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e,0xee,0x83,0x58,0xb1,0x5e, +0x06,0x63,0x99,0x62,0x91,0x78,0x82,0xb7,0x0d,0x93,0x0c,0x24,0x6a,0xb4,0x1b, +0xdb,0x27,0xec,0x5f,0x95,0x04,0x3f,0x93,0x4a,0x30,0xf5,0x97,0x18,0xb3,0xa7, +0xf9,0x19,0xa7,0x93,0x33,0x1d,0x01,0xc8,0xdb,0x22,0x52,0x5c,0xd7,0x25,0xc9, +0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43,0xbe,0x9b,0x62,0xb1,0x8d,0x2d,0x86,0x44, +0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09,0xfa,0xae,0x89,0xc4,0x41,0x2a,0x22, +0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c,0xa8,0xca,0x0d,0x2f,0xfb,0x52, +0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f,0xad,0x67,0xd6,0xa7,0x50, +0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a,0x43,0xb7,0xfb,0xae,0xf9, +0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9,0xc3,0xee,0xb0,0xc2,0x85, +0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c,0x3f,0xd6,0x5d,0xa3,0xe5, +0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00,0xe3,0xb8,0x38,0xab,0x83, +0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3,0x30,0xd1,0x1a,0x5a,0xc8, +0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad,0x7a,0xec,0xcb,0x41,0x60, +0xf3,0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51,0xc6,0x2e,0x80,0xc2,0xe2, +0x77,0x15,0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91,0xee,0x00,0xb5,0xa3,0x70, +0xec,0x9f,0xe3,0x8d,0x80,0x68,0x83,0x76,0xba,0xaf,0x5d,0x70,0x52,0x22,0x16, +0xe2,0x66,0xfb,0xba,0xb3,0xc5,0xc2,0xf7,0x3e,0x2f,0x77,0xa6,0xca,0xde,0xc1, +0xa6,0xc6,0x48,0x4c,0xc3,0x37,0x51,0x23,0xd3,0x27,0xd7,0xb8,0x4e,0x70,0x96, +0xf0,0xa1,0x44,0x76,0xaf,0x78,0xcf,0x9a,0xe1,0x66,0x13,0x02,0x03,0x01,0x00, +0x01 }; static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, @@ -3677,6 +3715,7 @@ static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, { sizeof(msPubKey1), msPubKey1 }, { sizeof(msPubKey2), msPubKey2 }, { sizeof(msPubKey3), msPubKey3 }, + { sizeof(msPubKey4), msPubKey4 }, }; PCERT_SIMPLE_CHAIN rootChain = pChainContext->rgpChain[pChainContext->cChain -1 ];

1 0

Hans Leidekker : crypt32: Microsoft root policy does not include the base policy.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 1f277190079f23b8a0b197fd8952c25028f70ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f277190079f23b8a0b197fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 15 14:43:00 2020 +0200 crypt32: Microsoft root policy does not include the base policy. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 57 +++--- dlls/crypt32/tests/chain.c | 440 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 468 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f277190079f23b8a0b1…

1 0

Nikolay Sivov : mfreadwrite/reader: Consider end-of-stream state when picking stream for MF_SOURCE_READER_ANY_STREAM requests.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 855c9bd6486b8394b4ea6581feddc68a914e5333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=855c9bd6486b8394b4ea6581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 16:03:50 2020 +0300 mfreadwrite/reader: Consider end-of-stream state when picking stream for MF_SOURCE_READER_ANY_STREAM requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 60 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index eaf52ce31e..e69c2b980b 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -114,6 +114,7 @@ struct media_stream enum media_stream_state state; unsigned int flags; unsigned int requests; + unsigned int responses; }; enum source_reader_async_op @@ -360,6 +361,7 @@ static void source_reader_queue_response(struct source_reader *reader, struct me IMFSample_AddRef(response->sample); list_add_tail(&reader->responses, &response->entry); + stream->responses++; if (stream->requests) { @@ -831,6 +833,22 @@ static ULONG WINAPI source_reader_async_commands_callback_Release(IMFAsyncCallba return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } +static struct stream_response * media_stream_detach_response(struct source_reader *reader, struct stream_response *response) +{ + struct media_stream *stream; + + list_remove(&response->entry); + + if (response->stream_index < reader->stream_count) + { + stream = &reader->streams[response->stream_index]; + if (stream->responses) + --stream->responses; + } + + return response; +} + static struct stream_response *media_stream_pop_response(struct source_reader *reader, struct media_stream *stream) { struct stream_response *response; @@ -841,20 +859,13 @@ static struct stream_response *media_stream_pop_response(struct source_reader *r LIST_FOR_EACH_ENTRY(response, &reader->responses, struct stream_response, entry) { if (response->stream_index == stream->index) - { - list_remove(&response->entry); - return response; - } + return media_stream_detach_response(reader, response); } } else { if ((head = list_head(&reader->responses))) - { - response = LIST_ENTRY(head, struct stream_response, entry); - list_remove(&response->entry); - return response; - } + return media_stream_detach_response(reader, LIST_ENTRY(head, struct stream_response, entry)); } return NULL; @@ -979,20 +990,35 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m static HRESULT source_reader_get_first_selected_stream(struct source_reader *reader, unsigned int flags, unsigned int *stream_index) { - unsigned int i; - BOOL selected; + unsigned int i, first_selected = ~0u; + BOOL selected, stream_drained; for (i = 0; i < reader->stream_count; ++i) { - source_reader_get_stream_selection(reader, i, &selected); - if (SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected && - !(reader->streams[i].flags & flags)) + stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; + selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; + + if (selected && !(reader->streams[i].flags & flags)) { - *stream_index = i; - break; + if (first_selected == ~0u) + first_selected = i; + + if (!stream_drained) + { + *stream_index = i; + break; + } } } + /* If all selected streams reached EOS, use first selected. This fallback only applies after reader went through all + selected streams once. */ + if (i == reader->stream_count && first_selected != ~0u && !flags) + { + *stream_index = first_selected; + i = first_selected; + } + return i == reader->stream_count ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } @@ -1046,7 +1072,7 @@ static void source_reader_release_responses(struct source_reader *reader, struct { continue; } - list_remove(&ptr->entry); + media_stream_detach_response(reader, ptr); source_reader_release_response(ptr); } }

1 0

Derek Lesho : mf/samplegrabber: Attach markers to previously queued sample, not the next.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: b9ec2719fc7cad070d51b05fd2c48293ee7b98ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ec2719fc7cad070d51b05f… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri May 15 18:32:52 2020 +0300 mf/samplegrabber: Attach markers to previously queued sample, not the next. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 60 +++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 7d9fa78732..adb4ded54f 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -708,61 +708,43 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_GetParameters(IMFAsyn return E_NOTIMPL; } -static struct scheduled_item *stream_get_next_item(struct sample_grabber *grabber) -{ - struct scheduled_item *item = NULL; - struct list *e; - - if ((e = list_head(&grabber->items))) - item = LIST_ENTRY(e, struct scheduled_item, entry); - - return item; -} - static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct sample_grabber *grabber = impl_from_IMFAsyncCallback(iface); - struct scheduled_item *item; - BOOL sample_delivered; + BOOL sample_reported = FALSE, sample_delivered = FALSE; + struct scheduled_item *item, *item2; HRESULT hr; EnterCriticalSection(&grabber->cs); - /* Report and schedule next. */ - if (!grabber->is_shut_down && (item = stream_get_next_item(grabber))) + if (!grabber->is_shut_down) { - while (item) + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &grabber->items, struct scheduled_item, entry) { - switch (item->type) + if (item->type == ITEM_TYPE_MARKER) + { + sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); + stream_release_pending_item(item); + } + else if (item->type == ITEM_TYPE_SAMPLE) { - case ITEM_TYPE_SAMPLE: + if (!sample_reported) + { if (FAILED(hr = sample_grabber_report_sample(grabber, item->u.sample, &sample_delivered))) WARN("Failed to report a sample, hr %#x.\n", hr); stream_release_pending_item(item); - - /* Schedule next sample, skipping markers. */ - LIST_FOR_EACH_ENTRY(item, &grabber->items, struct scheduled_item, entry) - { - if (item->type == ITEM_TYPE_SAMPLE) - { - if (FAILED(hr = stream_schedule_sample(grabber, item))) - WARN("Failed to schedule a sample, hr %#x.\n", hr); - break; - } - } - - if (sample_delivered) - sample_grabber_stream_request_sample(grabber); - - item = NULL; - break; - case ITEM_TYPE_MARKER: - sample_grabber_stream_report_marker(grabber, &item->u.marker.context, S_OK); - stream_release_pending_item(item); - item = stream_get_next_item(grabber); + sample_reported = TRUE; + } + else + { + if (FAILED(hr = stream_schedule_sample(grabber, item))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); break; + } } } + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); } LeaveCriticalSection(&grabber->cs);

1 0

Nikolay Sivov : mf/samglegrabber: Dump pending items on shutdown.
by Alexandre Julliard 15 May '20

15 May '20

Module: wine Branch: master Commit: 51dcfe4634da5b4ee3f96c330054807384082a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51dcfe4634da5b4ee3f96c33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 18:32:53 2020 +0300 mf/samglegrabber: Dump pending items on shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index adb4ded54f..eb116d81ed 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -802,11 +802,20 @@ static ULONG WINAPI sample_grabber_sink_AddRef(IMFMediaSink *iface) return refcount; } +static void sample_grabber_release_pending_items(struct sample_grabber *grabber) +{ + struct scheduled_item *item, *next_item; + + LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) + { + stream_release_pending_item(item); + } +} + static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&grabber->refcount); - struct scheduled_item *item, *next_item; TRACE("%p, refcount %u.\n", iface, refcount); @@ -836,10 +845,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) } if (grabber->sample_attributes) IMFAttributes_Release(grabber->sample_attributes); - LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) - { - stream_release_pending_item(item); - } + sample_grabber_release_pending_items(grabber); DeleteCriticalSection(&grabber->cs); heap_free(grabber); } @@ -1031,6 +1037,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) EnterCriticalSection(&grabber->cs); grabber->is_shut_down = TRUE; + sample_grabber_release_pending_items(grabber); if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { sample_grabber_set_presentation_clock(grabber, NULL);

1 0