January 2019 - Wine-Commits

Tag wine-4.0-rc7 : Alexandre Julliard : Release 4.0-rc7
by Alexandre Julliard Jan. 18, 2019

Jan. 18, 2019

Module: wine Branch: refs/tags/wine-4.0-rc7 Tag: 0b33d33ea70949fe2d6387719363b85a9b28850f URL: https://source.winehq.org/git/wine.git/?a=tag;h=0b33d33ea70949fe2d638771936… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 23:49:47 2019 +0100 Release 4.0-rc7

1 0

Sven Baars : ntdll/tests: Fix some string leaks (Valgrind).
by Alexandre Julliard Jan. 18, 2019

Jan. 18, 2019

Module: wine Branch: master Commit: ba3e07420e9b81d83166d4b84a168553c031c32d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba3e07420e9b81d83166d4b8… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Jan 18 17:18:31 2019 +0100 ntdll/tests: Fix some string leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 ++ dlls/ntdll/tests/reg.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dcea45e..8391570 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3662,6 +3662,8 @@ static void test_file_mode(void) if (option_tests[i].file_name == &file_name) DeleteFileW(dos_file_name); } + + pRtlFreeUnicodeString(&file_name); } static void test_query_volume_information_file(void) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b59d267..9bb8d25 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2008,6 +2008,8 @@ static void test_RtlCreateRegistryKey(void) status = pRtlCreateRegistryKey((RTL_REGISTRY_USER+1) | RTL_REGISTRY_OPTIONAL, NULL); ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_INVALID_PARAMETER); + + pRtlFreeUnicodeString(&str); } START_TEST(reg)

1 0

Henri Verbeet : ddraw/tests: Add a test for the "GDI" surface.
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: 5e677beef563b96505338024b84c122e26239d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e677beef563b96505338024… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 17:46:40 2019 +0330 ddraw/tests: Add a test for the "GDI" surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 364 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e677beef563b9650533…

1 0

Józef Kucia : wined3d: Avoid potential out-of-bounds memory access in surface_cpu_blt_colour_fill ().
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: e37b9c74f04a90ef350394720b673119e47481dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e37b9c74f04a90ef35039472… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 16 15:29:34 2019 +0100 wined3d: Avoid potential out-of-bounds memory access in surface_cpu_blt_colour_fill(). Draw rects are derived from the current viewport. It is possible to produce a clear operation with a draw rect which lies completely outside of one of render targets in D3D9. It seems that we never use the CPU blitter for D3D9 render target clears, so it might not be a problem in practice. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b6e7a5..0ee2f82 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2970,8 +2970,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; - w = min(box->right, view->width) - box->left; - h = min(box->bottom, view->height) - box->top; + w = min(box->right, view->width) - min(box->left, view->width); + h = min(box->bottom, view->height) - min(box->top, view->height); texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding;

1 0

Gijs Vermeulen : msvcp140/tests: Fix typos in ok() messages.
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: 999ef32a3ee99dddabe2244fd55d7bd6297f448a URL: https://source.winehq.org/git/wine.git/?a=commit;h=999ef32a3ee99dddabe2244f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jan 16 19:36:58 2019 +0100 msvcp140/tests: Fix typos in ok() messages. 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/msvcp140/tests/msvcp140.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 5705882..ac7154b 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -880,13 +880,13 @@ static void test_Stat(void) ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms); if(ret) { - todo_wine ok(DeleteFileW(test_f1_linkW), "expect tr2_test_dir/f1_link to exist\n"); - todo_wine ok(RemoveDirectoryW(test_dir_linkW), "expect tr2_test_dir/dir_link to exist\n"); + todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n"); + todo_wine ok(RemoveDirectoryW(test_dir_linkW), "expect wine_test_dir/dir_link to exist\n"); } - ok(DeleteFileW(test_f1W), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileW(test_f1W), "expect wine_test_dir/f1 to exist\n"); SetFileAttributesW(test_f2W, FILE_ATTRIBUTE_NORMAL); - ok(DeleteFileW(test_f2W), "expect tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryW(test_dirW), "expect tr2_test_dir to exist\n"); + ok(DeleteFileW(test_f2W), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(test_dirW), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } @@ -1173,7 +1173,7 @@ static void test_Rename(void) CloseHandle(h2); ok(info1.nFileIndexHigh == info2.nFileIndexHigh && info1.nFileIndexLow == info2.nFileIndexLow, - "test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1); + "_Rename(): test %d expect two files equivalent\n", i+1); } } @@ -1187,7 +1187,7 @@ static void test_Rename(void) ok(ret == ERROR_ALREADY_EXISTS, "_Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret); ok(p_File_size(f1W) == 7, "_Rename(): expect: 7, got %s\n", wine_dbgstr_longlong(p_File_size(f1W))); - ok(p_File_size(f1_renameW) == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n", + ok(p_File_size(f1_renameW) == 0, "_Rename(): expect: 0, got %s\n", wine_dbgstr_longlong(p_File_size(f1_renameW))); ok(DeleteFileW(f1_renameW), "expect f1_rename to exist\n");

1 0

Sven Baars : ntoskrnl.exe/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: 26db17e90df14632057611ac03c0fdebb7def261 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26db17e90df14632057611ac… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 17 17:42:39 2019 +0100 ntoskrnl.exe/tests: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 2dc86ee..c17da7f 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -33,6 +33,7 @@ static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); +static BOOL (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static void load_resource(const char *name, char *filename) { @@ -177,6 +178,8 @@ static void main_test(void) } while (read == sizeof(buffer)); winetest_add_failures(new_failures); + pRtlFreeUnicodeString(&pathU); + heap_free(test_input); CloseHandle(okfile); DeleteFileW(pathW); } @@ -249,6 +252,7 @@ START_TEST(ntoskrnl) HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return;

1 0

Sven Baars : ole32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: b0042fdc92ee4b8125dfec83a9f9a43302203a81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0042fdc92ee4b8125dfec83… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 17 16:03:27 2019 +0100 ole32/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f0ff24b..b71a103 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4091,6 +4091,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ *enumerated_streams += 1; } + + IEnumSTATSTG_Release(enumstg); } static HRESULT stgmedium_cmp(const STGMEDIUM *med1, STGMEDIUM *med2)

1 0

Alexandre Julliard : ntoskrnl.exe/tests: Fix path buffer allocation size.
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: 5bfa5f1e3994a43ba0b0c2f8ed2735e096722578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bfa5f1e3994a43ba0b0c2f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 19:42:42 2019 +0100 ntoskrnl.exe/tests: Fix path buffer allocation size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 9ab05bc..2dc86ee 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -144,7 +144,7 @@ static void main_test(void) WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; UNICODE_STRING pathU; - DWORD written, read; + DWORD len, written, read; LONG new_failures; char buffer[512]; HANDLE okfile; @@ -155,13 +155,14 @@ static void main_test(void) GetTempFileNameW(temppathW, dokW, 0, pathW); pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); - test_input = heap_alloc( offsetof( struct test_input, path[pathU.Length / sizeof(WCHAR)]) ); + len = pathU.Length + sizeof(WCHAR); + test_input = heap_alloc( offsetof( struct test_input, path[len / sizeof(WCHAR)]) ); test_input->running_under_wine = !strcmp(winetest_platform, "wine"); test_input->winetest_report_success = winetest_report_success; test_input->winetest_debug = winetest_debug; - memcpy(test_input->path, pathU.Buffer, pathU.Length + sizeof(WCHAR)); + memcpy(test_input->path, pathU.Buffer, len); res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, - offsetof( struct test_input, path[pathU.Length / sizeof(WCHAR)]), + offsetof( struct test_input, path[len / sizeof(WCHAR)]), &new_failures, sizeof(new_failures), &written, NULL); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(new_failures), "got size %x\n", written);

1 0

Gijs Vermeulen : atl100/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: c5c54480c66bad1fb603c0983787b72cf478e98c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c54480c66bad1fb603c098… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jan 17 01:37:14 2019 +0100 atl100/tests: Fix a memory leak (Valgrind). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl100/tests/atl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index bdd3c57..d23c53c 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -964,6 +964,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL;

1 0

Sven Baars : riched20/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Jan. 17, 2019

Jan. 17, 2019

Module: wine Branch: master Commit: 9d79aa686bbc0684e3c5382e7e0754ae4636d7f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d79aa686bbc0684e3c5382e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Jan 16 14:08:31 2019 +0100 riched20/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 0415be8..20d411a 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -705,6 +705,8 @@ static void test_TxSetText(void) ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); + SysFreeString(rettext); + /* Null-pointer should behave the same as empty-string */ hres = ITextServices_TxSetText(txtserv, 0);

1 0