January 2022 - Wine-commits

Eric Pouech : po: Some more French translations.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 39f77b25aacf248e18e747bf31c2055a9cfbc89a URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f77b25aacf248e18e747bf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 3 15:43:21 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 | 160 +++++++++++++++++++++++---------------------------------------- 1 file changed, 58 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39f77b25aacf248e18e7…

1 0

Alexandre Julliard : server: Don't return image information for terminating processes.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 14645b06a79f726965ae11d17db69a9521de6a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=14645b06a79f726965ae11d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 3 16:59:50 2022 +0100 server: Don't return image information for terminating processes. Fixes a test failure caused by 8eacd3e50792925cbd209f8a1940f3e96b725137. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index bcb66271771..58ae97cdb2f 100644 --- a/server/process.c +++ b/server/process.c @@ -1503,7 +1503,10 @@ DECL_HANDLER(get_process_info) reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) - set_reply_data( &process->image_info, min( sizeof(process->image_info), get_reply_max_size() )); + { + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else set_reply_data( &process->image_info, min( sizeof(process->image_info), get_reply_max_size() )); + } release_object( process ); } }

1 0

Alexandre Julliard : ntdll: Support debugger attach from a 64-bit process to a 32-bit process.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: e16ccaf05d845ea490d845d896cb284b5b00aa87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e16ccaf05d845ea490d845d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 3 17:32:39 2022 +0100 ntdll: Support debugger attach from a 64-bit process to a 32-bit process. This is needed until 64-bit ntdll can be mapped in all processes. Partial revert of 8dc6987ba5c3fdaa5baea8b00a860f62a3716c08. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52157 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 10 ++++++++++ dlls/ntdll/tests/wow64.c | 2 -- dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/server.c | 4 ++++ dlls/ntdll/unix/unix_private.h | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 82b8daa47af..7b36c988e81 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -558,6 +558,16 @@ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, DbgUiRemoteBreakin, NULL, 0, 0, 0, 0, NULL ); +#ifdef _WIN64 + /* FIXME: hack for debugging 32-bit wow64 process without a 64-bit ntdll */ + if (status == STATUS_INVALID_PARAMETER) + { + ULONG_PTR wow; + if (!NtQueryInformationProcess( process, ProcessWow64Information, &wow, sizeof(wow), NULL ) && wow) + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, + (void *)0x7ffe1000, NULL, 0, 0, 0, 0, NULL ); + } +#endif if (!status) NtClose( handle ); return status; } diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index efe51dd507b..f5d7b08cac3 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -39,7 +39,6 @@ static NTSTATUS (WINAPI *pNtWow64ReadVirtualMemory64)(HANDLE,ULONG64,void*,ULONG static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void *,ULONG64,ULONG64*); #endif -static BOOL is_win64 = (sizeof(void *) > sizeof(int)); static BOOL is_wow64; static void *code_mem; @@ -329,7 +328,6 @@ static void test_peb_teb(void) } ret = DebugActiveProcess( pi.dwProcessId ); - todo_wine_if( is_win64 ) ok( ret, "debugging failed\n" ); if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; ok( res == sizeof(peb), "wrong len %lx\n", res ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 10884a7a673..96301b1654e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -106,6 +106,7 @@ static const char so_dir[] = "/aarch64-unix"; static const char so_dir[] = ""; #endif +void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -1046,6 +1047,7 @@ static void load_ntdll_functions( HMODULE module ) if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ ERR( "%s not found\n", #name ) + GET_FUNC( DbgUiRemoteBreakin ); GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( KiUserApcDispatcher ); diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 6a3224d8385..9d0594d3374 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -534,6 +534,10 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { +#ifndef _WIN64 + /* FIXME: hack for debugging 32-bit process without a 64-bit ntdll */ + if (is_wow64 && func == (void *)0x7ffe1000) func = pDbgUiRemoteBreakin; +#endif attr->TotalLength = sizeof(buffer); attr->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; attr->Attributes[0].Size = sizeof(id); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 42b03cab8f6..a79edabc37c 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -92,6 +92,7 @@ static const LONG teb_offset = 0x2000; #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) /* callbacks to PE ntdll from the Unix side */ +extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN;

1 0

Alex Henrie : wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity).
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: adc3492107467d0877342ca084b8b6f64c623c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc3492107467d0877342ca0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 28 21:04:02 2021 -0700 wmphoto: Fix memory leak on error path in wmp_decoder_create (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/jxrlib.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index 757312b5f0f..3d7dedb869d 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -358,7 +358,10 @@ HRESULT CDECL wmp_decoder_create(struct decoder_info *info, struct decoder **res if (PKImageDecode_Create_WMP(&decoder)) return E_FAIL; This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); if (!This) + { + decoder->Release(&decoder); return E_OUTOFMEMORY; + } This->decoder_iface.vtable = &wmp_decoder_vtable; This->WMPStream_iface.Close = &wmp_stream_Close;

1 0

Jacek Caban : msvcrt: Use __WINE_PE_BUILD in crt_gccmain.c.
by Alexandre Julliard 03 Jan '22

03 Jan '22

Module: wine Branch: master Commit: 907859d7cb8852a914b18251db2aae9449bece54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=907859d7cb8852a914b18251… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 18:58:45 2022 +0100 msvcrt: Use __WINE_PE_BUILD in crt_gccmain.c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52292 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_gccmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/crt_gccmain.c b/dlls/msvcrt/crt_gccmain.c index ed25f385d1b..88ca2874732 100644 --- a/dlls/msvcrt/crt_gccmain.c +++ b/dlls/msvcrt/crt_gccmain.c @@ -22,7 +22,7 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ +#ifdef __WINE_PE_BUILD /* mingw compilers emit call to __main() when main() function is defined. * it's used by crt to call global constructors and register global destructors. */

1 0

Alexandre Julliard : Wine release 7.0-rc4
by Alexandre Julliard 02 Jan '22

02 Jan '22

Module: website Branch: master Commit: 719acbc64c09b7ef5cee0d144d9f0993548e0beb URL: https://source.winehq.org/git/website.git/?a=commit;h=719acbc64c09b7ef5cee0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 2 22:29:29 2022 +0100 Wine release 7.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022010201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022010201.xml b/news/en/2022010201.xml new file mode 100644 index 00000000..a75005c0 --- /dev/null +++ b/news/en/2022010201.xml @@ -0,0 +1,13 @@ +<news> +<date>January 2, 2022</date> +<title>Wine 7.0-rc4 Released</title> +<body> + The Wine development release 7.0-rc4 is now available. + <a href="{$root}/announce/7.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

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

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

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

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