wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

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

13 Oct '17

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 : regedit/tests: Print an error code when CreateFile fails.
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: c751b69f889c2385684407494f6815824aa232b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c751b69f889c2385684407494… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:05 2017 +0000 regedit/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/regedit/tests/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 3e949a5..37181bf 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -56,7 +56,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

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

13 Oct '17

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: Add more export tests.
by Alexandre Julliard 13 Oct '17

13 Oct '17

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

Hugh McMaster : reg/tests: Add REG_NONE to the empty hex data import tests.
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: 50619b6ed30afa39537c234954038cf678ab7865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50619b6ed30afa39537c23495… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:15:28 2017 +0000 reg/tests: Add REG_NONE to the empty hex data import 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 168a03d..48cf8f2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2356,7 +2356,8 @@ static void test_import(void) "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" "\"Wine68g\"=hex(abcd):\n" - "\"Wine68h\"=hex:\n\n", &r); + "\"Wine68h\"=hex:\n" + "\"Wine68i\"=hex(0):\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -2366,6 +2367,7 @@ static void test_import(void) verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3850,7 +3852,8 @@ static void test_unicode_import(void) "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" "\"Wine68g\"=hex(abcd):\n" - "\"Wine68h\"=hex:\n\n", &r); + "\"Wine68h\"=hex:\n" + "\"Wine68i\"=hex(0):\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -3860,6 +3863,7 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Delete the export file before returning from compare_export().
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: e426c353fa9a025b324a6a80231970198edf2f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e426c353fa9a025b324a6a802… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:15:27 2017 +0000 reg/tests: Delete the export file before returning from compare_export(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 12a1666..168a03d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4309,7 +4309,9 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp todo_wine_if (todo & TODO_REG_COMPARE) lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); - ret = TRUE; + + ret = DeleteFileA(filename); + todo_wine lok(ret, "DeleteFile failed: %u\n", GetLastError()); exit: HeapFree(GetProcessHeap(), 0, fbuf); @@ -4437,9 +4439,6 @@ static void test_export(void) todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - /* Test registry export with a simple data structure */ dword = 0x100; add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); @@ -4449,9 +4448,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); @@ -4490,9 +4486,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); @@ -4507,9 +4500,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -4525,9 +4515,6 @@ static void test_export(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); - err = DeleteFileA("file.reg"); - todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); - delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

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

13 Oct '17

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 13 Oct '17

13 Oct '17

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

Bernhard Übelacker : advapi32: Fix ChangeServiceConfig2 when given a null description.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: de7220e2553764afd5cf8d463110d4ec5b1a6696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7220e2553764afd5cf8d463… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Oct 11 15:36:16 2017 +0200 advapi32: Fix ChangeServiceConfig2 when given a null description. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 66 +++++++++++++++++++++++++++++++++++++++++++ programs/services/rpc.c | 3 ++ 2 files changed, 69 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ab7ae2e..405cef7 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -36,6 +36,7 @@ static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms static CHAR selfname[MAX_PATH]; static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); +static BOOL (WINAPI *pChangeServiceConfig2W)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCSTR); @@ -57,6 +58,7 @@ static void init_function_pointers(void) HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); + pChangeServiceConfig2W = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2W"); pEnumServicesStatusExA= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExA"); pEnumServicesStatusExW= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExW"); pGetSecurityInfo = (void *)GetProcAddress(hadvapi32, "GetSecurityInfo"); @@ -1954,6 +1956,7 @@ static void test_queryconfig2(void) DWORD expected, needed; BYTE buffer[MAX_PATH]; LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; + LPSERVICE_DESCRIPTIONW pConfigW = (LPSERVICE_DESCRIPTIONW)buffer; SERVICE_PRESHUTDOWN_INFO preshutdown_info; static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; @@ -1961,6 +1964,9 @@ static void test_queryconfig2(void) static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; static const CHAR password [] = ""; static const CHAR description [] = "Description"; + static const CHAR description_empty[] = ""; + static const WCHAR descriptionW [] = {'D','e','s','c','r','i','p','t','i','o','n','W',0}; + static const WCHAR descriptionW_empty[] = {0}; if(!pQueryServiceConfig2A) { @@ -2121,6 +2127,66 @@ static void test_queryconfig2(void) ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); ok(ret, "expected QueryServiceConfig2W to succeed\n"); + pConfig->lpDescription = (LPSTR)description; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = NULL; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); + + pConfig->lpDescription = NULL; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = NULL; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); + + pConfig->lpDescription = (LPSTR)description_empty; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = (void*)0xdeadbeef; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(!pConfig->lpDescription, + "expected lpDescription to be null, got %s\n", pConfig->lpDescription); + + pConfigW->lpDescription = (LPWSTR)descriptionW; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = NULL; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), + "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); + + pConfigW->lpDescription = NULL; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = NULL; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), + "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); + + pConfigW->lpDescription = (LPWSTR)descriptionW_empty; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = (void*)0xdeadbeef; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(!pConfigW->lpDescription, + "expected lpDescription to be null, got %s\n", wine_dbgstr_w(pConfigW->lpDescription)); + SetLastError(0xdeadbeef); ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 8c95b7e..4435af9 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -826,6 +826,9 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI { WCHAR *descr = NULL; + if (!config.u.descr->lpDescription) + break; + if (config.u.descr->lpDescription[0]) { if (!(descr = strdupW( config.u.descr->lpDescription )))

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeObject for image attributes object.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 825f393299393321f3ed6631b9f8e6b6c37f4d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825f393299393321f3ed6631b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 12 13:44:29 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeObject for image attributes object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 28 +++++++++++ dlls/gdiplus/image.c | 19 +------ dlls/gdiplus/metafile.c | 112 +++++++++++++++++++++++++++++++++++------ 3 files changed, 126 insertions(+), 33 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 566092e..d6ccb95 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -121,6 +121,7 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) DECLSPEC_HIDDEN; +extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; @@ -371,6 +372,32 @@ struct GpImage{ LONG busy; }; +#define EmfPlusObjectTableSize 64 + +typedef enum EmfPlusObjectType +{ + ObjectTypeInvalid, + ObjectTypeBrush, + ObjectTypePen, + ObjectTypePath, + ObjectTypeRegion, + ObjectTypeImage, + ObjectTypeFont, + ObjectTypeStringFormat, + ObjectTypeImageAttributes, + ObjectTypeCustomLineCap, + ObjectTypeMax = ObjectTypeCustomLineCap, +} EmfPlusObjectType; + +/* Deserialized EmfPlusObject record. */ +struct emfplus_object { + EmfPlusObjectType type; + union { + GpImageAttributes *image_attributes; + void *object; + } u; +}; + struct GpMetafile{ GpImage image; GpRectF bounds; @@ -404,6 +431,7 @@ struct GpMetafile{ GpRegion *base_clip; /* clip region in device space for all metafile output */ GpRegion *clip; /* clip region within the metafile */ struct list containers; + struct emfplus_object objtable[EmfPlusObjectTableSize]; }; struct GpBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 80ad65f..c0b54d0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2085,24 +2085,7 @@ static GpStatus free_image_data(GpImage *image) heap_free(((GpBitmap*)image)->prop_item); } else if (image->type == ImageTypeMetafile) - { - GpMetafile *metafile = (GpMetafile*)image; - heap_free(metafile->comment_data); - DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); - if (!metafile->preserve_hemf) - DeleteEnhMetaFile(metafile->hemf); - if (metafile->record_graphics) - { - WARN("metafile closed while recording\n"); - /* not sure what to do here; for now just prevent the graphics from functioning or using this object */ - metafile->record_graphics->image = NULL; - metafile->record_graphics->busy = TRUE; - } - if (metafile->record_stream) - { - IStream_Release(metafile->record_stream); - } - } + METAFILE_Free((GpMetafile *)image); else { WARN("invalid image: %p\n", image); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ecfbab2..78ea854 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -297,20 +297,6 @@ typedef struct EmfPlusImageAttributes DWORD Reserved2; } EmfPlusImageAttributes; -typedef enum ObjectType -{ - ObjectTypeInvalid, - ObjectTypeBrush, - ObjectTypePen, - ObjectTypePath, - ObjectTypeRegion, - ObjectTypeImage, - ObjectTypeFont, - ObjectTypeStringFormat, - ObjectTypeImageAttributes, - ObjectTypeCustomLineCap, -} ObjectType; - typedef struct EmfPlusObject { EmfPlusRecordHeader Header; @@ -370,9 +356,52 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) +{ + struct emfplus_object *object = &metafile->objtable[id]; + + switch (object->type) + { + case ObjectTypeInvalid: + break; + case ObjectTypeImageAttributes: + GdipDisposeImageAttributes(object->u.image_attributes); + break; + default: + FIXME("not implemented for object type %u.\n", object->type); + return; + } + + object->type = ObjectTypeInvalid; + object->u.object = NULL; +} + +void METAFILE_Free(GpMetafile *metafile) +{ + unsigned int i; + + heap_free(metafile->comment_data); + DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); + if (!metafile->preserve_hemf) + DeleteEnhMetaFile(metafile->hemf); + if (metafile->record_graphics) + { + WARN("metafile closed while recording\n"); + /* not sure what to do here; for now just prevent the graphics from functioning or using this object */ + metafile->record_graphics->image = NULL; + metafile->record_graphics->busy = TRUE; + } + + if (metafile->record_stream) + IStream_Release(metafile->record_stream); + + for (i = 0; i < sizeof(metafile->objtable)/sizeof(metafile->objtable[0]); i++) + metafile_free_object_table_entry(metafile, i); +} + static DWORD METAFILE_AddObjectId(GpMetafile *metafile) { - return (metafile->next_object_id++) % 64; + return (metafile->next_object_id++) % EmfPlusObjectTableSize; } static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) @@ -1407,6 +1436,55 @@ static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) return stat; } +static void metafile_set_object_table_entry(GpMetafile *metafile, BYTE id, BYTE type, void *object) +{ + metafile_free_object_table_entry(metafile, id); + metafile->objtable[id].type = type; + metafile->objtable[id].u.object = object; +} + +static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT data_size, const BYTE *record_data) +{ + BYTE type = (flags >> 8) & 0xff; + BYTE id = flags & 0xff; + void *object = NULL; + GpStatus status; + + if (type > ObjectTypeMax || id >= EmfPlusObjectTableSize) + return InvalidParameter; + + switch (type) + { + case ObjectTypeImageAttributes: + { + EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data; + GpImageAttributes *attributes = NULL; + + if (data_size != sizeof(*data)) + return InvalidParameter; + + if ((status = GdipCreateImageAttributes(&attributes)) != Ok) + return status; + + status = GdipSetImageAttributesWrapMode(attributes, data->WrapMode, *(DWORD *)&data->ClampColor, + !!data->ObjectClamp); + if (status == Ok) + object = attributes; + else + GdipDisposeImageAttributes(attributes); + break; + } + default: + FIXME("not implemented for object type %d.\n", type); + return NotImplemented; + } + + if (status == Ok) + metafile_set_object_table_entry(metafile, id, type, object); + + return status; +} + GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { @@ -1852,6 +1930,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetSmoothingMode(real_metafile->playback_graphics, (flags >> 1) & 0xff); } + case EmfPlusRecordTypeObject: + { + return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017