January 2022 - Wine-Commits

Tag wine-7.0-rc4 : Alexandre Julliard : Release 7.0-rc4
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: refs/tags/wine-7.0-rc4 Tag: 18608b67448a21747396c166d7d2abed41a5b215 URL: https://source.winehq.org/git/wine.git/?a=tag;h=18608b67448a21747396c166d7d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 22:27:12 2022 +0100 Release 7.0-rc4

1 0

Alexandre Julliard : Release 7.0-rc4.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: 2318484e1e33cb30f00eb9a62cb9aa5f83e5dc99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2318484e1e33cb30f00eb9a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 22:27:12 2022 +0100 Release 7.0-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 240 ++++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 126 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2318484e1e33cb30f00e…

1 0

Eric Pouech : po: Update French translation.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: 67c4afff133b787f5d6b1233342e44ccfb238212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67c4afff133b787f5d6b1233… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Jan 2 15:49:02 2022 +0100 po: Update French translation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 1131 +++++++++++++++----------------------------------------------- 1 file changed, 273 insertions(+), 858 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67c4afff133b787f5d6b…

1 0

Eric Pouech : po: Some more French translations.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: a38ced9354aa7d74f396fb91372dbbb7dccd2e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a38ced9354aa7d74f396fb91… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Jan 2 15:49:09 2022 +0100 po: Some more French translations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 970 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 489 insertions(+), 481 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a38ced9354aa7d74f396…

1 0

Paul Gofman : server: Store PE image info in process structure.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: 8eacd3e50792925cbd209f8a1940f3e96b725137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eacd3e50792925cbd209f8a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 31 14:51:43 2021 +0300 server: Store PE image info in process structure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51829 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 15 +++++++++++++++ server/mapping.c | 1 + server/process.c | 13 ++----------- server/process.h | 1 + 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c5857174403..f990d632f73 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1931,9 +1931,11 @@ static void test_section_access(void) char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; SIZE_T size; + SECTION_IMAGE_INFORMATION image_info; MEMORY_BASIC_INFORMATION info; STARTUPINFOA sti; PROCESS_INFORMATION pi; + NTSTATUS status; DWORD ret; /* prevent displaying of the "Unable to load this DLL" message box */ @@ -2084,6 +2086,19 @@ static void test_section_access(void) ok(!memcmp(buf, section_data, section.SizeOfRawData), "wrong section data\n"); } + status = NtQueryInformationProcess(pi.hProcess, ProcessImageInformation, + &image_info, sizeof(image_info), NULL ); + ok(!status, "Got unexpected status %#x.\n", status); + ok(!(image_info.ImageCharacteristics & IMAGE_FILE_DLL), + "Got unexpected characteristics %#x.\n", nt_header.FileHeader.Characteristics); + status = NtUnmapViewOfSection(pi.hProcess, info.BaseAddress); + ok(!status, "Got unexpected status %#x.\n", status); + status = NtQueryInformationProcess(pi.hProcess, ProcessImageInformation, + &image_info, sizeof(image_info), NULL ); + ok(!status, "Got unexpected status %#x.\n", status); + ok(!(image_info.ImageCharacteristics & IMAGE_FILE_DLL), + "Got unexpected characteristics %#x.\n", nt_header.FileHeader.Characteristics); + SetLastError(0xdeadbeef); ret = TerminateProcess(pi.hProcess, 0); ok(ret, "TerminateProcess() error %d\n", GetLastError()); diff --git a/server/mapping.c b/server/mapping.c index bc9ed5bdcb9..8d4332d240f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -408,6 +408,7 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) process->image = NULL; if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; + process->image_info = view->image; return; } } diff --git a/server/process.c b/server/process.c index 0cc7f6b60ee..bcb66271771 100644 --- a/server/process.c +++ b/server/process.c @@ -680,6 +680,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->trace_data = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; + memset( &process->image_info, 0, sizeof(process->image_info) ); list_init( &process->kernel_object ); list_init( &process->thread_list ); list_init( &process->locks ); @@ -1502,17 +1503,7 @@ DECL_HANDLER(get_process_info) reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) - { - client_ptr_t base; - const pe_image_info_t *info; - struct memory_view *view = get_exe_view( process ); - if (view) - { - if ((info = get_view_image_info( view, &base ))) - set_reply_data( info, min( sizeof(*info), get_reply_max_size() )); - } - else set_error( STATUS_PROCESS_IS_TERMINATING ); - } + set_reply_data( &process->image_info, min( sizeof(process->image_info), get_reply_max_size() )); release_object( process ); } } diff --git a/server/process.h b/server/process.h index 22ee8178368..632faf9c4bf 100644 --- a/server/process.h +++ b/server/process.h @@ -89,6 +89,7 @@ struct process const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ struct list kernel_object; /* list of kernel object pointers */ + pe_image_info_t image_info; /* main exe image info */ }; /* process functions */

1 0

Alex Henrie : faultrep/tests: Check for registry virtualization.
by Alexandre Julliard Jan. 2, 2022

Jan. 2, 2022

Module: wine Branch: master Commit: 425098974a83c2646acfeff656cf9eada3d73c20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=425098974a83c2646acfeff6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 2 00:11:44 2022 -0700 faultrep/tests: Check for registry virtualization. If registry virtualization is enabled, AddERExcludedApplicationA succeeds on Windows 8 even if the user does not really have permission to write to HKLM\Software. The behind-the-scenes writes to HLKM\Software are treated like any other writes: They are silently redirected to HKCU\Software\Classes\VirtualStore\Machine\Software. Since AddERExcludedApplicationA still fails even with registry virtualization enabled on Vista, 7, and 10, Windows 8's behavior is clearly broken. Fixes a testbot failure on 32-bit Windows 8 with a non-elevated administrator account. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/tests/faultrep.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index 30664bd29be..c71db80cdbb 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -47,6 +47,19 @@ static BOOL is_process_limited(void) return type == TokenElevationTypeLimited; } +static BOOL is_registry_virtualization_enabled(void) +{ + HANDLE token; + DWORD enabled = FALSE; + DWORD size; + + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + GetTokenInformation(token, TokenVirtualizationEnabled, &enabled, sizeof(enabled), &size); + CloseHandle(token); + + return enabled; +} + /* ###### */ @@ -86,7 +99,8 @@ static void test_AddERExcludedApplicationA(void) if (is_process_limited()) { /* LastError is not set! */ - ok(!res, "AddERExcludedApplicationA should have failed got %d\n", res); + ok(!res || broken(is_registry_virtualization_enabled()) /* win8 */, + "AddERExcludedApplicationA should have failed, got %d\n", res); } else {

1 0