April 2020 - Wine-Commits - list.winehq.org

Akihiro Sagawa : msvcrt: Fix _mbsspn implementation.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: oldstable Commit: ce8d7855f291439a1ac5d647adbd3a1c3036db7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce8d7855f291439a1ac5d647… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:24 2019 +0200 msvcrt: Fix _mbsspn implementation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f0f93c791f2bf79a2ea750f89dcd168bb20e529f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/mbcs.c | 24 ++++++++---------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d00c31af4c..edf919c435 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2006,27 +2006,19 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) { const unsigned char *p, *q; + unsigned int pc, qc; for (p = string; *p; p++) { - if (_ismbblead(*p)) - { - for (q = set; *q; q += 2) - { - if (!q[1]) - break; - if ((*p == *q) && (p[1] == q[1])) - break; - } - if (!q[0] || !q[1]) break; - } - else + pc = _mbsnextc(p); + for (q = set; *q; q++) { - for (q = set; *q; q++) - if (*p == *q) - break; - if (!*q) break; + qc = _mbsnextc(q); + if (pc == qc) break; + if (qc > 255 && q[1]) q++; } + if (!*q) break; + if (pc > 255 && p[1]) p++; } return p - string; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 154b964485..7fe6474e2b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -530,13 +530,13 @@ static void test_mbsspn( void) _setmbcp( 932); ret=_mbsspn( mbstr, mbset1); - todo_wine ok( ret==8, "_mbsspn returns %d should be 8\n", ret); + ok( ret==8, "_mbsspn returns %d should be 8\n", ret); ret=_mbsspn( mbstr, mbset2); ok( ret==1, "_mbsspn returns %d should be 1\n", ret); ret=_mbsspn( mbstr+8, mbset1); ok( ret==0, "_mbsspn returns %d should be 0\n", ret); ret=_mbsspn( mbstr+8, mbset2); - todo_wine ok( ret==2, "_mbsspn returns %d should be 2\n", ret); + ok( ret==2, "_mbsspn returns %d should be 2\n", ret); _setmbcp( cp); }

1 0

Ziqing Hui : comctl32/tests: Remove duplicate ImageList_DrawIndirect() tests.
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: 59987bc9ecdd0dbafd768a95c21a14884bc77c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59987bc9ecdd0dbafd768a95… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 17 15:06:31 2020 +0800 comctl32/tests: Remove duplicate ImageList_DrawIndirect() tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index db18443f89..7b22c1ece4 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1580,10 +1580,6 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_NORMAL, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_TRANSPARENT, 0x00ABCDEF, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0xFFE8F1FA, 0xFFD4D9DD, __LINE__); - if (bpp == 16 || bpp == 24) broken_value = 0xFFD4D9DD; - else broken_value = 0xFFB4BDC4; - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_MASK, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_IMAGE, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_PRESERVEALPHA, 0x00ABCDEF, __LINE__);

1 0

Sven Baars : setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind).
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: b08974900f5855f548ab36b43049bec158bd7a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b08974900f5855f548ab36b4… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:11 2020 +0200 setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ccbc82bb76..9fb8699895 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4716,7 +4716,8 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat driver_dataW.cbSize = sizeof(driver_dataW); ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW); - driver_data_wtoa(driver_data, &driver_dataW); + if (ret) driver_data_wtoa(driver_data, &driver_dataW); + return ret; }

1 0

Derek Lesho : mfreadwrite: Clear STREAM_FLAG_SAMPLE_REQUESTED flag on MEEndOfStream event.
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: a2794b5eaeefc881578073f7fd0485c4929dec85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2794b5eaeefc881578073f7… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Apr 16 16:30:51 2020 -0500 mfreadwrite: Clear STREAM_FLAG_SAMPLE_REQUESTED flag on MEEndOfStream event. 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/mfreadwrite/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index e66eb03135..eaf52ce31e 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -727,6 +727,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re { case MEEndOfStream: stream->state = STREAM_STATE_EOS; + stream->flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_DRAIN, 0)))

1 0

Nikolay Sivov : maintainers: Take Media Foundation core modules section.
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: 116eb500556478ae2b88c412ac20eaae41a37b06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=116eb500556478ae2b88c412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 17 21:30:25 2020 +0300 maintainers: Take Media Foundation core modules section. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d5b9133c79..cfbeaeb12b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -281,6 +281,17 @@ F: dlls/wbemdisp/ F: dlls/wbemprox/ F: dlls/wmiutils/ +Windows Media Foundation +M: Nikolay Sivov <nsivov(a)codeweavers.com> +F: dlls/mf/ +F: dlls/mferror/ +F: dlls/mfmediaengine/ +F: dlls/mfplat/ +F: dlls/mfplay/ +F: dlls/mfreadwrite/ +F: dlls/mfuuid/ +F: dlls/rtworkq/ + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com>

1 0

Sven Baars : setupapi: Fix a memory leak (Valgrind).
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: 75e878346a61945c893ff989a3b0e4e4b1c6daf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75e878346a61945c893ff989… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:09 2020 +0200 setupapi: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 617e3f54c3..11fd4d50e2 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -736,6 +736,7 @@ static void delete_device(struct device *device) RegCloseKey(device->key); heap_free(device->instanceId); + heap_free(device->drivers); LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry)

1 0

Sven Baars : setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind).
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: dcc6a143e96ce7b500af2746834943ec346fe6b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcc6a143e96ce7b500af2746… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:12 2020 +0200 setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9fb8699895..5bd2b88a02 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4188,7 +4188,11 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, have_name = 0 < dret; if (dret >= MAX_PATH -1) FIXME("buffer might be too small\n"); - if (have_guid && !have_name) FIXME("class name lookup via guid not implemented\n"); + if (have_guid && !have_name) + { + class_name[0] = '\0'; + FIXME("class name lookup via guid not implemented\n"); + } if (have_name) {

1 0

Sven Baars : setupapi: Fix a leak on early return in SetupDiGetDriverInfoDetailA (Valgrind).
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: c85b14053155734c65631ccf3f838ed148ef93a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c85b14053155734c65631ccf… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:10 2020 +0200 setupapi: Fix a leak on early return in SetupDiGetDriverInfoDetailA (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 11fd4d50e2..ccbc82bb76 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4887,7 +4887,10 @@ BOOL WINAPI SetupDiGetDriverInfoDetailA(HDEVINFO devinfo, SP_DEVINFO_DATA *devic if (ret_size) *ret_size = size_needed; if (!detail_data) + { + SetupCloseInfFile(hinf); return TRUE; + } detail_data->CompatIDsLength = detail_data->CompatIDsOffset = 0; detail_data->HardwareID[0] = 0;

1 0

Zhiyi Zhang : setupapi: Fix a registry key handle leak.
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: e570c2fe591ee2680bd18ef31e9d657f3d0f389b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e570c2fe591ee2680bd18ef3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 17 21:51:01 2020 +0800 setupapi: Fix a registry key handle leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a21959a262..617e3f54c3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4230,6 +4230,7 @@ static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop { value_size = prop_buff_size; ls = RegQueryValueExW(hkey, NULL, NULL, &value_type, prop_buff, &value_size); + RegCloseKey(hkey); } switch (ls)

1 0

Philip Rebohle : dxgi: Improve the d3d12_swapchain_SetColorSpace1() stub.
by Alexandre Julliard April 17, 2020

April 17, 2020

Module: wine Branch: master Commit: 5a1283a3e27c942ac4846543a75bad855505b81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a1283a3e27c942ac4846543… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Fri Apr 17 20:39:20 2020 +0430 dxgi: Improve the d3d12_swapchain_SetColorSpace1() stub. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ad1a74e1b6..f57183879d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2703,9 +2703,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_CheckColorSpaceSupport(IDXGISwa static HRESULT STDMETHODCALLTYPE d3d12_swapchain_SetColorSpace1(IDXGISwapChain3 *iface, DXGI_COLOR_SPACE_TYPE colour_space) { - FIXME("iface %p, colour_space %#x stub!\n", iface, colour_space); + FIXME("iface %p, colour_space %#x semi-stub!\n", iface, colour_space); - return E_NOTIMPL; + if (colour_space != DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709) + { + WARN("Colour space %u not supported.\n", colour_space); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers1(IDXGISwapChain3 *iface,

1 0