September 2020 - Wine-Commits

Henri Verbeet : build: Print whether we're building documentation in the configuration summary.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: vkd3d Branch: master Commit: da4449ac91e71b12eead761ef0bbc5b47e41c17f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=da4449ac91e71b12eead761… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 18 19:34:55 2020 +0430 build: Print whether we're building documentation in the configuration summary. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index d5f6588..a9db172 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,7 @@ AC_OUTPUT dnl Output configuration summary AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) +AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) AS_ECHO([" Configuration summary for $PACKAGE $VERSION @@ -156,6 +157,7 @@ AS_ECHO([" Building demos: ${enable_demos} Building tests: ${enable_tests} + Building documentation: ${HAVE_DOCS} Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])])

1 0

Isabella Bosia : vkd3d-shader: Print oC registers as o in versions >= 4.
by Alexandre Julliard Sept. 18, 2020

Sept. 18, 2020

Module: vkd3d Branch: master Commit: 171f25e6a55478ddc18d9edc2013799ce7dba443 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=171f25e6a55478ddc18d9ed… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:14:43 2020 +0100 vkd3d-shader: Print oC registers as o in versions >= 4. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d86a84a..02abbf9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -700,7 +700,9 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, break; case VKD3DSPR_COLOROUT: - shader_addline(buffer, "oC"); + shader_addline(buffer, "o"); + if (!shader_ver_ge(shader_version, 4, 0)) + shader_addline(buffer, "C"); break; case VKD3DSPR_DEPTHOUT:

1 0

Nikolay Sivov : evr/mixer: Handle uninitialized input case in GetOutputAvailableType().
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: deac29d411dccadcd12a815ab0a4a8cb6f5ebdee URL: https://source.winehq.org/git/wine.git/?a=commit;h=deac29d411dccadcd12a815a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:24:38 2020 +0300 evr/mixer: Handle uninitialized input case in GetOutputAvailableType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 70199f37a1..710e20815a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -533,7 +533,9 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform EnterCriticalSection(&mixer->cs); - if (index >= mixer->output.type_count) + if (!mixer->inputs[0].media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (index >= mixer->output.type_count) hr = MF_E_NO_MORE_TYPES; else { diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ecf1f850c7..a68952c42a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -835,6 +835,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr);

1 0

Nikolay Sivov : oleacc/tests: Use wide string constants.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: da4dc79db93309ede68ca8baa82716f51f55fa0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4dc79db93309ede68ca8ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 10:43:03 2020 +0300 oleacc/tests: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index c1e7d93ba3..e4ef0e78bf 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -726,9 +726,6 @@ static void test_AccessibleChildren(IAccessible *acc) static void test_default_client_accessible_object(void) { - static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; - static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; - IAccessible *acc; IDispatch *disp; IOleWindow *ow; @@ -813,7 +810,7 @@ static void test_default_client_accessible_object(void) V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"test t &junk"), "name = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_I4(&vid) = 1; @@ -855,7 +852,7 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, shortcutW), "str = %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = (void*)0xdeadbeef;

1 0

Dmitry Timoshkov : setupapi/tests: Add explicit field for inf contents size.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 43115a74f94293994904c9857996e9576dc3a8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=43115a74f94293994904c985… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 17 12:16:31 2020 +0300 setupapi/tests: Add explicit field for inf contents size. To make testing embedded NULs possible. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/parser.c | 234 +++++++++++++++++++++++-------------------- 1 file changed, 123 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43115a74f94293994904…

1 0

Myah Caron : dmband: Avoid cloning stream in parse_bands_list.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 2cf69bb5a5b43951abb251f415ccb81e809bd32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cf69bb5a5b43951abb251f4… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 17 05:18:08 2020 -0700 dmband: Avoid cloning stream in parse_bands_list. A stream that doesn't implement ::Clone can be passed, causing IStream_Seek to crash. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/bandtrack.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 14d2c7a571..612be063e1 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -425,21 +425,22 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK StreamSize = Chunk.dwSize - sizeof(FOURCC); switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { - LPSTREAM pClonedStream = NULL; + ULARGE_INTEGER liOrigPos; TRACE_(dmfile)(": BAND RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - + liMove.QuadPart = 0; + IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, &liOrigPos); + liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - hr = load_band(This, pClonedStream, &pBand, &header); + hr = load_band(This, pStm, &pBand, &header); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; } - IStream_Release (pClonedStream); + liMove.QuadPart = (LONGLONG)liOrigPos.QuadPart; + IStream_Seek (pStm, liMove, STREAM_SEEK_SET, NULL); IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release at as it inserted */

1 0

Martin Storsjo : ntdll: Implement __C_specific_handler and _local_unwind for arm64.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 2693e6662d73bd774edc5d018092b0318e49b1b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2693e6662d73bd774edc5d01… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Sep 17 11:04:48 2020 +0300 ntdll: Implement __C_specific_handler and _local_unwind for arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 4 +- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/signal_arm64.c | 174 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- dlls/vcruntime140/vcruntime140.spec | 4 +- 5 files changed, 182 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2693e6662d73bd774edc…

1 0

Paul Gofman : d3d11: Avoid crash in _CopySubresourceRegion[1]() on NULL resources.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 962e939a4da3f73814ce82e693585a8371ae4502 URL: https://source.winehq.org/git/wine.git/?a=commit;h=962e939a4da3f73814ce82e6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 16 15:19:23 2020 +0300 d3d11: Avoid crash in _CopySubresourceRegion[1]() on NULL resources. Marvel's Avengers randomly hits this case. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 9 +++++++++ dlls/d3d11/tests/d3d11.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0508fa3f7b..2a68e02585 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -965,6 +965,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -2438,6 +2441,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box, flags); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -4507,6 +4513,9 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3099d22d27..208b0b20a9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12689,6 +12689,11 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D11DeviceContext_CopySubresourceRegion(context, NULL, 0, + 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box);

1 0

Dmitry Timoshkov : setupapi: Treat trailing \0 in field values same way as trailing spaces.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: 5b7fac05d95fd2cd0c274f1342fb96d0f7152848 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b7fac05d95fd2cd0c274f13… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 17 12:16:35 2020 +0300 setupapi: Treat trailing \0 in field values same way as trailing spaces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 4 ++-- dlls/setupapi/tests/parser.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 560c2401b8..c81a712ad8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -724,7 +724,7 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos ) set_state( parser, EOL_BACKSLASH ); return p; default: - if (!iswspace(*p)) token_end = p + 1; + if (*p && !iswspace(*p)) token_end = p + 1; else { push_token( parser, p ); @@ -838,7 +838,7 @@ static const WCHAR *trailing_spaces_state( struct parser *parser, const WCHAR *p set_state( parser, EOL_BACKSLASH ); return p; } - if (!iswspace(*p)) break; + if (*p && !iswspace(*p)) break; } pop_state( parser ); return p; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 8cde35b9de..c18063fbe3 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -370,6 +370,9 @@ static const struct { C("ab\032=cd"), "ab", { "ab" } }, /* nulls */ { C("abcd=ef\x0gh"), "abcd", { "ef gh" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb\0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb \0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=aaa\0bbb \0\n"), "foo", { "aaa bbb" } }, /* multiple sections with same name */ { C("[Test2]\nab\n[Test]\nee=ff\n"), "ee", { "ff" } }, /* string substitution */ @@ -470,12 +473,12 @@ static void test_key_names(void) ok( err == 0, "line %u: bad error %u\n", i, err ); if (key_names[i].fields[index]) { - if (i == 49) + if (i == 52) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A1200), /* Vista, W2K8 */ "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); - else if (i == 52) + else if (i == 55) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A4096), /* Win10 >= 1709 */ "line %u: bad field %s/%s\n",

1 0

Myah Caron : dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif.
by Alexandre Julliard Sept. 17, 2020

Sept. 17, 2020

Module: wine Branch: master Commit: d28c7938c704fe4dcfc8920db494a7175a46fe6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28c7938c704fe4dcfc8920d… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 17 09:04:02 2020 +0000 dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49850 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5a97dac079..6eaedb1fbd 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -201,8 +201,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, IDirectMusicSegment **ppSegment) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); - return S_OK; + FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszName), ppSegment); + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface,

1 0