March 2011 - Wine-commits - list.winehq.org

André Hentschel : uxtheme/tests: Add tests for OpenThemeDataEx.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: d69c1bef4c2dcd74e3f6f78c6459b9ff4b8e93b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69c1bef4c2dcd74e3f6f78c6… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Wed Mar 23 17:54:55 2011 +0100 uxtheme/tests: Add tests for OpenThemeDataEx. --- dlls/uxtheme/tests/system.c | 164 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 157 insertions(+), 7 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index ad277a0..7f77546 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -33,17 +33,12 @@ static BOOL (WINAPI * pIsAppThemed)(VOID); static BOOL (WINAPI * pIsThemeActive)(VOID); static BOOL (WINAPI * pIsThemePartDefined)(HTHEME, int, int); static HTHEME (WINAPI * pOpenThemeData)(HWND, LPCWSTR); +static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); static HRESULT (WINAPI * pSetWindowTheme)(HWND, LPCWSTR, LPCWSTR); static HMODULE hUxtheme = 0; -#define UXTHEME_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hUxtheme, #func); \ - if(!p ## func) { \ - trace("GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(hUxtheme); \ - return FALSE; \ - } +#define UXTHEME_GET_PROC(func) p ## func = (void*)GetProcAddress(hUxtheme, #func); static BOOL InitFunctionPtrs(void) { @@ -61,6 +56,7 @@ static BOOL InitFunctionPtrs(void) UXTHEME_GET_PROC(IsThemeActive) UXTHEME_GET_PROC(IsThemePartDefined) UXTHEME_GET_PROC(OpenThemeData) + UXTHEME_GET_PROC(OpenThemeDataEx) UXTHEME_GET_PROC(SetWindowTheme) } /* The following functions should be available, if not return FALSE. The Vista functions will @@ -71,7 +67,10 @@ static BOOL InitFunctionPtrs(void) !pGetWindowTheme || !pIsAppThemed || !pIsThemeActive || !pIsThemePartDefined || !pOpenThemeData || !pSetWindowTheme) + { + FreeLibrary(hUxtheme); return FALSE; + } return TRUE; } @@ -336,6 +335,153 @@ static void test_OpenThemeData(void) hWnd, GetLastError()); } +static void test_OpenThemeDataEx(void) +{ + HTHEME hTheme; + HWND hWnd; + BOOL bThemeActive; + BOOL bDestroyed; + + WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; + WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; + WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; + WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; + + if (!pOpenThemeDataEx) + { + win_skip("OpenThemeDataEx not available\n"); + return; + } + + bThemeActive = pIsThemeActive(); + + /* All NULL */ + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(NULL, NULL, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_POINTER, + "Expected GLE() to be E_POINTER, got 0x%08x\n", + GetLastError()); + + /* A NULL hWnd and an invalid classlist without flags */ + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(NULL, szInvalidClassList, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(NULL, szClassList, 0); + if (bThemeActive) + { + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + } + else + { + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + } + + /* Only do the bare minimum to get a valid hdc */ + hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); + if (!hWnd) return; + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, NULL, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_POINTER, + "Expected GLE() to be E_POINTER, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szInvalidClassList, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + + if (!bThemeActive) + { + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + skip("No active theme, skipping rest of OpenThemeData tests\n"); + return; + } + + /* Only do the next checks if we have an active theme */ + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, OTD_FORCE_RECT_SIZING); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, OTD_NONCLIENT); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0x3); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + /* Test with bUtToN instead of Button */ + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList2, 0); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szClassList, 0); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + bDestroyed = DestroyWindow(hWnd); + if (!bDestroyed) + trace("Window %p couldn't be destroyed : 0x%08x\n", + hWnd, GetLastError()); +} + static void test_GetCurrentThemeName(void) { BOOL bThemeActive; @@ -498,6 +644,10 @@ START_TEST(system) trace("Starting test_OpenThemeData()\n"); test_OpenThemeData(); + /* OpenThemeDataEx */ + trace("Starting test_OpenThemeDataEx()\n"); + test_OpenThemeDataEx(); + /* GetCurrentThemeName */ trace("Starting test_GetCurrentThemeName()\n"); test_GetCurrentThemeName();

1 0

Steven Wallace : ntdll: implemented ProcessDebugFlags in NtQueryInformationProcess.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: b3369e06c73f72ea8ff53223b22668854bfd9ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3369e06c73f72ea8ff53223b… Author: Steven Wallace <swallace(a)wine-patches.sdwmail.homeunix.org> Date: Sun Mar 27 20:20:20 2011 -0700 ntdll: implemented ProcessDebugFlags in NtQueryInformationProcess. --- dlls/ntdll/process.c | 25 +++++++++++++++- dlls/ntdll/tests/info.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index b9b81ca..eff3f58 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -141,7 +141,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessForegroundInformation); UNIMPLEMENTED_INFO_CLASS(ProcessLUIDDeviceMapsEnabled); UNIMPLEMENTED_INFO_CLASS(ProcessBreakOnTermination); - UNIMPLEMENTED_INFO_CLASS(ProcessDebugFlags); UNIMPLEMENTED_INFO_CLASS(ProcessHandleTracing); case ProcessBasicInformation: @@ -314,6 +313,30 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessDebugFlags: + len = sizeof(DWORD); + if (ProcessInformationLength == len) + { + if (!ProcessInformation) + ret = STATUS_ACCESS_VIOLATION; + else if (!ProcessHandle) + ret = STATUS_INVALID_HANDLE; + else + { + SERVER_START_REQ(get_process_info) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + if ((ret = wine_server_call( req )) == STATUS_SUCCESS) + { + *(DWORD *)ProcessInformation = !reply->debugger_present; + } + } + SERVER_END_REQ; + } + } + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; case ProcessDefaultHardErrorMode: len = sizeof(process_error_mode); if (ProcessInformationLength == len) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 774e8a1..2d5c94f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1028,6 +1028,78 @@ static void test_query_process_debug_object_handle(int argc, char **argv) ok(ret, "CloseHandle failed with last error %u\n", GetLastError()); } +static void test_query_process_debug_flags(int argc, char **argv) +{ + DWORD debug_flags = 0xdeadbeef; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFO si = { 0 }; + NTSTATUS status; + BOOL ret; + + sprintf(cmdline, "%s %s %s", argv[0], argv[1], "debuggee"); + + si.cb = sizeof(si); + ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + if (!ret) return; + + status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, + NULL, 0, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, + NULL, sizeof(debug_flags), NULL); + ok(status == STATUS_INVALID_HANDLE || status == STATUS_ACCESS_VIOLATION || broken(status == STATUS_INVALID_INFO_CLASS) /* W7PROX64 (32-bit) */, + "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, + NULL, sizeof(debug_flags), NULL); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, + &debug_flags, sizeof(debug_flags), NULL); + ok(status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, + &debug_flags, sizeof(debug_flags) - 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, + &debug_flags, sizeof(debug_flags) + 1, NULL); + ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected STATUS_INFO_LENGTH_MISMATCH, got %#x.\n", status); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, + &debug_flags, sizeof(debug_flags), NULL); + ok(!status || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "NtQueryInformationProcess failed, status %#x.\n", status); + ok(debug_flags == TRUE|| broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected flag TRUE, got %x.\n", debug_flags); + + status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, + &debug_flags, sizeof(debug_flags), NULL); + ok(!status || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "NtQueryInformationProcess failed, status %#x.\n", status); + ok(debug_flags == FALSE || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected flag FALSE, got %x.\n", debug_flags); + + for (;;) + { + DEBUG_EVENT ev; + + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + + if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + } + + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); +} + static void test_readvirtualmemory(void) { HANDLE process; @@ -1411,6 +1483,10 @@ START_TEST(info) trace("Starting test_query_process_debug_object_handle()\n"); test_query_process_debug_object_handle(argc, argv); + /* 0x1F ProcessDebugFlags */ + trace("Starting test_process_debug_flags()\n"); + test_query_process_debug_flags(argc, argv); + /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory();

1 0

Dmitry Timoshkov : ntdll: Add more NtCreateFile tests.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 0cc619ccc5c5370a6849fa026523120445e9ffc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc619ccc5c5370a6849fa026… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 30 18:08:39 2011 +0900 ntdll: Add more NtCreateFile tests. --- dlls/ntdll/tests/file.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index cc91eb6..4f6c7dc 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1568,13 +1568,19 @@ static void test_NtCreateFile(void) /* 3*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, TRUE }, /* 4*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, FALSE }, /* 5*/{ FILE_OPEN_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /* 6*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /* 7*/{ FILE_OVERWRITE, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, - /* 8*/{ FILE_OVERWRITE_IF, 0, STATUS_ACCESS_DENIED, 0, 0, FALSE }, - /* 9*/{ FILE_OVERWRITE_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, - /*10*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /*11*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE }, - /*12*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE } + /* 6*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, TRUE }, + /* 7*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 8*/{ FILE_OPEN_IF, 0, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 9*/{ FILE_OVERWRITE, 0, STATUS_ACCESS_DENIED, 0, 0, TRUE }, + /*10*/{ FILE_OVERWRITE, 0, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, FALSE }, + /*11*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /*12*/{ FILE_OVERWRITE, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /*13*/{ FILE_OVERWRITE_IF, 0, STATUS_ACCESS_DENIED, 0, 0, TRUE }, + /*14*/{ FILE_OVERWRITE_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /*15*/{ FILE_OVERWRITE_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /*16*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /*17*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE }, + /*18*/{ FILE_SUPERSEDE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, TRUE } }; static const WCHAR fooW[] = {'f','o','o',0}; static const WCHAR dotW[] = {'.',0}; @@ -1610,17 +1616,15 @@ static void test_NtCreateFile(void) ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); CloseHandle(handle); SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); - continue; - } - ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + if (td[i].needs_cleanup) + DeleteFileW(path); - if (status == STATUS_ACCESS_DENIED) - { - SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); continue; } + ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + if (!status) { ok(io.Information == td[i].result,"%d: expected %#x got %#lx\n", i, td[i].result, io.Information);

1 0

Dmitry Timoshkov : server: FILE_OVERWRITE and FILE_OVERWRITE_IF need the FILE_WRITE_ATTRIBUTES permission .
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f834d2319738c57f9a1eebd69bca88eecb75f6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f834d2319738c57f9a1eebd69… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 30 18:08:49 2011 +0900 server: FILE_OVERWRITE and FILE_OVERWRITE_IF need the FILE_WRITE_ATTRIBUTES permission. --- dlls/ntdll/tests/file.c | 14 -------------- server/file.c | 4 +++- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4f6c7dc..ac4ff19 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1609,20 +1609,6 @@ static void test_NtCreateFile(void) td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE, td[i].disposition, 0, NULL, 0); - /* FIXME: completely remove once Wine is fixed */ - if (td[i].status == STATUS_ACCESS_DENIED) - { - todo_wine - ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); - CloseHandle(handle); - SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); - - if (td[i].needs_cleanup) - DeleteFileW(path); - - continue; - } - ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); if (!status) diff --git a/server/file.c b/server/file.c index ee7202b..8cf474b 100644 --- a/server/file.c +++ b/server/file.c @@ -179,10 +179,12 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si { case FILE_CREATE: flags = O_CREAT | O_EXCL; break; case FILE_OVERWRITE_IF: /* FIXME: the difference is whether we trash existing attr or not */ + access |= FILE_WRITE_ATTRIBUTES; case FILE_SUPERSEDE: flags = O_CREAT | O_TRUNC; break; case FILE_OPEN: flags = 0; break; case FILE_OPEN_IF: flags = O_CREAT; break; - case FILE_OVERWRITE: flags = O_TRUNC; break; + case FILE_OVERWRITE: flags = O_TRUNC; + access |= FILE_WRITE_ATTRIBUTES; break; default: set_error( STATUS_INVALID_PARAMETER ); goto done; }

1 0

Damjan Jovanovic : winemenubuilder: Do not skip entries when cleaning up file open associations.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 299d84bf2ca59d34a242bada5b61f86e3cc991b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299d84bf2ca59d34a242bada5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Mar 30 16:22:23 2011 +0200 winemenubuilder: Do not skip entries when cleaning up file open associations. --- programs/winemenubuilder/winemenubuilder.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8b230b1..5908e4e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2106,7 +2106,7 @@ static BOOL cleanup_associations(void) { int i; BOOL done = FALSE; - for (i = 0; !done; i++) + for (i = 0; !done;) { WCHAR *extensionW = NULL; DWORD size = 1024; @@ -2142,6 +2142,8 @@ static BOOL cleanup_associations(void) hasChanged = TRUE; HeapFree(GetProcessHeap(), 0, desktopFile); } + else + i++; HeapFree(GetProcessHeap(), 0, command); } else

1 0

Hans Leidekker : msi: Accept whitespace-only property values on the command line.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 8d58ddfe12a1b299c18f683dc93b5df1b0805e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d58ddfe12a1b299c18f683dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:31:19 2011 +0200 msi: Accept whitespace-only property values on the command line. --- dlls/msi/action.c | 10 +++++----- dlls/msi/tests/install.c | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index abee14c..a5a1e33 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -276,7 +276,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; case ' ': state = state_whitespace; - if (!count || !len) goto done; + if (!count) goto done; in_quotes = 1; break; default: @@ -317,7 +317,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ) { LPCWSTR ptr, ptr2; - int quotes; + int num_quotes; DWORD len; WCHAR *prop, *val; UINT r; @@ -345,10 +345,10 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, ptr2++; while (*ptr2 == ' ') ptr2++; - quotes = 0; + num_quotes = 0; val = msi_alloc( (strlenW( ptr2 ) + 1) * sizeof(WCHAR) ); - len = parse_prop( ptr2, val, &quotes ); - if (quotes % 2) + len = parse_prop( ptr2, val, &num_quotes ); + if (num_quotes % 2) { WARN("unbalanced quotes\n"); msi_free( val ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9e8535a..1f5ab9c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6282,6 +6282,10 @@ static void test_command_line_parsing(void) r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + cmd = "P=\" \""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + cmd = "P=one"; r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);

1 0

Hans Leidekker : msi: Implement MsiGetFileSignatureInformationA/W.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f3f25af9002d4f3386f1eb372173b80ace4cf164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f25af9002d4f3386f1eb372… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:31:35 2011 +0200 msi: Implement MsiGetFileSignatureInformationA/W. --- dlls/msi/Makefile.in | 2 +- dlls/msi/msi.c | 80 +++++++++++++++++++++++++++++++++++++++++--------- dlls/msi/tests/msi.c | 43 ++++++++++++++++++++++++++- 3 files changed, 109 insertions(+), 16 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 8217bcf..066398e 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,7 +1,7 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 -DELAYIMPORTS = odbccp32 +DELAYIMPORTS = odbccp32 wintrust crypt32 C_SRCS = \ action.c \ diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 325a5b0..890132a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -28,7 +28,6 @@ #include "winreg.h" #include "winnls.h" #include "shlwapi.h" -#include "wine/debug.h" #include "msi.h" #include "msidefs.h" #include "msiquery.h" @@ -39,6 +38,10 @@ #include "shlobj.h" #include "shobjidl.h" #include "objidl.h" +#include "wintrust.h" +#include "softpub.h" + +#include "wine/debug.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -2261,22 +2264,71 @@ UINT WINAPI MsiProvideComponentFromDescriptorW( LPCWSTR szDescriptor, return ERROR_CALL_NOT_IMPLEMENTED; } -HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR szSignedObjectPath, - DWORD dwFlags, PCCERT_CONTEXT* ppcCertContext, LPBYTE pbHashData, - LPDWORD pcbHashData) +HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT_CONTEXT *cert, + LPBYTE hash, LPDWORD hashlen ) { - FIXME("%s %08x %p %p %p\n", debugstr_a(szSignedObjectPath), dwFlags, - ppcCertContext, pbHashData, pcbHashData); - return ERROR_CALL_NOT_IMPLEMENTED; + UINT r; + WCHAR *pathW = NULL; + + TRACE("%s %08x %p %p %p\n", debugstr_a(path), flags, cert, hash, hashlen); + + if (path && !(pathW = strdupAtoW( path ))) return ERROR_OUTOFMEMORY; + r = MsiGetFileSignatureInformationW( pathW, flags, cert, hash, hashlen ); + msi_free( pathW ); + return r; } -HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR szSignedObjectPath, - DWORD dwFlags, PCCERT_CONTEXT* ppcCertContext, LPBYTE pbHashData, - LPDWORD pcbHashData) -{ - FIXME("%s %08x %p %p %p\n", debugstr_w(szSignedObjectPath), dwFlags, - ppcCertContext, pbHashData, pcbHashData); - return ERROR_CALL_NOT_IMPLEMENTED; +HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCERT_CONTEXT *cert, + LPBYTE hash, LPDWORD hashlen ) +{ + static GUID generic_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; + HRESULT hr; + WINTRUST_DATA data; + WINTRUST_FILE_INFO info; + CRYPT_PROVIDER_SGNR *signer; + CRYPT_PROVIDER_CERT *provider; + + TRACE("%s %08x %p %p %p\n", debugstr_w(path), flags, cert, hash, hashlen); + + if (!path || !cert) return E_INVALIDARG; + + info.cbStruct = sizeof(info); + info.pcwszFilePath = path; + info.hFile = NULL; + info.pgKnownSubject = NULL; + + data.cbStruct = sizeof(data); + data.pPolicyCallbackData = NULL; + data.pSIPClientData = NULL; + data.dwUIChoice = WTD_UI_NONE; + data.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; + data.dwUnionChoice = WTD_CHOICE_FILE; + data.u.pFile = &info; + data.dwStateAction = WTD_STATEACTION_VERIFY; + data.hWVTStateData = NULL; + data.pwszURLReference = NULL; + data.dwProvFlags = 0; + data.dwUIContext = WTD_UICONTEXT_INSTALL; + hr = WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data ); + if (FAILED(hr)) return hr; + + signer = WTHelperGetProvSignerFromChain( data.hWVTStateData, 0, FALSE, 0 ); + if (!signer) return TRUST_E_NOSIGNATURE; + if (hash) + { + DWORD len = signer->psSigner->EncryptedHash.cbData; + if (*hashlen < len) + { + *hashlen = len; + return HRESULT_FROM_WIN32(ERROR_MORE_DATA); + } + memcpy( hash, signer->psSigner->EncryptedHash.pbData, len ); + *hashlen = len; + } + provider = WTHelperGetProvCertFromChain( signer, 0 ); + if (!provider) return TRUST_E_PROVIDER_UNKNOWN; + *cert = CertDuplicateCertificateContext( provider->pCert ); + return S_OK; } /****************************************************************** diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e21d1e1..6ba0e11 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11753,6 +11753,47 @@ static void test_MsiEnumProducts(void) LocalFree(usersid); } +static void test_MsiGetFileSignatureInformation(void) +{ + HRESULT hr; + const CERT_CONTEXT *cert; + DWORD len; + + hr = MsiGetFileSignatureInformationA( NULL, 0, NULL, NULL, NULL ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( NULL, 0, NULL, NULL, &len ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( NULL, 0, &cert, NULL, &len ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( "", 0, NULL, NULL, NULL ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, NULL ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, &len ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len ); + todo_wine ok(hr == CRYPT_E_FILE_ERROR, "expected CRYPT_E_FILE_ERROR got 0x%08x\n", hr); + + create_file( "signature.bin", "signature", sizeof("signature") ); + + hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, NULL ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, &len ); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + + hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len ); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FUNCTION_FAILED), "got 0x%08x\n", hr); + + DeleteFileA( "signature.bin" ); +} + START_TEST(msi) { init_functionpointers(); @@ -11786,6 +11827,6 @@ START_TEST(msi) test_MsiGetPatchInfo(); test_MsiEnumProducts(); } - test_MsiGetFileVersion(); + test_MsiGetFileSignatureInformation(); }

1 0

Hans Leidekker : msi/tests: Remove unneeded Wow64 checks.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: a0a7a7fc3d5548a1b9b402c4fd46072ea2b53e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a7a7fc3d5548a1b9b402c4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:31:57 2011 +0200 msi/tests: Remove unneeded Wow64 checks. --- dlls/msi/tests/action.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 70fd066..2643e39 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2546,7 +2546,7 @@ static void test_register_product(void) res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -2653,7 +2653,7 @@ static void test_register_product(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, access, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3616,7 +3616,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3699,7 +3699,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3759,7 +3759,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3819,7 +3819,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3902,7 +3902,7 @@ static void test_publish(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4550,7 +4550,7 @@ static void test_write_registry_values(void) ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(delete_pf("msitest", FALSE), "File installed\n"); - if (is_64bit && !is_wow64) + if (is_64bit) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); else res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, KEY_ALL_ACCESS, &hkey); @@ -5318,7 +5318,7 @@ static void test_remove_registry_values(void) ok(res == ERROR_SUCCESS, "key removed\n"); RegCloseKey(key); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key2", 0, KEY_ALL_ACCESS, &key); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); @@ -5336,7 +5336,7 @@ static void test_remove_registry_values(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key1", 0, KEY_ALL_ACCESS, &key); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); @@ -5355,7 +5355,7 @@ static void test_remove_registry_values(void) ok(res == ERROR_SUCCESS, "key removed\n"); RegCloseKey(key); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); @@ -5649,7 +5649,7 @@ static void test_register_class_info(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (is_64bit && !is_wow64) + if (is_64bit) res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); else res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); @@ -5667,7 +5667,7 @@ static void test_register_class_info(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (is_64bit && !is_wow64) + if (is_64bit) res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); else res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey);

1 0

Hans Leidekker : msi: Make sure to access the 64-bit portion of the registry where needed on Wow64 .
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 881ff642a2130df414c022305ff06dabbeda9e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881ff642a2130df414c022305… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:32:21 2011 +0200 msi: Make sure to access the 64-bit portion of the registry where needed on Wow64. --- dlls/msi/registry.c | 600 +++++++++++++++++++++------------------------------ 1 files changed, 247 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=881ff642a2130df414c02…

1 0

Hans Leidekker : msi: Avoid sprintf for simple concatenations.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 6f552fd2f72d42097e684fb19e5987582b3154a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f552fd2f72d42097e684fb19… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:32:39 2011 +0200 msi: Avoid sprintf for simple concatenations. --- dlls/msi/package.c | 5 +- dlls/msi/registry.c | 342 +++++++++++++++++++++----------------------------- 2 files changed, 147 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f552fd2f72d42097e684…

1 0