December 2017 - Wine-commits

Henri Verbeet : ddraw/tests: Introduce an ARRAY_SIZE macro to ddraw7 as well.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: 053272d66554dafe54ad0b3f76c1920c4590f46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=053272d66554dafe54ad0b3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 27 17:30:13 2017 +0100 ddraw/tests: Introduce an ARRAY_SIZE macro to ddraw7 as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 167 +++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=053272d66554dafe54ad…

1 0

Henri Verbeet : ddraw/tests: Print driver and device information before running the tests.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: 7c9671c0021e0a00203816322f9343132e5771eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9671c0021e0a0020381632… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 27 17:30:14 2017 +0100 ddraw/tests: Print driver and device information before running the tests. Analogous to the d3d8 and d3d9 tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 59 ++++++++++++++++++++++------------------------- dlls/ddraw/tests/ddraw2.c | 59 ++++++++++++++++++++++------------------------- dlls/ddraw/tests/ddraw4.c | 51 ++++++++++++++++++++++------------------ dlls/ddraw/tests/ddraw7.c | 55 +++++++++++++++++++++++-------------------- 4 files changed, 114 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9671c0021e0a002038…

1 0

Alex Henrie : ddraw/tests: Recognise E_NOTIMPL returned from UpdateOverlay () on VMware as broken.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: 2a0f704d9b165959223a9da91edf4df76860b893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0f704d9b165959223a9da9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 27 17:30:15 2017 +0100 ddraw/tests: Recognise E_NOTIMPL returned from UpdateOverlay() on VMware as broken. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 12 +++++++++++- dlls/ddraw/tests/ddraw2.c | 12 +++++++++++- dlls/ddraw/tests/ddraw4.c | 12 +++++++++++- dlls/ddraw/tests/ddraw7.c | 12 +++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index db54abd..2c4410a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -123,6 +123,15 @@ static BOOL ddraw_is_intel(IDirectDraw *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -8666,7 +8675,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d2382d1..89d0d7e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -125,6 +125,15 @@ static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -9800,7 +9809,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index caa3ced..fa1178d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -131,6 +131,15 @@ static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11262,7 +11271,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f1568bb..fdfac69 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -145,6 +145,15 @@ static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw) +{ + DDDEVICEIDENTIFIER2 identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11220,7 +11229,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */

1 0

Gijs Vermeulen : msvcrt: Add _get_[winmajor|winminor|osver].
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: 43034dee45b7e62c86665c53a14c7a0559722fd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43034dee45b7e62c86665c53… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Dec 27 00:52:27 2017 +0100 msvcrt: Add _get_[winmajor|winminor|osver]. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcrt/data.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index dd80131..5aa93e5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -548,7 +548,7 @@ @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -@ stub _get_osver +@ cdecl _get_osver(ptr) MSVCRT__get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -558,8 +558,8 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_winmajor -@ stub _get_winminor +@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor +@ cdecl _get_winminor(ptr) MSVCRT__get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5de80f4..712b330 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -746,3 +746,33 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) return wide_command_line = s; } + +/********************************************************************* + * _get_winmajor (MSVCRT.@) + */ +int CDECL MSVCRT__get_winmajor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winmajor; + return 0; +} + +/********************************************************************* + * _get_winminor (MSVCRT.@) + */ +int CDECL MSVCRT__get_winminor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winminor; + return 0; +} + +/********************************************************************* + * _get_osver (MSVCRT.@) + */ +int CDECL MSVCRT__get_osver(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__osver; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2f20699..15d9ffc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -508,13 +508,13 @@ @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -# stub _get_osver(ptr) +@ cdecl _get_osver(ptr) MSVCRT__get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) -# stub _get_winmajor(ptr) -# stub _get_winminor(ptr) +@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor +@ cdecl _get_winminor(ptr) MSVCRT__get_winminor # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() MSVCRT__get_terminate

1 0

Nikolay Sivov : usp10/tests: Add missing return value tests (Coverity).
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: ee04cb5475e4d1e3b1b4588c9b92e126aafb5e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee04cb5475e4d1e3b1b4588c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 13:22:28 2017 +0300 usp10/tests: Add missing return value tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 55bec7f..35cdec5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3150,6 +3150,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP() failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==1,"%i should return 0(%i) and 1(%i)\n",iX,piCP,piTrailing); } for (iX = 9; iX < 16; iX++) @@ -3157,6 +3158,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP() failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==0,"%i should return 0(%i) and 0(%i)\n",iX,piCP,piTrailing); }

1 0

Francois Gouget : testbot: Add a history record when a task is canceled.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: tools Branch: master Commit: f21d2d15572579292fd924c4c1c162bd56ee87d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f21d2d15572579292fd924c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 27 12:14:21 2017 +0100 testbot: Add a history record when a task is canceled. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 73fc34e..a2427cc 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -258,6 +258,7 @@ sub Cancel($) $VM->KillChild(); ($EProperty, $EMessage) = $VM->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); + $VM->RecordResult(undef, "canceled"); } } }

1 0

Francois Gouget : testbot: Add a history record when a child process died.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: tools Branch: master Commit: d52d59c56bb595cc3fa5287d4828c1b07255672d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d52d59c56bb595cc3fa5287… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 27 12:14:49 2017 +0100 testbot: Add a history record when a child process died. The Job scheduler may notice that a VM's child process died. In such a case add a history record so the VM's previous status record can be anotated appropriately. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index a2427cc..4ed6e03 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -519,6 +519,7 @@ sub ScheduleOnHost($$$$) { if (!$VM->HasRunningChild()) { + $VM->RecordResult($Records, "boterror process died"); my $ErrMessage = $VM->RunMonitor(); return $ErrMessage if (defined $ErrMessage); } diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 11f087f..1f91d26 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -179,6 +179,7 @@ sub UpdateStatus($$) $VM->Status('dirty'); $VM->ChildPid(undef); $VM->Save(); + $VM->RecordResult(undef, "boterror process died"); } # else it looks like this is not our VM anymore

1 0

Nikolay Sivov : hlink/tests: Check return value (Coverity).
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: 2bde3e203b8852ea4fccdd54ffd41fbb74c77970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bde3e203b8852ea4fccdd54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 10:49:48 2017 +0300 hlink/tests: Check return value (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 8350624..e40807c 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -877,11 +877,13 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, { IBindCtx *bctx; WCHAR *name; + HRESULT hr; CHECK_EXPECT(HBC_GetObject); CreateBindCtx(0, &bctx); - IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + hr = IMoniker_GetDisplayName(pimk, bctx, NULL, &name); + ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); ok(!lstrcmpW(winehq_urlW, name) || !lstrcmpW(winehq_404W, name), "got unexpected url\n"); CoTaskMemFree(name); IBindCtx_Release(bctx);

1 0

Nikolay Sivov : mlang/tests: Add some return value checks (Coverity).
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: 523e07da5c9ec9bb224d66853a614d39fe6278ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=523e07da5c9ec9bb224d6685… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 10:50:57 2017 +0300 mlang/tests: Add some return value checks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 2e3b36b..9727b4f 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2679,8 +2679,10 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08x\n", ret); /* Show that the font cache is global */ - IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); - IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); + ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); + ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); + ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p", font1, font2); ok(font1 == font2, "expected equal, got not equal");

1 0

Nikolay Sivov : taskschd: Fix a leak on error path (Coverity).
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: fb4ab15a4e14cec89279fbc7ab2ea12ec1acad89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb4ab15a4e14cec89279fbc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 10:51:17 2017 +0300 taskschd: Fix a leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder_collection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 969baec..0b2b513 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -239,6 +239,7 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o if (!(folders->path = heap_strdupW(path))) { heap_free(folders); + free_list(list, count); return E_OUTOFMEMORY; } folders->count = count;

1 0