wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Alexandre Julliard : libwine: Also apply the load delta to the FirstThunk table.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 20d13d0b788c807d54cd8d0896350818989fd5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d13d0b788c807d54cd8d089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:41:43 2017 +0200 libwine: Also apply the load delta to the FirstThunk table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 172bfa0..c07042a 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -320,22 +320,27 @@ static inline void fixup_rva_dwords( DWORD *ptr, int delta, unsigned int count ) } +/* fixup an array of name/ordinal RVAs by adding the specified delta */ +static inline void fixup_rva_names( UINT_PTR *ptr, int delta ) +{ + while (*ptr) + { + if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta; + ptr++; + } +} + + /* fixup RVAs in the import directory */ static void fixup_imports( IMAGE_IMPORT_DESCRIPTOR *dir, BYTE *base, int delta ) { - UINT_PTR *ptr; - while (dir->Name) { fixup_rva_dwords( &dir->u.OriginalFirstThunk, delta, 1 ); fixup_rva_dwords( &dir->Name, delta, 1 ); fixup_rva_dwords( &dir->FirstThunk, delta, 1 ); - ptr = (UINT_PTR *)(base + (dir->u.OriginalFirstThunk ? dir->u.OriginalFirstThunk : dir->FirstThunk)); - while (*ptr) - { - if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta; - ptr++; - } + if (dir->u.OriginalFirstThunk) fixup_rva_names( (UINT_PTR *)(base + dir->u.OriginalFirstThunk), delta ); + if (dir->FirstThunk) fixup_rva_names( (UINT_PTR *)(base + dir->FirstThunk), delta ); dir++; } }

1 0

Alexandre Julliard : winebuild: Put the thunk hint/ name in FirstThunk too instead of zero.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 75a830e8e16b305cbc341037757749c333540740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a830e8e16b305cbc3410377… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 18 15:35:20 2017 +0200 winebuild: Put the thunk hint/name in FirstThunk too instead of zero. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 43dfa50..01a418f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -708,7 +708,7 @@ int has_imports(void) /* output the import table of a Win32 module */ static void output_immediate_imports(void) { - int j; + int i, j; struct import *import; if (list_empty( &dll_imports )) return; /* no immediate imports */ @@ -742,30 +742,28 @@ static void output_immediate_imports(void) output( "\t.long 0\n" ); /* FirstThunk */ output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); - output( ".L__wine_spec_import_data_names:\n" ); - LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) + /* output the names twice, once for OriginalFirstThunk and once for FirstThunk */ + for (i = 0; i < 2; i++) { - for (j = 0; j < import->nb_imports; j++) + output( ".L__wine_spec_import_data_%s:\n", i ? "ptrs" : "names" ); + LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) { - struct import_func *func = &import->imports[j]; - if (func->name) - output( "\t%s .L__wine_spec_import_data_%s_%s-.L__wine_spec_rva_base\n", - get_asm_ptr_keyword(), import->c_name, func->name ); - else + for (j = 0; j < import->nb_imports; j++) { - if (get_ptr_size() == 8) - output( "\t.quad 0x800000000000%04x\n", func->ordinal ); + struct import_func *func = &import->imports[j]; + if (func->name) + output( "\t%s .L__wine_spec_import_data_%s_%s-.L__wine_spec_rva_base\n", + get_asm_ptr_keyword(), import->c_name, func->name ); else - output( "\t.long 0x8000%04x\n", func->ordinal ); + { + if (get_ptr_size() == 8) + output( "\t.quad 0x800000000000%04x\n", func->ordinal ); + else + output( "\t.long 0x8000%04x\n", func->ordinal ); + } } + output( "\t%s 0\n", get_asm_ptr_keyword() ); } - output( "\t%s 0\n", get_asm_ptr_keyword() ); - } - output( ".L__wine_spec_import_data_ptrs:\n" ); - LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) - { - for (j = 0; j < import->nb_imports; j++) output( "\t%s 0\n", get_asm_ptr_keyword() ); - output( "\t%s 0\n", get_asm_ptr_keyword() ); } output( ".L__wine_spec_imports_end:\n" );

1 0

Hugh McMaster : regedit: Export Unicode registry files by default.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 0ab54e4a6486c62723cb4a3ce5f52337673b7ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab54e4a6486c62723cb4a3ce… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:43 2017 +0000 regedit: Export Unicode registry files by default. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- programs/regedit/regedit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index cb7738c..c6fcee4 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -431,7 +431,7 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAMEW *pofn) snprintfW( FilterBuffer, MAX_PATH, filterW, filter_reg, 0, 0, filter_reg4, 0, 0, filter_all, 0, 0 ); } pofn->lpstrFilter = FilterBuffer; - pofn->nFilterIndex = 2; + pofn->nFilterIndex = 1; pofn->lpstrFile = FileNameBuffer; pofn->nMaxFile = _MAX_PATH; pofn->lpstrFileTitle = FileTitleBuffer; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 4dd889b..4dd71ca 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -157,9 +157,9 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) WCHAR *key_name = argv[++(*i)]; if (key_name && *key_name) - export_registry_key(filename, key_name, REG_FORMAT_4); + export_registry_key(filename, key_name, REG_FORMAT_5); else - export_registry_key(filename, NULL, REG_FORMAT_4); + export_registry_key(filename, NULL, REG_FORMAT_5); break; } default:

1 0

Hugh McMaster : regedit/tests: Combine and rename the r_exec_import_*str functions.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: ee11f6fff5f6332f58ce51a844cedab6719e57ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee11f6fff5f6332f58ce51a84… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:43 2017 +0000 regedit/tests: Combine and rename the r_exec_import_*str functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 +++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 1f2284f..5912c25 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -67,48 +67,38 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -#define exec_import_str(c) r_exec_import_str(__LINE__, c) -static BOOL r_exec_import_str(unsigned line, const char *file_contents) -{ - BOOL br; - - if (!write_file(file_contents, strlen(file_contents))) - return FALSE; - - run_regedit_exe("regedit.exe /s test.reg"); - - br = DeleteFileA("test.reg"); - lok(br, "DeleteFile failed: %u\n", GetLastError()); +#define exec_import_str(c) import_reg(__LINE__,c,FALSE) +#define exec_import_wstr(c) import_reg(__LINE__,c,TRUE) - return br; -} - -#define exec_import_wstr(c) r_exec_import_wstr(__LINE__, c) -static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) +static BOOL import_reg(unsigned line, const char *contents, BOOL unicode) { - int lenA, len, memsize; - WCHAR *wstr; - BOOL br = FALSE; + int lenA; + BOOL ret; - lenA = strlen(file_contents); + lenA = strlen(contents); - 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); + 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); + } + else + ret = write_file(contents, lenA); - if (!write_file(wstr, memsize)) - goto exit; + 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()); -exit: - HeapFree(GetProcessHeap(), 0, wstr); - return br; + return ret; } #define TODO_REG_TYPE (0x0001u)

1 0

Hugh McMaster : regedit/tests: Use a helper function to write registry files.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 77442049624ee74c7c6540e2154286d1129b9c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77442049624ee74c7c6540e21… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:42 2017 +0000 regedit/tests: Use a helper function to write registry files. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 52 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 60f93c9..1f2284f 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -48,23 +48,33 @@ static BOOL run_regedit_exe_(unsigned line, const char *cmd) return (ret != WAIT_TIMEOUT); } +static BOOL write_file(const void *str, DWORD size) +{ + HANDLE file; + BOOL ret; + DWORD written; + + file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(file, str, size, &written, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); + + return ret; +} + #define exec_import_str(c) r_exec_import_str(__LINE__, c) static BOOL r_exec_import_str(unsigned line, const char *file_contents) { - HANDLE regfile; - 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) + if (!write_file(file_contents, strlen(file_contents))) 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"); @@ -78,9 +88,7 @@ static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) { int lenA, len, memsize; WCHAR *wstr; - HANDLE regfile; - DWORD written; - BOOL br; + BOOL br = FALSE; lenA = strlen(file_contents); @@ -90,26 +98,16 @@ static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) if (!wstr) return FALSE; MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); - 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) - { - HeapFree(GetProcessHeap(), 0, wstr); - return FALSE; - } - - br = WriteFile(regfile, wstr, memsize, &written, NULL); - lok(br, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - HeapFree(GetProcessHeap(), 0, wstr); + if (!write_file(wstr, memsize)) + goto exit; run_regedit_exe("regedit.exe /s test.reg"); br = DeleteFileA("test.reg"); lok(br, "DeleteFile failed: %u\n", GetLastError()); +exit: + HeapFree(GetProcessHeap(), 0, wstr); return br; }

1 0

Hugh McMaster : reg/tests: Compare registry export data with expected data.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 9ce39bd2136bbd411000e542b5b865c13b20adff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce39bd2136bbd411000e542b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:41 2017 +0000 reg/tests: Compare registry export data with expected data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f4ab824..c069154 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4210,11 +4210,55 @@ static void test_import_31(void) ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } +#define compare_export(f,e) compare_export_(__LINE__,f,e) +static BOOL compare_export_(unsigned line, const char *filename, const char *expected) +{ + 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); + + lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); + ret = TRUE; + +exit: + HeapFree(GetProcessHeap(), 0, fbuf); + HeapFree(GetProcessHeap(), 0, wstr); + return ret; + +error: + fclose(fp); + return FALSE; +} + static void test_export(void) { LONG err; DWORD r, os_version, major_version, minor_version; HKEY hkey; + 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"; err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4276,6 +4320,8 @@ static void test_export(void) else /* Windows XP (32-bit) and older */ win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); + todo_wine ok(compare_export("file.reg", empty_key_test), "compare_export() failed\n"); + err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());

1 0

Hugh McMaster : reg/tests: Test the placement of the overwrite file flag [ /y].
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: f886f9f3d8878245d9ad2c021ecac15495c7bb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f886f9f3d8878245d9ad2c021… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:41 2017 +0000 reg/tests: Test the placement of the overwrite file flag [/y]. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c41d284..f4ab824 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4213,7 +4213,8 @@ static void test_import_31(void) static void test_export(void) { LONG err; - DWORD r; + DWORD r, os_version, major_version, minor_version; + HKEY hkey; err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4250,6 +4251,36 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Test registry export with an empty key */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + os_version = GetVersion(); + major_version = LOBYTE(LOWORD(os_version)); + minor_version = HIBYTE(LOWORD(os_version)); + + if (major_version > 5 || (major_version == 5 && minor_version == 2)) + { + run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " /y file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + } + else /* Windows XP (32-bit) and older */ + win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } START_TEST(reg)

1 0

Hugh McMaster : reg/tests: Combine and rename the test_import_*str functions.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: bfe5fed0b3e628a859eb53d906a104c28a3ce6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe5fed0b3e628a859eb53d90… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:40 2017 +0000 reg/tests: Combine and rename the test_import_*str functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 50 +++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1857545..c41d284 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -750,47 +750,37 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -#define test_import_str(c,r) test_import_str_(__LINE__,c,r) -static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) -{ - BOOL ret; - - if (!write_file(file_contents, strlen(file_contents))) - return FALSE; - - run_reg_exe("reg import test.reg", rc); - - ret = DeleteFileA("test.reg"); - lok(ret, "DeleteFile failed: %u\n", GetLastError()); - - return ret; -} +#define test_import_str(c,r) import_reg(__LINE__,c,FALSE,r) +#define test_import_wstr(c,r) import_reg(__LINE__,c,TRUE,r) -#define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) -static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) +static BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc) { - int lenA, len, memsize; - WCHAR *wstr; - BOOL ret = FALSE; + int lenA; + BOOL ret; - lenA = strlen(file_contents); + lenA = strlen(contents); - 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); + 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); + } + else + ret = write_file(contents, lenA); - if (!write_file(wstr, memsize)) - goto exit; + if (!ret) return FALSE; run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); lok(ret, "DeleteFile failed: %u\n", GetLastError()); -exit: - HeapFree(GetProcessHeap(), 0, wstr); return ret; }

1 0

Hugh McMaster : reg/tests: Use a helper function to write registry files.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 08a7836ef384d222f298077192f393ae8576f1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a7836ef384d222f29807719… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:39 2017 +0000 reg/tests: Use a helper function to write registry files. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 52 +++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3b6216f..1857545 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -731,23 +731,33 @@ static BOOL write_reg_file(const char *value, char *tmp_name) return ret; } +static BOOL write_file(const void *str, DWORD size) +{ + HANDLE file; + BOOL ret; + DWORD written; + + file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(file, str, size, &written, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); + + return ret; +} + #define test_import_str(c,r) test_import_str_(__LINE__,c,r) static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) { - HANDLE regfile; - DWORD written; BOOL ret; - 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 (!write_file(file_contents, strlen(file_contents))) return FALSE; - ret = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); - lok(ret, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); @@ -761,9 +771,7 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r { int lenA, len, memsize; WCHAR *wstr; - HANDLE regfile; - DWORD written; - BOOL ret; + BOOL ret = FALSE; lenA = strlen(file_contents); @@ -773,26 +781,16 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r if (!wstr) return FALSE; MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); - 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) - { - HeapFree(GetProcessHeap(), 0, wstr); - return FALSE; - } - - ret = WriteFile(regfile, wstr, memsize, &written, NULL); - lok(ret, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - HeapFree(GetProcessHeap(), 0, wstr); + if (!write_file(wstr, memsize)) + goto exit; run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); lok(ret, "DeleteFile failed: %u\n", GetLastError()); +exit: + HeapFree(GetProcessHeap(), 0, wstr); return ret; }

1 0

Hugh McMaster : reg/tests: Use a helper function to add registry values.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 733350b9264b35604d42e7a656f43e7a24951a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=733350b9264b35604d42e7a65… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:39 2017 +0000 reg/tests: Use a helper function to add registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7f055dc..3b6216f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -128,6 +128,16 @@ static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *sub lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); } +#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 err; + + err = RegSetValueExA(hkey, name, 0, type, (const BYTE *)data, size); + lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err); +} + static void test_add(void) { HKEY hkey; @@ -527,15 +537,9 @@ static void test_delete(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); - - err = RegSetValueExA(hkey, "foo", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); - ok(err == ERROR_SUCCESS, "got %d\n" ,err); - - err = RegSetValueExA(hkey, "bar", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); - ok(err == ERROR_SUCCESS, "got %d\n" ,err); - - err = RegSetValueExA(hkey, "", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); - ok(err == ERROR_SUCCESS, "got %d\n" ,err); + add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, NULL, REG_DWORD, &deadbeef, sizeof(deadbeef)); add_key(hkey, "subkey", &hsubkey); RegCloseKey(hsubkey); @@ -591,14 +595,9 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); - err = RegSetValueExA(key, "Test", 0, REG_SZ, (BYTE *)hello, sizeof(hello)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(key, "Wine", 0, REG_DWORD, (BYTE *)&dword1, sizeof(dword1)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(key, NULL, 0, REG_SZ, (BYTE *)empty1, sizeof(empty1)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + add_value(key, "Test", REG_SZ, hello, sizeof(hello)); + add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1)); + add_value(key, NULL, REG_SZ, empty1, sizeof(empty1)); run_reg_exe("reg query HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -620,15 +619,9 @@ static void test_query(void) /* Create a test subkey */ add_key(key, "Subkey", &subkey); - - err = RegSetValueExA(subkey, "Test", 0, REG_SZ, (BYTE *)world, sizeof(world)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(subkey, "Wine", 0, REG_DWORD, (BYTE *)&dword2, sizeof(dword2)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(subkey, NULL, 0, REG_SZ, (BYTE *)empty2, sizeof(empty2)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + add_value(subkey, "Test", REG_SZ, world, sizeof(world)); + add_value(subkey, "Wine", REG_DWORD, &dword2, sizeof(dword2)); + add_value(subkey, NULL, REG_SZ, empty2, sizeof(empty2)); err = RegCloseKey(subkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2017