wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Eric Pouech : po: Update French translation.
by Alexandre Julliard 02 Jan '22

02 Jan '22

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

Alex Henrie : faultrep/tests: Check for registry virtualization.
by Alexandre Julliard 02 Jan '22

02 Jan '22

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

Alex Henrie : faultrep/tests: Drop workarounds for Windows <= 2000.
by Alexandre Julliard 02 Jan '22

02 Jan '22

Module: wine Branch: master Commit: e69d218d57b92790f82f988dbe568076ca04c07a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e69d218d57b92790f82f988d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 2 00:11:43 2022 -0700 faultrep/tests: Drop workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/tests/faultrep.c | 62 ++++-------------------------------------- 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d0b30f70cf1..30664bd29be 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -36,65 +36,15 @@ static const char regpath_exclude[] = "ExclusionList"; static BOOL is_process_limited(void) { - static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL) = NULL; - static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; - BOOL IsInGroup; HANDLE token; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; - if (!pOpenProcessToken) - { - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); - pCheckTokenMembership = (void*)GetProcAddress(hadvapi32, "CheckTokenMembership"); - if (!pCheckTokenMembership || !pOpenProcessToken) - { - /* Win9x (power to the masses) or NT4 (no way to know) */ - trace("missing pOpenProcessToken or CheckTokenMembership\n"); - return FALSE; - } - } - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - if (!AllocateAndInitializeSid(&NtAuthority, 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_POWER_USERS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is a power user\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - /* Only administrators and power users can be powerful */ - return TRUE; - } - } + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; + return type == TokenElevationTypeLimited; }

1 0

Alexandre Julliard : Update copyright info for 2022.
by Alexandre Julliard 02 Jan '22

02 Jan '22

Module: wine Branch: master Commit: cd2b8b64f7d34d1713813a5e4bb66495db4c5f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2b8b64f7d34d1713813a5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 13:50:20 2022 +0100 Update copyright info for 2022. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 1a12a1e3a92..e8275c2cfc9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index f17f3ce0d74..b8e01166a44 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 989192dc6fc..29b499c796c 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2022 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Alexandre Julliard : ntdll: Fix current directory initialization on removable devices.
by Alexandre Julliard 02 Jan '22

02 Jan '22

Module: wine Branch: master Commit: 15101bae7b9a10d73b8edc05e0ea58590378db29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15101bae7b9a10d73b8edc05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 13:45:40 2022 +0100 ntdll: Fix current directory initialization on removable devices. Fix a regression caused by 3e73437ae8f04a12200bf537758d22e5f9723637. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52311 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b8c7ce715e6..6a3224d8385 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -104,6 +104,7 @@ timeout_t server_start_time = 0; /* time of server startup */ sigset_t server_block_set; /* signals to block during server calls */ static int fd_socket = -1; /* socket to exchange file descriptors with the server */ +static int initial_cwd = -1; static pid_t server_pid; static pthread_mutex_t fd_cache_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -1173,16 +1174,6 @@ static int setup_config_dir(void) } else if (errno != EEXIST) fatal_perror( "cannot create %s/dosdevices", config_dir ); - if (fd_cwd != -1) - { - FILE_FS_DEVICE_INFORMATION info; - if (!get_device_info( fd_cwd, &info ) && (info.Characteristics & FILE_REMOVABLE_MEDIA)) - { - close( fd_cwd ); - fd_cwd = -1; - } - } - if (fd_cwd == -1) fd_cwd = open( "dosdevices/c:", O_RDONLY ); fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); return fd_cwd; @@ -1231,9 +1222,9 @@ static int server_connect(void) { struct sockaddr_un addr; struct stat st; - int s, slen, retry, fd_cwd; + int s, slen, retry; - fd_cwd = setup_config_dir(); + initial_cwd = setup_config_dir(); /* chdir to the server directory */ if (chdir( server_dir ) == -1) @@ -1287,12 +1278,7 @@ static int server_connect(void) #endif if (connect( s, (struct sockaddr *)&addr, slen ) != -1) { - /* switch back to the starting directory */ - if (fd_cwd != -1) - { - fchdir( fd_cwd ); - close( fd_cwd ); - } + fchdir( initial_cwd ); /* switch back to the starting directory */ fcntl( s, F_SETFD, FD_CLOEXEC ); return s; } @@ -1555,6 +1541,11 @@ void server_init_process_done(void) void *entry, *teb; NTSTATUS status; int suspend; + FILE_FS_DEVICE_INFORMATION info; + + if (!get_device_info( initial_cwd, &info ) && (info.Characteristics & FILE_REMOVABLE_MEDIA)) + chdir( "/" ); + close( initial_cwd ); #ifdef __APPLE__ send_server_task_port();

1 0

Paul Gofman : server: Store PE image info in process structure.
by Alexandre Julliard 02 Jan '22

02 Jan '22

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

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 January 2022