Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[akhaldi] 73320: [WSHOM_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:56:32 2016 New Revision: 73320 URL: http://svn.reactos.org/svn/reactos?rev=73320&view=rev Log: [WSHOM_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/wshom/wshom.c Modified: trunk/rostests/winetests/wshom/wshom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.c?r… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] Thu Nov 17 23:56:32 2016 @@ -216,10 +216,8 @@ SysFreeString(str); /* current directory */ -if (0) /* crashes on native */ -{ - hr = IWshShell3_get_CurrentDirectory(sh3, NULL); -} + if (0) /* crashes on native */ + hr = IWshShell3_get_CurrentDirectory(sh3, NULL); str = NULL; hr = IWshShell3_get_CurrentDirectory(sh3, &str);

8 years, 1 month

[akhaldi] 73319: [RSAENH_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:54:08 2016 New Revision: 73319 URL: http://svn.reactos.org/svn/reactos?rev=73319&view=rev Log: [RSAENH_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/rsaenh/rsaenh.c Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Thu Nov 17 23:54:08 2016 @@ -2801,8 +2801,18 @@ if (!result) return; result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); - ok (result, "%08x\n", GetLastError()); - if (!result) return; + ok (result || + broken(!result), /* Windows 8 and greater */ + "%08x\n", GetLastError()); + if (!result) + { + win_skip("Broken TLS1 hash creation\n"); + CryptDestroyKey(hRSAKey); + CryptDestroyKey(hMasterSecret); + CryptReleaseContext(hProv, 0); + CryptAcquireContextA(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_DELETEKEYSET); + return; + } /* Deriving the server write encryption key from the master hash can't * succeed before the encryption key algorithm is set. @@ -3836,7 +3846,7 @@ if(!BASE_PROV) test_key_derivation(STRONG_PROV ? "STRONG" : "ENH"); clean_up_base_environment(); } - if (!init_base_environment(MS_ENHANCED_PROV_A, 0)) + test_key_permissions(); test_key_initialization(); test_schannel_provider();

8 years, 1 month

[akhaldi] 73318: [SCRRUN_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:52:31 2016 New Revision: 73318 URL: http://svn.reactos.org/svn/reactos?rev=73318&view=rev Log: [SCRRUN_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/scrrun/dictionary.c trunk/rostests/winetests/scrrun/filesystem.c Modified: trunk/rostests/winetests/scrrun/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/dictiona… ============================================================================== --- trunk/rostests/winetests/scrrun/dictionary.c [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/dictionary.c [iso-8859-1] Thu Nov 17 23:52:31 2016 @@ -101,10 +101,8 @@ &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ -{ - hr = IDictionary_get_CompareMode(dict, NULL); -} + if (0) /* crashes on native */ + hr = IDictionary_get_CompareMode(dict, NULL); method = 10; hr = IDictionary_get_CompareMode(dict, &method); @@ -935,10 +933,8 @@ &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ -{ - hr = IDictionary__NewEnum(dict, NULL); -} + if (0) /* crashes on native */ + hr = IDictionary__NewEnum(dict, NULL); hr = IDictionary__NewEnum(dict, &enum1); ok(hr == S_OK, "got 0x%08x\n", hr); Modified: trunk/rostests/winetests/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/filesyst… ============================================================================== --- trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] Thu Nov 17 23:52:31 2016 @@ -621,7 +621,7 @@ hr = IFile_get_Path(file, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, pathW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpiW(str, pathW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); #define FILE_ATTR_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \

8 years, 1 month

[akhaldi] 73317: [SETUPAPI_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:49:54 2016 New Revision: 73317 URL: http://svn.reactos.org/svn/reactos?rev=73317&view=rev Log: [SETUPAPI_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/setupapi/devinst.c Modified: trunk/rostests/winetests/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devins… ============================================================================== --- trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devinst.c [iso-8859-1] Thu Nov 17 23:49:54 2016 @@ -281,6 +281,12 @@ devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL); error = GetLastError(); + if (error == ERROR_CALL_NOT_IMPLEMENTED) + { + /* win10 reports ERROR_CALL_NOT_IMPLEMENTED at first here */ + win_skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); + return; + } ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); ok(error == ERROR_INVALID_MACHINENAME || error == ERROR_MACHINE_UNAVAILABLE, "GetLastError returned wrong value : %d, (expected %d or %d)\n", error, ERROR_INVALID_MACHINENAME, ERROR_MACHINE_UNAVAILABLE); @@ -445,7 +451,6 @@ DWORD i; static GUID deadbeef = {0xdeadbeef, 0xdead, 0xbeef, {0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; - LONG res; HKEY key; static const WCHAR bogus0000[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -453,8 +458,13 @@ 'L','E','G','A','C','Y','_','B','O','G','U','S','\\','0','0','0','0',0}; /* So we know we have a clean start */ - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus0000, &key); - ok(res != ERROR_SUCCESS, "Expected key to not exist\n"); + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus0000, &key)) + { + trace("Expected LEGACY_BOGUS\\0000 key to not exist, will be removed now\n"); + change_reg_permissions(bogus0000); + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, bogus0000), "Could not delete LEGACY_BOGUS\\0000 key\n"); + } + /* No GUID given */ SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL,

8 years, 1 month

[akhaldi] 73316: [IMM32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:47:11 2016 New Revision: 73316 URL: http://svn.reactos.org/svn/reactos?rev=73316&view=rev Log: [IMM32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… ============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Thu Nov 17 23:47:11 2016 @@ -207,7 +207,6 @@ case FIRST_WINDOW: case SECOND_WINDOW: case CREATE_CANCEL: - todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; case IME_DISABLED: @@ -223,7 +222,6 @@ case FIRST_WINDOW: case SECOND_WINDOW: case CREATE_CANCEL: - todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; case IME_DISABLED: @@ -868,6 +866,8 @@ HWND def1, def3; HANDLE thread; HWND hwnd; + char title[16]; + LONG style; hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, @@ -883,6 +883,13 @@ } def1 = ImmGetDefaultIMEWnd(hwnd); + + GetWindowTextA(def1, title, sizeof(title)); + ok(!strcmp(title, "Default IME"), "got %s\n", title); + style = GetWindowLongA(def1, GWL_STYLE); + ok(style == (WS_DISABLED | WS_POPUP | WS_CLIPSIBLINGS), "got %08x\n", style); + style = GetWindowLongA(def1, GWL_EXSTYLE); + ok(style == 0, "got %08x\n", style); imc2 = ImmCreateContext(); ImmSetOpenStatus(imc2, TRUE); @@ -952,9 +959,9 @@ 240, 24, hwnd, NULL, GetModuleHandleW(NULL), NULL); } ime_wnd = get_ime_window(); - todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); + ok(ime_wnd != NULL, "Expected IME window existence\n"); default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); - todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); test_phase = SECOND_WINDOW; hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", @@ -962,7 +969,7 @@ CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); DestroyWindow(hwnd2); - todo_wine ok(IsWindow(ime_wnd) || + ok(IsWindow(ime_wnd) || broken(!testcase->visible /* Vista */) || broken(!testcase->top_level_window /* Vista */) , "Expected IME window existence\n"); @@ -1000,9 +1007,9 @@ CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); ime_wnd = get_ime_window(); - todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); + ok(ime_wnd != NULL, "Expected IME window existence\n"); default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); - todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); DestroyWindow(hwnd2); ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); @@ -1023,6 +1030,41 @@ default_ime_wnd = ImmGetDefaultIMEWnd(hWnd); ok(!default_ime_wnd, "Expected no IME windows\n"); DestroyWindow(hWnd); + return 1; +} + +static DWORD WINAPI test_default_ime_with_message_only_window_cb(void *arg) +{ + HWND hwnd1, hwnd2, default_ime_wnd; + + test_phase = PHASE_UNKNOWN; + hwnd1 = CreateWindowA(wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, HWND_MESSAGE, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + ok(!IsWindow(default_ime_wnd), "Expected no IME windows, got %p\n", default_ime_wnd); + + hwnd2 = CreateWindowA(wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, hwnd1, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); + ok(IsWindow(default_ime_wnd), "Expected IME window existance\n"); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd1); + + hwnd1 = CreateWindowA(wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + ok(IsWindow(default_ime_wnd), "Expected IME window existence\n"); + SetParent(hwnd1, HWND_MESSAGE); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + ok(IsWindow(default_ime_wnd), "Expected IME window existence\n"); + DestroyWindow(hwnd1); return 1; } @@ -1063,6 +1105,10 @@ } thread = CreateThread(NULL, 0, test_default_ime_disabled_cb, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, test_default_ime_with_message_only_window_cb, NULL, 0, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread);

8 years, 1 month

[akhaldi] 73315: [REGEDIT_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:39:22 2016 New Revision: 73315 URL: http://svn.reactos.org/svn/reactos?rev=73315&view=rev Log: [REGEDIT_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/regedit/regedit.c Modified: trunk/rostests/winetests/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/regedit/regedit… ============================================================================== --- trunk/rostests/winetests/regedit/regedit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/regedit/regedit.c [iso-8859-1] Thu Nov 17 23:39:22 2016 @@ -98,56 +98,46 @@ return (dr != WAIT_TIMEOUT); } -#define verify_reg_sz(k,s,n,e) r_verify_reg_sz(__LINE__,k,s,n,e) -static void r_verify_reg_sz(unsigned line, HKEY key, const char *subkey, - const char *value_name, const char *exp_value) -{ - LONG lr; - DWORD fnd_type, fnd_len; - char fnd_value[1024]; - HKEY fnd_key; - - lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key); - lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) +#define TODO_REG_TYPE (0x0001u) +#define TODO_REG_SIZE (0x0002u) +#define TODO_REG_DATA (0x0004u) + +/* verify_reg() adapted from programs/reg/tests/reg.c */ +#define verify_reg(k,v,t,d,s,todo) verify_reg_(__LINE__,k,v,t,d,s,todo) +static void verify_reg_(unsigned line, HKEY hkey, const char *value, + DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD todo) +{ + DWORD type, size; + BYTE data[256]; + LONG err; + + size = sizeof(data); + memset(data, 0xdd, size); + err = RegQueryValueExA(hkey, value, NULL, &type, data, &size); + lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); + if (err != ERROR_SUCCESS) return; - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type, - (BYTE*)fnd_value, &fnd_len); - RegCloseKey(fnd_key); - lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; - - lok(fnd_type == REG_SZ, "Got wrong type: %d\n", fnd_type); - if(fnd_type != REG_SZ) - return; - lok(!strcmp(exp_value, fnd_value), - "Strings differ: expected %s, got %s\n", exp_value, fnd_value); -} - -#define verify_reg_wsz(k,s,n,e) r_verify_reg_wsz(__LINE__,k,s,n,e) -static void r_verify_reg_wsz(unsigned line, HKEY key, const char *subkey, - const char *value_name, const WCHAR *exp_value) + todo_wine_if (todo & TODO_REG_TYPE) + lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); + todo_wine_if (todo & TODO_REG_SIZE) + lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); + todo_wine_if (todo & TODO_REG_DATA) + lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); +} + +#define verify_reg_wsz(k,n,e) r_verify_reg_wsz(__LINE__,k,n,e) +static void r_verify_reg_wsz(unsigned line, HKEY key, const char *value_name, const WCHAR *exp_value) { LONG lr; DWORD fnd_type, fnd_len; WCHAR fnd_value[1024], value_nameW[1024]; - HKEY fnd_key; - - lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key); - lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; MultiByteToWideChar(CP_ACP, 0, value_name, -1, value_nameW, sizeof(value_nameW)/sizeof(value_nameW[0])); fnd_len = sizeof(fnd_value); - lr = RegQueryValueExW(fnd_key, value_nameW, NULL, &fnd_type, - (BYTE*)fnd_value, &fnd_len); - RegCloseKey(fnd_key); + lr = RegQueryValueExW(key, value_nameW, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len); lok(lr == ERROR_SUCCESS, "RegQueryValueExW failed: %d\n", lr); if(lr != ERROR_SUCCESS) return; @@ -160,89 +150,25 @@ wine_dbgstr_w(exp_value), wine_dbgstr_w(fnd_value)); } -#define verify_reg_dword(k,s,n,e) r_verify_reg_dword(__LINE__,k,s,n,e) -static void r_verify_reg_dword(unsigned line, HKEY key, const char *subkey, - const char *value_name, DWORD exp_value) -{ - LONG lr; - DWORD fnd_type, fnd_len, fnd_value; - HKEY fnd_key; - - lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key); - lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; - - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type, - (BYTE *)&fnd_value, &fnd_len); - RegCloseKey(fnd_key); - lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; - - lok(fnd_type == REG_DWORD, "Got wrong type: %d\n", fnd_type); - if(fnd_type != REG_DWORD) - return; - lok(fnd_value == exp_value, "Values differ: expected: 0x%x, got: 0x%x\n", - exp_value, fnd_value); -} - -#define verify_reg_binary(k,s,n,e,z) r_verify_reg_binary(__LINE__,k,s,n,e,z) -static void r_verify_reg_binary(unsigned line, HKEY key, const char *subkey, - const char *value_name, const char *exp_value, int exp_len) -{ - LONG lr; - DWORD fnd_type, fnd_len; - char fnd_value[1024]; - HKEY fnd_key; - - lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key); - lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; - - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type, - (BYTE*)fnd_value, &fnd_len); - RegCloseKey(fnd_key); - lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; - - lok(fnd_type == REG_BINARY, "Got wrong type: %d\n", fnd_type); - if(fnd_type != REG_BINARY) - return; - lok(fnd_len == exp_len, - "Lengths differ: expected %d, got %d\n", exp_len, fnd_len); - lok(!memcmp(exp_value, fnd_value, exp_len), - "Data differs\n"); -} - -#define verify_reg_nonexist(k,s,n) r_verify_reg_nonexist(__LINE__,k,s,n) -static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *subkey, - const char *value_name) +#define verify_reg_nonexist(k,n) r_verify_reg_nonexist(__LINE__,k,n) +static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_name) { LONG lr; DWORD fnd_type, fnd_len; char fnd_value[32]; - HKEY fnd_key; - - lr = RegOpenKeyExA(key, subkey, 0, KEY_READ, &fnd_key); - lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(fnd_key, value_name, NULL, &fnd_type, - (BYTE*)fnd_value, &fnd_len); - RegCloseKey(fnd_key); + lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len); lok(lr == ERROR_FILE_NOT_FOUND, "Reg value shouldn't exist: %s\n", value_name); } +#define KEY_BASE "Software\\Wine\\regedit_test" + static void test_basic_import(void) { + HKEY hkey; + DWORD dword = 0x17; char exp_binary[] = {0xAA,0xBB,0xCC,0x11}; WCHAR wide_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', 'i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s', @@ -263,114 +189,137 @@ WCHAR wide_exp[] = {0x3041,'V','a','l','u','e',0}; LONG lr; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestValue\"=\"AValue\"\n"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue", "AValue"); + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + verify_reg(hkey, "TestValue", REG_SZ, "AValue", 7, 0); exec_import_str("REGEDIT4\r\n\r\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" "\"TestValue2\"=\"BValue\"\r\n"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue2", "BValue"); - - if(supports_wchar){ + verify_reg(hkey, "TestValue2", REG_SZ, "BValue", 7, 0); + + if (supports_wchar) + { exec_import_wstr(wide_test); - verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue3", wide_exp); + verify_reg_wsz(hkey, "TestValue3", wide_exp); exec_import_wstr(wide_test_r); - verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue5", wide_exp); - }else + verify_reg_wsz(hkey, "TestValue5", wide_exp); + } + else win_skip("Some WCHAR tests skipped\n"); exec_import_str("REGEDIT4\r\r" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\r" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r" "\"TestValue4\"=\"DValue\"\r"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue4", "DValue"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg(hkey, "TestValue4", REG_SZ, "DValue", 7, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestDword\"=dword:00000017\n"); - verify_reg_dword(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestDword", 0x17); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg(hkey, "TestDword", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestBinary\"=hex:aa,bb,cc,11\n"); - verify_reg_binary(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestBinary", exp_binary, sizeof(exp_binary)); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg(hkey, "TestBinary", REG_BINARY, exp_binary, sizeof(exp_binary), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"With=Equals\"=\"asdf\"\n"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "With=Equals", "asdf"); - - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + verify_reg(hkey, "With=Equals", REG_SZ, "asdf", 5, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Line1\"=\"Value1\"\n\n" + "\"Line2\"=\"Value2\"\n\n\n" + "\"Line3\"=\"Value3\"\n\n\n\n" + "\"Line4\"=\"Value4\"\n\n"); + verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, 0); + verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1\"=dword:00000782\n\n" + "\"Wine2\"=\"Test Value\"\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\ + 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "#comment\n" + "@=\"Test\"\n" + ";comment\n\n" + "\"Wine4\"=dword:12345678\n\n"); + dword = 0x782; + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); + dword = 0x12345678; + verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0); + + RegCloseKey(hkey); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } static void test_invalid_import(void) { LONG lr; - - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, - "RegDeleteKeyA failed: %d\n", lr); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + HKEY hkey; + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestNoEndQuote"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + verify_reg_nonexist(hkey, "TestNoEndQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoBeginQuote\"=Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestNoBeginQuote"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg_nonexist(hkey, "TestNoBeginQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoQuotes\"=Asdffdsa\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestNoQuotes"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg_nonexist(hkey, "TestNoQuotes"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"NameNoEndQuote=\"Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "NameNoEndQuote"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg_nonexist(hkey, "NameNoEndQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoBeginQuote\"=\"Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "NameNoBeginQuote"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg_nonexist(hkey, "NameNoBeginQuote"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoQuotes=\"Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "NameNoQuotes"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + verify_reg_nonexist(hkey, "NameNoQuotes"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"MixedQuotes=Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "MixedQuotes"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "MixedQuotes=Asdffdsa"); - - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + verify_reg_nonexist(hkey, "MixedQuotes"); + verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + + RegCloseKey(hkey); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); }

8 years, 1 month

[akhaldi] 73314: [GDI32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:36:54 2016 New Revision: 73314 URL: http://svn.reactos.org/svn/reactos?rev=73314&view=rev Log: [GDI32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/gdi32/dib.c Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] Thu Nov 17 23:36:54 2016 @@ -2796,6 +2796,9 @@ ExtSelectClipRgn( hdc, NULL, RGN_COPY ); + ret = ExtFloodFill( hdc, -1, -1, RGB( 0, 0xff, 0 ), FLOODFILLSURFACE ); + ok (!ret, "got ret %d\n", ret); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(solid_brush);

8 years, 1 month

[akhaldi] 73313: [PSDK] Add missing WINHTTP_NO_CLIENT_CERT_CONTEXT.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:32:39 2016 New Revision: 73313 URL: http://svn.reactos.org/svn/reactos?rev=73313&view=rev Log: [PSDK] Add missing WINHTTP_NO_CLIENT_CERT_CONTEXT. Modified: trunk/reactos/sdk/include/psdk/winhttp.h Modified: trunk/reactos/sdk/include/psdk/winhttp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winhttp.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/winhttp.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winhttp.h [iso-8859-1] Thu Nov 17 23:32:39 2016 @@ -62,6 +62,8 @@ #define WINHTTP_NO_PROXY_NAME NULL #define WINHTTP_NO_PROXY_BYPASS NULL + +#define WINHTTP_NO_CLIENT_CERT_CONTEXT NULL #define WINHTTP_NO_REFERER NULL #define WINHTTP_DEFAULT_ACCEPT_TYPES NULL

8 years, 1 month

[akhaldi] 73312: [XMLLITE_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:31:04 2016 New Revision: 73312 URL: http://svn.reactos.org/svn/reactos?rev=73312&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Thu Nov 17 23:31:04 2016 @@ -1790,6 +1790,23 @@ IXmlReader_Release(reader); } +static void test_reader_properties(void) +{ + IXmlReader *reader; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MultiLanguage, 0); + ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 0); + ok(hr == S_OK, "SetProperty failed: %08x\n", hr); + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -1807,4 +1824,5 @@ test_read_pending(); test_readvaluechunk(); test_read_xmldeclaration(); -} + test_reader_properties(); +}

8 years, 1 month

[akhaldi] 73311: [XMLLITE] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 23:30:21 2016 New Revision: 73311 URL: http://svn.reactos.org/svn/reactos?rev=73311&view=rev Log: [XMLLITE] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Thu Nov 17 23:30:21 2016 @@ -234,6 +234,7 @@ XmlNodeType nodetype; DtdProcessing dtdmode; IXmlResolver *resolver; + IUnknown *mlang; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ @@ -2464,6 +2465,7 @@ IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); if (This->resolver) IXmlResolver_Release(This->resolver); + if (This->mlang) IUnknown_Release(This->mlang); reader_clear_attrs(This); reader_clear_elements(This); reader_free_strvalues(This); @@ -2548,6 +2550,11 @@ switch (property) { + case XmlReaderProperty_MultiLanguage: + *value = (LONG_PTR)This->mlang; + if (This->mlang) + IUnknown_AddRef(This->mlang); + break; case XmlReaderProperty_XmlResolver: *value = (LONG_PTR)This->resolver; if (This->resolver) @@ -2575,6 +2582,15 @@ switch (property) { + case XmlReaderProperty_MultiLanguage: + if (This->mlang) + IUnknown_Release(This->mlang); + This->mlang = (IUnknown*)value; + if (This->mlang) + IUnknown_AddRef(This->mlang); + if (This->mlang) + FIXME("Ignoring MultiLanguage %p\n", This->mlang); + break; case XmlReaderProperty_XmlResolver: if (This->resolver) IXmlResolver_Release(This->resolver); @@ -2585,6 +2601,9 @@ case XmlReaderProperty_DtdProcessing: if (value < 0 || value > _DtdProcessing_Last) return E_INVALIDARG; This->dtdmode = value; + break; + case XmlReaderProperty_MaxElementDepth: + FIXME("Ignoring MaxElementDepth %ld\n", value); break; default: FIXME("Unimplemented property (%u)\n", property); @@ -2979,6 +2998,7 @@ reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; reader->resolver = NULL; + reader->mlang = NULL; reader->line = reader->pos = 0; reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 17 23:30:21 2016 @@ -218,7 +218,7 @@ reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.11 reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.9.23 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.11 -reactos/dll/win32/xmllite # Synced to WineStaging-1.9.16 +reactos/dll/win32/xmllite # Synced to WineStaging-1.9.23 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.11

8 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2016