Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [SCRRUN_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdbc2cbf9eb1fa452744c… commit bdbc2cbf9eb1fa452744c17b5481d99c4085f271 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:44:28 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:44:28 2018 +0100 [SCRRUN_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/scrrun/filesystem.c | 40 ++++++++++---------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/modules/rostests/winetests/scrrun/filesystem.c b/modules/rostests/winetests/scrrun/filesystem.c index 2e3406d3ce..d0c448c085 100644 --- a/modules/rostests/winetests/scrrun/filesystem.c +++ b/modules/rostests/winetests/scrrun/filesystem.c @@ -46,6 +46,7 @@ static inline ULONG get_refcount(IUnknown *iface) static const WCHAR crlfW[] = {'\r','\n',0}; static const char utf16bom[] = {0xff,0xfe,0}; +static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -239,7 +240,6 @@ static void test_createfolder(void) static void test_textstream(void) { - static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; ITextStream *stream; VARIANT_BOOL b; DWORD written; @@ -1451,10 +1451,18 @@ static void test_DriveCollection(void) IDriveCollection_Release(drives); } -static void test_CreateTextFile(void) +static void get_temp_filepath(const WCHAR *filename, WCHAR *path, WCHAR *dir) { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; + + GetTempPathW(MAX_PATH, path); + lstrcatW(path, scrrunW); + lstrcpyW(dir, path); + lstrcatW(path, filename); +} + +static void test_CreateTextFile(void) +{ WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; @@ -1462,10 +1470,7 @@ static void test_CreateTextFile(void) HRESULT hr; BOOL ret; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); /* dir doesn't exist */ nameW = SysAllocString(pathW); @@ -1533,8 +1538,6 @@ static void test_CreateTextFile(void) static void test_WriteLine(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; WCHAR buffW[MAX_PATH], buff2W[MAX_PATH]; char buffA[MAX_PATH]; @@ -1545,10 +1548,7 @@ static void test_WriteLine(void) HRESULT hr; BOOL ret; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -1607,8 +1607,6 @@ static void test_WriteLine(void) static void test_ReadAll(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR aW[] = {'A',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; @@ -1618,10 +1616,7 @@ static void test_ReadAll(void) BOOL ret; BSTR str; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -1741,8 +1736,6 @@ todo_wine static void test_Read(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR aW[] = {'A',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; @@ -1752,10 +1745,7 @@ static void test_Read(void) BOOL ret; BSTR str; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError());

6 years, 11 months

01/01: [REGEDIT_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f85bcc30ba523bd62a08… commit 2f85bcc30ba523bd62a08239180dc5f85eb1f885 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:43:47 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:43:47 2018 +0100 [REGEDIT_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/regedit/regedit.c | 668 ++++++++++++++++++++------- 1 file changed, 500 insertions(+), 168 deletions(-) diff --git a/modules/rostests/winetests/regedit/regedit.c b/modules/rostests/winetests/regedit/regedit.c index 60f93c92c2..3bab7e1220 100644 --- a/modules/rostests/winetests/regedit/regedit.c +++ b/modules/rostests/winetests/regedit/regedit.c @@ -17,7 +17,7 @@ */ #include <windows.h> - +#include <stdio.h> #include "wine/test.h" #define lok ok_(__FILE__,line) @@ -48,74 +48,63 @@ static BOOL run_regedit_exe_(unsigned line, const char *cmd) return (ret != WAIT_TIMEOUT); } -#define exec_import_str(c) r_exec_import_str(__LINE__, c) -static BOOL r_exec_import_str(unsigned line, const char *file_contents) +static BOOL write_file(const void *str, DWORD size) { - HANDLE regfile; + HANDLE file; + BOOL ret; DWORD written; - BOOL br; - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + if (file == INVALID_HANDLE_VALUE) return FALSE; - br = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); - lok(br, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - run_regedit_exe("regedit.exe /s test.reg"); - - br = DeleteFileA("test.reg"); - lok(br, "DeleteFile failed: %u\n", GetLastError()); + ret = WriteFile(file, str, size, &written, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); - return br; + return ret; } -#define exec_import_wstr(c) r_exec_import_wstr(__LINE__, c) -static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) -{ - int lenA, len, memsize; - WCHAR *wstr; - HANDLE regfile; - DWORD written; - BOOL br; +#define exec_import_str(c) import_reg(__LINE__,c,FALSE) +#define exec_import_wstr(c) import_reg(__LINE__,c,TRUE) - lenA = strlen(file_contents); +static BOOL import_reg(unsigned line, const char *contents, BOOL unicode) +{ + int lenA; + BOOL ret; - len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); - memsize = len * sizeof(WCHAR); - wstr = HeapAlloc(GetProcessHeap(), 0, memsize); - if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); + lenA = strlen(contents); - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if (regfile == INVALID_HANDLE_VALUE) + if (unicode) { + int len = MultiByteToWideChar(CP_UTF8, 0, contents, lenA, NULL, 0); + int size = len * sizeof(WCHAR); + WCHAR *wstr = HeapAlloc(GetProcessHeap(), 0, size); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, contents, lenA, wstr, len); + + ret = write_file(wstr, size); HeapFree(GetProcessHeap(), 0, wstr); - return FALSE; } + else + ret = write_file(contents, lenA); - br = WriteFile(regfile, wstr, memsize, &written, NULL); - lok(br, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - HeapFree(GetProcessHeap(), 0, wstr); + if (!ret) return FALSE; run_regedit_exe("regedit.exe /s test.reg"); - br = DeleteFileA("test.reg"); - lok(br, "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); - return br; + return ret; } #define TODO_REG_TYPE (0x0001u) #define TODO_REG_SIZE (0x0002u) #define TODO_REG_DATA (0x0004u) +#define TODO_REG_COMPARE (0x0008u) /* 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) @@ -137,8 +126,11 @@ static void verify_reg_(unsigned line, HKEY hkey, const char *value, 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"); + if (exp_data) + { + todo_wine_if (todo & TODO_REG_DATA) + lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + } } #define verify_reg_nonexist(k,n) r_verify_reg_nonexist(__LINE__,k,n) @@ -151,6 +143,15 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam (value_name && *value_name) ? value_name : "(Default)", lr); } +#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 lr; + + lr = RegOpenKeyExA(base, path, 0, KEY_READ|sam, hkey); + lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); +} + #define verify_key(k,s) verify_key_(__LINE__,k,s) static void verify_key_(unsigned line, HKEY key_base, const char *subkey) { @@ -178,6 +179,89 @@ static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subke RegCloseKey(hkey); } +#define add_key(k,p,s) add_key_(__LINE__,k,p,s) +static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) +{ + LONG lr; + + lr = RegCreateKeyExA(hkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, subkey, NULL); + lok(lr == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", lr); +} + +#define delete_key(k,p) delete_key_(__LINE__,k,p) +static void delete_key_(unsigned line, const HKEY hkey, const char *path) +{ + if (path && *path) + { + LONG lr; + + lr = RegDeleteKeyA(hkey, path); + lok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + } +} + +static LONG delete_tree(const HKEY key, const char *subkey) +{ + HKEY hkey; + LONG ret; + char *subkey_name = NULL; + DWORD max_subkey_len, subkey_len; + static const char empty[1]; + + ret = RegOpenKeyExA(key, subkey, 0, KEY_READ, &hkey); + if (ret) return ret; + + ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &max_subkey_len, + NULL, NULL, NULL, NULL, NULL, NULL); + if (ret) goto cleanup; + + max_subkey_len++; + + subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len); + if (!subkey_name) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + for (;;) + { + subkey_len = max_subkey_len; + ret = RegEnumKeyExA(hkey, 0, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (ret == ERROR_NO_MORE_ITEMS) break; + if (ret) goto cleanup; + ret = delete_tree(hkey, subkey_name); + if (ret) goto cleanup; + } + + ret = RegDeleteKeyA(hkey, empty); + +cleanup: + HeapFree(GetProcessHeap(), 0, subkey_name); + RegCloseKey(hkey); + return ret; +} + +#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) +static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, + const void *data, size_t size) +{ + LONG lr; + + lr = RegSetValueExA(hkey, name, 0, type, (const BYTE *)data, size); + lok(lr == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", lr); +} + +#define delete_value(k,n) delete_value_(__LINE__,k,n) +static void delete_value_(unsigned line, const HKEY hkey, const char *name) +{ + LONG lr; + + lr = RegDeleteValueA(hkey, name); + lok(lr == ERROR_SUCCESS, "RegDeleteValueA failed: %d\n", lr); +} + #define KEY_BASE "Software\\Wine\\regedit_test" static void test_basic_import(void) @@ -196,8 +280,7 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestValue\"=\"AValue\"\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "TestValue", REG_SZ, "AValue", 7, 0); exec_import_str("REGEDIT4\r\n\r\n" @@ -398,24 +481,20 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n"); - lr = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); lr = RegCloseKey(subkey); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" "\"123/\\\"4;'5\"=\"Random value name\"\n\n"); - lr = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); lr = RegCloseKey(subkey); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); /* Test the accepted range of the hex-based data types */ exec_import_str("REGEDIT4\n\n" @@ -571,10 +650,30 @@ static void test_basic_import(void) verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(1):\n" + "\"Wine22b\"=hex(2):\n" + "\"Wine22c\"=hex(3):\n" + "\"Wine22d\"=hex(4):\n" + "\"Wine22e\"=hex(7):\n" + "\"Wine22f\"=hex(100):\n" + "\"Wine22g\"=hex(abcd):\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, 0); + verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, 0); + 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); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_basic_import_unicode(void) @@ -592,8 +691,7 @@ static void test_basic_import_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestValue\"=\"AValue\"\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "TestValue", REG_SZ, "AValue", 7, 0); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -795,24 +893,20 @@ static void test_basic_import_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n"); - lr = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); lr = RegCloseKey(subkey); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" "\"123/\\\"4;'5\"=\"Random value name\"\n\n"); - lr = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); lr = RegCloseKey(subkey); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); /* Test the accepted range of the hex-based data types */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -971,10 +1065,30 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(1):\n" + "\"Wine22b\"=hex(2):\n" + "\"Wine22c\"=hex(3):\n" + "\"Wine22d\"=hex(4):\n" + "\"Wine22e\"=hex(7):\n" + "\"Wine22f\"=hex(100):\n" + "\"Wine22g\"=hex(abcd):\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, 0); + verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, 0); + 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); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_basic_import_31(void) @@ -1036,8 +1150,7 @@ static void test_basic_import_31(void) RegCloseKey(hkey); - lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CLASSES_ROOT, KEY_BASE); } static void test_invalid_import(void) @@ -1052,8 +1165,7 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_SET_VALUE, &hkey); verify_reg_nonexist(hkey, "TestNoEndQuote"); exec_import_str("REGEDIT4\n\n" @@ -1364,8 +1476,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine24b"); verify_key(hkey, "Subkey2"); - lr = RegDeleteKeyA(hkey, "Subkey2"); - ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + delete_key(hkey, "Subkey2"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1477,8 +1588,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine28c"); verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); - lr = RegDeleteValueW(hkey, NULL); - ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + delete_value(hkey, NULL); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1530,15 +1640,14 @@ static void test_invalid_import(void) RegCloseKey(hkey); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_invalid_import_unicode(void) { LONG lr; HKEY hkey; - DWORD dword = 0x8, os_version, major_version, minor_version; + DWORD dword = 0x8; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -1546,8 +1655,7 @@ static void test_invalid_import_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, KEY_SET_VALUE, &hkey); verify_reg_nonexist(hkey, "TestNoEndQuote"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -1632,19 +1740,10 @@ static void test_invalid_import_unicode(void) "\"Test10\"=\"Value\"\n"); verify_reg_nonexist(hkey, "Test10"); - os_version = GetVersion(); - major_version = LOBYTE(LOWORD(os_version)); - minor_version = HIBYTE(LOWORD(os_version)); - - if (major_version > 5 || (major_version == 5 && minor_version > 0)) - { - exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Test11\"=\"Value\"\n"); - verify_reg_nonexist(hkey, "Test11"); - } - else /* Windows 2000 */ - win_skip("Skipping a non-standard header test\n"); + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test11"); /* Test multi-line import with incorrect comma placement */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -1871,8 +1970,7 @@ static void test_invalid_import_unicode(void) verify_reg_nonexist(hkey, "Wine24b"); verify_key(hkey, "Subkey2"); - lr = RegDeleteKeyA(hkey, "Subkey2"); - ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + delete_key(hkey, "Subkey2"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1984,8 +2082,7 @@ static void test_invalid_import_unicode(void) verify_reg_nonexist(hkey, "Wine28c"); verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); - lr = RegDeleteValueW(hkey, NULL); - ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + delete_value(hkey, NULL); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2039,8 +2136,7 @@ static void test_invalid_import_unicode(void) RegCloseKey(hkey); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_invalid_import_31(void) @@ -2094,8 +2190,7 @@ static void test_invalid_import_31(void) RegCloseKey(hkey); - lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CLASSES_ROOT, KEY_BASE); } static void test_comments(void) @@ -2113,8 +2208,7 @@ static void test_comments(void) "\"Wine1\"=\"Line 1\"\n" ";comment\\\n" "\"Wine2\"=\"Line 2\"\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0); verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0); @@ -2335,8 +2429,7 @@ static void test_comments(void) RegCloseKey(hkey); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_comments_unicode(void) @@ -2354,8 +2447,7 @@ static void test_comments_unicode(void) "\"Wine1\"=\"Line 1\"\n" ";comment\\\n" "\"Wine2\"=\"Line 2\"\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0); verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0); @@ -2578,8 +2670,7 @@ static void test_comments_unicode(void) RegCloseKey(hkey); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_import_with_whitespace(void) @@ -2594,8 +2685,7 @@ static void test_import_with_whitespace(void) exec_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); exec_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2728,8 +2818,7 @@ static void test_import_with_whitespace(void) lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_import_with_whitespace_unicode(void) @@ -2744,8 +2833,7 @@ static void test_import_with_whitespace_unicode(void) exec_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); exec_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2878,8 +2966,7 @@ static void test_import_with_whitespace_unicode(void) lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_key_creation_and_deletion(void) @@ -2893,8 +2980,7 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); /* Test key creation */ exec_import_str("REGEDIT4\n\n" @@ -2916,26 +3002,22 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n"); verify_key(hkey, "Subkey1c "); - lr = RegDeleteKeyA(hkey, "Subkey1c "); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(hkey, "Subkey1c "); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n"); verify_key(hkey, "Subkey1d\t"); - lr = RegDeleteKeyA(hkey, "Subkey1d\t"); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(hkey, "Subkey1d\t"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" "\"Wine\"=\"Test value\"\n\n"); verify_key(hkey, "Subkey1e\\"); verify_key(hkey, "Subkey1e"); - lr = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + open_key(hkey, "Subkey1e", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); - lr = RegDeleteKeyA(hkey, "Subkey1e"); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + delete_key(hkey, "Subkey1e"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" @@ -2943,12 +3025,10 @@ static void test_key_creation_and_deletion(void) verify_key(hkey, "Subkey1f\\\\"); verify_key(hkey, "Subkey1f\\"); verify_key(hkey, "Subkey1f"); - lr = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + open_key(hkey, "Subkey1f\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); - lr = RegDeleteKeyA(hkey, "Subkey1f\\\\"); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + delete_key(hkey, "Subkey1f\\\\"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" @@ -2957,12 +3037,10 @@ static void test_key_creation_and_deletion(void) verify_key(hkey, "Subkey1g\\\\"); verify_key(hkey, "Subkey1g\\"); verify_key(hkey, "Subkey1g"); - lr = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + open_key(hkey, "Subkey1g\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); - lr = RegDeleteKeyA(hkey, "Subkey1g\\\\"); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + delete_key(hkey, "Subkey1g\\\\"); /* Test key deletion. We start by creating some registry keys. */ exec_import_str("REGEDIT4\n\n" @@ -3028,8 +3106,7 @@ static void test_key_creation_and_deletion(void) lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_key_creation_and_deletion_unicode(void) @@ -3043,8 +3120,7 @@ static void test_key_creation_and_deletion_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); /* Test key creation */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3066,26 +3142,22 @@ static void test_key_creation_and_deletion_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n"); verify_key(hkey, "Subkey1c "); - lr = RegDeleteKeyA(hkey, "Subkey1c "); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(hkey, "Subkey1c "); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n"); verify_key(hkey, "Subkey1d\t"); - lr = RegDeleteKeyA(hkey, "Subkey1d\t"); - ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + delete_key(hkey, "Subkey1d\t"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" "\"Wine\"=\"Test value\"\n\n"); verify_key(hkey, "Subkey1e\\"); verify_key(hkey, "Subkey1e"); - lr = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + open_key(hkey, "Subkey1e", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); - lr = RegDeleteKeyA(hkey, "Subkey1e"); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + delete_key(hkey, "Subkey1e"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" @@ -3093,12 +3165,10 @@ static void test_key_creation_and_deletion_unicode(void) verify_key(hkey, "Subkey1f\\\\"); verify_key(hkey, "Subkey1f\\"); verify_key(hkey, "Subkey1f"); - lr = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + open_key(hkey, "Subkey1f\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); - lr = RegDeleteKeyA(hkey, "Subkey1f\\\\"); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + delete_key(hkey, "Subkey1f\\\\"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" @@ -3107,12 +3177,10 @@ static void test_key_creation_and_deletion_unicode(void) verify_key(hkey, "Subkey1g\\\\"); verify_key(hkey, "Subkey1g\\"); verify_key(hkey, "Subkey1g"); - lr = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + open_key(hkey, "Subkey1g\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); RegCloseKey(subkey); - lr = RegDeleteKeyA(hkey, "Subkey1g\\\\"); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + delete_key(hkey, "Subkey1g\\\\"); /* Test key deletion. We start by creating some registry keys. */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3178,8 +3246,7 @@ static void test_key_creation_and_deletion_unicode(void) lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } static void test_value_deletion(void) @@ -3195,8 +3262,7 @@ static void test_value_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); /* Test value deletion. We start by creating some registry values. */ exec_import_str("REGEDIT4\n\n" @@ -3233,8 +3299,7 @@ static void test_value_deletion(void) lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } @@ -3251,8 +3316,7 @@ static void test_value_deletion_unicode(void) exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); /* Test value deletion. We start by creating some registry values. */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3290,8 +3354,269 @@ static void test_value_deletion_unicode(void) lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + delete_key(HKEY_CURRENT_USER, KEY_BASE); +} + +#define compare_export(f,e,todo) compare_export_(__LINE__,f,e,todo) +static BOOL compare_export_(unsigned line, const char *filename, const char *expected, DWORD todo) +{ + FILE *fp; + long file_size; + WCHAR *fbuf = NULL, *wstr = NULL; + size_t len; + BOOL ret = FALSE; + + fp = fopen(filename, "rb"); + if (!fp) return FALSE; + + if (fseek(fp, 0, SEEK_END)) goto error; + file_size = ftell(fp); + if (file_size == -1) goto error; + rewind(fp); + + fbuf = HeapAlloc(GetProcessHeap(), 0, file_size + sizeof(WCHAR)); + if (!fbuf) goto error; + + fread(fbuf, file_size, 1, fp); + fbuf[file_size/sizeof(WCHAR)] = 0; + fclose(fp); + + len = MultiByteToWideChar(CP_UTF8, 0, expected, -1, NULL, 0); + wstr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!wstr) goto exit; + MultiByteToWideChar(CP_UTF8, 0, expected, -1, wstr, len); + + todo_wine_if (todo & TODO_REG_COMPARE) + lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); + + ret = DeleteFileA(filename); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + +exit: + HeapFree(GetProcessHeap(), 0, fbuf); + HeapFree(GetProcessHeap(), 0, wstr); + return ret; + +error: + fclose(fp); + return FALSE; +} + +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" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + + const char *simple_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; + + const char *complex_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n" + "\"Binary\"=hex:11,22,33,44\r\n" + "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\r\n" + "\"double\\\"quote\"=\"\\\"Hello, World!\\\"\"\r\n" + "\"single'quote\"=dword:00000008\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a\\Subkey2b]\r\n" + "@=\"Default value name\"\r\n" + "\"Multiple strings\"=hex(7):4c,00,69,00,6e,00,65,00,31,00,00,00,4c,00,69,00,6e,\\\r\n" + " 00,65,00,32,00,00,00,4c,00,69,00,6e,00,65,00,33,00,00,00,00,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a]\r\n" + "\"Backslash\"=\"Use \\\\\\\\ to escape a backslash\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a\\Subkey3b]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a\\Subkey3b\\Subkey3c]\r\n" + "\"String expansion\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,25,00,50,\\\r\n" + " 00,41,00,54,00,48,00,25,00,00,00\r\n" + "\"Zero data type\"=hex(0):56,61,6c,75,65,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4]\r\n" + "@=dword:12345678\r\n" + "\"43981\"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; + + const char *key_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\r\n\r\n"; + + const char *value_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"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, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + + /* Test registry export with an empty key */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + + 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"); + + /* Test registry export with a simple data structure */ + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + 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"); + + /* Test registry export with a complex data structure */ + add_key(hkey, "Subkey1", &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + RegCloseKey(subkey); + + add_key(hkey, "Subkey2a", &subkey); + add_value(subkey, "double\"quote", REG_SZ, "\"Hello, World!\"", 16); + dword = 0x8; + add_value(subkey, "single'quote", REG_DWORD, &dword, sizeof(dword)); + RegCloseKey(subkey); + + add_key(hkey, "Subkey2a\\Subkey2b", &subkey); + add_value(subkey, NULL, REG_SZ, "Default value name", 19); + add_value(subkey, "Multiple strings", REG_MULTI_SZ, "Line1\0Line2\0Line3\0", 19); + RegCloseKey(subkey); + + add_key(hkey, "Subkey3a", &subkey); + add_value(subkey, "Backslash", REG_SZ, "Use \\\\ to escape a backslash", 29); + RegCloseKey(subkey); + + add_key(hkey, "Subkey3a\\Subkey3b\\Subkey3c", &subkey); + add_value(subkey, "String expansion", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14); + add_value(subkey, "Zero data type", REG_NONE, "Value", 6); + RegCloseKey(subkey); + + add_key(hkey, "Subkey4", &subkey); + dword = 0x12345678; + add_value(subkey, NULL, REG_DWORD, &dword, sizeof(dword)); + add_value(subkey, "43981", 0xabcd, "Value", 6); + RegCloseKey(subkey); + + RegCloseKey(hkey); + + 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 = delete_tree(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS, "delete_tree() failed: %d\n", lr); + + /* Test the export order of registry keys */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "Subkey2", &subkey); + RegCloseKey(subkey); + add_key(hkey, "Subkey1", &subkey); + RegCloseKey(subkey); + + 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"); + + delete_key(hkey, "Subkey1"); + delete_key(hkey, "Subkey2"); + + /* Test the export order of registry values. Windows exports registry values + * in order of creation; Wine uses alphabetical order. + */ + add_value(hkey, "Value 2", REG_SZ, "I was added first!", 19); + add_value(hkey, "Value 1", REG_SZ, "I was added second!", 20); + + RegCloseKey(hkey); + + 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"); + + 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, 0), "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, 0), "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) @@ -3301,6 +3626,12 @@ START_TEST(regedit) return; } + if (!run_regedit_exe("regedit.exe /s test.reg") && GetLastError() == ERROR_ELEVATION_REQUIRED) + { + win_skip("User is a non-elevated admin; skipping regedit tests.\n"); + return; + } + test_basic_import(); test_basic_import_unicode(); test_basic_import_31(); @@ -3315,4 +3646,5 @@ START_TEST(regedit) test_key_creation_and_deletion_unicode(); test_value_deletion(); test_value_deletion_unicode(); + test_export(); }

6 years, 11 months

01/01: [PSAPI_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a7f3bdb4e7e8f5419f65… commit 4a7f3bdb4e7e8f5419f6586aba1708aee2393f04 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:43:04 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:43:04 2018 +0100 [PSAPI_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/psapi/psapi_main.c | 78 +++++++++++++-------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/modules/rostests/winetests/psapi/psapi_main.c b/modules/rostests/winetests/psapi/psapi_main.c index b02c7a0f06..a8fe243a73 100644 --- a/modules/rostests/winetests/psapi/psapi_main.c +++ b/modules/rostests/winetests/psapi/psapi_main.c @@ -107,7 +107,7 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { - HMODULE hMod = GetModuleHandleA(NULL); + HMODULE hMod; DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -119,14 +119,18 @@ static void test_EnumProcessModules(void) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + hMod = (void *)0xdeadbeef; ret = pEnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + hMod = (void *)0xdeadbeef; ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); + todo_wine ok(hMod == GetModuleHandleA(NULL), + "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); SetLastError(0xdeadbeef); ret = pEnumProcessModules(hpQV, NULL, 0, &cbNeeded); @@ -138,9 +142,9 @@ static void test_EnumProcessModules(void) ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + hMod = (void *)0xdeadbeef; ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); - if(ret != 1) - return; + ok(ret == 1, "got %d, failed with %d\n", ret, GetLastError()); ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); @@ -149,7 +153,6 @@ static void test_EnumProcessModules(void) static void test_GetModuleInformation(void) { HMODULE hMod = GetModuleHandleA(NULL); - DWORD *tmp, counter = 0; MODULEINFO info; DWORD ret; @@ -169,21 +172,10 @@ static void test_GetModuleInformation(void) pGetModuleInformation(hpQV, hMod, &info, sizeof(info)-1); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = pGetModuleInformation(hpQV, hMod, &info, sizeof(info)); ok(ret == 1, "failed with %d\n", GetLastError()); ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); - - hMod = LoadLibraryA("shell32.dll"); - ok(hMod != NULL, "Failed to load shell32.dll, error: %u\n", GetLastError()); - - ret = pGetModuleInformation(hpQV, hMod, &info, sizeof(info)); - ok(ret == 1, "failed with %d\n", GetLastError()); - info.SizeOfImage /= sizeof(DWORD); - for (tmp = (DWORD *)hMod; info.SizeOfImage; info.SizeOfImage--) - counter ^= *tmp++; - trace("xor of shell32: %08x\n", counter); - - FreeLibrary(hMod); } static BOOL check_with_margin(SIZE_T perf, SIZE_T sysperf, int margin) @@ -234,19 +226,19 @@ static void test_GetPerformanceInfo(void) ok(check_with_margin(info.CommitPeak, sys_performance_info->PeakCommitment, 32), "expected approximately %ld but got %d\n", info.CommitPeak, sys_performance_info->PeakCommitment); - ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 128), + ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 512), "expected approximately %ld but got %d\n", info.PhysicalAvailable, sys_performance_info->AvailablePages); /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 64), + ok(check_with_margin(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); - ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 64), + ok(check_with_margin(info.KernelPaged, sys_performance_info->PagedPoolUsage, 256), "expected approximately %ld but got %d\n", info.KernelPaged, sys_performance_info->PagedPoolUsage); - ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 8), + ok(check_with_margin(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage, 16), "expected approximately %ld but got %d\n", info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage); /* compare with values from SYSTEM_BASIC_INFORMATION */ @@ -339,7 +331,14 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW ret_len = 0xdeadbeef; status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, &ret_len); +todo_wine ok(!status, "NtQueryVirtualMemory error %x\n", status); + /* FIXME: remove once Wine is fixed */ + if (status) + { + HeapFree(GetProcessHeap(), 0, buf); + return FALSE; + } section_name = (MEMORY_SECTION_NAME *)buf; ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n", @@ -365,30 +364,31 @@ static void test_GetMappedFileName(void) char temp_path[MAX_PATH], file_name[MAX_PATH], map_name[MAX_PATH], device_name[MAX_PATH], drive[3]; WCHAR map_nameW[MAX_PATH], nt_map_name[MAX_PATH]; HANDLE hfile, hmap; - HANDLE current_process; - - DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), - GetCurrentProcess(), &current_process, 0, 0, DUPLICATE_SAME_ACCESS ); SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); +todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); ok(!ret, "GetMappedFileName should fail\n"); +todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError( 0xdeadbeef ); ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); +todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); if (ret) { ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); + todo_wine ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ + todo_wine ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); if (szMapBaseName) { @@ -426,30 +426,36 @@ static void test_GetMappedFileName(void) SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); ok(!ret, "GetMappedFileName should fail\n"); +todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); +todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 1); +todo_wine ok(ret == 1, "GetMappedFileName error %d\n", GetLastError()); ok(!map_name[0] || broken(map_name[0] == device_name[0]) /* before win2k */, "expected 0, got %c\n", map_name[0]); SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); +todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); +} SetLastError(0xdeadbeef); ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, sizeof(map_nameW)/sizeof(map_nameW[0])); +todo_wine { ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - +} if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name, sizeof(nt_map_name)/sizeof(nt_map_name[0]))) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); @@ -457,27 +463,18 @@ static void test_GetMappedFileName(void) ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } - SetLastError(0xdeadbeef); - ret = pGetMappedFileNameW(current_process, base, map_nameW, sizeof(map_nameW)/sizeof(map_nameW[0])); - ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); - ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - - if (nt_get_mapped_file_name(current_process, base, nt_map_name, sizeof(nt_map_name)/sizeof(nt_map_name[0]))) - { - ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); - WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); - ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); - } - SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); +todo_wine { ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); +} SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base + 0x4000, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); +todo_wine ok(GetLastError() == ERROR_UNEXP_NET_ERR, "expected ERROR_UNEXP_NET_ERR, got %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -489,6 +486,7 @@ todo_wine SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(0, base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); +todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); UnmapViewOfFile(base); @@ -507,9 +505,9 @@ todo_wine SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(!ret, "GetMappedFileName should fail\n"); +todo_wine ok(GetLastError() == ERROR_FILE_INVALID, "expected ERROR_FILE_INVALID, got %d\n", GetLastError()); - CloseHandle(current_process); UnmapViewOfFile(base); CloseHandle(hmap); } @@ -556,8 +554,8 @@ static void test_GetProcessImageFileName(void) if(ret && ret1) { /* Windows returns 2*strlen-1 */ - ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); - ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); + todo_wine ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); + todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } SetLastError(0xdeadbeef);

6 years, 11 months

01/01: [OPENGL32_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1c4fe8cfbb3e173a089c… commit d1c4fe8cfbb3e173a089cfbd45f62d411ca1fde3 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:42:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:42:20 2018 +0100 [OPENGL32_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/opengl32/opengl.c | 132 +++++---------------------- 1 file changed, 24 insertions(+), 108 deletions(-) diff --git a/modules/rostests/winetests/opengl32/opengl.c b/modules/rostests/winetests/opengl32/opengl.c index 346b89d45a..8126fbf96d 100644 --- a/modules/rostests/winetests/opengl32/opengl.c +++ b/modules/rostests/winetests/opengl32/opengl.c @@ -24,20 +24,10 @@ #include "wine/wgl.h" #define MAX_FORMATS 256 -typedef void* HPBUFFERARB; /* WGL_ARB_create_context */ static HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); -#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 -#define WGL_CONTEXT_FLAGS_ARB 0x2094 - -/* Flags for WGL_CONTEXT_FLAGS_ARB */ -#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 -#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 - /* WGL_ARB_extensions_string */ static const char* (WINAPI *pwglGetExtensionsStringARB)(HDC); static int (WINAPI *pwglReleasePbufferDCARB)(HPBUFFERARB, HDC); @@ -47,35 +37,17 @@ static BOOL (WINAPI *pwglMakeContextCurrentARB)(HDC hdraw, HDC hread, HGLRC hglr static HDC (WINAPI *pwglGetCurrentReadDCARB)(void); /* WGL_ARB_pixel_format */ -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_ALPHA_BITS_ARB 0x201B -#define WGL_SUPPORT_GDI_ARB 0x200F -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 - static BOOL (WINAPI *pwglChoosePixelFormatARB)(HDC, const int *, const FLOAT *, UINT, int *, UINT *); static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const int *, int *); /* WGL_ARB_pbuffer */ -#define WGL_DRAW_TO_PBUFFER_ARB 0x202D -static HPBUFFERARB* (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); +static HPBUFFERARB (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); /* WGL_EXT_swap_control */ static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); static int (WINAPI *pwglGetSwapIntervalEXT)(void); -/* GL_ARB_debug_output */ -static void (WINAPI *pglDebugMessageCallbackARB)(void *, void *); -static void (WINAPI *pglDebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); -static void (WINAPI *pglDebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const char *); - static const char* wgl_extensions = NULL; static void init_functions(void) @@ -108,11 +80,6 @@ static void init_functions(void) GET_PROC(wglSwapIntervalEXT) GET_PROC(wglGetSwapIntervalEXT) - /* GL_ARB_debug_output */ - GET_PROC(glDebugMessageCallbackARB) - GET_PROC(glDebugMessageControlARB) - GET_PROC(glDebugMessageInsertARB) - #undef GET_PROC } @@ -242,7 +209,7 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } -static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt) +static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd) { int pf; HDC hdc; @@ -255,12 +222,6 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt hdc = GetDC( hwnd ); pf = ChoosePixelFormat( hdc, pfd ); - if (pf && fmt) - { - memset(fmt, 0, sizeof(*fmt)); - ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), - "DescribePixelFormat failed with error: %u\n", GetLastError()); - } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd ); @@ -288,105 +249,61 @@ static void test_choosepixelformat(void) 0, /* reserved */ 0, 0, 0 /* layer masks */ }; - PIXELFORMATDESCRIPTOR ret_fmt; - ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); + ok( test_pfd(&pfd), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; - pfd.iPixelType = 32; - ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 32 failed\n" ); - ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); - pfd.iPixelType = 33; - ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 33 failed\n" ); - ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); - pfd.iPixelType = 15; - ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 15 failed\n" ); - ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); - pfd.iPixelType = PFD_TYPE_RGBA; pfd.cColorBits = 32; - ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); + ok( test_pfd(&pfd), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cColorBits = 0; pfd.cAlphaBits = 8; - ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); + ok( test_pfd(&pfd), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAlphaBits = 0; pfd.cStencilBits = 8; - ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); + ok( test_pfd(&pfd), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cStencilBits = 0; pfd.cAuxBuffers = 1; - ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); + ok( test_pfd(&pfd), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAuxBuffers = 0; } -static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, - GLsizei length, const GLchar *message, const void *userParam) -{ - DWORD *count = (DWORD *)userParam; - (*count)++; -} - -static void test_debug_message_callback(void) -{ - static const char testmsg[] = "Hello World"; - DWORD count; - - if (!pglDebugMessageCallbackARB) - { - skip("glDebugMessageCallbackARB not supported\n"); - return; - } - - glEnable(GL_DEBUG_OUTPUT); - glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); - - pglDebugMessageCallbackARB(gl_debug_message_callback, &count); - pglDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE); - - count = 0; - pglDebugMessageInsertARB(GL_DEBUG_SOURCE_APPLICATION, GL_DEBUG_TYPE_OTHER, 0x42424242, - GL_DEBUG_SEVERITY_LOW, sizeof(testmsg), testmsg); - ok(count == 1, "expected count == 1, got %u\n", count); - - glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS); - glDisable(GL_DEBUG_OUTPUT); -} - static void test_setpixelformat(HDC winhdc) { int res = 0; @@ -464,7 +381,7 @@ static void test_setpixelformat(HDC winhdc) ok( GetLastError() == ERROR_INVALID_PIXEL_FORMAT, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); res = SetPixelFormat( hdc, pf, &pfd ); - ok( i == 0, "SetPixelFormat succeeded\n" ); + ok( !res, "SetPixelFormat succeeded\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); res = DescribePixelFormat( hdc, 0, 0, NULL ); @@ -525,7 +442,7 @@ static void test_sharelists(HDC winhdc) res = wglMakeCurrent(winhdc, hglrc2); ok(res, "Make current failed\n"); res = wglShareLists(hglrc1, hglrc2); - ok(res, "Sharing display lists with a destination context which has been made current failed\n"); + todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); wglMakeCurrent(0, 0); wglDeleteContext(hglrc2); } @@ -1870,7 +1787,6 @@ START_TEST(opengl) } test_choosepixelformat(); - test_debug_message_callback(); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc);

6 years, 11 months

01/01: [NETAPI32_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=173200c3cbe1b047bad18… commit 173200c3cbe1b047bad180dcfab8b4fdac7c599c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:40:45 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:40:45 2018 +0100 [NETAPI32_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/netapi32/wksta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/netapi32/wksta.c b/modules/rostests/winetests/netapi32/wksta.c index ee3004e17c..418a1ad626 100644 --- a/modules/rostests/winetests/netapi32/wksta.c +++ b/modules/rostests/winetests/netapi32/wksta.c @@ -168,7 +168,8 @@ static void run_wkstatransportenum_tests(void) /* 4th check: is param 6 passed? */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, NULL, NULL); - ok(apiReturn == RPC_X_NULL_REF_POINTER, "null pointer\n"); + ok(apiReturn == RPC_X_NULL_REF_POINTER, + "NetWkstaTransportEnum returned %d\n", apiReturn); /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH,

6 years, 11 months

01/01: [MSVCRT_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d42fce3c823d7ffb2a33a… commit d42fce3c823d7ffb2a33ad546a64b141299956f0 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:39:53 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:39:53 2018 +0100 [MSVCRT_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/msvcrt/CMakeLists.txt | 2 +- modules/rostests/winetests/msvcrt/file.c | 148 ++++++++++++++++++++++- modules/rostests/winetests/msvcrt/locale.c | 122 ++++++------------- modules/rostests/winetests/msvcrt/printf.c | 22 ++-- modules/rostests/winetests/msvcrt/scanf.c | 36 +++++- modules/rostests/winetests/msvcrt/string.c | 136 +++++++++++++++++++++ modules/rostests/winetests/msvcrt/time.c | 25 ++-- 7 files changed, 376 insertions(+), 115 deletions(-) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index f50ed55eae..c456d9c003 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -28,7 +28,7 @@ if(USE_CLANG_CL OR (NOT MSVC)) endif() set_module_type(msvcrt_winetest win32cui) -add_importlibs(msvcrt_winetest msvcrt kernel32) +add_importlibs(msvcrt_winetest advapi32 msvcrt kernel32) if(MSVC) target_link_libraries(msvcrt_winetest oldnames) diff --git a/modules/rostests/winetests/msvcrt/file.c b/modules/rostests/winetests/msvcrt/file.c index b2d32a7c1f..d27e0d49f7 100644 --- a/modules/rostests/winetests/msvcrt/file.c +++ b/modules/rostests/winetests/msvcrt/file.c @@ -21,6 +21,7 @@ #include "precomp.h" +#include <winreg.h> #include <fcntl.h> #include <share.h> #include <sys/stat.h> @@ -212,7 +213,7 @@ static void test_readmode( BOOL ascii_mode ) static const char outbuffer[] = "0,1,2,3,4,5,6,7,8,9\r\n\r\nA,B,C,D,E\r\nX,Y,Z"; static const char padbuffer[] = "ghjghjghjghj"; static const char nlbuffer[] = "\r\n"; - char buffer[2*BUFSIZ+256]; + static char buffer[8192]; const char *optr; int fd; FILE *file; @@ -317,7 +318,7 @@ static void test_readmode( BOOL ascii_mode ) ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==0,"fread failure in %s\n",IOMODE); ok(feof(file)!=0,"feof failure in %s\n", IOMODE); - + /* test some additional functions */ rewind(file); ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); @@ -340,6 +341,30 @@ static void test_readmode( BOOL ascii_mode ) fclose (file); unlink ("fdopen.tst"); + + /* test INTERNAL_BUFSIZ read containing 0x1a character (^Z) */ + fd = open("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); + ok(fd != -1, "open failed\n"); + memset(buffer, 'a', sizeof(buffer)); + buffer[1] = 0x1a; + ok(write(fd, buffer, sizeof(buffer)) == sizeof(buffer), "write failed\n"); + ok(close(fd) != -1, "close failed\n"); + + fd = open("fdopen.tst", O_RDONLY); + ok(fd != -1, "open failed\n"); + file = fdopen(fd, ascii_mode ? "r" : "rb"); + ok(file != NULL, "fdopen failed\n"); + + memset(buffer, 0, sizeof(buffer)); + i = fread(buffer, 4096, 1, file); + ok(!i, "fread succeeded\n"); + ok(file->_bufsiz == 4096, "file->_bufsiz = %d\n", file->_bufsiz); + for(i=0; i<4096; i++) + if(buffer[i] != (i==1 ? 0x1a : 'a')) break; + ok(i==4096, "buffer[%d] = %d\n", i, buffer[i]); + + fclose(file); + unlink("fdopen.tst"); } static void test_asciimode(void) @@ -1513,6 +1538,113 @@ static void test_file_inherit( const char* selfname ) DeleteFileA("fdopen.tst"); } +static void test_invalid_stdin_child( void ) +{ + HANDLE handle; + ioinfo *info; + int ret; + char c; + + errno = 0xdeadbeef; + handle = (HANDLE)_get_osfhandle(STDIN_FILENO); + ok(handle == (HANDLE)-2, "handle = %p\n", handle); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + info = &__pioinfo[STDIN_FILENO/MSVCRT_FD_BLOCK_SIZE][STDIN_FILENO%MSVCRT_FD_BLOCK_SIZE]; + ok(info->handle == (HANDLE)-2, "info->handle = %p\n", info->handle); + ok(info->wxflag == 0xc1, "info->wxflag = %x\n", info->wxflag); + + ok(stdin->_file == -2, "stdin->_file = %d\n", stdin->_file); + + errno = 0xdeadbeef; + ret = fread(&c, 1, 1, stdin); + ok(!ret, "fread(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = read(-2, &c, 1); + ok(ret == -1, "read(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = read(STDIN_FILENO, &c, 1); + ok(ret == -1, "read(STDIN_FILENO) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _flsbuf('a', stdin); + ok(ret == EOF, "_flsbuf(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = fwrite(&c, 1, 1, stdin); + ok(!ret, "fwrite(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = write(-2, &c, 1); + ok(ret == -1, "write(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = write(STDIN_FILENO, &c, 1); + ok(ret == -1, "write(STDIN_FILENO) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = fclose(stdin); + ok(ret == -1, "fclose(stdin) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = close(-2); + ok(ret == -1, "close(-2) returned %d\n", ret); + ok(errno == EBADF, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = close(STDIN_FILENO); + ok(ret==-1 || !ret, "close(STDIN_FILENO) returned %d\n", ret); + ok((ret==-1 && errno==EBADF) || (!ret && errno==0xdeadbeef), "errno = %d\n", errno); +} + +static void test_invalid_stdin( const char* selfname ) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION proc; + SECURITY_ATTRIBUTES sa; + STARTUPINFOA startup; + HKEY key; + LONG ret; + + if(!p_fopen_s) { + /* Behaviour of the dll has changed in newer version */ + win_skip("skipping invalid stdin tests\n"); + return; + } + + ret = RegOpenCurrentUser(KEY_READ, &key); + ok(!ret, "RegOpenCurrentUser failed: %x\n", ret); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESTDHANDLES; + startup.hStdInput = key; + startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + startup.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + sprintf(cmdline, "%s file stdin", selfname); + CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, + CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); + + ret = RegCloseKey(key); + ok(!ret, "RegCloseKey failed: %x\n", ret); +} + static void test_tmpnam( void ) { char name[MAX_PATH] = "abc"; @@ -1601,10 +1733,13 @@ static void test_fopen_fclose_fcloseall( void ) ok(ret == 0, "The file '%s' was not closed\n", fname2); ret = fclose(stream3); ok(ret == 0, "The file '%s' was not closed\n", fname3); + errno = 0xdeadbeef; ret = fclose(stream2); ok(ret == EOF, "Closing file '%s' returned %d\n", fname2, ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); ret = fclose(stream3); ok(ret == EOF, "Closing file '%s' returned %d\n", fname3, ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); /* testing fcloseall() */ numclosed = _fcloseall(); @@ -2349,6 +2484,12 @@ static void test_close(void) ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); ok(close(fd2), "close(fd2) succeeded\n"); + /* test close on already closed fd */ + errno = 0xdeadbeef; + ret1 = close(fd1); + ok(ret1 == -1, "close(fd1) succeeded\n"); + ok(errno == 9, "errno = %d\n", errno); + /* test close on stdout and stderr that use the same handle */ h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); @@ -2452,12 +2593,15 @@ START_TEST(file) test_file_inherit_child_no(arg_v[3]); else if (strcmp(arg_v[2], "pipes") == 0) test_pipes_child(arg_c, arg_v); + else if (strcmp(arg_v[2], "stdin") == 0) + test_invalid_stdin_child(); else ok(0, "invalid argument '%s'\n", arg_v[2]); return; } test_dup2(); test_file_inherit(arg_v[0]); + test_invalid_stdin(arg_v[0]); test_file_write_read(); test_chsize(); test_stat(); diff --git a/modules/rostests/winetests/msvcrt/locale.c b/modules/rostests/winetests/msvcrt/locale.c index 0554270f1d..195b7738ae 100644 --- a/modules/rostests/winetests/msvcrt/locale.c +++ b/modules/rostests/winetests/msvcrt/locale.c @@ -660,6 +660,24 @@ static void test_crtGetStringTypeW(void) static void test__Gettnames(void) { + static const DWORD time_data[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6, + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12, + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12, + LOCALE_S1159, LOCALE_S2359, + LOCALE_SSHORTDATE, LOCALE_SLONGDATE, + LOCALE_STIMEFORMAT + }; + struct { char *str[43]; LCID lcid; @@ -669,6 +687,7 @@ static void test__Gettnames(void) } *ret; int size; char buf[64]; + int i; if(!setlocale(LC_ALL, "english")) return; @@ -683,100 +702,27 @@ static void test__Gettnames(void) else ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size); - ok(!strcmp(ret->str[0], "Sun"), "ret->str[0] = %s\n", ret->str[0]); - ok(!strcmp(ret->str[1], "Mon"), "ret->str[1] = %s\n", ret->str[1]); - ok(!strcmp(ret->str[2], "Tue"), "ret->str[2] = %s\n", ret->str[2]); - ok(!strcmp(ret->str[3], "Wed"), "ret->str[3] = %s\n", ret->str[3]); - ok(!strcmp(ret->str[4], "Thu"), "ret->str[4] = %s\n", ret->str[4]); - ok(!strcmp(ret->str[5], "Fri"), "ret->str[5] = %s\n", ret->str[5]); - ok(!strcmp(ret->str[6], "Sat"), "ret->str[6] = %s\n", ret->str[6]); - ok(!strcmp(ret->str[7], "Sunday"), "ret->str[7] = %s\n", ret->str[7]); - ok(!strcmp(ret->str[8], "Monday"), "ret->str[8] = %s\n", ret->str[8]); - ok(!strcmp(ret->str[9], "Tuesday"), "ret->str[9] = %s\n", ret->str[9]); - ok(!strcmp(ret->str[10], "Wednesday"), "ret->str[10] = %s\n", ret->str[10]); - ok(!strcmp(ret->str[11], "Thursday"), "ret->str[11] = %s\n", ret->str[11]); - ok(!strcmp(ret->str[12], "Friday"), "ret->str[12] = %s\n", ret->str[12]); - ok(!strcmp(ret->str[13], "Saturday"), "ret->str[13] = %s\n", ret->str[13]); - ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); - ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); - ok(!strcmp(ret->str[16], "Mar"), "ret->str[16] = %s\n", ret->str[16]); - ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); - ok(!strcmp(ret->str[18], "May"), "ret->str[18] = %s\n", ret->str[18]); - ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); - ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); - ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); - ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); - ok(!strcmp(ret->str[23], "Oct"), "ret->str[23] = %s\n", ret->str[23]); - ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); - ok(!strcmp(ret->str[25], "Dec"), "ret->str[25] = %s\n", ret->str[25]); - ok(!strcmp(ret->str[26], "January"), "ret->str[26] = %s\n", ret->str[26]); - ok(!strcmp(ret->str[27], "February"), "ret->str[27] = %s\n", ret->str[27]); - ok(!strcmp(ret->str[28], "March"), "ret->str[28] = %s\n", ret->str[28]); - ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); - ok(!strcmp(ret->str[30], "May"), "ret->str[30] = %s\n", ret->str[30]); - ok(!strcmp(ret->str[31], "June"), "ret->str[31] = %s\n", ret->str[31]); - ok(!strcmp(ret->str[32], "July"), "ret->str[32] = %s\n", ret->str[32]); - ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); - ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); - ok(!strcmp(ret->str[35], "October"), "ret->str[35] = %s\n", ret->str[35]); - ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); - ok(!strcmp(ret->str[37], "December"), "ret->str[37] = %s\n", ret->str[37]); - ok(!strcmp(ret->str[38], "AM"), "ret->str[38] = %s\n", ret->str[38]); - ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); - ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, - "ret->str[40] = %s\n", ret->str[40]); - size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), - LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, buf, sizeof(buf)); - ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); - ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); + for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + { + size = GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), + time_data[i], buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); + } + free(ret); if(!setlocale(LC_TIME, "german")) return; ret = _Gettnames(); - ok(!strcmp(ret->str[0], "So"), "ret->str[0] = %s\n", ret->str[0]); - ok(!strcmp(ret->str[1], "Mo"), "ret->str[1] = %s\n", ret->str[1]); - ok(!strcmp(ret->str[2], "Di"), "ret->str[2] = %s\n", ret->str[2]); - ok(!strcmp(ret->str[3], "Mi"), "ret->str[3] = %s\n", ret->str[3]); - ok(!strcmp(ret->str[4], "Do"), "ret->str[4] = %s\n", ret->str[4]); - ok(!strcmp(ret->str[5], "Fr"), "ret->str[5] = %s\n", ret->str[5]); - ok(!strcmp(ret->str[6], "Sa"), "ret->str[6] = %s\n", ret->str[6]); - ok(!strcmp(ret->str[7], "Sonntag"), "ret->str[7] = %s\n", ret->str[7]); - ok(!strcmp(ret->str[8], "Montag"), "ret->str[8] = %s\n", ret->str[8]); - ok(!strcmp(ret->str[9], "Dienstag"), "ret->str[9] = %s\n", ret->str[9]); - ok(!strcmp(ret->str[10], "Mittwoch"), "ret->str[10] = %s\n", ret->str[10]); - ok(!strcmp(ret->str[11], "Donnerstag"), "ret->str[11] = %s\n", ret->str[11]); - ok(!strcmp(ret->str[12], "Freitag"), "ret->str[12] = %s\n", ret->str[12]); - ok(!strcmp(ret->str[13], "Samstag"), "ret->str[13] = %s\n", ret->str[13]); - ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); - ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); - ok(!strcmp(ret->str[16], "Mrz"), "ret->str[16] = %s\n", ret->str[16]); - ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); - ok(!strcmp(ret->str[18], "Mai"), "ret->str[18] = %s\n", ret->str[18]); - ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); - ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); - ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); - ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); - ok(!strcmp(ret->str[23], "Okt"), "ret->str[23] = %s\n", ret->str[23]); - ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); - ok(!strcmp(ret->str[25], "Dez"), "ret->str[25] = %s\n", ret->str[25]); - ok(!strcmp(ret->str[26], "Januar"), "ret->str[26] = %s\n", ret->str[26]); - ok(!strcmp(ret->str[27], "Februar"), "ret->str[27] = %s\n", ret->str[27]); - ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); - ok(!strcmp(ret->str[30], "Mai"), "ret->str[30] = %s\n", ret->str[30]); - ok(!strcmp(ret->str[31], "Juni"), "ret->str[31] = %s\n", ret->str[31]); - ok(!strcmp(ret->str[32], "Juli"), "ret->str[32] = %s\n", ret->str[32]); - ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); - ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); - ok(!strcmp(ret->str[35], "Oktober"), "ret->str[35] = %s\n", ret->str[35]); - ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); - ok(!strcmp(ret->str[37], "Dezember"), "ret->str[37] = %s\n", ret->str[37]); - ok(!strcmp(ret->str[38], ""), "ret->str[38] = %s\n", ret->str[38]); - ok(!strcmp(ret->str[39], ""), "ret->str[39] = %s\n", ret->str[39]); - ok(!strcmp(ret->str[40], "dd.MM.yyyy") || broken(!strcmp(ret->str[40], "dd.MM.yy"))/*NT*/, - "ret->str[40] = %s\n", ret->str[40]); - ok(!strcmp(ret->str[41], "dddd, d. MMMM yyyy"), "ret->str[41] = %s\n", ret->str[41]); + for (i = 0; i < sizeof(time_data)/sizeof(time_data[0]); i++) + { + size = GetLocaleInfoA(MAKELCID(LANG_GERMAN, SORT_DEFAULT), + time_data[i], buf, sizeof(buf)); + ok(size, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); + } free(ret); setlocale(LC_ALL, "C"); diff --git a/modules/rostests/winetests/msvcrt/printf.c b/modules/rostests/winetests/msvcrt/printf.c index 372509088c..43b2ec3dda 100644 --- a/modules/rostests/winetests/msvcrt/printf.c +++ b/modules/rostests/winetests/msvcrt/printf.c @@ -1185,7 +1185,7 @@ static void test_xcvt(void) win_skip("_fcvt_s not available\n"); } -static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) { int ret; __ms_va_list valist; @@ -1219,7 +1219,7 @@ static void test_vsnwprintf(void) ok( ret == 11 || broken(ret == -1 /* Win2k */), "got %d, expected 11\n", ret ); } -static int __cdecl vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) +static int WINAPIV vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) { int ret; __ms_va_list valist; @@ -1229,7 +1229,7 @@ static int __cdecl vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) return ret; } -static int __cdecl _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) +static int WINAPIV _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) { int ret; __ms_va_list valist; @@ -1239,7 +1239,7 @@ static int __cdecl _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) return ret; } -static int __cdecl _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, void *locale, ...) +static int WINAPIV _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, void *locale, ...) { int ret; __ms_va_list valist; @@ -1249,7 +1249,7 @@ static int __cdecl _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, voi return ret; } -static int __cdecl _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t *format, ...) +static int WINAPIV _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t *format, ...) { int ret; __ms_va_list valist; @@ -1259,7 +1259,7 @@ static int __cdecl _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t return ret; } -static int __cdecl _vswprintf_c_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...) +static int WINAPIV _vswprintf_c_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...) { int ret; __ms_va_list valist; @@ -1269,7 +1269,7 @@ static int __cdecl _vswprintf_c_l_wrapper(wchar_t *str, size_t size, const wchar return ret; } -static int __cdecl _vswprintf_p_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...) +static int WINAPIV _vswprintf_p_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...) { int ret; __ms_va_list valist; @@ -1325,7 +1325,7 @@ static void test_vswprintf(void) ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf)); } -static int __cdecl _vscprintf_wrapper(const char *format, ...) +static int WINAPIV _vscprintf_wrapper(const char *format, ...) { int ret; __ms_va_list valist; @@ -1349,7 +1349,7 @@ static void test_vscprintf(void) ok( ret == 8, "got %d expected 8\n", ret ); } -static int __cdecl _vscwprintf_wrapper(const wchar_t *format, ...) +static int WINAPIV _vscwprintf_wrapper(const wchar_t *format, ...) { int ret; __ms_va_list valist; @@ -1376,7 +1376,7 @@ static void test_vscwprintf(void) ok( ret == 8, "got %d expected 8\n", ret ); } -static int __cdecl _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer, +static int WINAPIV _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer, size_t count, const wchar_t *format, ...) { int ret; @@ -1434,7 +1434,7 @@ static void test_vsnwprintf_s(void) ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); } -static int __cdecl _vsprintf_p_wrapper(char *str, size_t sizeOfBuffer, +static int WINAPIV _vsprintf_p_wrapper(char *str, size_t sizeOfBuffer, const char *format, ...) { int ret; diff --git a/modules/rostests/winetests/msvcrt/scanf.c b/modules/rostests/winetests/msvcrt/scanf.c index a5c4d9da71..d25bee6a00 100644 --- a/modules/rostests/winetests/msvcrt/scanf.c +++ b/modules/rostests/winetests/msvcrt/scanf.c @@ -257,7 +257,7 @@ static void test_sscanf( void ) static void test_sscanf_s(void) { - int (__cdecl *psscanf_s)(const char*,const char*,...); + int (WINAPIV *psscanf_s)(const char*,const char*,...); HMODULE hmod = GetModuleHandleA("msvcrt.dll"); int i, ret; char buf[100]; @@ -322,9 +322,43 @@ static void test_swscanf( void ) ok(c == 'b', "c = %x\n", c); } +static void test_swscanf_s(void) +{ + static const wchar_t fmt1[] = {'%','c',0}; + static const wchar_t fmt2[] = {'%','[','a','-','z',']',0}; + + int (WINAPIV *pswscanf_s)(const wchar_t*,const wchar_t*,...); + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + wchar_t buf[2], out[2]; + int ret; + + pswscanf_s = (void*)GetProcAddress(hmod, "swscanf_s"); + if(!pswscanf_s) { + win_skip("swscanf_s not available\n"); + return; + } + + buf[0] = 'a'; + buf[1] = '1'; + out[1] = 'b'; + ret = pswscanf_s(buf, fmt1, out, 1); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(out[1] == 'b', "out[1] = %x\n", out[1]); + + ret = pswscanf_s(buf, fmt2, out, 1); + ok(!ret, "swscanf_s returned %d\n", ret); + + ret = pswscanf_s(buf, fmt2, out, 2); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(!out[1], "out[1] = %x\n", out[1]); +} + START_TEST(scanf) { test_sscanf(); test_sscanf_s(); test_swscanf(); + test_swscanf_s(); } diff --git a/modules/rostests/winetests/msvcrt/string.c b/modules/rostests/winetests/msvcrt/string.c index 10974e5ad4..4fc34ebfc4 100644 --- a/modules/rostests/winetests/msvcrt/string.c +++ b/modules/rostests/winetests/msvcrt/string.c @@ -86,6 +86,10 @@ static double (__cdecl *p__atof_l)(const char*,_locale_t); static double (__cdecl *p__strtod_l)(const char *,char**,_locale_t); static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t); static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t); +static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); +static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned char*); +static int (__cdecl *p__memicmp)(const char*, const char*, size_t); +static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -306,6 +310,20 @@ static void test_mbcp(void) expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */ expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */ + if(!p__mbsnlen) { + win_skip("_mbsnlen tests\n"); + }else { + expect_eq(p__mbsnlen(mbstring, 8), 8, int, "%d"); + expect_eq(p__mbsnlen(mbstring, 9), 4, int, "%d"); + expect_eq(p__mbsnlen(mbstring, 10), 4, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 0), 0, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 1), 1, int, "%d"); + expect_eq(p__mbsnlen(mbsonlylead, 2), 0, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 7), 7, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 8), 4, int, "%d"); + expect_eq(p__mbsnlen(mbstring2, 9), 4, int, "%d"); + } + /* mbrlen */ if(!setlocale(LC_ALL, ".936") || !p_mbrlen) { win_skip("mbrlen tests\n"); @@ -348,6 +366,40 @@ static void test_mbcp(void) _mbccpy(buf, mbstring); expect_bin(buf, "\xb0\xb1\xff", 3); + if(!p__mbccpy_s) { + win_skip("_mbccpy_s tests\n"); + }else { + int err, copied; + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 0, &copied, mbstring); + ok(err == EINVAL, "_mbccpy_s returned %d\n", err); + ok(!copied, "copied = %d\n", copied); + ok(buf[0] == 0xff, "buf[0] = %x\n", buf[0]); + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 1, &copied, mbstring); + ok(err == ERANGE, "_mbccpy_s returned %d\n", err); + ok(!copied, "copied = %d\n", copied); + ok(!buf[0], "buf[0] = %x\n", buf[0]); + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 2, &copied, mbstring); + ok(!err, "_mbccpy_s returned %d\n", err); + ok(copied == 2, "copied = %d\n", copied); + expect_bin(buf, "\xb0\xb1\xff", 3); + + memset(buf, 0xff, sizeof(buf)); + copied = -1; + err = p__mbccpy_s(buf, 2, &copied, (unsigned char *)"\xb0"); + ok(err == EILSEQ, "_mbccpy_s returned %d\n", err); + ok(copied == 1, "copied = %d\n", copied); + expect_bin(buf, "\x00\xff", 2); + } + memset(buf, 0xff, sizeof(buf)); _mbsncpy(buf, mbstring, 1); expect_bin(buf, "\xb0\xb1\xff", 3); @@ -3206,6 +3258,84 @@ static void test__ismbclx(void) _setmbcp(cp); } +static void test__memicmp(void) +{ + static const char *s1 = "abc"; + static const char *s2 = "aBd"; + int ret; + + ret = p__memicmp(NULL, NULL, 0); + ok(!ret, "got %d\n", ret); + + ret = p__memicmp(s1, s2, 2); + ok(!ret, "got %d\n", ret); + + ret = p__memicmp(s1, s2, 3); + ok(ret == -1, "got %d\n", ret); + + if (!p__memicmp_l) + return; + + /* Following calls crash on WinXP/W2k3. */ + errno = 0xdeadbeef; + ret = p__memicmp(NULL, NULL, 1); + ok(ret == _NLSCMPERROR, "got %d\n", ret); + ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); + + errno = 0xdeadbeef; + ret = p__memicmp(s1, NULL, 1); + ok(ret == _NLSCMPERROR, "got %d\n", ret); + ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); + + errno = 0xdeadbeef; + ret = p__memicmp(NULL, s2, 1); + ok(ret == _NLSCMPERROR, "got %d\n", ret); + ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); +} + +static void test__memicmp_l(void) +{ + static const char *s1 = "abc"; + static const char *s2 = "aBd"; + int ret; + + if (!p__memicmp_l) + { + win_skip("_memicmp_l not found.\n"); + return; + } + + errno = 0xdeadbeef; + ret = p__memicmp_l(NULL, NULL, 0, NULL); + ok(!ret, "got %d\n", ret); + ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); + + errno = 0xdeadbeef; + ret = p__memicmp_l(NULL, NULL, 1, NULL); + ok(ret == _NLSCMPERROR, "got %d\n", ret); + ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); + + errno = 0xdeadbeef; + ret = p__memicmp_l(s1, NULL, 1, NULL); + ok(ret == _NLSCMPERROR, "got %d\n", ret); + ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); + + errno = 0xdeadbeef; + ret = p__memicmp_l(NULL, s2, 1, NULL); + ok(ret == _NLSCMPERROR, "got %d\n", ret); + ok(errno == EINVAL, "errno is %d, expected EINVAL\n", errno); + + errno = 0xdeadbeef; + ret = p__memicmp_l(s1, s2, 2, NULL); + ok(!ret, "got %d\n", ret); + ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); + + errno = 0xdeadbeef; + ret = p__memicmp_l(s1, s2, 3, NULL); + ok(ret == -1, "got %d\n", ret); + ok(errno == 0xdeadbeef, "errno is %d, expected 0xdeadbeef\n", errno); +} + START_TEST(string) { char mem[100]; @@ -3260,6 +3390,10 @@ START_TEST(string) p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l"); p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s"); p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s"); + p__mbsnlen = (void*)GetProcAddress(hMsvcrt, "_mbsnlen"); + p__mbccpy_s = (void*)GetProcAddress(hMsvcrt, "_mbccpy_s"); + p__memicmp = (void*)GetProcAddress(hMsvcrt, "_memicmp"); + p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -3322,4 +3456,6 @@ START_TEST(string) test__wcsset_s(); test__mbscmp(); test__ismbclx(); + test__memicmp(); + test__memicmp_l(); } diff --git a/modules/rostests/winetests/msvcrt/time.c b/modules/rostests/winetests/msvcrt/time.c index 6173cf4bc6..176ead348e 100644 --- a/modules/rostests/winetests/msvcrt/time.c +++ b/modules/rostests/winetests/msvcrt/time.c @@ -869,18 +869,19 @@ static void test__tzset(void) static void test_clock(void) { - static const int THRESH = 50; - clock_t s, e; - int i; - - for (i = 0; i < 10; i++) - { - s = clock(); - Sleep(1000); - e = clock(); - - ok(abs((e-s) - 1000) < THRESH, "clock off on loop %i: %i\n", i, e-s); - } + static const int THRESH = 100; + FILETIME start, cur; + int c, expect; + BOOL ret; + + ret = GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur); + ok(ret, "GetProcessTimes failed with error: %d\n", GetLastError()); + GetSystemTimeAsFileTime(&cur); + expect = (((LONGLONG)cur.dwHighDateTime<<32)+cur.dwLowDateTime - + ((LONGLONG)start.dwHighDateTime<<32)-start.dwLowDateTime) / 10000; + + c = clock(); + ok(abs(c-expect) < THRESH, "clock() = %d, expected %d\n", c, expect); } START_TEST(time)

6 years, 11 months

01/01: [CMD_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64daf542b8d12d3490f15… commit 64daf542b8d12d3490f15986cb0e0643b72eec28 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:38:00 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:38:00 2018 +0100 [CMD_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/cmd/test_builtins.cmd.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/winetests/cmd/test_builtins.cmd.exp b/modules/rostests/winetests/cmd/test_builtins.cmd.exp index 675fc487af..796550e57e 100644 --- a/modules/rostests/winetests/cmd/test_builtins.cmd.exp +++ b/modules/rostests/winetests/cmd/test_builtins.cmd.exp @@ -1258,8 +1258,8 @@ file move succeeded @todo_wine@bar@or_broken@baz read-only files are moveable file moved in subdirectory -moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op! -ErrorLevel: 0@or_broken@ErrorLevel: 1 +@todo_wine@moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op! +@todo_wine@ErrorLevel: 0@or_broken@ErrorLevel: 1 --- directory move simple directory move succeeded moving a directory to itself gives error; errlevel 1

6 years, 11 months

01/01: [QUARTZ_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c16a79f47aa24a81b9138… commit c16a79f47aa24a81b9138ecefaae424a01eb4fb5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:34:54 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:34:54 2018 +0100 [QUARTZ_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/quartz/CMakeLists.txt | 4 +- modules/rostests/winetests/quartz/avisplitter.c | 134 +++++++++-------------- modules/rostests/winetests/quartz/filtergraph.c | 63 +++++++++-- modules/rostests/winetests/quartz/rsrc.rc | 27 +++++ modules/rostests/winetests/quartz/test.avi | Bin 0 -> 6938 bytes modules/rostests/winetests/quartz/test.mpg | Bin 0 -> 6144 bytes 6 files changed, 130 insertions(+), 98 deletions(-) diff --git a/modules/rostests/winetests/quartz/CMakeLists.txt b/modules/rostests/winetests/quartz/CMakeLists.txt index e73e5310eb..d74b8c5a6c 100644 --- a/modules/rostests/winetests/quartz/CMakeLists.txt +++ b/modules/rostests/winetests/quartz/CMakeLists.txt @@ -16,11 +16,11 @@ list(APPEND SOURCE testlist.c) add_idl_headers(quartz_test_idlheader fil_data.idl) -add_executable(quartz_winetest ${SOURCE}) +add_executable(quartz_winetest ${SOURCE} rsrc.rc) target_link_libraries(quartz_winetest uuid) add_dependencies(quartz_winetest dxsdk quartz_test_idlheader) set_module_type(quartz_winetest win32cui) -add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32) +add_importlibs(quartz_winetest ole32 oleaut32 advapi32 user32 msvcrt kernel32) if(MSVC) add_importlibs(quartz_winetest ntdll) diff --git a/modules/rostests/winetests/quartz/avisplitter.c b/modules/rostests/winetests/quartz/avisplitter.c index 78ca8b8468..8bafb14157 100644 --- a/modules/rostests/winetests/quartz/avisplitter.c +++ b/modules/rostests/winetests/quartz/avisplitter.c @@ -25,38 +25,8 @@ #include "dshow.h" #include "tlhelp32.h" -static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); -static BOOL (WINAPI *pThread32First)(HANDLE, LPTHREADENTRY32); -static BOOL (WINAPI *pThread32Next)(HANDLE, LPTHREADENTRY32); - static IUnknown *pAviSplitter = NULL; -static int count_threads(void) -{ - THREADENTRY32 te; - int threads; - HANDLE h; - - h = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); - te.dwSize = sizeof(te); - - if (h == INVALID_HANDLE_VALUE) - return -1; - - pThread32First(h, &te); - if (te.th32OwnerProcessID == GetCurrentProcessId()) - threads = 1; - else - threads = 0; - - while (pThread32Next(h, &te)) - if (te.th32OwnerProcessID == GetCurrentProcessId()) - ++threads; - - CloseHandle(h); - return threads; -} - static BOOL create_avisplitter(void) { HRESULT hr; @@ -300,45 +270,54 @@ static void test_filesourcefilter(void) } } -static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; -static const char afile[] = "test.avi"; +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; -/* This test doesn't use the quartz filtergraph because it makes it impossible - * to be certain that a thread is really one owned by the avi splitter. - * A lot of the decoder filters will also have their own thread, and Windows' - * filtergraph has a separate thread for start/stop/seeking requests. - * By avoiding the filtergraph altogether and connecting streams directly to - * the null renderer I am sure that this is not the case here. - */ -static void test_threads(void) +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + +static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; IBaseFilter *preader = NULL, *pavi = NULL; IEnumPins *enumpins = NULL; IPin *filepin = NULL, *avipin = NULL; HRESULT hr; - int baselevel, curlevel, expected; HANDLE file = NULL; PIN_DIRECTION dir = PINDIR_OUTPUT; char buffer[13]; DWORD readbytes; FILTER_STATE state; - /* We need another way of counting threads on NT4. Skip these tests (for now) */ - if (!pCreateToolhelp32Snapshot || !pThread32First || !pThread32Next) - { - win_skip("Needed thread functions are not available (NT4)\n"); - return; - } - - /* Before doing anything (the thread count at the start differs per OS) */ - baselevel = count_threads(); + WCHAR *filename = load_resource(avifile); - file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) { - skip("Could not read test file \"%s\", skipping test\n", afile); + skip("Could not read test file \"%s\", skipping test\n", wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -349,7 +328,8 @@ static void test_threads(void) if (strncmp(buffer, "RIFF", 4) || strcmp(buffer + 8, "AVI ")) { skip("%s is not an avi riff file, not doing the avi splitter test\n", - afile); + wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -379,10 +359,10 @@ static void test_threads(void) if (hr != S_OK) goto fail; - hr = IFileSourceFilter_Load(pfile, wfile, NULL); + hr = IFileSourceFilter_Load(pfile, filename, NULL); if (hr != S_OK) { - trace("Could not load file\n"); + trace("Could not load file: %08x\n", hr); goto fail; } @@ -409,20 +389,11 @@ static void test_threads(void) if (hr != S_OK) goto fail; - curlevel = count_threads(); - ok(curlevel == baselevel, - "The thread count should be %d not %d\n", baselevel, curlevel); - hr = IPin_Connect(filepin, avipin, NULL); ok(hr == S_OK, "Could not connect: %08x\n", hr); if (hr != S_OK) goto fail; - expected = 1 + baselevel; - curlevel = count_threads(); - ok(curlevel == expected, - "The thread count should be %d not %d\n", expected, curlevel); - IPin_Release(avipin); avipin = NULL; @@ -444,12 +415,17 @@ static void test_threads(void) hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pnull); - ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - if (hr != S_OK) + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("Null renderer not registered, skipping\n"); break; + } + ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - IBaseFilter_EnumPins(pnull, &nullenum); - IEnumPins_Next(nullenum, 1, &nullpin, NULL); + hr = IBaseFilter_EnumPins(pnull, &nullenum); + ok(hr == S_OK, "Failed to enum pins, hr %#x.\n", hr); + hr = IEnumPins_Next(nullenum, 1, &nullpin, NULL); + ok(hr == S_OK, "Failed to get next pin, hr %#x.\n", hr); IEnumPins_Release(nullenum); IPin_QueryDirection(nullpin, &dir); @@ -462,7 +438,6 @@ static void test_threads(void) break; } IBaseFilter_Run(pnull, 0); - ++expected; } IPin_Release(avipin); @@ -494,10 +469,6 @@ static void test_threads(void) IBaseFilter_Run(pavi, 0); IBaseFilter_GetState(pavi, INFINITE, &state); - curlevel = count_threads(); - ok(curlevel == expected, - "The thread count should be %d not %d\n", expected, curlevel); - IBaseFilter_Pause(pavi); IBaseFilter_Pause(preader); IBaseFilter_Stop(pavi); @@ -520,7 +491,9 @@ fail2: if (dir == PINDIR_OUTPUT) { PIN_INFO info; - IPin_QueryPinInfo(to, &info); + + hr = IPin_QueryPinInfo(to, &info); + ok(hr == S_OK, "Failed to query pin info, hr %#x.\n", hr); /* Release twice: Once normal, second from the * previous while loop @@ -569,20 +542,11 @@ fail: if (pfile) IFileSourceFilter_Release(pfile); - curlevel = count_threads(); - todo_wine - ok(curlevel == baselevel, - "The thread count should be %d not %d\n", baselevel, curlevel); + DeleteFileW(filename); } START_TEST(avisplitter) { - HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); - - pCreateToolhelp32Snapshot = (void*)GetProcAddress(kernel32, "CreateToolhelp32Snapshot"); - pThread32First = (void*)GetProcAddress(kernel32, "Thread32First"); - pThread32Next = (void*)GetProcAddress(kernel32, "Thread32Next"); - CoInitialize(NULL); if (!create_avisplitter()) @@ -594,7 +558,7 @@ START_TEST(avisplitter) test_query_interface(); test_basefilter(); test_filesourcefilter(); - test_threads(); + test_filter_graph(); release_avisplitter(); diff --git a/modules/rostests/winetests/quartz/filtergraph.c b/modules/rostests/winetests/quartz/filtergraph.c index a895071011..5fd3107208 100644 --- a/modules/rostests/winetests/quartz/filtergraph.c +++ b/modules/rostests/winetests/quartz/filtergraph.c @@ -42,6 +42,31 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + static IGraphBuilder *pgraph; static int createfiltergraph(void) @@ -53,7 +78,7 @@ static int createfiltergraph(void) static void test_basic_video(void) { IBasicVideo* pbv; - LONG video_width, video_height; + LONG video_width, video_height, window_width; LONG left, top, width, height; HRESULT hr; @@ -158,6 +183,8 @@ static void test_basic_video(void) ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); /* test destination rectangle */ + window_width = max(video_width, GetSystemMetrics(SM_CXMIN) - 2 * GetSystemMetrics(SM_CXFRAME)); + hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, NULL, NULL); ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, NULL, NULL); @@ -168,7 +195,7 @@ static void test_basic_video(void) ok(hr == S_OK, "Cannot get destination position returned: %x\n", hr); ok(left == 0, "expected 0, got %d\n", left); ok(top == 0, "expected 0, got %d\n", top); - todo_wine ok(width == video_width, "expected %d, got %d\n", video_width, width); + todo_wine ok(width == window_width, "expected %d, got %d\n", window_width, width); todo_wine ok(height == video_height, "expected %d, got %d\n", video_height, height); hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, 0, 0); @@ -328,8 +355,7 @@ static void rungraph(void) hr = IMediaEvent_GetEventHandle(pme, (OAEVENT*)&hEvent); ok(hr==S_OK, "Cannot get event handle returned: %x\n", hr); - /* WaitForSingleObject(hEvent, INFINITE); */ - Sleep(20000); + ok(WaitForSingleObject(hEvent, 2000) == WAIT_OBJECT_0, "Wait failed\n"); hr = IMediaEvent_Release(pme); ok(hr==2, "Releasing mediaevent returned: %x\n", hr); @@ -354,26 +380,39 @@ static void test_render_run(const WCHAR *file) HANDLE h; HRESULT hr; - h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + WCHAR *filename = load_resource(file); + + h = CreateFileW(filename, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h == INVALID_HANDLE_VALUE) { skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(file)); + DeleteFileW(filename); return; } CloseHandle(h); if (!createfiltergraph()) + { + DeleteFileW(filename); return; + } - hr = IGraphBuilder_RenderFile(pgraph, file, NULL); - ok(hr == S_OK, "RenderFile returned: %x\n", hr); - rungraph(); + hr = IGraphBuilder_RenderFile(pgraph, filename, NULL); + if (hr == VFW_E_CANNOT_RENDER) + skip("%s: codec not supported; skipping test\n", wine_dbgstr_w(file)); + else + { + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); + rungraph(); + } releasefiltergraph(); /* check reference leaks */ - h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); CloseHandle(h); + + DeleteFileW(filename); } static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) @@ -392,8 +431,9 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) CloseHandle(handle); hr = IFilterGraph2_RenderFile(filter_graph, mp3file, NULL); - todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older */ - hr == VFW_E_NO_TRANSPORT, /* win7 or newer */ + todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older + DirectX 9 */ + hr == VFW_E_NO_TRANSPORT || /* win7 or newer */ + broken(hr == CLASS_E_CLASSNOTAVAILABLE), /* xp or older + DirectX 8 or older */ "Expected 0x%08x or 0x%08x, returned 0x%08x\n", VFW_E_CANNOT_RENDER, VFW_E_NO_TRANSPORT, hr); DeleteFileW(mp3file); @@ -446,6 +486,7 @@ static void test_render_with_multithread(void) IFilterGraph2_Release(filter_graph); IGraphBuilder_Release(graph_builder); IClassFactory_Release(classfactory); + CloseHandle(thread); CoUninitialize(); return; } diff --git a/modules/rostests/winetests/quartz/rsrc.rc b/modules/rostests/winetests/quartz/rsrc.rc new file mode 100644 index 0000000000..9bea5be370 --- /dev/null +++ b/modules/rostests/winetests/quartz/rsrc.rc @@ -0,0 +1,27 @@ +/* + * Resource file for quartz tests. + * + * Copyright 2017 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: test.avi */ +test.avi RCDATA "test.avi" + +/* @makedep: test.mpg */ +test.mpg RCDATA "test.mpg" diff --git a/modules/rostests/winetests/quartz/test.avi b/modules/rostests/winetests/quartz/test.avi new file mode 100644 index 0000000000..bec304de1d Binary files /dev/null and b/modules/rostests/winetests/quartz/test.avi differ diff --git a/modules/rostests/winetests/quartz/test.mpg b/modules/rostests/winetests/quartz/test.mpg new file mode 100644 index 0000000000..7fe379aa3f Binary files /dev/null and b/modules/rostests/winetests/quartz/test.mpg differ

6 years, 11 months

01/01: [QUARTZ] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b313fd906e8ecb62e414f… commit b313fd906e8ecb62e414f70712d2488b281f298b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:33:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:33:20 2018 +0100 [QUARTZ] Sync with Wine 3.0. CORE-14225 --- dll/directx/wine/quartz/avisplit.c | 3 +- dll/directx/wine/quartz/filesource.c | 36 ++++++----- dll/directx/wine/quartz/filtergraph.c | 111 +++++++++++++++++----------------- dll/directx/wine/quartz/parser.c | 25 ++++---- dll/directx/wine/quartz/pin.c | 5 +- dll/directx/wine/quartz/pin.h | 5 +- media/doc/README.WINE | 2 +- 7 files changed, 98 insertions(+), 89 deletions(-) diff --git a/dll/directx/wine/quartz/avisplit.c b/dll/directx/wine/quartz/avisplit.c index fbdd01a3a8..0f5c2d72ed 100644 --- a/dll/directx/wine/quartz/avisplit.c +++ b/dll/directx/wine/quartz/avisplit.c @@ -1098,8 +1098,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, pos += sizeof(RIFFCHUNK) + list.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } - while (hr == S_OK && (list.fcc != FOURCC_LIST || - (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); + while (hr == S_OK && (list.fcc != FOURCC_LIST || list.fccListType != listtypeAVIMOVIE)); if (hr != S_OK) { diff --git a/dll/directx/wine/quartz/filesource.c b/dll/directx/wine/quartz/filesource.c index 16a0419327..39227a1747 100644 --- a/dll/directx/wine/quartz/filesource.c +++ b/dll/directx/wine/quartz/filesource.c @@ -376,6 +376,8 @@ static IPin* WINAPI AsyncReader_GetPin(BaseFilter *iface, int pos) { AsyncReader *This = impl_from_BaseFilter(iface); + TRACE("%p->(%d)\n", This, pos); + if (pos >= 1 || !This->pOutputPin) return NULL; @@ -387,6 +389,8 @@ static LONG WINAPI AsyncReader_GetPinCount(BaseFilter *iface) { AsyncReader *This = impl_from_BaseFilter(iface); + TRACE("%p->()\n", This); + if (!This->pOutputPin) return 0; else @@ -432,7 +436,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + TRACE("%p->(%s, %p)\n", This, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -467,7 +471,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) AsyncReader *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->filter.refCount); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + TRACE("%p->() Release from %d\n", This, refCount + 1); if (!refCount) { @@ -499,7 +503,7 @@ static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("()\n"); + TRACE("%p->()\n", This); This->filter.state = State_Stopped; @@ -510,7 +514,7 @@ static HRESULT WINAPI AsyncReader_Pause(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("()\n"); + TRACE("%p->()\n", This); This->filter.state = State_Paused; @@ -521,7 +525,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); + TRACE("%p->(%s)\n", This, wine_dbgstr_longlong(tStart)); This->filter.state = State_Running; @@ -533,7 +537,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { AsyncReader *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", debugstr_w(Id), ppPin); + TRACE("%p->(%s, %p)\n", This, debugstr_w(Id), ppPin); if (!Id || !ppPin) return E_POINTER; @@ -596,7 +600,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi IAsyncReader * pReader = NULL; AsyncReader *This = impl_from_IFileSourceFilter(iface); - TRACE("(%s, %p)\n", debugstr_w(pszFileName), pmt); + TRACE("%p->(%s, %p)\n", This, debugstr_w(pszFileName), pmt); if (!pszFileName) return E_POINTER; @@ -677,7 +681,7 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR { AsyncReader *This = impl_from_IFileSourceFilter(iface); - TRACE("(%p, %p)\n", ppszFileName, pmt); + TRACE("%p->(%p, %p)\n", This, ppszFileName, pmt); if (!ppszFileName) return E_POINTER; @@ -873,7 +877,7 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(BasePin * iface, IPin BaseOutputPin *This = impl_BaseOutputPin_from_BasePin(iface); HRESULT hr; - TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("%p->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); /* FIXME: call queryacceptproc */ @@ -981,7 +985,7 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe HRESULT hr = S_OK; - TRACE("(%p, %p, %p)\n", pPreferred, pProps, ppActual); + TRACE("%p->(%p, %p, %p)\n", This, pPreferred, pProps, ppActual); if (!pProps->cbAlign || (pProps->cbAlign % DEF_ALIGNMENT) != 0) pProps->cbAlign = DEF_ALIGNMENT; @@ -1077,7 +1081,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample FileAsyncReader *This = impl_from_IAsyncReader(iface); LPBYTE pBuffer = NULL; - TRACE("(%p, %lx)\n", pSample, dwUser); + TRACE("%p->(%p, %lx)\n", This, pSample, dwUser); if (!pSample) return E_POINTER; @@ -1155,7 +1159,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw FileAsyncReader *This = impl_from_IAsyncReader(iface); DWORD buffer = ~0; - TRACE("(%u, %p, %p)\n", dwTimeout, ppSample, pdwUser); + TRACE("%p->(%u, %p, %p)\n", This, dwTimeout, ppSample, pdwUser); *ppSample = NULL; *pdwUser = 0; @@ -1320,7 +1324,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG ll HRESULT hr = S_OK; FileAsyncReader *This = impl_from_IAsyncReader(iface); - TRACE("(%s, %d, %p)\n", wine_dbgstr_longlong(llPosition), lLength, pBuffer); + TRACE("%p->(%s, %d, %p)\n", This, wine_dbgstr_longlong(llPosition), lLength, pBuffer); ZeroMemory(&ovl, sizeof(ovl)); @@ -1355,7 +1359,7 @@ static HRESULT WINAPI FileAsyncReader_Length(IAsyncReader * iface, LONGLONG * pT DWORD dwSizeHigh; FileAsyncReader *This = impl_from_IAsyncReader(iface); - TRACE("(%p, %p)\n", pTotal, pAvailable); + TRACE("%p->(%p, %p)\n", This, pTotal, pAvailable); if (((dwSizeLow = GetFileSize(This->hFile, &dwSizeHigh)) == -1) && (GetLastError() != NO_ERROR)) @@ -1372,7 +1376,7 @@ static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) { FileAsyncReader *This = impl_from_IAsyncReader(iface); - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&This->csList); This->bFlushing = TRUE; @@ -1388,7 +1392,7 @@ static HRESULT WINAPI FileAsyncReader_EndFlush(IAsyncReader * iface) FileAsyncReader *This = impl_from_IAsyncReader(iface); int x; - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&This->csList); ResetEvent(This->handle_list[This->samples]); diff --git a/dll/directx/wine/quartz/filtergraph.c b/dll/directx/wine/quartz/filtergraph.c index 8e6dda73a3..b6538ab16c 100644 --- a/dll/directx/wine/quartz/filtergraph.c +++ b/dll/directx/wine/quartz/filtergraph.c @@ -179,6 +179,7 @@ typedef struct _IFilterGraphImpl { GUID timeformatseek; REFERENCE_TIME start_time; REFERENCE_TIME pause_time; + LONGLONG stop_position; LONG recursioncount; IUnknown *pSite; LONG version; @@ -2457,6 +2458,52 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *p return hr; } +static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) +{ + IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); + HRESULT hr = S_OK; + + TRACE("(%p/%p)->(%p)\n", This, iface, pStop); + + if (!pStop) + return E_POINTER; + + EnterCriticalSection(&This->cs); + if (This->stop_position < 0) + /* Stop position not set, use duration instead */ + hr = IMediaSeeking_GetDuration(iface, pStop); + else + *pStop = This->stop_position; + LeaveCriticalSection(&This->cs); + + return hr; +} + +static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) +{ + IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); + LONGLONG time = 0; + + if (!pCurrent) + return E_POINTER; + + EnterCriticalSection(&This->cs); + if (This->state == State_Running && This->refClock && This->start_time >= 0) + { + IReferenceClock_GetTime(This->refClock, &time); + if (time) + time -= This->start_time; + } + if (This->pause_time > 0) + time += This->pause_time; + *pCurrent = time; + LeaveCriticalSection(&This->cs); + + TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); + + return S_OK; +} + static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat) { @@ -2509,6 +2556,11 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * (dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); + if ((dwStopFlags & 0x7) == AM_SEEKING_AbsolutePositioning) + This->stop_position = *pStop; + else if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) + FIXME("Stop position not handled yet!\n"); + if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) IMediaControl_Pause(&This->IMediaControl_iface); args.current = pCurrent; @@ -2526,68 +2578,16 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * return hr; } -static HRESULT WINAPI found_getposition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pargs) -{ - struct pos_args *args = (void*)pargs; - - return IMediaSeeking_GetPositions(seek, args->current, args->stop); -} - static HRESULT WINAPI MediaSeeking_GetPositions(IMediaSeeking *iface, LONGLONG *pCurrent, LONGLONG *pStop) { IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - struct pos_args args; - LONGLONG time = 0; HRESULT hr; TRACE("(%p/%p)->(%p, %p)\n", This, iface, pCurrent, pStop); - - args.current = pCurrent; - args.stop = pStop; - EnterCriticalSection(&This->cs); - hr = all_renderers_seek(This, found_getposition, (DWORD_PTR)&args); - if (This->state == State_Running && This->refClock && This->start_time >= 0) - { - IReferenceClock_GetTime(This->refClock, &time); - if (time) - time -= This->start_time; - } - if (This->pause_time > 0) - time += This->pause_time; - *pCurrent += time; - LeaveCriticalSection(&This->cs); - - return hr; -} - -static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) -{ - LONGLONG time; - HRESULT hr; - - if (!pCurrent) - return E_POINTER; - - hr = MediaSeeking_GetPositions(iface, pCurrent, &time); - - TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); - - return hr; -} - -static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *pStop) -{ - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - LONGLONG time; - HRESULT hr; - - TRACE("(%p/%p)->(%p)\n", This, iface, pStop); - - if (!pStop) - return E_POINTER; - - hr = MediaSeeking_GetPositions(iface, &time, pStop); + hr = IMediaSeeking_GetCurrentPosition(iface, pCurrent); + if (SUCCEEDED(hr)) + hr = IMediaSeeking_GetStopPosition(iface, pStop); return hr; } @@ -5713,6 +5713,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); fimpl->start_time = fimpl->pause_time = 0; + fimpl->stop_position = -1; fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0; fimpl->version = 0; diff --git a/dll/directx/wine/quartz/parser.c b/dll/directx/wine/quartz/parser.c index d24bd85c91..6f46ed7339 100644 --- a/dll/directx/wine/quartz/parser.c +++ b/dll/directx/wine/quartz/parser.c @@ -54,7 +54,7 @@ static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) { ParserImpl *This = impl_from_BaseFilter(iface); - TRACE("Asking for pos %x\n", pos); + TRACE("%p->(%x)\n", This, pos); /* Input pin also has a pin, hence the > and not >= */ if (pos > This->cStreams || pos < 0) @@ -68,6 +68,8 @@ static LONG WINAPI Parser_GetPinCount(BaseFilter *iface) { ParserImpl *This = impl_from_BaseFilter(iface); + TRACE("%p->()\n", This); + return This->cStreams; } @@ -141,12 +143,8 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && - !IsEqualIID(riid, &IID_IVideoWindow) && - !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - { + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); - } return E_NOINTERFACE; } @@ -212,7 +210,7 @@ HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) { ParserImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p)\n", pClsid); + TRACE("%p->(%p)\n", This, pClsid); *pClsid = This->filter.clsid; @@ -227,7 +225,7 @@ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); ULONG i; - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&pin->thread_lock); @@ -265,7 +263,7 @@ HRESULT WINAPI Parser_Pause(IBaseFilter * iface) ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); - TRACE("()\n"); + TRACE("%p->()\n", This); EnterCriticalSection(&pin->thread_lock); EnterCriticalSection(&This->filter.csFilter); @@ -301,7 +299,7 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) ULONG i; - TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); + TRACE("%p->(%s)\n", This, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&pin->thread_lock); EnterCriticalSection(&This->filter.csFilter); @@ -347,7 +345,7 @@ HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FI PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); HRESULT hr = S_OK; - TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState); + TRACE("%p->(%d, %p)\n", This, dwMilliSecsTimeout, pState); EnterCriticalSection(&pin->thread_lock); EnterCriticalSection(&This->filter.csFilter); @@ -368,7 +366,7 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); - TRACE("(%p)\n", pClock); + TRACE("%p->(%p)\n", This, pClock); EnterCriticalSection(&pin->thread_lock); BaseFilterImpl_SetSyncSource(iface,pClock); @@ -391,7 +389,8 @@ HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { - FIXME("(%p)->(%s,%p)\n", iface, debugstr_w(Id), ppPin); + ParserImpl *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%s,%p)\n", This, debugstr_w(Id), ppPin); /* FIXME: critical section */ diff --git a/dll/directx/wine/quartz/pin.c b/dll/directx/wine/quartz/pin.c index 50dd0c26aa..738b1c0609 100644 --- a/dll/directx/wine/quartz/pin.c +++ b/dll/directx/wine/quartz/pin.c @@ -209,7 +209,10 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI return S_OK; } -HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, + SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, + CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, + LPCRITICAL_SECTION pCritSec, IPin ** ppPin) { PullPin * pPinImpl; diff --git a/dll/directx/wine/quartz/pin.h b/dll/directx/wine/quartz/pin.h index 84046bc1e2..2cc44c1d1d 100644 --- a/dll/directx/wine/quartz/pin.h +++ b/dll/directx/wine/quartz/pin.h @@ -104,7 +104,10 @@ typedef struct PullPin #define Req_Pause 3 /*** Constructors ***/ -HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, + SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, + CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, + LPCRITICAL_SECTION pCritSec, IPin ** ppPin); /**************************/ /*** Pin Implementation ***/ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index bebb2f97bc..9bab464f27 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to Wine-3.0 reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9 reactos/dll/directx/wine/qedit # Synced to Wine-3.0 -reactos/dll/directx/wine/quartz # Synced to WineStaging-2.16 +reactos/dll/directx/wine/quartz # Synced to Wine-3.0 reactos/dll/directx/wine/wined3d # Synced to Wine-3.0 reactos/dll/win32/activeds # Synced to WineStaging-2.9

6 years, 11 months

01/01: [QEDIT_WINETEST] Sync with Wine 3.0. CORE-14225

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d8fc348d7343164b38ea… commit 4d8fc348d7343164b38ea99ffa9931d0b5edb2d1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Jan 21 22:32:08 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 22:32:08 2018 +0100 [QEDIT_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/qedit/timeline.c | 38 +++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/modules/rostests/winetests/qedit/timeline.c b/modules/rostests/winetests/qedit/timeline.c index 40cf774ecd..94c018e0fb 100644 --- a/modules/rostests/winetests/qedit/timeline.c +++ b/modules/rostests/winetests/qedit/timeline.c @@ -106,11 +106,49 @@ static void test_timeline(void) hr = IAMTimelineObj_GetTimelineNoRef(obj, &timeline2); ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE got %08x\n", hr); ok(!timeline2, "Expected NULL got %p\n", timeline2); + + IAMTimelineObj_Release(obj); + IAMTimeline_Release(timeline); +} + +static void test_timelineobj_interfaces(void) +{ + HRESULT hr; + IAMTimeline *timeline = NULL; + IAMTimelineObj *obj; + + hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER, &IID_IAMTimeline, (void **)&timeline); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "CoCreateInstance failed: %08x\n", hr); + if (!timeline) + return; + + hr = IAMTimeline_CreateEmptyNode(timeline, &obj, TIMELINE_MAJOR_TYPE_GROUP); + ok(hr == S_OK, "CreateEmptyNode failed: %08x\n", hr); + if(hr == S_OK) + { + IAMTimelineGroup *group; + IAMTimelineObj *obj2; + + hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimelineGroup, (void **)&group); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IAMTimelineGroup_QueryInterface(group, &IID_IAMTimelineObj, (void **)&obj2); + ok(hr == S_OK, "got %08x\n", hr); + ok(obj == obj2, "Different pointers\n"); + IAMTimelineObj_Release(obj2); + + IAMTimelineGroup_Release(group); + + IAMTimelineObj_Release(obj); + } + + IAMTimeline_Release(timeline); } START_TEST(timeline) { CoInitialize(NULL); test_timeline(); + test_timelineobj_interfaces(); CoUninitialize(); }

6 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
38
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 January 2018