September 2017 - Wine-Commits

Stefan Dösinger : ntdll: Do not queue a completion status if pipe ops fail synchronously.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: bf6025e0e111d265bdf1c56871be9a73955e9ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6025e0e111d265bdf1c5687… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 22 13:13:25 2017 +0300 ntdll: Do not queue a completion status if pipe ops fail synchronously. This fixes random crashes when exiting Chromium or shutting down CEF. It is similar to 7a1142035d7ee04839417176ff93fd0953e2a4e1, just for pipes. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 6 +++--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0a6edd6..84db14e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1076,6 +1076,45 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) } trace("Server done writing.\n"); + /* Client will finish this connection, the following ops will trigger broken pipe errors. */ + + /* Wait for the pipe to break. */ + while (PeekNamedPipe(hnp, NULL, 0, NULL, &written, &written)); + + trace("Server writing on disconnected pipe...\n"); + SetLastError(ERROR_SUCCESS); + success = WriteFile(hnp, buf, readden, &written, &oWrite); + err = GetLastError(); + todo_wine_if (!success && err == ERROR_PIPE_NOT_CONNECTED) ok(!success && err == ERROR_NO_DATA, + "overlapped WriteFile on disconnected pipe returned %u, err=%i\n", success, err); + + /* No completion status is queued on immediate error. */ + SetLastError(ERROR_SUCCESS); + oResult = (OVERLAPPED *)0xdeadbeef; + success = GetQueuedCompletionStatus(hcompletion, &written, &compkey, + &oResult, 0); + err = GetLastError(); + ok(!success && err == WAIT_TIMEOUT && !oResult, + "WriteFile GetQueuedCompletionStatus returned %u, err=%i, oResult %p\n", + success, err, oResult); + + trace("Server reading from disconnected pipe...\n"); + SetLastError(ERROR_SUCCESS); + success = ReadFile(hnp, buf, sizeof(buf), &readden, &oRead); + trace("Server ReadFile from disconnected pipe returned...\n"); + err = GetLastError(); + ok(!success && err == ERROR_BROKEN_PIPE, + "overlapped ReadFile on disconnected pipe returned %u, err=%i\n", success, err); + + SetLastError(ERROR_SUCCESS); + oResult = (OVERLAPPED *)0xdeadbeef; + success = GetQueuedCompletionStatus(hcompletion, &readden, &compkey, + &oResult, 0); + err = GetLastError(); + ok(!success && err == WAIT_TIMEOUT && !oResult, + "ReadFile GetQueuedCompletionStatus returned %u, err=%i, oResult %p\n", + success, err, oResult); + /* finish this connection, wait for next one */ ok(FlushFileBuffers(hnp), "FlushFileBuffers\n"); success = DisconnectNamedPipe(hnp); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 28a69ff..d498581 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -937,7 +937,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, break; default: status = STATUS_PIPE_BROKEN; - goto done; + goto err; } } else if (type == FD_TYPE_FILE) continue; /* no async I/O on regular files */ @@ -946,7 +946,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, { if (errno == EINTR) continue; if (!total) status = FILE_GetNtStatus(); - goto done; + goto err; } if (async_read) @@ -1331,7 +1331,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; else status = FILE_GetNtStatus(); } - goto done; + goto err; } if (async_write)

1 0

Alexandre Julliard : kernel32/tests: Add more WRITECOPY tests.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 6eec34a9edb56463ca24f8e4c5356f228fecb673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eec34a9edb56463ca24f8e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:38:06 2017 +0200 kernel32/tests: Add more WRITECOPY tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 77 ++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 409d479..3ee9683 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3836,6 +3836,16 @@ static DWORD map_prot_no_write(DWORD prot) } } +static DWORD map_prot_written(DWORD prot) +{ + switch (prot) + { + case PAGE_WRITECOPY: return PAGE_READWRITE; + case PAGE_EXECUTE_WRITECOPY: return PAGE_EXECUTE_READWRITE; + default: return prot; + } +} + static DWORD file_access_to_prot( DWORD access ) { BOOL exec = access & FILE_MAP_EXECUTE; @@ -4083,29 +4093,11 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) if (is_compatible_protection(alloc_prot, actual_prot)) { /* win2k and XP don't support EXEC on file mappings */ - if (!ret && page_prot[k] == PAGE_EXECUTE) - { - ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); - continue; - } - /* NT4 and win2k don't support EXEC on file mappings */ - if (!ret && (page_prot[k] == PAGE_EXECUTE_READ || page_prot[k] == PAGE_EXECUTE_READWRITE)) + if (!ret && (page_prot[k] == PAGE_EXECUTE || page_prot[k] == PAGE_EXECUTE_WRITECOPY || view[j].prot == PAGE_EXECUTE_WRITECOPY)) { ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); continue; } - /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ - if (!ret && page_prot[k] == PAGE_EXECUTE_WRITECOPY) - { - ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n"); - continue; - } - /* win2k and XP don't support PAGE_EXECUTE_WRITECOPY views properly */ - if (!ret && view[j].prot == PAGE_EXECUTE_WRITECOPY) - { - ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY view properly\n"); - continue; - } ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); @@ -4164,6 +4156,53 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) } } + if (!anon_mapping && is_compatible_protection(alloc_prot, PAGE_WRITECOPY)) + { + ret = VirtualProtect(base, si.dwPageSize, PAGE_WRITECOPY, &old_prot); + ok(ret, "VirtualProtect error %d, map %#x, view %#x\n", GetLastError(), page_prot[i], view[j].prot); + if (ret) *(DWORD*)base = 0xdeadbeef; + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine + ok(info.Protect == PAGE_READWRITE, "VirtualProtect wrong prot, map %#x, view %#x got %#x\n", + page_prot[i], view[j].prot, info.Protect ); + + prev_prot = info.Protect; + alloc_prot = info.AllocationProtect; + + for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) + { + DWORD actual_prot = (sec_flags & SEC_IMAGE) ? map_prot_no_write(page_prot[k]) : page_prot[k]; + SetLastError(0xdeadbeef); + old_prot = 0xdeadbeef; + ret = VirtualProtect(base, si.dwPageSize, page_prot[k], &old_prot); + if (is_compatible_protection(alloc_prot, actual_prot)) + { + /* win2k and XP don't support EXEC on file mappings */ + if (!ret && (page_prot[k] == PAGE_EXECUTE || page_prot[k] == PAGE_EXECUTE_WRITECOPY || view[j].prot == PAGE_EXECUTE_WRITECOPY)) + { + ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); + continue; + } + + ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); + + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine_if( map_prot_written( page_prot[k] ) != actual_prot ) + ok(info.Protect == map_prot_written( page_prot[k] ), + "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", + page_prot[i], view[j].prot, page_prot[k], info.Protect ); + prev_prot = info.Protect; + } + else + { + ok(!ret, "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + } + } UnmapViewOfFile(base); }

1 0

Alexandre Julliard : kernel32/tests: Fix some confusing WRITECOPY tests.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 0494f036491c86ab539050f01f5da7cb0559b512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0494f036491c86ab539050f01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:37:37 2017 +0200 kernel32/tests: Fix some confusing WRITECOPY tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d7d5124..409d479 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3584,7 +3584,7 @@ static void test_CreateFileMapping_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE, PAGE_NOACCESS } /* 0xf0 */ }; char *base, *ptr; - DWORD ret, i, alloc_prot, prot, old_prot; + DWORD ret, i, alloc_prot, old_prot; MEMORY_BASIC_INFORMATION info; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; @@ -3641,16 +3641,6 @@ static void test_CreateFileMapping_protection(void) ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); ok(info.Type == MEM_MAPPED, "%d: %#x != MEM_MAPPED\n", i, info.Type); - if (is_mem_writable(info.Protect)) - { - base[0] = 0xfe; - - SetLastError(0xdeadbeef); - ret = VirtualQuery(base, &info, sizeof(info)); - ok(ret, "VirtualQuery failed %d\n", GetLastError()); - ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); - } - SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); @@ -3682,19 +3672,19 @@ static void test_CreateFileMapping_protection(void) hmap = CreateFileMappingW(hfile, NULL, alloc_prot, 0, si.dwPageSize, NULL); ok(hmap != 0, "%d: CreateFileMapping error %d\n", i, GetLastError()); - SetLastError(0xdeadbeef); - base = MapViewOfFile(hmap, FILE_MAP_READ | FILE_MAP_WRITE | (page_exec_supported ? FILE_MAP_EXECUTE : 0), 0, 0, 0); - ok(base != NULL, "MapViewOfFile failed %d\n", GetLastError()); - - old_prot = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); - ok(ret, "VirtualProtect error %d\n", GetLastError()); - ok(old_prot == alloc_prot, "got %#x != expected %#x\n", old_prot, alloc_prot); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef); + base = MapViewOfFile(hmap, FILE_MAP_READ | FILE_MAP_WRITE | (page_exec_supported ? FILE_MAP_EXECUTE : 0), 0, 0, 0); + ok(base != NULL, "MapViewOfFile failed %d\n", GetLastError()); + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); + ok(old_prot == alloc_prot, "got %#x != expected %#x\n", old_prot, alloc_prot); + + SetLastError(0xdeadbeef); ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); @@ -3735,18 +3725,12 @@ static void test_CreateFileMapping_protection(void) ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); - prot = td[i].prot; - /* looks strange but Windows doesn't do this for PAGE_WRITECOPY */ - if (prot == PAGE_EXECUTE_WRITECOPY) prot = PAGE_EXECUTE_READWRITE; - SetLastError(0xdeadbeef); ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - /* FIXME: remove the condition below once Wine is fixed */ - todo_wine_if (td[i].prot == PAGE_EXECUTE_WRITECOPY) - ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); + ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == alloc_prot, "%d: %#x != %#x\n", i, info.AllocationProtect, alloc_prot); ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); @@ -3778,9 +3762,10 @@ static void test_CreateFileMapping_protection(void) /* FIXME: remove the condition below once Wine is fixed */ todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(old_prot == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_after_write); + + UnmapViewOfFile(base); } - UnmapViewOfFile(base); CloseHandle(hmap); CloseHandle(hfile);

1 0

Nikolay Sivov : include: Added stgprop.h.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 398d42585e705572e105ec03deca3fb2b663724b URL: http://source.winehq.org/git/wine.git/?a=commit;h=398d42585e705572e105ec03d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 25 10:59:35 2017 +0300 include: Added stgprop.h. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ntquery.h | 25 +------------------------ include/stgprop.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index fd52a5f..236d2bd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -620,6 +620,7 @@ HEADER_SRCS = \ sqlucode.h \ srrestoreptapi.h \ sspi.h \ + stgprop.h \ sti.h \ storage.h \ strsafe.h \ diff --git a/include/ntquery.h b/include/ntquery.h index 928dafc..307304f 100644 --- a/include/ntquery.h +++ b/include/ntquery.h @@ -19,8 +19,7 @@ #ifndef __WINE_NTQUERY_H__ #define __WINE_NTQUERY_H__ -/* FIXME: #include <stgprop.h> */ - +#include "stgprop.h" #include <pshpack4.h> typedef struct _CI_STATE @@ -44,28 +43,6 @@ typedef struct _CI_STATE #include <poppack.h> -#define PSGUID_STORAGE {0xb725f130, 0x47ef, 0x101a, {0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac}} -#define PID_STG_DIRECTORY ((PROPID)0x02) -#define PID_STG_CLASSID ((PROPID)0x03) -#define PID_STG_STORAGETYPE ((PROPID)0x04) -#define PID_STG_VOLUME_ID ((PROPID)0x05) -#define PID_STG_PARENT_WORKID ((PROPID)0x06) -#define PID_STG_SECONDARYSTORE ((PROPID)0x07) -#define PID_STG_FILEINDEX ((PROPID)0x08) -#define PID_STG_LASTCHANGEUSN ((PROPID)0x09) -#define PID_STG_NAME ((PROPID)0x0a) -#define PID_STG_PATH ((PROPID)0x0b) -#define PID_STG_SIZE ((PROPID)0x0c) -#define PID_STG_ATTRIBUTES ((PROPID)0x0d) -#define PID_STG_WRITETIME ((PROPID)0x0e) -#define PID_STG_CREATETIME ((PROPID)0x0f) -#define PID_STG_ACCESSTIME ((PROPID)0x10) -#define PID_STG_CHANGETIME ((PROPID)0x11) -#define PID_STG_CONTENTS ((PROPID)0x13) -#define PID_STG_SHORTNAME ((PROPID)0x14) -#define PID_STG_MAX PID_STG_SHORTNAME - - #ifdef __cplusplus extern "C" { #endif diff --git a/include/stgprop.h b/include/stgprop.h new file mode 100644 index 0000000..5688a0b --- /dev/null +++ b/include/stgprop.h @@ -0,0 +1,43 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * 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 + */ + +#ifndef __WINE_STGPROP_H__ +#define __WINE_STGPROP_H__ + +#define PSGUID_STORAGE {0xb725f130, 0x47ef, 0x101a, {0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac}} +#define PID_STG_DIRECTORY ((PROPID)0x02) +#define PID_STG_CLASSID ((PROPID)0x03) +#define PID_STG_STORAGETYPE ((PROPID)0x04) +#define PID_STG_VOLUME_ID ((PROPID)0x05) +#define PID_STG_PARENT_WORKID ((PROPID)0x06) +#define PID_STG_SECONDARYSTORE ((PROPID)0x07) +#define PID_STG_FILEINDEX ((PROPID)0x08) +#define PID_STG_LASTCHANGEUSN ((PROPID)0x09) +#define PID_STG_NAME ((PROPID)0x0a) +#define PID_STG_PATH ((PROPID)0x0b) +#define PID_STG_SIZE ((PROPID)0x0c) +#define PID_STG_ATTRIBUTES ((PROPID)0x0d) +#define PID_STG_WRITETIME ((PROPID)0x0e) +#define PID_STG_CREATETIME ((PROPID)0x0f) +#define PID_STG_ACCESSTIME ((PROPID)0x10) +#define PID_STG_CHANGETIME ((PROPID)0x11) +#define PID_STG_CONTENTS ((PROPID)0x13) +#define PID_STG_SHORTNAME ((PROPID)0x14) +#define PID_STG_MAX PID_STG_SHORTNAME + +#endif

1 0

Hugh McMaster : regedit/tests: Test registry export against order of data creation.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 03a9bf4f5c71bc082f4606b906031f31ce65625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a9bf4f5c71bc082f4606b90… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:58:22 2017 +0000 regedit/tests: Test registry export against order of data creation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 58 +++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index a49b44f..a660e9e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -104,6 +104,7 @@ static BOOL import_reg(unsigned line, const char *contents, BOOL unicode) #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) @@ -3326,8 +3327,8 @@ static void test_value_deletion_unicode(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); } -#define compare_export(f,e) compare_export_(__LINE__,f,e) -static BOOL compare_export_(unsigned line, const char *filename, const char *expected) +#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; @@ -3355,7 +3356,8 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp if (!wstr) goto exit; MultiByteToWideChar(CP_UTF8, 0, expected, -1, wstr, len); - lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); + todo_wine_if (todo & TODO_REG_COMPARE) + lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); ret = TRUE; exit: @@ -3410,6 +3412,18 @@ static void test_export(void) "@=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"; + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -3417,7 +3431,7 @@ static void test_export(void) 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), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); lr = DeleteFileA("file.reg"); ok(lr, "DeleteFile failed: %u\n", GetLastError()); @@ -3428,7 +3442,7 @@ static void test_export(void) 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), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); lr = DeleteFileA("file.reg"); ok(lr, "DeleteFile failed: %u\n", GetLastError()); @@ -3468,13 +3482,45 @@ static void test_export(void) RegCloseKey(hkey); run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); - ok(compare_export("file.reg", complex_test), "compare_export() failed\n"); + ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); lr = DeleteFileA("file.reg"); ok(lr, "DeleteFile failed: %u\n", GetLastError()); lr = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS, "delete_tree() failed: %d\n", lr); + + /* 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"); + + lr = DeleteFileA("file.reg"); + ok(lr, "DeleteFile failed: %u\n", GetLastError()); + + 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"); + + lr = DeleteFileA("file.reg"); + ok(lr, "DeleteFile failed: %u\n", GetLastError()); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(regedit)

1 0

Hugh McMaster : regedit/tests: Test registry export with a complex data structure.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 73bb1f66a365f6898fdd31c97ee5ed9a783e77a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bb1f66a365f6898fdd31c97… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:58:22 2017 +0000 regedit/tests: Test registry export with a complex data structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 111 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 4b29183..a49b44f 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -188,6 +188,48 @@ static void delete_key_(unsigned line, const HKEY hkey, const char *path) } } +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) @@ -3329,7 +3371,7 @@ error: static void test_export(void) { LONG lr; - HKEY hkey; + HKEY hkey, subkey; DWORD dword; const char *empty_key_test = @@ -3342,6 +3384,32 @@ static void test_export(void) "\"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"; + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -3365,9 +3433,48 @@ static void test_export(void) lr = DeleteFileA("file.reg"); ok(lr, "DeleteFile failed: %u\n", GetLastError()); + /* Test registry export with a complex data structure */ + add_key(hkey, "Subkey1", &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + 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); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", complex_test), "compare_export() failed\n"); + + lr = DeleteFileA("file.reg"); + ok(lr, "DeleteFile failed: %u\n", GetLastError()); + + lr = delete_tree(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS, "delete_tree() failed: %d\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit/tests: Test registry export with an empty key.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: fd4ce9a0efa72f5cf0770a9cc342502e667ba5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4ce9a0efa72f5cf0770a9cc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:58:20 2017 +0000 regedit/tests: Test registry export with an empty key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 81 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 8b0b085..d64a590 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -17,7 +17,7 @@ */ #include <windows.h> - +#include <stdio.h> #include "wine/test.h" #define lok ok_(__FILE__,line) @@ -166,6 +166,16 @@ 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) { @@ -3264,6 +3274,74 @@ static void test_value_deletion_unicode(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); } +#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 lr; + 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"; + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + 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), "compare_export() failed\n"); + + lr = DeleteFileA("file.reg"); + ok(lr, "DeleteFile failed: %u\n", GetLastError()); + + RegCloseKey(hkey); + + delete_key(HKEY_CURRENT_USER, KEY_BASE); +} + START_TEST(regedit) { if(!exec_import_str("REGEDIT4\r\n\r\n")){ @@ -3285,4 +3363,5 @@ START_TEST(regedit) test_key_creation_and_deletion_unicode(); test_value_deletion(); test_value_deletion_unicode(); + test_export(); }

1 0

Hugh McMaster : regedit/tests: Use a helper function to delete registry keys.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: cca0147fcfc553b5111e50a28b70075ebe3647b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca0147fcfc553b5111e50a28… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:58:20 2017 +0000 regedit/tests: Use a helper function to delete registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 102 ++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cca0147fcfc553b5111e5…

1 0

Hugh McMaster : reg/tests: Use a helper function to delete registry keys.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 2ce7d1f2069eafb4757614c8e7ee41aaa40e3b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce7d1f2069eafb4757614c8e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:51 2017 +0000 reg/tests: Use a helper function to delete registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 102 +++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ce7d1f2069eafb475761…

1 0

Hugh McMaster : reg/tests: Use a helper function to delete registry values.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: ba0a7b0f267b576ca5fca39c74cb976890eb678d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0a7b0f267b576ca5fca39c7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:50 2017 +0000 reg/tests: Use a helper function to delete 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 | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index dca5f78..a3f43f3 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -180,6 +180,15 @@ static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err); } +#define delete_value(k,n) delete_value_(__LINE__,k,n) +static void delete_value_(unsigned line, const HKEY hkey, const char *name) +{ + LONG err; + + err = RegDeleteValueA(hkey, name); + lok(err == ERROR_SUCCESS, "RegDeleteValueA failed: %d\n", err); +} + static void test_add(void) { HKEY hkey; @@ -2058,8 +2067,7 @@ static void test_import(void) verify_reg_nonexist(hkey, "Wine57i"); verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); - err = RegDeleteValueW(hkey, NULL); - ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + delete_value(hkey, NULL); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2087,8 +2095,7 @@ static void test_import(void) verify_reg_nonexist(hkey, "Wine58c"); verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); - err = RegDeleteValueW(hkey, NULL); - ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + delete_value(hkey, NULL); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3542,8 +3549,7 @@ static void test_unicode_import(void) verify_reg_nonexist(hkey, "Wine57i"); verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); - err = RegDeleteValueW(hkey, NULL); - ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + delete_value(hkey, NULL); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3571,8 +3577,7 @@ static void test_unicode_import(void) verify_reg_nonexist(hkey, "Wine58c"); verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); - err = RegDeleteValueW(hkey, NULL); - ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + delete_value(hkey, NULL); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -4201,8 +4206,7 @@ static void test_import_31(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "", REG_SZ, "No newline", 11, 0); - err = RegDeleteValueW(hkey, NULL); - ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %d\n", err); + delete_value(hkey, NULL); /* Test character validity at the start of the line */ test_import_str("REGEDIT\r\n"

1 0