September 2020 - Wine-commits

Owen Rudge : winecfg: Add /v parameter to display current Windows version.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 87f41e6b408dd01055ff6a378b90d089d61ec370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f41e6b408dd01055ff6a37… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Aug 31 23:11:39 2020 +0100 winecfg: Add /v parameter to display current Windows version. This patch allows winecfg to be called with the "/v" parameter to display the current Windows version. "/v winver" will continue to allow the Windows version to be updated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49242 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 24 +++++++++++++++++++++++- programs/winecfg/main.c | 9 +++++++-- programs/winecfg/winecfg.h | 1 + 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index dd3480cd63..8068941ff8 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> +#include "wine/heap.h" #include "wine/unicode.h" #include "winecfg.h" #include "resource.h" @@ -74,6 +75,8 @@ static const struct win_version win_versions[] = #endif }; +#define DEFAULT_WIN_VERSION "win7" + static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; @@ -146,7 +149,7 @@ static void update_comboboxes(HWND dialog) return; } if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); - else winver = strdupA("win7"); + else winver = strdupA(DEFAULT_WIN_VERSION); } WINE_TRACE("winver is %s\n", winver); @@ -498,6 +501,25 @@ void print_windows_versions(void) } } +void print_current_winver(void) +{ + char *winver = get_reg_key(config_key, keypath(""), "Version", ""); + + if (!winver || !winver[0]) + { + int ver = get_registry_version(); + + if (ver == -1) + printf(DEFAULT_WIN_VERSION "\n"); + else + printf("%s\n", win_versions[ver].szVersion); + } + else + printf("%s\n", winver); + + heap_free(winver); +} + static void on_winver_change(HWND dialog) { int selection = SendDlgItemMessageW(dialog, IDC_WINVER, CB_GETCURSEL, 0, 0); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index f29e2f036f..9b30ed6e8e 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -187,9 +187,13 @@ ProcessCmdLine(LPSTR lpCmdLine) { return -1; } - if ((lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') && (lstrlenA(lpCmdLine) > 4)) + if (lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') { - return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; + if (lstrlenA(lpCmdLine) > 4) + return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; + + print_current_winver(); + return 0; } if (lpCmdLine[1] == '?') @@ -197,6 +201,7 @@ ProcessCmdLine(LPSTR lpCmdLine) printf("Usage: winecfg [options]\n\n"); printf("Options:\n"); printf(" [no option] Launch the graphical version of this program.\n"); + printf(" /v Display the current global Windows version.\n"); printf(" /v version Set global Windows version to 'version'.\n"); printf(" /? Display this information and exit.\n\n"); printf("Valid versions for 'version':\n\n"); diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 9dd39c51c3..d022cd3d68 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -91,6 +91,7 @@ INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara /* Windows version management */ BOOL set_winver_from_string(const char *version); +void print_current_winver(void); void print_windows_versions(void); /* Drive management */

1 0

Rémi Bernon : bcrypt: Return STATUS_INVALID_PARAMETER on ECC magic mismatch.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 4bc5b822f6c1ac0de4c5f18f1a7648deefdc40a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bc5b822f6c1ac0de4c5f18f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 2 09:59:46 2020 +0200 bcrypt: Return STATUS_INVALID_PARAMETER on ECC magic mismatch. Flight Simulator XAL authentication hits this condition because of buggy bcrypt private key export (see next patch). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 4 ++-- dlls/bcrypt/tests/bcrypt.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b6bb73a715..cd3b746e29 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1171,7 +1171,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) return STATUS_INVALID_PARAMETER; @@ -1211,7 +1211,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; } - if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) return STATUS_INVALID_PARAMETER; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e37a33e38a..3e5d5cf17f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1730,6 +1730,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); @@ -1749,6 +1755,12 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ecckey->dwMagic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + ecckey->cbKey = 32; + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + ecckey->dwMagic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; ecckey->cbKey = 32; status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status);

1 0

Rémi Bernon : bcrypt: Export ECDSA/ECDH blobs with the correct header magic.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 4ee4fffafa76e1b55c746cea50f50ac6b8b81be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee4fffafa76e1b55c746cea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 2 09:59:47 2020 +0200 bcrypt: Export ECDSA/ECDH blobs with the correct header magic. This fixes Flight Simulator XAL authentication error message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 54 +++++++++++++++++++++++++++++++--------------- dlls/bcrypt/tests/bcrypt.c | 8 +++++++ 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a80bce47f9..7acf819862 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -680,7 +680,8 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_SUCCESS; } -static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **pubkey, ULONG *pubkey_len ) +static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_id alg_id, UCHAR **pubkey, + ULONG *pubkey_len ) { BCRYPT_ECCKEY_BLOB *ecc_blob; gnutls_ecc_curve_t curve; @@ -689,20 +690,29 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **p UCHAR *src, *dst; int ret; + switch (alg_id) + { + case ALG_ID_ECDH_P256: + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + size = 32; + break; + case ALG_ID_ECDSA_P256: + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + size = 32; + break; + default: + FIXME( "algorithm %u not supported\n", alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + if ((ret = pgnutls_privkey_export_ecc_raw( gnutls_key, &curve, &x, &y, NULL ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - switch (curve) + if (curve != GNUTLS_ECC_CURVE_SECP256R1) { - case GNUTLS_ECC_CURVE_SECP256R1: - magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; - size = 32; - break; - - default: FIXME( "curve %u not supported\n", curve ); free( x.data ); free( y.data ); return STATUS_NOT_IMPLEMENTED; @@ -863,7 +873,7 @@ NTSTATUS key_asymmetric_generate( struct key *key ) break; case GNUTLS_PK_ECC: - status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ); + status = export_gnutls_pubkey_ecc( handle, key->alg_id, &key->u.a.pubkey, &key->u.a.pubkey_len ); break; case GNUTLS_PK_DSA: @@ -894,20 +904,30 @@ NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len UCHAR *src, *dst; int ret; + switch (key->alg_id) + { + case ALG_ID_ECDH_P256: + magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + size = 32; + break; + case ALG_ID_ECDSA_P256: + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + size = 32; + break; + + default: + FIXME( "algorithm %u does not yet support exporting ecc blob\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + if ((ret = pgnutls_privkey_export_ecc_raw( key->u.a.handle, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - switch (curve) + if (curve != GNUTLS_ECC_CURVE_SECP256R1) { - case GNUTLS_ECC_CURVE_SECP256R1: - magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; - size = 32; - break; - - default: FIXME( "curve %u not supported\n", curve ); free( x.data ); free( y.data ); free( d.data ); return STATUS_NOT_IMPLEMENTED; @@ -982,7 +1002,7 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) return STATUS_INTERNAL_ERROR; } - if ((status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ))) + if ((status = export_gnutls_pubkey_ecc( handle, key->alg_id, &key->u.a.pubkey, &key->u.a.pubkey_len ))) { pgnutls_privkey_deinit( handle ); return status; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3e5d5cf17f..7fdc0ac7fb 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1765,6 +1765,14 @@ static void test_ECDSA(void) status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %08x\n", status); + memset( buffer, 0, sizeof(buffer) ); + status = pBCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ecckey = (BCRYPT_ECCKEY_BLOB *)buffer; + ok(ecckey->dwMagic == BCRYPT_ECDSA_PRIVATE_P256_MAGIC, "got %08x\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 3, "got %u\n", size); + pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); }

1 0

Zebediah Figura : server: Avoid a potential NULL dereference in startup_info_dump().
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 74dc9aa33502ba89333ab4be3c7c1458015c1d56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74dc9aa33502ba89333ab4be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 1 17:22:20 2020 -0500 server: Avoid a potential NULL dereference in startup_info_dump(). info->data may be set to NULL by get_startup_info, without invalidating the object itself. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index c1bdb591f6..9bf5e447d3 100644 --- a/server/process.c +++ b/server/process.c @@ -749,8 +749,11 @@ static void startup_info_dump( struct object *obj, int verbose ) struct startup_info *info = (struct startup_info *)obj; assert( obj->ops == &startup_info_ops ); - fprintf( stderr, "Startup info in=%04x out=%04x err=%04x\n", - info->data->hstdin, info->data->hstdout, info->data->hstderr ); + fputs( "Startup info", stderr ); + if (info->data) + fprintf( stderr, " in=%04x out=%04x err=%04x", + info->data->hstdin, info->data->hstdout, info->data->hstderr ); + fputc( '\n', stderr ); } static int startup_info_signaled( struct object *obj, struct wait_queue_entry *entry )

1 0

Alexandre Julliard : ntdll: Move the NT path conversion for exec process to the Unix library.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 52e9baddbce3f6d8aa768379ec6d7e82b47545c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52e9baddbce3f6d8aa768379… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 14:31:00 2020 +0200 ntdll: Move the NT path conversion for exec process to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 23 +++++++++++--------- dlls/ntdll/unix/process.c | 55 +++++++++++++++++++++++++++++++---------------- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c0b36be38e..7afd2a40a5 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -59,13 +59,13 @@ PEB * WINAPI RtlGetCurrentPeb(void) */ NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) { - static const WCHAR argsW[] = {'%','s','%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; + static const WCHAR argsW[] = {'%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; static const WCHAR winevdm[] = {'w','i','n','e','v','d','m','.','e','x','e',0}; static const WCHAR comW[] = {'.','c','o','m',0}; static const WCHAR pifW[] = {'.','p','i','f',0}; DWORD len; - WCHAR *p, *cmdline; + WCHAR *p, *appname, *cmdline; UNICODE_STRING pathW, cmdW; /* check for .com or .pif extension */ @@ -80,20 +80,23 @@ NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) case STATUS_NO_MEMORY: case STATUS_INVALID_IMAGE_FORMAT: case STATUS_INVALID_IMAGE_NOT_MZ: - if (!RtlDosPathNameToNtPathName_U( params->ImagePathName.Buffer, &pathW, NULL, NULL )) - return status; - status = unix_funcs->exec_process( &pathW, &params->CommandLine, status ); + status = unix_funcs->exec_process( &params->ImagePathName, &params->CommandLine, status ); break; case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT: - len = (wcslen(system_dir) + wcslen(winevdm) + 16 + wcslen(params->ImagePathName.Buffer) + - wcslen(params->CommandLine.Buffer)); + len = wcslen(system_dir) + wcslen(winevdm) + 1; + if (!(appname = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + wcscpy( appname, (is_win64 || is_wow64) ? syswow64_dir : system_dir ); + wcscat( appname, winevdm ); + + len += 16 + wcslen(params->ImagePathName.Buffer) + wcslen(params->CommandLine.Buffer); if (!(cmdline = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - swprintf( cmdline, len, argsW, (is_win64 || is_wow64) ? syswow64_dir : system_dir, - winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); - RtlInitUnicodeString( &pathW, winevdm ); + swprintf( cmdline, len, argsW, appname, params->ImagePathName.Buffer, params->CommandLine.Buffer ); + + RtlInitUnicodeString( &pathW, appname ); RtlInitUnicodeString( &cmdW, cmdline ); status = unix_funcs->exec_process( &pathW, &cmdW, status ); break; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 6b41080cee..82c0452f8e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -474,35 +474,47 @@ static ULONG get_env_size( const RTL_USER_PROCESS_PARAMETERS *params, char **win /*********************************************************************** - * get_unix_curdir + * get_nt_pathname + * + * Simplified version of RtlDosPathNameToNtPathName_U. */ -static int get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) +static WCHAR *get_nt_pathname( const UNICODE_STRING *str ) { static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; static const WCHAR uncprefixW[] = {'U','N','C','\\',0}; - const UNICODE_STRING *curdir = &params->CurrentDirectory.DosPath; - const WCHAR *dir = curdir->Buffer; - UNICODE_STRING nt_name; - OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; - NTSTATUS status; - HANDLE handle; - int fd = -1; + const WCHAR *name = str->Buffer; + WCHAR *ret; - if (!(nt_name.Buffer = malloc( curdir->Length + 8 * sizeof(WCHAR) ))) return -1; + if (!(ret = malloc( str->Length + 8 * sizeof(WCHAR) ))) return NULL; - /* simplified version of RtlDosPathNameToNtPathName_U */ - wcscpy( nt_name.Buffer, ntprefixW ); - if (dir[0] == '\\' && dir[1] == '\\') + wcscpy( ret, ntprefixW ); + if (name[0] == '\\' && name[1] == '\\') { - if ((dir[2] == '.' || dir[2] == '?') && dir[3] == '\\') dir += 4; + if ((name[2] == '.' || name[2] == '?') && name[3] == '\\') name += 4; else { - wcscat( nt_name.Buffer, uncprefixW ); - dir += 2; + wcscat( ret, uncprefixW ); + name += 2; } } - wcscat( nt_name.Buffer, dir ); + wcscat( ret, name ); + return ret; +} + + +/*********************************************************************** + * get_unix_curdir + */ +static int get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) +{ + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; + int fd = -1; + + if (!(nt_name.Buffer = get_nt_pathname( &params->CurrentDirectory.DosPath ))) return -1; nt_name.Length = wcslen( nt_name.Buffer ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); @@ -616,9 +628,14 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST case STATUS_NO_MEMORY: case STATUS_INVALID_IMAGE_FORMAT: case STATUS_INVALID_IMAGE_NOT_MZ: + { + UNICODE_STRING image; if (getenv( "WINEPRELOADRESERVE" )) return status; - if ((status = get_pe_file_info( path, &handle, &pe_info ))) return status; + image.Buffer = get_nt_pathname( path ); + image.Length = wcslen( image.Buffer ) * sizeof(WCHAR); + if ((status = get_pe_file_info( &image, &handle, &pe_info ))) return status; break; + } case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT:

1 0

Alexandre Julliard : ntdll: Use the process parameters directly in exec_process().
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: f51cd0a1b5383506c5b1a535f702acab42898d08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51cd0a1b5383506c5b1a535… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 14:48:05 2020 +0200 ntdll: Use the process parameters directly in exec_process(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 50 +++++++++++++++++++++++++++++++------ dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/process.c | 56 ------------------------------------------ dlls/ntdll/unix/process.c | 9 ++++--- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 4 +-- 6 files changed, 51 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f51cd0a1b5383506c5b1…

1 0

Alexandre Julliard : ntdll: Get rid of the exec_process() Unix library callback.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 4c45348f7808c3a1ea635e196402951f0008ab90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c45348f7808c3a1ea635e19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 15:06:05 2020 +0200 ntdll: Get rid of the exec_process() Unix library callback. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 +++++++--------- dlls/ntdll/unix/loader.c | 7 ++++--- dlls/ntdll/unix/process.c | 36 ++++++++++++++++++++++++++++-------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 +---- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e87f092784..ccaae0a5a2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3957,7 +3957,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params ) /*********************************************************************** * process_init */ -static void process_init(void) +static NTSTATUS process_init(void) { static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', @@ -4058,20 +4058,17 @@ static void process_init(void) restart_winevdm( params ); status = STATUS_INVALID_IMAGE_WIN_16; } - status = unix_funcs->exec_process( status ); - break; + return status; } case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT: restart_winevdm( params ); - status = unix_funcs->exec_process( status ); - break; + return status; case STATUS_CONFLICTING_ADDRESSES: case STATUS_NO_MEMORY: case STATUS_INVALID_IMAGE_FORMAT: - status = unix_funcs->exec_process( status ); - break; + return status; case STATUS_INVALID_IMAGE_WIN_64: ERR( "%s 64-bit application not supported in 32-bit prefix\n", debugstr_us(&params->ImagePathName) ); @@ -4109,14 +4106,15 @@ static void process_init(void) teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; + return STATUS_SUCCESS; } /*********************************************************************** * __wine_set_unix_funcs */ -void CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ) +NTSTATUS CDECL __wine_set_unix_funcs( int version, const struct unix_funcs *funcs ) { assert( version == NTDLL_UNIXLIB_VERSION ); unix_funcs = funcs; - process_init(); + return process_init(); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6f25f4ae87..73d4ceee14 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -99,7 +99,7 @@ NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; -static void (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); +static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); @@ -1367,7 +1367,6 @@ static struct unix_funcs unix_funcs = get_unix_codepage_data, get_locales, virtual_release_address_space, - exec_process, set_show_dot_files, load_so_dll, load_builtin_dll, @@ -1387,6 +1386,7 @@ static struct unix_funcs unix_funcs = static void start_main_thread(void) { BOOL suspend; + NTSTATUS status; TEB *teb = virtual_alloc_first_teb(); signal_init_threading(); @@ -1399,7 +1399,8 @@ static void start_main_thread(void) init_cpu_info(); init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); - p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); + status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); + if (status) exec_process( status ); server_init_process_done(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index e16410d0ec..64380aba03 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -613,7 +613,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so /*********************************************************************** * exec_process */ -NTSTATUS CDECL exec_process( NTSTATUS status ) +void DECLSPEC_NORETURN exec_process( NTSTATUS status ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; pe_image_info_t pe_info; @@ -621,7 +621,7 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) char **argv; HANDLE handle; - if (startup_info_size) return status; /* started from another Win32 process */ + if (startup_info_size) goto done; /* started from another Win32 process */ switch (status) { @@ -631,10 +631,10 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) case STATUS_INVALID_IMAGE_NOT_MZ: { UNICODE_STRING image; - if (getenv( "WINEPRELOADRESERVE" )) return status; + if (getenv( "WINEPRELOADRESERVE" )) goto done; image.Buffer = get_nt_pathname( &params->ImagePathName ); image.Length = wcslen( image.Buffer ) * sizeof(WCHAR); - if ((status = get_pe_file_info( &image, &handle, &pe_info ))) return status; + if ((status = get_pe_file_info( &image, &handle, &pe_info ))) goto done; break; } case STATUS_INVALID_IMAGE_WIN_16: @@ -645,12 +645,16 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) pe_info.cpu = CPU_x86; break; default: - return status; + goto done; } unixdir = get_unix_curdir( params ); - if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) return STATUS_TOO_MANY_OPENED_FILES; + if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) + { + status = STATUS_TOO_MANY_OPENED_FILES; + goto done; + } #ifdef SO_PASSCRED else { @@ -671,7 +675,11 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) if (!status) { - if (!(argv = build_argv( &params->CommandLine, 2 ))) return STATUS_NO_MEMORY; + if (!(argv = build_argv( &params->CommandLine, 2 ))) + { + status = STATUS_NO_MEMORY; + goto done; + } fchdir( unixdir ); do { @@ -685,7 +693,19 @@ NTSTATUS CDECL exec_process( NTSTATUS status ) free( argv ); } close( socketfd[0] ); - return status; + +done: + switch (status) + { + case STATUS_INVALID_IMAGE_FORMAT: + case STATUS_INVALID_IMAGE_NOT_MZ: + ERR( "%s not supported on this system\n", debugstr_us(&params->ImagePathName) ); + break; + default: + ERR( "failed to load %s error %x\n", debugstr_us(&params->ImagePathName), status ); + break; + } + for (;;) NtTerminateProcess( GetCurrentProcess(), status ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 54bd53c482..0a21a059b4 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,7 +117,6 @@ extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL exec_process( NTSTATUS status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; @@ -220,6 +219,7 @@ extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, void *thunk, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN exec_process( NTSTATUS status ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d4aa010ee0..d6cd4ed403 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 103 +#define NTDLL_UNIXLIB_VERSION 104 struct unix_funcs { @@ -81,9 +81,6 @@ struct unix_funcs /* virtual memory functions */ void (CDECL *virtual_release_address_space)(void); - /* thread/process functions */ - NTSTATUS (CDECL *exec_process)( NTSTATUS status ); - /* file functions */ void (CDECL *set_show_dot_files)( BOOL enable );

1 0

Alexandre Julliard : ntdll: Make the reserved area functions static.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 7b96e82fd569bc3b261be147abe49a822f14d4e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b96e82fd569bc3b261be147… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 16:29:35 2020 +0200 ntdll: Make the reserved area functions static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 59 +++--------------------------------------- dlls/ntdll/unix/unix_private.h | 5 ---- dlls/ntdll/unix/virtual.c | 12 +++++---- 3 files changed, 11 insertions(+), 65 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 73d4ceee14..dcbe4eff0f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1406,43 +1406,12 @@ static void start_main_thread(void) #ifdef __APPLE__ -struct apple_stack_info -{ - void *stack; - size_t desired_size; -}; - static void *apple_wine_thread( void *arg ) { start_main_thread(); return NULL; } -/*********************************************************************** - * apple_alloc_thread_stack - * - * Callback for mmap_enum_reserved_areas to allocate space for - * the secondary thread's stack. - */ -#ifndef _WIN64 -static int CDECL apple_alloc_thread_stack( void *base, size_t size, void *arg ) -{ - struct apple_stack_info *info = arg; - - /* For mysterious reasons, putting the thread stack at the very top - * of the address space causes subsequent execs to fail, even on the - * child side of a fork. Avoid the top 16MB. */ - char * const limit = (char*)0xff000000; - if ((char *)base >= limit) return 0; - if (size > limit - (char*)base) - size = limit - (char*)base; - if (size < info->desired_size) return 0; - info->stack = wine_anon_mmap( (char *)base + size - info->desired_size, - info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); - return (info->stack != (void *)-1); -} -#endif - /*********************************************************************** * apple_create_wine_thread * @@ -1453,33 +1422,13 @@ static int CDECL apple_alloc_thread_stack( void *base, size_t size, void *arg ) */ static void apple_create_wine_thread( void *arg ) { - int success = 0; pthread_t thread; pthread_attr_t attr; - if (!pthread_attr_init( &attr )) - { -#ifndef _WIN64 - struct apple_stack_info info; - - /* Try to put the new thread's stack in the reserved area. If this - * fails, just let it go wherever. It'll be a waste of space, but we - * can go on. */ - if (!pthread_attr_getstacksize( &attr, &info.desired_size ) && - mmap_enum_reserved_areas( apple_alloc_thread_stack, &info, 1 )) - { - mmap_remove_reserved_area( info.stack, info.desired_size ); - pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); - } -#endif - - if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && - !pthread_create( &thread, &attr, apple_wine_thread, NULL )) - success = 1; - - pthread_attr_destroy( &attr ); - } - if (!success) exit(1); + pthread_attr_init( &attr ); + pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ); + if (pthread_create( &thread, &attr, apple_wine_thread, NULL )) exit(1); + pthread_attr_destroy( &attr ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0a21a059b4..f71963f4a9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -103,11 +103,6 @@ extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), void *arg, - int top_down ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_startup_info( startup_info_t *info, SIZE_T *total_size, SIZE_T *info_size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 58c84caab5..3eba5c0a9d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -212,6 +212,8 @@ static inline BOOL is_inside_signal_stack( void *ptr ) } +static void mmap_add_reserved_area( void *addr, SIZE_T size ); + static void reserve_area( void *addr, void *end ) { #ifdef __APPLE__ @@ -351,7 +353,7 @@ static void mmap_init( const struct preload_info *preload_info ) #endif } -void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) +static void mmap_add_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; struct list *ptr; @@ -400,7 +402,7 @@ void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) } } -void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) +static void mmap_remove_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; struct list *ptr; @@ -460,7 +462,7 @@ void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) } } -int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) +static int mmap_is_in_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; struct list *ptr; @@ -477,8 +479,8 @@ int CDECL mmap_is_in_reserved_area( void *addr, SIZE_T size ) return 0; } -int CDECL mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), - void *arg, int top_down ) +static int mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), + void *arg, int top_down ) { int ret = 0; struct list *ptr;

1 0

Alexandre Julliard : ntdll: Move the reserved area functions to avoid forward declarations.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 5b4b8774888b58ed424c46383d709c8e39345112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b4b8774888b58ed424c4638… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 16:29:53 2020 +0200 ntdll: Move the reserved area functions to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 280 +++++++++++++++++++++++----------------------- 1 file changed, 139 insertions(+), 141 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b4b8774888b58ed424c…

1 0

Hans Leidekker : mountmgr: Add ioctl to read host credentials on macOS.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: wine Branch: master Commit: 0f7cc8d9ddfd6e18a000044d47c714e28fa158cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7cc8d9ddfd6e18a000044d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 15:07:59 2020 +0200 mountmgr: Add ioctl to read host credentials on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/mountmgr.c | 246 ++++++++++++++++++++++++++++++++++++++++++ include/ddk/mountmgr.h | 16 +++ 3 files changed, 263 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f7cc8d9ddfd6e18a000…

1 0