January 2018 - Wine-Commits

Alex Henrie : wininet/tests: Fix off-by-one errors in HTTP tests (Coverity ).
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 7b2ead8da082e27d403f8554f0e714f0603ffd31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2ead8da082e27d403f8554… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 6 21:53:58 2018 -0700 wininet/tests: Fix off-by-one errors in HTTP tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index efc73e0..1c2aadb 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -720,7 +720,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = sizeof(buffer)-1; + length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); @@ -744,7 +744,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); - length = sizeof(wbuffer)-sizeof(WCHAR); + length = sizeof(wbuffer)-2*sizeof(WCHAR); memset(wbuffer, 0x77, sizeof(wbuffer)); res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError());

1 0

Alex Henrie : shlwapi/tests: Add missing return value checks to istream tests (Coverity).
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 031f2ab64f9700e2e4490b6f7aaf3762f9606f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=031f2ab64f9700e2e4490b6f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 01:19:29 2018 -0700 shlwapi/tests: Add missing return value checks to istream tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/istream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 54a73fc..926f2f8 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -663,8 +663,10 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) static const WCHAR prefix[] = { 'T', 'S', 'T', 0 }; GetTempPathW(MAX_PATH, tmpPath); - GetTempFileNameW(tmpPath, prefix, 0, srcFileName); - GetTempFileNameW(tmpPath, prefix, 0, dstFileName); + ret = GetTempFileNameW(tmpPath, prefix, 0, srcFileName); + ok(ret != 0, "GetTempFileName failed, got error %d\n", GetLastError()); + ret = GetTempFileNameW(tmpPath, prefix, 0, dstFileName); + ok(ret != 0, "GetTempFileName failed, got error %d\n", GetLastError()); ret = SHCreateStreamOnFileEx(srcFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &src); ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret);

1 0

Alex Henrie : shell32/tests: Add missing return value check to shelllink tests (Coverity).
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 8bb6addb1ea15072cfbe60dc12602d515be7e018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bb6addb1ea15072cfbe60dc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 7 22:05:18 2018 -0700 shell32/tests: Add missing return value check to shelllink tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 6f12fb2..4f16290 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -169,8 +169,9 @@ static void test_get_set(void) ok(finddata.dwFileAttributes == 0, "unexpected attributes %x\n", finddata.dwFileAttributes); ok(finddata.cFileName[0] == 0, "unexpected filename '%s'\n", finddata.cFileName); - CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, - &IID_IShellLinkW, (LPVOID*)&slW); + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&slW); + ok(r == S_OK, "CoCreateInstance failed (0x%08x)\n", r); if (!slW /* Win9x */ || !pGetLongPathNameA /* NT4 */) skip("SetPath with NULL parameter crashes on Win9x and some NT4\n"); else

1 0

Alex Henrie : msi/tests: Add missing return value checks to package tests (Coverity).
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 0f49d2a80df9dfc4c440fcb5cb0386e18ec22922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f49d2a80df9dfc4c440fcb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 7 22:57:36 2018 -0700 msi/tests: Add missing return value checks to package tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 002e692..e4cee59 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3268,7 +3268,8 @@ static void test_states(void) add_file_entry( hdb, "'psi_file', 'psi', 'psi.txt', 100, '', '1033', 8192, 1" ); add_file_entry( hdb, "'upsilon_file', 'upsilon', 'upsilon.txt', 0, '', '1033', 16384, 1" ); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); /* these properties must not be in the saved msi file */ add_property_entry( hdb, "'ADDLOCAL', 'one,four'"); @@ -7056,7 +7057,8 @@ static void test_shortlongsource(void) /* CostFinalize:long */ add_directory_entry(hdb, "'SubDir7', 'TARGETDIR', 'eleven|twelve'"); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); r = package_from_db(hdb, &hpkg); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -8553,7 +8555,8 @@ static void test_MsiEnumComponentCosts(void) add_install_execute_sequence_entry( hdb, "'CostFinalize', '', '1000'" ); add_install_execute_sequence_entry( hdb, "'InstallValidate', '', '1100'" ); - MsiDatabaseCommit( hdb ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); sprintf( package, "#%u", hdb ); r = MsiOpenPackageA( package, &hpkg ); @@ -9116,8 +9119,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI { INT retval = context ? *((INT *)context) : 0; struct externalui_message msg; - char buffer[100]; - DWORD length = 100; + char buffer[256]; + DWORD length; + UINT r; int i; msg.message = message; @@ -9131,8 +9135,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI msg.field_count = MsiRecordGetFieldCount(hrecord); for (i = 0; i <= msg.field_count; i++) { - length = 100; - MsiRecordGetStringA(hrecord, i, buffer, &length); + length = sizeof(buffer); + r = MsiRecordGetStringA(hrecord, i, buffer, &length); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); memcpy(msg.field[i], buffer, min(100, length+1)); }

1 0

Andrey Gusev : ddraw: Fix typos in comments.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: fbb57d4176d5f42140ceb0b15d3bee2c2cca270c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbb57d4176d5f42140ceb0b1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 8 13:43:44 2018 +0200 ddraw: Fix typos in comments. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 542f23a..28bb2fb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI d3d_device3_EnumTextureFormats(IDirect3DDevice3 *iface, * IDirect3DDevice2::EnumTextureformats * * EnumTextureFormats for Version 1 and 2, see - * IDirect3DDevice7::EnumTexureFormats for a more detailed description. + * IDirect3DDevice7::EnumTextureFormats for a more detailed description. * * This version has a different callback and does not enumerate FourCC * formats diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index cc676f3..6a9544b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) * SrcIndex: Index of the first vertex in the src buffer to process * D3DDevice: Device to use for transformation * Flags: 0 for default, D3DPV_DONOTCOPYDATA to prevent copying - * unchaned vertices + * unchanged vertices * * Returns: * D3D_OK on success

1 0

Andrey Gusev : kernel32/tests: Fix a typo in comment.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: e041039ce66c189d8604c1c33756816387f25a8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e041039ce66c189d8604c1c3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 8 13:44:12 2018 +0200 kernel32/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2af4946..ce2f13b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2480,7 +2480,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(ret == ret2, "%s ret %d, expected value %d\n", func_name, ret2, ret); /* test LCMAP_FULLWIDTH | LCMAP_HIRAGANA - (half-width katakana is converted into full-wdith hiragana) */ + (half-width katakana is converted into full-width hiragana) */ ret = func_ptr(LCMAP_FULLWIDTH | LCMAP_HIRAGANA, halfwidth_text, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok(ret == lstrlenW(hiragana_text) + 1, "%s ret %d, error %d, expected value %d\n", func_name,

1 0

Andrey Gusev : comctl32: Fix a typo in comment.
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 2000386baf31ec2709ba1e5f0f06c3a40dccad55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2000386baf31ec2709ba1e5f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 8 13:43:17 2018 +0200 comctl32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4d700b9..589d5c4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1017,7 +1017,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP return ret; } - /* if dipsinfo holder changed notification code then convert */ + /* if dispinfo holder changed notification code then convert */ if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW) && (pdi->item.mask & LVIF_TEXT)) { length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL);

1 0

Alex Henrie : kernel32/tests: Add missing return value check to module tests (Coverity).
by Alexandre Julliard Jan. 8, 2018

Jan. 8, 2018

Module: wine Branch: master Commit: 3675b7035e2fd6d5606464d45182c7aa2bca8309 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3675b7035e2fd6d5606464d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 7 22:05:15 2018 -0700 kernel32/tests: Add missing return value check to module tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 108d0cb..d3b9c92 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -972,7 +972,8 @@ static void test_AddDllDirectory(void) buf[0] = '\0'; GetTempPathW( sizeof(path)/sizeof(path[0]), path ); - GetTempFileNameW( path, tmpW, 0, buf ); + ret = GetTempFileNameW( path, tmpW, 0, buf ); + ok( ret, "GetTempFileName failed err %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); cookie = pAddDllDirectory( buf ); ok( cookie != NULL, "AddDllDirectory failed err %u\n", GetLastError() );

1 0

Alexandre Julliard : Wine release 3.0-rc5
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: website Branch: master Commit: a0f5318afb9d84ba907df1979817936715fb9789 URL: https://source.winehq.org/git/website.git/?a=commit;h=a0f5318afb9d84ba907df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 21:02:19 2018 +0100 Wine release 3.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018010501.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018010501.xml b/news/en/2018010501.xml new file mode 100644 index 0000000..6ff20b8 --- /dev/null +++ b/news/en/2018010501.xml @@ -0,0 +1,12 @@ +<news> +<date>January 5, 2018</date> +<title>Wine 3.0-rc5 Released</title> +<body> + The Wine development release 3.0-rc5 is now available. + <a href="{$root}/announce/3.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 3.0-rc5.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: bd41696680a15f399558b8635525537337f997d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd41696680a15f399558b863… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 20:59:29 2018 +0100 Release 3.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 204 +++++++++++++++++++++++++++++++++++++++++++------------------- VERSION | 2 +- configure | 18 +++--- 4 files changed, 153 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd41696680a15f399558…

1 0