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

Jeff Smith : kernelbase: Fix PathAllocCanonicalize handling segments that contain dots.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 5278fb29acd7e9f89947ac600038e1a605a5df50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5278fb29acd7e9f89947ac60… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Sep 19 12:04:30 2019 +0800 kernelbase: Fix PathAllocCanonicalize handling segments that contain dots. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47766 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c13a8f60bdef5b69f5db61f79efb7fd341a27303) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/path.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index bcd129cce9..adefe3abc7 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -204,13 +204,8 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** continue; } - /* Keep the . if one of the following is true: - * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS - * 2. in form of a..b - */ - if (dst > buffer - && (((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS) && dst[-1] != '\\') - || (dst[-1] != '\\' && src[2] != '\\' && src[2]))) + /* Keep the .. if not surrounded by \ */ + if ((src[2] != '\\' && src[2]) || (dst > buffer && dst[-1] != '\\')) { *dst++ = *src++; *dst++ = *src++; @@ -241,14 +236,8 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** } else { - /* Keep the . if one of the following is true: - * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS - * 2. in form of a.b, which is used in domain names - * 3. *. - */ - if (dst > buffer - && ((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS && dst[-1] != '\\') - || (dst[-1] != '\\' && src[1] != '\\' && src[1]) || (dst[-1] == '*'))) + /* Keep the . if not surrounded by \ */ + if ((src[1] != '\\' && src[1]) || (dst > buffer && dst[-1] != '\\')) { *dst++ = *src++; continue; @@ -280,6 +269,22 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** /* End the path */ *dst = 0; + /* Strip multiple trailing . */ + if (!(flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS)) + { + while (dst > buffer && dst[-1] == '.') + { + /* Keep a . after * */ + if (dst - 1 > buffer && dst[-2] == '*') + break; + /* If . follow a : at the second character, remove the . and add a \ */ + else if (dst - 1 > buffer && dst[-2] == ':' && dst - 2 == buffer + 1) + *--dst = '\\'; + else + *--dst = 0; + } + } + /* If result path is empty, fill in \ */ if (!*buffer) {

1 0

Derek Lesho : mfreadwrite: Clear STREAM_FLAG_SAMPLE_REQUESTED flag on MEEndOfStream event.
by Alexandre Julliard 17 Apr '20

17 Apr '20

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 17 Apr '20

17 Apr '20

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 17 Apr '20

17 Apr '20

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: Fix a leak on early return in SetupDiGetDriverInfoDetailA (Valgrind).
by Alexandre Julliard 17 Apr '20

17 Apr '20

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

Sven Baars : setupapi: Only copy driver info if SetupDiEnumDriverInfoW succeeded (Valgrind).
by Alexandre Julliard 17 Apr '20

17 Apr '20

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

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

17 Apr '20

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

Ziqing Hui : comctl32/tests: Remove duplicate ImageList_DrawIndirect() tests.
by Alexandre Julliard 17 Apr '20

17 Apr '20

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

Henri Verbeet : wined3d: Move OpenGL specific context functions to context_gl.c.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 0a5e61595a2fd58e18766e2a314d384962674784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a5e61595a2fd58e18766e2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 20:39:08 2020 +0430 wined3d: Move OpenGL specific context functions to context_gl.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/context.c | 5904 ++-------------------------------------- dlls/wined3d/context_gl.c | 5333 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 17 + 4 files changed, 5646 insertions(+), 5609 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a5e61595a2fd58e1876…

1 0

Henri Verbeet : wined3d: Track buffer usage.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: d65abdabe3f7ce6c1510c322a7fe8dacf6326664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65abdabe3f7ce6c1510c322… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 20:39:09 2020 +0430 wined3d: Track buffer usage. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 7 +- dlls/wined3d/context_vk.c | 144 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 35 +++++++++- 3 files changed, 172 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65abdabe3f7ce6c1510…

1 0