October 2017 - Wine-commits

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

13 Oct '17

Module: wine Branch: master Commit: a5de10a207a6a510752b2d6b3b3fddf12e7c5ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5de10a207a6a510752b2d6b3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:07 2017 +0000 regedit/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/regedit/tests/regedit.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bf0232a..64793b7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3393,7 +3393,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); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); exit: HeapFree(GetProcessHeap(), 0, fbuf); @@ -3468,9 +3470,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - /* Test registry export with a simple data structure */ dword = 0x100; add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); @@ -3479,9 +3478,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "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); @@ -3519,9 +3515,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - lr = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS, "delete_tree() failed: %d\n", lr); @@ -3535,9 +3528,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -3552,9 +3542,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); - lr = DeleteFileA("file.reg"); - ok(lr, "DeleteFile failed: %u\n", GetLastError()); - delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Hugh McMaster : regedit/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: 8ecc0d41ca00e762ad22e9abddbce35caacfea19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ecc0d41ca00e762ad22e9abd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Oct 13 08:14:08 2017 +0000 regedit/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/regedit/tests/regedit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 64793b7..babea53 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -659,7 +659,8 @@ static void test_basic_import(void) "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" "\"Wine22g\"=hex(abcd):\n" - "\"Wine22h\"=hex:\n\n"); + "\"Wine22h\"=hex:\n" + "\"Wine22i\"=hex(0):\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -668,6 +669,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); RegCloseKey(hkey); @@ -1072,7 +1074,8 @@ static void test_basic_import_unicode(void) "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" "\"Wine22g\"=hex(abcd):\n" - "\"Wine22h\"=hex:\n\n"); + "\"Wine22h\"=hex:\n" + "\"Wine22i\"=hex(0):\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -1081,6 +1084,7 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); RegCloseKey(hkey);

1 0

Hugh McMaster : regedit/tests: Add more export tests.
by Alexandre Julliard 13 Oct '17

13 Oct '17

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

Andrey Gusev : shell32: Fix misplaced parenthesis.
by Alexandre Julliard 13 Oct '17

13 Oct '17

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

Andrey Gusev : user32/tests: Remove redundant comparison.
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: 70b8a2f86b8e270841bea8390f2063445b5c8b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b8a2f86b8e270841bea8390… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Oct 13 15:38:27 2017 +0300 user32/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 94e98af..8f2576d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -933,8 +933,7 @@ static void test_Input_blackbox(void) empty_message_queue(); prevWndProc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR) WndProc2); - ok(prevWndProc != 0 || (prevWndProc == 0 && GetLastError() == 0), - "error: %d\n", (int) GetLastError()); + ok(prevWndProc != 0 || GetLastError() == 0, "error: %d\n", (int) GetLastError()); i.type = INPUT_KEYBOARD; i.u.ki.time = 0;

1 0

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

13 Oct '17

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

Daniel Lehman : msvcp90: Add std::range_error table.
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: f664a991fdf52dfd142439be7ec4c2c9aaa7f1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f664a991fdf52dfd142439be7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 12 15:52:45 2017 -0700 msvcp90: Add std::range_error table. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 22 ++++++++--------- dlls/msvcp90/cxx.h | 1 + dlls/msvcp90/exception.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index d9e42bd..f496430 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -907,10 +907,10 @@ @ stub -arch=win64 ??0overflow_error(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0overflow_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z @ stub -arch=win64 ??0overflow_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win32 ??0range_error(a)std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z +@ thiscall -arch=win32 ??0range_error(a)std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_range_error_copy_ctor +@ cdecl -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_range_error_copy_ctor +@ thiscall -arch=win32 ??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) MSVCP_range_error_ctor_bstr +@ cdecl -arch=win64 ??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) MSVCP_range_error_ctor_bstr @ thiscall -arch=win32 ??0runtime_error(a)std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_runtime_error_copy_ctor @ cdecl -arch=win64 ??0runtime_error(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_runtime_error_copy_ctor @ thiscall -arch=win32 ??0runtime_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) MSVCP_runtime_error_ctor_bstr @@ -1083,8 +1083,8 @@ @ cdecl -arch=win64 ??1out_of_range(a)std@@UEAA(a)XZ(ptr) MSVCP_logic_error_dtor @ stub -arch=win32 ??1overflow_error(a)std@@UAE(a)XZ @ stub -arch=win64 ??1overflow_error(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1range_error(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1range_error(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1range_error(a)std@@UAE(a)XZ(ptr) MSVCP_runtime_error_dtor +@ cdecl -arch=win64 ??1range_error(a)std@@UEAA(a)XZ(ptr) MSVCP_runtime_error_dtor @ thiscall -arch=win32 ??1runtime_error(a)std@@UAE(a)XZ(ptr) MSVCP_logic_error_dtor @ cdecl -arch=win64 ??1runtime_error(a)std@@UEAA(a)XZ(ptr) MSVCP_logic_error_dtor @ thiscall -arch=win32 ??1strstream(a)std@@UAE(a)XZ(ptr) strstream_dtor @@ -1257,8 +1257,8 @@ @ cdecl -arch=win64 ??4out_of_range(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_out_of_range_assign @ stub -arch=win32 ??4overflow_error(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4overflow_error(a)std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4range_error(a)std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4range_error(a)std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4range_error(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_range_error_assign +@ cdecl -arch=win64 ??4range_error(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_range_error_assign @ thiscall -arch=win32 ??4runtime_error(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_runtime_error_assign @ cdecl -arch=win64 ??4runtime_error(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_runtime_error_assign @ stub -arch=win32 ??4underflow_error(a)std@@QAEAAV01(a)ABV01@@Z @@ -1829,7 +1829,7 @@ # extern ??_7money_base(a)std@@6B@ @ extern ??_7out_of_range(a)std@@6B@ MSVCP_out_of_range_vtable # extern ??_7overflow_error(a)std@@6B@ -# extern ??_7range_error(a)std@@6B@ +@ extern ??_7range_error(a)std@@6B@ MSVCP_range_error_vtable @ extern ??_7runtime_error(a)std@@6B@ MSVCP_runtime_error_vtable # extern ??_7time_base(a)std@@6B@ # extern ??_7underflow_error(a)std@@6B@ @@ -2045,8 +2045,8 @@ @ cdecl -arch=win64 ?_Doraise(a)out_of_range@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise(a)overflow_error@std@@MBEXXZ @ stub -arch=win64 ?_Doraise(a)overflow_error@std@@MEBAXXZ -@ stub -arch=win32 ?_Doraise(a)range_error@std@@MBEXXZ -@ stub -arch=win64 ?_Doraise(a)range_error@std@@MEBAXXZ +@ thiscall -arch=win32 ?_Doraise(a)range_error@std@@MBEXXZ(ptr) MSVCP_exception__Doraise +@ cdecl -arch=win64 ?_Doraise(a)range_error@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ thiscall -arch=win32 ?_Doraise(a)runtime_error@std@@MBEXXZ(ptr) MSVCP_exception__Doraise @ cdecl -arch=win64 ?_Doraise(a)runtime_error@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise(a)underflow_error@std@@MBEXXZ diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 12a7f84..ddf9421 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -311,6 +311,7 @@ typedef enum __exception_type { EXCEPTION_INVALID_ARGUMENT, EXCEPTION_RUNTIME_ERROR, EXCEPTION_FAILURE, + EXCEPTION_RANGE_ERROR, } exception_type; void throw_exception(exception_type, const char *); diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index c96f7a1..e62dfae 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -59,6 +59,8 @@ extern const vtable_ptr MSVCP_runtime_error_vtable; extern const vtable_ptr MSVCP_failure_vtable; /* ??_7bad_cast(a)std@@6B@ */ extern const vtable_ptr MSVCP_bad_cast_vtable; +/* ??_7range_error(a)std@@6B@ */ +extern const vtable_ptr MSVCP_range_error_vtable; static void MSVCP_type_info_dtor(type_info * _this) { @@ -195,6 +197,8 @@ exception* __thiscall MSVCP_exception_assign(exception *this, const exception *a /* ?_Doraise(a)runtime_error@std@@MEBAXXZ */ /* ?_Doraise(a)bad_cast@std@@MBEXXZ */ /* ?_Doraise(a)bad_cast@std@@MEBAXXZ */ +/* ?_Doraise(a)range_error@std@@MBEXXZ */ +/* ?_Doraise(a)range_error@std@@MEBAXXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_exception__Doraise, 4) void __thiscall MSVCP_exception__Doraise(exception *this) { @@ -585,6 +589,8 @@ runtime_error* __thiscall MSVCP_runtime_error_ctor_bstr(runtime_error *this, con /* ??1runtime_error(a)std@@UAE(a)XZ */ /* ??1runtime_error(a)std@@UEAA(a)XZ */ +/* ??1range_error(a)std@@UAE(a)XZ */ +/* ??1range_error(a)std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_dtor, 4) void __thiscall MSVCP_runtime_error_dtor(runtime_error *this) { @@ -766,6 +772,53 @@ bad_cast* __thiscall MSVCP_bad_cast_opequals(bad_cast *this, const bad_cast *rhs DEFINE_RTTI_DATA1(bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@") DEFINE_CXX_DATA1(bad_cast, &exception_cxx_type_info, MSVCP_bad_cast_dtor) +/* range_error class data */ +typedef runtime_error range_error; + +static range_error* MSVCP_range_error_ctor( range_error *this, exception_name name ) +{ + TRACE("%p %s\n", this, EXCEPTION_STR(name)); + MSVCP_runtime_error_ctor(this, name); + this->e.vtable = &MSVCP_range_error_vtable; + return this; +} + +/* ??0range_error(a)std@@QAE(a)ABV01@@Z */ +/* ??0range_error(a)std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_range_error_copy_ctor, 8) +range_error* __thiscall MSVCP_range_error_copy_ctor( + range_error *this, const range_error *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_runtime_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_range_error_vtable; + return this; +} + +/* ??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +/* ??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +#ifndef _MSVCIRT +DEFINE_THISCALL_WRAPPER(MSVCP_range_error_ctor_bstr, 8) +range_error* __thiscall MSVCP_range_error_ctor_bstr(range_error *this, const basic_string_char *str) +{ + const char *name = MSVCP_basic_string_char_c_str(str); + TRACE("(%p %p %s)\n", this, str, name); + return MSVCP_range_error_ctor(this, EXCEPTION_NAME(name)); +} +#endif + +/* ??4range_error(a)std@@QAEAAV01(a)ABV01@@Z */ +/* ??4range_error(a)std@@QEAAAEAV01(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_range_error_assign, 8) +range_error* __thiscall MSVCP_range_error_assign(range_error *this, const range_error *assign) +{ + MSVCP_runtime_error_dtor(this); + return MSVCP_range_error_copy_ctor(this, assign); +} + +DEFINE_RTTI_DATA2(range_error, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVrange_error(a)std@@") +DEFINE_CXX_DATA2(range_error, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) + /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void) { @@ -856,6 +909,9 @@ void __asm_dummy_vtables(void) { EXCEPTION_VTABLE(bad_cast, VTABLE_ADD_FUNC(MSVCP_bad_cast_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what)); + EXCEPTION_VTABLE(range_error, + VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_exception_what)); #ifndef __GNUC__ } #endif @@ -913,6 +969,11 @@ void throw_exception(exception_type et, const char *str) MSVCP_failure_ctor(&e, name); _CxxThrowException((exception*)&e, &failure_cxx_type); } + case EXCEPTION_RANGE_ERROR: { + range_error e; + MSVCP_range_error_ctor(&e, name); + _CxxThrowException((exception*)&e, &range_error_cxx_type); + } } } @@ -929,6 +990,7 @@ void init_exception(void *base) init_runtime_error_rtti(base); init_failure_rtti(base); init_bad_cast_rtti(base); + init_range_error_rtti(base); init_exception_cxx(base); init_bad_alloc_cxx(base); @@ -939,5 +1001,6 @@ void init_exception(void *base) init_runtime_error_cxx(base); init_failure_cxx(base); init_bad_cast_cxx(base); + init_range_error_cxx(base); #endif }

1 0

Vadim Druzhin : comctl32/tests: Add tests for LVM_APPROXIMATEVIEWRECT in LVS_REPORT mode.
by Alexandre Julliard 13 Oct '17

13 Oct '17

Module: wine Branch: master Commit: 2fb1002f323cb6129f41ac4131980eaf75ed6158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb1002f323cb6129f41ac413… Author: Vadim Druzhin <cdslow(a)mail.ru> Date: Fri Oct 13 17:45:09 2017 +0300 comctl32/tests: Add tests for LVM_APPROXIMATEVIEWRECT in LVS_REPORT mode. Signed-off-by: Vadim Druzhin <cdslow(a)mail.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 136 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 132 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index dce253c..0e12362 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4962,13 +4962,18 @@ static void test_LVS_EX_TRANSPARENTBKGND(void) static void test_approximate_viewrect(void) { - HWND hwnd; - DWORD ret; + static CHAR test[] = "abracadabra, a very long item label"; + DWORD item_width, item_height, header_height; + static CHAR column_header[] = "Header"; + unsigned const column_width = 100; + DWORD ret, item_count; HIMAGELIST himl; - HBITMAP hbmp; LVITEMA itema; - static CHAR test[] = "abracadabra, a very long item label"; + LVCOLUMNA col; + HBITMAP hbmp; + HWND hwnd; + /* LVS_ICON */ hwnd = create_listview_control(LVS_ICON); himl = ImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); @@ -5025,6 +5030,129 @@ static void test_approximate_viewrect(void) expect(MAKELONG(152,152), ret); DestroyWindow(hwnd); + + /* LVS_REPORT */ + hwnd = create_listview_control(LVS_REPORT); + + /* Empty control without columns */ + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, MAKELPARAM(100, 100)); +todo_wine + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); +todo_wine + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); + + header_height = HIWORD(ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); +todo_wine + ok(HIWORD(ret) > header_height, "Unexpected height %d.\n", HIWORD(ret)); + + item_height = HIWORD(ret) - header_height; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == (header_height - 2 * item_height), "Unexpected height %d.\n", HIWORD(ret)) ; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -1, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height, "Unexpected height.\n"); + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, 0); + ok(LOWORD(ret) == 0, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + /* Insert column */ + col.mask = LVCF_TEXT | LVCF_WIDTH; + col.pszText = column_header; + col.cx = column_width; + ret = SendMessageA(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + /* Empty control with column */ + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0); +todo_wine { + ok(LOWORD(ret) >= column_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); +} + header_height = HIWORD(ret); + item_width = LOWORD(ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); +todo_wine + ok(HIWORD(ret) > header_height, "Unexpected height %d.\n", HIWORD(ret)); + + item_height = HIWORD(ret) - header_height; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + for (item_count = 1; item_count <= 2; ++item_count) + { + itema.mask = LVIF_TEXT; + itema.iItem = 0; + itema.iSubItem = 0; + itema.pszText = test; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 0, 0); + ok(LOWORD(ret) >= column_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) != 0, "Unexpected height %d.\n", HIWORD(ret)); + + header_height = HIWORD(ret); + item_width = LOWORD(ret); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d, item %d\n", LOWORD(ret), item_count - 1); + ok(HIWORD(ret) > header_height, "Unexpected height %d. item %d.\n", HIWORD(ret), item_count - 1); + + item_height = HIWORD(ret) - header_height; + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -1, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + item_count * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, 0); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, 2, MAKELONG(item_width * 2, header_height + 3 * item_height)); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + ok(HIWORD(ret) == header_height + 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, MAKELONG(item_width * 2, 0)); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + + ret = SendMessageA(hwnd, LVM_APPROXIMATEVIEWRECT, -2, MAKELONG(-1, -1)); + ok(LOWORD(ret) == item_width, "Unexpected width %d.\n", LOWORD(ret)); + todo_wine + ok(HIWORD(ret) == header_height - 2 * item_height, "Unexpected height %d.\n", HIWORD(ret)); + } + + DestroyWindow(hwnd); + } static void test_finditem(void)

1 0

Vincent Povirk : twain_32: Add debug traces to TWAIN_UserSelect.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 7fa90d26db618563d05bb440d1930485b970d229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa90d26db618563d05bb440d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 11 15:46:16 2017 -0500 twain_32: Add debug traces to TWAIN_UserSelect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index b71c112..1d206c8 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -263,11 +263,16 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) { pTW_IDENTITY selected = (pTW_IDENTITY)pData; + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + selected->SupportedGroups, wine_dbgstr_a(selected->ProductName)); + if (!nrdevices) { + TRACE("<-- TWRC_FAILURE\n"); DSM_twCC = TWCC_OPERATIONERROR; return TWRC_FAILURE; } *selected = devices[0].identity; + TRACE("<-- %s\n", wine_dbgstr_a(selected->ProductName)); DSM_twCC = TWCC_SUCCESS; return TWRC_SUCCESS; }

1 0

Vincent Povirk : twain_32: Detect devices in TWAIN_UserSelect.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: a247605894deb7b78acef14507ea62fbd26c26c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a247605894deb7b78acef1450… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 11 15:46:17 2017 -0500 twain_32: Detect devices in TWAIN_UserSelect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 1d206c8..9d67dfb 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -266,6 +266,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", selected->SupportedGroups, wine_dbgstr_a(selected->ProductName)); + twain_autodetect(); if (!nrdevices) { TRACE("<-- TWRC_FAILURE\n"); DSM_twCC = TWCC_OPERATIONERROR;

1 0