October 2017 - Wine-Commits

Andrey Gusev : shell32: Fix misplaced parenthesis.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 498578d1bb324e9d2f43a24483d6bf2a16f783f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498578d1bb324e9d2f43a2448… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 13 15:03:27 2017 +0300 shell32: Fix misplaced parenthesis. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 0ed6790..445cd59 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -721,7 +721,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, DWORD size = sizeof(buf); int icon_idx; - while ((hr = SIC_get_location( psfi->iIcon, file, &size, &icon_idx ) == E_NOT_SUFFICIENT_BUFFER)) + while ((hr = SIC_get_location( psfi->iIcon, file, &size, &icon_idx )) == E_NOT_SUFFICIENT_BUFFER) { if (file == buf) file = HeapAlloc( GetProcessHeap(), 0, size ); else file = HeapReAlloc( GetProcessHeap(), 0, file, size );

1 0

Hugh McMaster : regedit/tests: Use a helper function to open registry keys.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 1baa026bc35357a6c5119fb7b29f19b93d664a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1baa026bc35357a6c5119fb7b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:06 2017 +0000 regedit/tests: Use a helper function to open registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 75 +++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1baa026bc35357a6c5119…

1 0

Hugh McMaster : reg/tests: Remove write_reg_file() and rewrite associated tests.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: d75e38c71894095d807a1e0b58b1b020e8d53b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75e38c71894095d807a1e0b5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:17:05 2017 +0000 reg/tests: Remove write_reg_file() and rewrite associated tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 78 ++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 52 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c1011ec..42e6a97 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -778,29 +778,6 @@ static void test_v_flags(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } -static BOOL write_reg_file(const char *value, char *tmp_name) -{ - static const char regedit4[] = "REGEDIT4"; - static const char key[] = "[HKEY_CURRENT_USER\\" KEY_BASE "]"; - char file_data[MAX_PATH], tmp_path[MAX_PATH]; - HANDLE hfile; - DWORD written; - BOOL ret; - - sprintf(file_data, "%s\n\n%s\n%s\n", regedit4, key, value); - - GetTempPathA(MAX_PATH, tmp_path); - GetTempFileNameA(tmp_path, "reg", 0, tmp_name); - - hfile = CreateFileA(tmp_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (hfile == INVALID_HANDLE_VALUE) - return FALSE; - - ret = WriteFile(hfile, file_data, strlen(file_data), &written, NULL); - CloseHandle(hfile); - return ret; -} - static BOOL write_file(const void *str, DWORD size) { HANDLE file; @@ -857,8 +834,7 @@ static BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD static void test_import(void) { DWORD r, dword = 0x123, type, size; - char test1_reg[MAX_PATH], test2_reg[MAX_PATH], cmdline[MAX_PATH]; - char test_string[] = "Test string", buffer[24]; + char buffer[24]; HKEY hkey, subkey = NULL; LONG err; BYTE hex[8]; @@ -875,35 +851,9 @@ static void test_import(void) run_reg_exe("reg import missing.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - /* Create test files */ - ok(write_reg_file("\"Wine\"=dword:00000123", test1_reg), "Failed to write registry file\n"); - ok(write_reg_file("@=\"Test string\"", test2_reg), "Failed to write registry file\n"); - - sprintf(cmdline, "reg import %s", test1_reg); - run_reg_exe(cmdline, &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - sprintf(cmdline, "reg import %s", test2_reg); - run_reg_exe(cmdline, &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); - - verify_reg(hkey, "Wine", REG_DWORD, &dword, sizeof(dword), 0); - verify_reg(hkey, "", REG_SZ, test_string, sizeof(test_string), 0); - - err = RegCloseKey(hkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - delete_key(HKEY_CURRENT_USER, KEY_BASE); - - sprintf(cmdline, "reg import %s %s", test1_reg, test2_reg); - run_reg_exe(cmdline, &r); + run_reg_exe("reg import a.reg b.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - DeleteFileA(test1_reg); - DeleteFileA(test2_reg); - /* Test file contents */ test_import_str("regedit\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -961,6 +911,18 @@ static void test_import(void) open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_SET_VALUE, &hkey); + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine\"=dword:00000123\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "@=\"Test string\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "Test string", 12, 0); + test_import_str("REGEDIT3\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value\"\n", &r); @@ -2550,6 +2512,18 @@ static void test_unicode_import(void) "got exit code %d, expected 1\n", r); verify_reg_nonexist(hkey, "Test12"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine\"=dword:00000123\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "@=\"Test string\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "Test string", 12, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode4\"=\"Value4\"\n", &r);

1 0

Hugh McMaster : reg/tests: Use a helper function to open registry keys.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: d3ad7b1837b7ceff0989c83fb58b2182ea1ed2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ad7b1837b7ceff0989c83fb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:15:27 2017 +0000 reg/tests: Use a helper function to open registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 57 +++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 163e4dc..12a1666 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -95,6 +95,15 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) (value && *value) ? value : "(Default)", err); } +#define open_key(b,p,s,k) open_key_(__LINE__,b,p,s,k) +static void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam, HKEY *hkey) +{ + LONG err; + + err = RegOpenKeyExA(base, path, 0, KEY_READ|sam, hkey); + lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err); +} + #define verify_key(k,s) verify_key_(__LINE__,k,s) static void verify_key_(unsigned line, HKEY key_base, const char *subkey) { @@ -226,8 +235,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); /* Test empty type */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\" /d WineTest /f", &r); @@ -879,8 +887,7 @@ static void test_import(void) run_reg_exe(cmdline, &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "", REG_SZ, test_string, sizeof(test_string), 0); @@ -952,8 +959,7 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_SET_VALUE, &hkey); test_import_str("REGEDIT3\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1644,8 +1650,7 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); err = RegCloseKey(subkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1655,8 +1660,7 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); err = RegCloseKey(subkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1701,8 +1705,7 @@ static void test_import(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1e\\"); verify_key(hkey, "Subkey1e"); - err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + open_key(hkey, "Subkey1e", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); delete_key(hkey, "Subkey1e"); @@ -1714,8 +1717,7 @@ static void test_import(void) verify_key(hkey, "Subkey1f\\\\"); verify_key(hkey, "Subkey1f\\"); verify_key(hkey, "Subkey1f"); - err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + open_key(hkey, "Subkey1f\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); delete_key(hkey, "Subkey1f\\\\"); @@ -1728,8 +1730,7 @@ static void test_import(void) verify_key(hkey, "Subkey1g\\\\"); verify_key(hkey, "Subkey1g\\"); verify_key(hkey, "Subkey1g"); - err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + open_key(hkey, "Subkey1g\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); delete_key(hkey, "Subkey1g\\\\"); @@ -2417,8 +2418,7 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_SET_VALUE, &hkey); test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3134,8 +3134,7 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); err = RegCloseKey(subkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3145,8 +3144,7 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); err = RegCloseKey(subkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3191,8 +3189,7 @@ static void test_unicode_import(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1e\\"); verify_key(hkey, "Subkey1e"); - err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + open_key(hkey, "Subkey1e", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); delete_key(hkey, "Subkey1e"); @@ -3204,8 +3201,7 @@ static void test_unicode_import(void) verify_key(hkey, "Subkey1f\\\\"); verify_key(hkey, "Subkey1f\\"); verify_key(hkey, "Subkey1f"); - err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + open_key(hkey, "Subkey1f\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); delete_key(hkey, "Subkey1f\\\\"); @@ -3218,8 +3214,7 @@ static void test_unicode_import(void) verify_key(hkey, "Subkey1g\\\\"); verify_key(hkey, "Subkey1g\\"); verify_key(hkey, "Subkey1g"); - err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + open_key(hkey, "Subkey1g\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); delete_key(hkey, "Subkey1g\\\\"); @@ -3885,8 +3880,7 @@ static void test_import_with_whitespace(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", err); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -4034,8 +4028,7 @@ static void test_unicode_import_with_whitespace(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", err); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Print an error code when CreateFile fails.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 3f7f4cdc3776c18706ea02e1a6acf8870479a0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7f4cdc3776c18706ea02e1a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:15:26 2017 +0000 reg/tests: Print an error code when CreateFile fails. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3a3ff8d..163e4dc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -801,7 +801,7 @@ static BOOL write_file(const void *str, DWORD size) file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); if (file == INVALID_HANDLE_VALUE) return FALSE;

1 0

Andrey Gusev : dwrite/tests: Fix a typo in ok() message.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: de4e3dda474806f5571dd2ad2c4ac9721dc11bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4e3dda474806f5571dd2ad2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 12 14:21:26 2017 +0300 dwrite/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index d689771..347d750 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4771,7 +4771,7 @@ static void test_FontFallbackBuilder(void) ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 0.0f); - ok(hr == S_OK, "Unexected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* empty range */ range.first = range.last = 0;

1 0

Hugh McMaster : regedit/tests: Add more export tests.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 33f9093f6d041e786cbdb016fda6a7ef40e76fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f9093f6d041e786cbdb016f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:08 2017 +0000 regedit/tests: Add more export tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 79 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index babea53..b1f30b2 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3416,6 +3416,7 @@ static void test_export(void) LONG lr; HKEY hkey, subkey; DWORD dword; + BYTE hex[4]; const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -3465,6 +3466,32 @@ static void test_export(void) "\"Value 2\"=\"I was added first!\"\r\n" "\"Value 1\"=\"I was added second!\"\r\n\r\n"; + const char *empty_hex_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine1a\"=hex(0):\r\n" + "\"Wine1b\"=\"\"\r\n" + "\"Wine1c\"=hex(2):\r\n" + "\"Wine1d\"=hex:\r\n" + "\"Wine1e\"=hex(4):\r\n" + "\"Wine1f\"=hex(7):\r\n" + "\"Wine1g\"=hex(100):\r\n" + "\"Wine1h\"=hex(abcd):\r\n\r\n"; + + const char *empty_hex_test2 = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine2a\"=\"\"\r\n" + "\"Wine2b\"=hex:\r\n" + "\"Wine2c\"=hex(4):\r\n\r\n"; + + const char *hex_types_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine3a\"=\"Value\"\r\n" + "\"Wine3b\"=hex:12,34,56,78\r\n" + "\"Wine3c\"=dword:10203040\r\n\r\n"; + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -3547,6 +3574,58 @@ static void test_export(void) ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with empty hex data */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine1a", REG_NONE, NULL, 0); + add_value(hkey, "Wine1b", REG_SZ, NULL, 0); + add_value(hkey, "Wine1c", REG_EXPAND_SZ, NULL, 0); + add_value(hkey, "Wine1d", REG_BINARY, NULL, 0); + add_value(hkey, "Wine1e", REG_DWORD, NULL, 0); + add_value(hkey, "Wine1f", REG_MULTI_SZ, NULL, 0); + add_value(hkey, "Wine1g", 0x100, NULL, 0); + add_value(hkey, "Wine1h", 0xabcd, NULL, 0); + RegCloseKey(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", empty_hex_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export after importing alternative registry data types */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2a\"=hex(1):\n" + "\"Wine2b\"=hex(3):\n" + "\"Wine2c\"=hex(4):\n\n"); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + verify_reg(hkey, "Wine2a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine2b", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine2c", REG_DWORD, NULL, 0, 0); + RegCloseKey(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", empty_hex_test2, TODO_REG_COMPARE), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); + + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine3b\"=hex(3):12,34,56,78\n" + "\"Wine3c\"=hex(4):40,30,20,10\n\n"); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); + memcpy(hex, "\x12\x34\x56\x78", 4); + verify_reg(hkey, "Wine3b", REG_BINARY, hex, 4, 0); + dword = 0x10203040; + verify_reg(hkey, "Wine3c", REG_DWORD, &dword, sizeof(dword), 0); + RegCloseKey(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(regedit)

1 0

Hugh McMaster : reg/tests: Add more export tests.
by Alexandre Julliard Oct. 13, 2017

Oct. 13, 2017

Module: wine Branch: master Commit: 6f52f666e5b43624d1b12ac867d62b26a5b44015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f52f666e5b43624d1b12ac86… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:15:29 2017 +0000 reg/tests: Add more export tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 48cf8f2..c1011ec 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4332,6 +4332,7 @@ static void test_export(void) LONG err; DWORD r, os_version, major_version, minor_version, dword; HKEY hkey, subkey; + BYTE hex[4]; const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -4381,6 +4382,32 @@ static void test_export(void) "\"Value 2\"=\"I was added first!\"\r\n" "\"Value 1\"=\"I was added second!\"\r\n\r\n"; + const char *empty_hex_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine1a\"=hex(0):\r\n" + "\"Wine1b\"=\"\"\r\n" + "\"Wine1c\"=hex(2):\r\n" + "\"Wine1d\"=hex:\r\n" + "\"Wine1e\"=hex(4):\r\n" + "\"Wine1f\"=hex(7):\r\n" + "\"Wine1g\"=hex(100):\r\n" + "\"Wine1h\"=hex(abcd):\r\n\r\n"; + + const char *empty_hex_test2 = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine2a\"=\"\"\r\n" + "\"Wine2b\"=hex:\r\n" + "\"Wine2c\"=hex(4):\r\n\r\n"; + + const char *hex_types_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine3a\"=\"Value\"\r\n" + "\"Wine3b\"=hex:12,34,56,78\r\n" + "\"Wine3c\"=dword:10203040\r\n\r\n"; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4520,6 +4547,61 @@ static void test_export(void) todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with empty hex data */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine1a", REG_NONE, NULL, 0); + add_value(hkey, "Wine1b", REG_SZ, NULL, 0); + add_value(hkey, "Wine1c", REG_EXPAND_SZ, NULL, 0); + add_value(hkey, "Wine1d", REG_BINARY, NULL, 0); + add_value(hkey, "Wine1e", REG_DWORD, NULL, 0); + add_value(hkey, "Wine1f", REG_MULTI_SZ, NULL, 0); + add_value(hkey, "Wine1g", 0x100, NULL, 0); + add_value(hkey, "Wine1h", 0xabcd, NULL, 0); + RegCloseKey(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export after importing alternative registry data types */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine2a\"=hex(1):\n" + "\"Wine2b\"=hex(3):\n" + "\"Wine2c\"=hex(4):\n\n", &r); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + verify_reg(hkey, "Wine2a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine2b", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine2c", REG_DWORD, NULL, 0, 0); + RegCloseKey(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine3b\"=hex(3):12,34,56,78\n" + "\"Wine3c\"=hex(4):40,30,20,10\n\n", &r); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); + memcpy(hex, "\x12\x34\x56\x78", 4); + verify_reg(hkey, "Wine3b", REG_BINARY, hex, 4, 0); + dword = 0x10203040; + verify_reg(hkey, "Wine3c", REG_DWORD, &dword, sizeof(dword), 0); + RegCloseKey(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(reg)

1 0

Henri Verbeet : d3d11: Increment the device reference count in d3d11_input_layout_AddRef().
by Alexandre Julliard Oct. 12, 2017

Oct. 12, 2017

Module: wine Branch: master Commit: 2e877152de1aee128968f8525e5d0b73f43010c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e877152de1aee128968f8525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 12 16:17:10 2017 +0200 d3d11: Increment the device reference count in d3d11_input_layout_AddRef(). Since we release it in d3d11_input_layout_Release(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 2f194e0..784779c 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -134,6 +134,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac if (refcount == 1) { + ID3D11Device_AddRef(layout->device); wined3d_mutex_lock(); wined3d_vertex_declaration_incref(layout->wined3d_decl); wined3d_mutex_unlock();

1 0

Jacek Caban : mshtml/tests: Use winetest.js in events.html.
by Alexandre Julliard Oct. 12, 2017

Oct. 12, 2017

Module: wine Branch: master Commit: 1824f67a06854a3863ceea26bfa2d0874c8e5acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1824f67a06854a3863ceea26b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 12 14:27:08 2017 +0200 mshtml/tests: Use winetest.js in events.html. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 8d5fcc3..638545c 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -1,16 +1,11 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> var testevent_divid2_called = false, testevent_document_called = false, cnt=0; -function ok(b,m) { - return external.ok(b, m); -} - -function broken(expr) { - return external.broken(expr); -} - function ondataavailable_test() { var evobj, div, b = false; @@ -130,7 +125,7 @@ function test_insert_script() { ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); if(e.readyState === "complete") { ok(readystatechange_log === "append,complete", "readystatechange_log = " + readystatechange_log); - external.reportSuccess(); + reportSuccess(); } } @@ -202,7 +197,7 @@ img.src = "http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_ var img_onload_called = false; img.onload = function() { - external.trace("img.onload"); + trace("img.onload"); img_onload_called = true; } </script> @@ -242,7 +237,7 @@ function extern_res_script_readystatechange() { if(elem.readyState != "loading") extern_res_script_rs += elem.readyState + extern_cnt + ","; else - external.trace("Got loading readyState from external res script."); + trace("Got loading readyState from external res script."); } function http_script_readystatechange() {

1 0