February 2016 - Wine-commits

Nikolay Sivov : dwrite: Handle font data initialization failure when building collections.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 7276d5fac1417dd81344db45b3af904f8f2c7d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7276d5fac1417dd81344db45b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 17:47:14 2016 +0300 dwrite: Handle font data initialization failure when building collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 05b5f55..c0e0e43 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -387,7 +387,8 @@ static void release_font_data(struct dwrite_font_data *data) if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } - IDWriteLocalizedStrings_Release(data->names); + if (data->names) + IDWriteLocalizedStrings_Release(data->names); IDWriteFontFile_Release(data->file); IDWriteFactory2_Release(data->factory); @@ -3147,8 +3148,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat /* alloc and init new font data structure */ hr = init_font_data(factory, file, face_type, i, &family_name, &font_data); - if (FAILED(hr)) + if (FAILED(hr)) { + /* move to next one */ + hr = S_OK; continue; + } fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR));

1 0

Ken Thomases : winemac: Simplify and optimize making a GL context current with no view.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 38f579f9ba0aba49788c2ce84172ae5237929ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f579f9ba0aba49788c2ce84… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 22 21:14:30 2016 -0600 winemac: Simplify and optimize making a GL context current with no view. If the context is already current, don't do +clearCurrentContext followed by -makeCurrentContext. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 4694dfd..e1aca77 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -227,17 +227,17 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) { WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext]; - if ([currentContext isKindOfClass:[WineOpenGLContext class]]) - { - [WineOpenGLContext clearCurrentContext]; - if (currentContext != context) - [currentContext removeFromViews:YES]; - } + [context removeFromViews:YES]; - if (context) + if (currentContext != context) { - [context removeFromViews:YES]; - [context makeCurrentContext]; + if (context) + [context makeCurrentContext]; + else + [WineOpenGLContext clearCurrentContext]; + + if ([currentContext isKindOfClass:[WineOpenGLContext class]]) + [currentContext removeFromViews:YES]; } }

1 0

Hugh McMaster : reg: Allow either lowercase or uppercase 'x' when used with REG_DWORD.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 5e6429520b917ff8b447d31d8224b3eef6887053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6429520b917ff8b447d31d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:14 2016 +1100 reg: Allow either lowercase or uppercase 'x' when used with REG_DWORD. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7dc624a..933341c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -243,7 +243,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { LPWSTR rest; DWORD val; - val = strtoulW(data, &rest, (data[1] == 'x') ? 16 : 10); + val = strtoulW(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); if (*rest || data[0] == '-') { output_message(STRING_MISSING_INTEGER); break; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a813de1..eb75ac9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -298,6 +298,11 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword14 /t REG_DWORD /d 0X123 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x123; + verify_reg(hkey, "dword14", REG_DWORD, &dword, sizeof(dword), 0); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Add more tests for REG_MULTI_SZ.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 99f2cebe86e8899f09016e716f8c98b65b3d9544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f2cebe86e8899f09016e716… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:15 2016 +1100 reg/tests: Add more tests for REG_MULTI_SZ. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index eb75ac9..bb54e2a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -363,6 +363,16 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi13 /t REG_MULTI_SZ /f /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi14 /t REG_MULTI_SZ /d \"\\0a\" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : libwine: strtoulW and strtolW should set errno to ERANGE if an overflow will occur.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: a9fb9ac657fccd45baee39df4dbe085a8a8e7014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fb9ac657fccd45baee39df4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:16 2016 +1100 libwine: strtoulW and strtolW should set errno to ERANGE if an overflow will occur. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/string.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/wine/string.c b/libs/wine/string.c index f2a9bd3..7aa981f 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -19,6 +19,7 @@ */ #include <assert.h> +#include <errno.h> #include <limits.h> #include <stdio.h> @@ -162,6 +163,7 @@ long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base ) if (overflow) { + errno = ERANGE; return negative ? LONG_MIN : LONG_MAX; } @@ -274,6 +276,7 @@ unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base ) if (overflow) { + errno = ERANGE; return ULONG_MAX; }

1 0

Hugh McMaster : reg: Fail if the data value passed with REG_DWORD will cause an overflow.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 3c7b7ece37b83770d9bbef21d9c83712d045cd6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7b7ece37b83770d9bbef21d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:18 2016 +1100 reg: Fail if the data value passed with REG_DWORD will cause an overflow. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 3 ++- programs/reg/tests/reg.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 933341c..c6351a9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -19,6 +19,7 @@ #include <windows.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <errno.h> #include "reg.h" #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) @@ -244,7 +245,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r LPWSTR rest; DWORD val; val = strtoulW(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); - if (*rest || data[0] == '-') { + if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { output_message(STRING_MISSING_INTEGER); break; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index bb54e2a..d660a07 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -288,7 +288,7 @@ static void test_add(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Add a test for base 10 overflow.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 7c50e34efe73382ce7501c2e03c86ff772b635d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c50e34efe73382ce7501c2e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:19 2016 +1100 reg/tests: Add a test for base 10 overflow. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d660a07..2c71b5c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -303,6 +303,9 @@ static void test_add(void) dword = 0x123; verify_reg(hkey, "dword14", REG_DWORD, &dword, sizeof(dword), 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword15 /t REG_DWORD /d 4294967296 /f", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Add a test for REG_NONE with no data argument.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 965dee67c1e48d80f0e6c77d63c28b6bd2c6ab4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=965dee67c1e48d80f0e6c77d6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:20 2016 +1100 reg/tests: Add a test for REG_NONE with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2c71b5c..db3b5a2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -145,6 +145,10 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v none1 /t REG_NONE /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "none1", REG_NONE, "\0", 2, TODO_REG_SIZE); + /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),

1 0

Detlef Riekenberg : crypt32/tests: Accept Windows 10 error code.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: c957ff6c4cea98ad35e48b69be49e507ef63f014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c957ff6c4cea98ad35e48b69b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 20 22:01:31 2016 +0100 crypt32/tests: Accept Windows 10 error code. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b7fe08b..be2ec54 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -125,8 +125,10 @@ static void testCreateCertChainEngine(void) CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert), CERT_STORE_ADD_ALWAYS, NULL); ret = pCertCreateCertificateChainEngine(pConfig, &engine); - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + /* ERROR_FILE_NOT_FOUND used in Windows 10 */ + ok(!ret && ((GetLastError() == CRYPT_E_NOT_FOUND) || + (GetLastError() == ERROR_FILE_NOT_FOUND)), + "Expected CRYPT_E_NOT_FOUND or ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); CertCloseStore(store, 0); }

1 0

André Hentschel : webservices/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 68b92d052a08435931581fe700da8d88504b70bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b92d052a08435931581fe70… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:16 2016 +0100 webservices/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4416a84..8fba4eb 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -486,13 +486,7 @@ static void test_WsSetInput(void) charset = 0xdeadbeef; size = sizeof(charset); hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); - if (tests[i].todo) - { - todo_wine ok( hr == tests[i].hr, "%u: got %08x expected %08x\n", i, hr, tests[i].hr ); - if (hr == S_OK) - todo_wine ok( charset == tests[i].charset, "%u: got %u expected %u\n", i, charset, tests[i].charset ); - } - else + todo_wine_if (tests[i].todo) { ok( hr == tests[i].hr, "%u: got %08x expected %08x\n", i, hr, tests[i].hr ); if (hr == S_OK) @@ -1082,9 +1076,7 @@ static void test_WsReadNode(void) ok( hr == S_OK, "%u: got %08x\n", i, hr ); hr = WsReadNode( reader, NULL ); - if (tests[i].todo) - todo_wine ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); - else + todo_wine_if (tests[i].todo) ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); if (hr == S_OK) { @@ -1094,10 +1086,7 @@ static void test_WsReadNode(void) ok( node != NULL, "%u: node not set\n", i ); if (node) { - if (tests[i].todo) - todo_wine - ok( node->nodeType == tests[i].type, "%u: got %u\n", i, node->nodeType ); - else + todo_wine_if (tests[i].todo) ok( node->nodeType == tests[i].type, "%u: got %u\n", i, node->nodeType ); } }

1 0