March 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Set environment variables from the registry on the Unix side.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: f6e64c55f2ddcb92a9ff53f18d1b12f366dd4036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6e64c55f2ddcb92a9ff53f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 11:25:43 2021 +0100 ntdll: Set environment variables from the registry on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 2 +- dlls/ntdll/unix/env.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 4931e407e57..ade6aefc2d5 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -1023,7 +1023,7 @@ void init_user_process_params(void) if (!params->DllPath.MaximumLength) /* not inherited from parent process */ { - first_prefix_start = set_registry_environment( &params->Environment, TRUE ); + first_prefix_start = !ENV_FindVariable( params->Environment, L"COMSPEC", 7 ); set_additional_environment( &params->Environment ); get_image_path( params->ImagePathName.Buffer, image, sizeof(image) ); diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 92498318665..97a43a90000 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1242,6 +1242,148 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) } +static WCHAR *expand_value( WCHAR *env, SIZE_T size, const WCHAR *src, SIZE_T src_len ) +{ + SIZE_T len, retlen = src_len, count = 0; + const WCHAR *var; + WCHAR *ret; + + ret = malloc( retlen * sizeof(WCHAR) ); + while (src_len) + { + if (*src != '%') + { + for (len = 0; len < src_len; len++) if (src[len] == '%') break; + var = src; + src += len; + src_len -= len; + } + else /* we are at the start of a variable */ + { + for (len = 1; len < src_len; len++) if (src[len] == '%') break; + if (len < src_len) + { + if ((var = find_env_var( env, size, src + 1, len - 1 ))) + { + src += len + 1; /* skip the variable name */ + src_len -= len + 1; + var += len; + len = wcslen(var); + } + else + { + var = src; /* copy original name instead */ + len++; + src += len; + src_len -= len; + } + } + else /* unfinished variable name, ignore it */ + { + var = src; + src += len; + src_len = 0; + } + } + if (len >= retlen - count) + { + retlen *= 2; + ret = realloc( ret, retlen * sizeof(WCHAR) ); + } + memcpy( ret + count, var, len * sizeof(WCHAR) ); + count += len; + } + ret[count] = 0; + return ret; +} + +/*********************************************************************** + * add_registry_variables + * + * Set environment variables by enumerating the values of a key; + * helper for add_registry_environment(). + * Note that Windows happily truncates the value if it's too big. + */ +static void add_registry_variables( WCHAR **env, SIZE_T *pos, SIZE_T *size, HANDLE key, BOOL append ) +{ + static const WCHAR pathW[] = {'P','A','T','H'}; + NTSTATUS status; + DWORD index = 0, info_size, namelen, datalen; + WCHAR *data, *value, *p; + WCHAR buffer[offsetof(KEY_VALUE_FULL_INFORMATION, Name[1024]) / sizeof(WCHAR)]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + + for (;;) + { + status = NtEnumerateValueKey( key, index++, KeyValueFullInformation, + buffer, sizeof(buffer) - sizeof(WCHAR), &info_size ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW) break; + + value = data = buffer + info->DataOffset / sizeof(WCHAR); + datalen = info->DataLength / sizeof(WCHAR); + namelen = info->NameLength / sizeof(WCHAR); + + if (datalen && !data[datalen - 1]) datalen--; /* don't count terminating null if any */ + if (!datalen) continue; + data[datalen] = 0; + if (info->Type == REG_EXPAND_SZ) value = expand_value( *env, *pos, data, datalen ); + + /* PATH is magic */ + if (append && namelen == 4 && !wcsnicmp( info->Name, pathW, 4 ) && (p = find_env_var( *env, *pos, pathW, 4 ))) + { + static const WCHAR sepW[] = {';',0}; + WCHAR *newpath = malloc( (wcslen(p) - 4 + datalen) * sizeof(WCHAR) ); + wcscpy( newpath, p + 5 ); + wcscat( newpath, sepW ); + wcscat( newpath, data ); + if (value != data) free( value ); + value = newpath; + } + + set_env_var( env, pos, size, info->Name, namelen, value ); + if (value != data) free( value ); + } +} + + +/*********************************************************************** + * add_registry_environment + * + * Set the environment variables specified in the registry. + */ +static void add_registry_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) +{ + static const WCHAR syskeyW[] = {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r', + '\\','E','n','v','i','r','o','n','m','e','n','t',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE key; + + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + init_unicode_string( &nameW, syskeyW ); + if (!NtOpenKey( &key, KEY_READ, &attr )) + { + add_registry_variables( env, pos, size, key, FALSE ); + NtClose( key ); + } + if (!open_hkcu_key( "Environment", &key )) + { + add_registry_variables( env, pos, size, key, TRUE ); + NtClose( key ); + } + if (!open_hkcu_key( "Volatile Environment", &key )) + { + add_registry_variables( env, pos, size, key, TRUE ); + NtClose( key ); + } +} + + /************************************************************************* * get_initial_console * @@ -1485,6 +1627,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) NTSTATUS status; add_dynamic_environment( &env, &env_pos, &env_size ); + add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; size = (sizeof(*params)

1 0

Alexandre Julliard : ntdll: Add support for growing the initial environment dynamically.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: e63b8ead4306a72064e47f9c77d4e0a98603f3ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63b8ead4306a72064e47f9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 09:56:30 2021 +0100 ntdll: Add support for growing the initial environment dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 206 ++++++++++++++++++++++++-------------------------- 1 file changed, 100 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e63b8ead4306a72064e4…

1 0

Alexandre Julliard : ntdll: Launch wineboot from the Unix side.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 0599347e96afb0152873ef2baf240e32bf8fe78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0599347e96afb0152873ef2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 13:27:42 2021 +0100 ntdll: Launch wineboot from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 181 -------------------------------------------------- dlls/ntdll/unix/env.c | 91 +++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0599347e96afb0152873…

1 0

Paul Gofman : mprapi: Add stub for MprConfigServerConnect().
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 2cb4bdb10abcfd751d4d1b2ca7780c778166608a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cb4bdb10abcfd751d4d1b2c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 4 15:35:42 2021 +0300 mprapi: Add stub for MprConfigServerConnect(). Fixes ARK Park start failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mprapi/mprapi.c | 12 ++++++++++++ dlls/mprapi/mprapi.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index cfb4259b339..b3d641fe108 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -60,3 +60,15 @@ BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server) return FALSE; } + +/*********************************************************************** + * MprConfigServerConnect (MPRAPI.@) + */ +DWORD APIENTRY MprConfigServerConnect(LPWSTR server_name, HANDLE *hmprconfig) +{ + FIXME("server_name %s, hmprconfig %p stub.\n", debugstr_w(server_name), hmprconfig); + + *hmprconfig = NULL; + + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/mprapi/mprapi.spec b/dlls/mprapi/mprapi.spec index 4b5937b8806..21d39841db5 100644 --- a/dlls/mprapi/mprapi.spec +++ b/dlls/mprapi/mprapi.spec @@ -82,7 +82,7 @@ @ stub MprConfigInterfaceTransportRemove @ stub MprConfigInterfaceTransportSetInfo @ stub MprConfigServerBackup -@ stub MprConfigServerConnect +@ stdcall MprConfigServerConnect(wstr ptr) @ stub MprConfigServerDisconnect @ stub MprConfigServerGetInfo @ stub MprConfigServerInstall

1 0

Alexandre Julliard : ntdll: Make the open_hkcu_key() helper available globally.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 16b099441264e155edc58885868cd0ebb1e193b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16b099441264e155edc58885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 10:00:29 2021 +0100 ntdll: Make the open_hkcu_key() helper available globally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 29 ----------------------------- dlls/ntdll/unix/registry.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 3 +-- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 315354be7aa..bcaf03a2d02 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2727,35 +2727,6 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') -static NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) -{ - NTSTATUS status; - char buffer[256]; - WCHAR bufferW[256]; - DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; - DWORD i, len = sizeof(sid_data); - SID *sid; - UNICODE_STRING name; - OBJECT_ATTRIBUTES attr; - - status = NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len ); - if (status) return status; - - sid = ((TOKEN_USER *)sid_data)->User.Sid; - len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), - MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); - for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); - len += sprintf( buffer + len, "\\%s", path ); - - ascii_to_unicode( bufferW, buffer, len + 1 ); - init_unicode_string( &name, bufferW ); - InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, 0, NULL ); - return NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ); -} - - /*********************************************************************** * init_files */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index b52811b05e7..9a572d7f44e 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -40,6 +40,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define MAX_VALUE_LENGTH (16383 * sizeof(WCHAR)) +NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) +{ + NTSTATUS status; + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + UNICODE_STRING name; + OBJECT_ATTRIBUTES attr; + + status = NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len ); + if (status) return status; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + len += sprintf( buffer + len, "\\%s", path ); + + ascii_to_unicode( bufferW, buffer, len + 1 ); + init_unicode_string( &name, bufferW ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, 0, NULL ); + return NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ); +} + + /****************************************************************************** * NtCreateKey (NTDLL.@) */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c8156fbcb6b..b8b6619c0a9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -105,8 +105,6 @@ extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; -extern void CDECL set_show_dot_files( BOOL enable ) DECLSPEC_HIDDEN; - extern const char *home_dir DECLSPEC_HIDDEN; extern const char *data_dir DECLSPEC_HIDDEN; extern const char *build_dir DECLSPEC_HIDDEN; @@ -215,6 +213,7 @@ extern void DECLSPEC_NORETURN exec_process( NTSTATUS status ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void signal_restore_full_cpu_context(void) DECLSPEC_HIDDEN; extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDDEN; +extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer,

1 0

Alexandre Julliard : ntdll: Add a helper to initialize a UNICODE_STRING on the Unix side.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 285830f5ec2a4cc22ed9f3bbd1e62136deb0652d URL: https://source.winehq.org/git/wine.git/?a=commit;h=285830f5ec2a4cc22ed9f3bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 09:50:34 2021 +0100 ntdll: Add a helper to initialize a UNICODE_STRING on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 8 ++------ dlls/ntdll/unix/file.c | 11 +++-------- dlls/ntdll/unix/loader.c | 4 +--- dlls/ntdll/unix/system.c | 4 +--- dlls/ntdll/unix/unix_private.h | 7 +++++++ 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index cca334865e4..d1a669a4964 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -168,9 +168,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : systemdirW ); p = strrchr( path, '/' ) + 1; ascii_to_unicode( buffer + wcslen(buffer), p, strlen(p) + 1 ); - valueW.Buffer = buffer; - valueW.Length = wcslen( buffer ) * sizeof(WCHAR); - valueW.MaximumLength = sizeof( buffer ); + init_unicode_string( &valueW, buffer ); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, @@ -1645,9 +1643,7 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** if ((status = get_nls_section_name( type, id, name ))) return status; - nameW.Buffer = name; - nameW.Length = wcslen(name) * sizeof(WCHAR); - nameW.MaximumLength = sizeof(name); + init_unicode_string( &nameW, name ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); if ((status = NtOpenSection( &handle, SECTION_MAP_READ, &attr ))) { diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 381805c0f04..315354be7aa 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1974,8 +1974,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni else drive->letter = 'a' + letter; - string.Buffer = (WCHAR *)MOUNTMGR_DEVICE_NAME; - string.Length = sizeof(MOUNTMGR_DEVICE_NAME) - sizeof(WCHAR); + init_unicode_string( &string, MOUNTMGR_DEVICE_NAME ); InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); status = NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); @@ -2750,10 +2749,8 @@ static NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); len += sprintf( buffer + len, "\\%s", path ); - name.Buffer = bufferW; - name.Length = len * sizeof(WCHAR); - name.MaximumLength = name.Length + sizeof(WCHAR); ascii_to_unicode( bufferW, buffer, len + 1 ); + init_unicode_string( &name, bufferW ); InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, 0, NULL ); return NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ); } @@ -2787,9 +2784,7 @@ void init_files(void) DWORD dummy; UNICODE_STRING nameW; - nameW.MaximumLength = sizeof(showdotfilesW); - nameW.Length = nameW.MaximumLength - sizeof(WCHAR); - nameW.Buffer = showdotfilesW; + init_unicode_string( &nameW, showdotfilesW ); if (!NtQueryValueKey( key, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) { WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b7e1432535d..6adf4bb5b00 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1618,9 +1618,7 @@ static void load_ntdll(void) void *module; char *name = build_path( dll_dir, "ntdll.dll.so" ); - str.Buffer = path; - str.Length = sizeof(path) - sizeof(WCHAR); - str.MaximumLength = sizeof(path); + init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); name[strlen(name) - 3] = 0; /* remove .so */ status = open_builtin_file( name, &attr, &mapping, &module, &info, &st, FALSE ); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 788328292de..48321957fb8 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1809,9 +1809,7 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* sprintf( buffer, "%u", year ); ascii_to_unicode( yearW, buffer, strlen(buffer) + 1 ); - - nameW.Buffer = (WCHAR *)Time_ZonesW; - nameW.Length = sizeof(Time_ZonesW) - sizeof(WCHAR); + init_unicode_string( &nameW, Time_ZonesW ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); if (NtOpenKey( &key, KEY_READ, &attr )) return; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 031f9ed3d33..c8156fbcb6b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -482,4 +482,11 @@ static inline int ntdll_wcsnicmp( const WCHAR *str1, const WCHAR *str2, int n ) #define towupper(c) ntdll_towupper(c) #define towlower(c) ntdll_towlower(c) +static inline void init_unicode_string( UNICODE_STRING *str, const WCHAR *data ) +{ + str->Length = wcslen(data) * sizeof(WCHAR); + str->MaximumLength = str->Length + sizeof(WCHAR); + str->Buffer = (WCHAR *)data; +} + #endif /* __NTDLL_UNIX_PRIVATE_H */

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontSet::GetFontFaceReference().
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: a6bdbc714642478c744040d45cd7079ef348a2d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bdbc714642478c744040d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:35 2021 +0300 dwrite: Implement IDWriteFontSet::GetFontFaceReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 14 ++++++++++++-- dlls/dwrite/tests/font.c | 15 ++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ef61b173824..98c194b8c30 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7162,9 +7162,19 @@ static UINT32 WINAPI dwritefontset_GetFontCount(IDWriteFontSet3 *iface) static HRESULT WINAPI dwritefontset_GetFontFaceReference(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontFaceReference **reference) { - FIXME("%p, %u, %p.\n", iface, index, reference); + struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); + struct dwrite_fontset_entry *entry; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, reference); + + *reference = NULL; + + if (index >= set->count) + return E_INVALIDARG; + + entry = &set->entries[index]; + return IDWriteFactory7_CreateFontFaceReference_(set->factory, entry->file, entry->face_index, + entry->simulations, reference); } static HRESULT WINAPI dwritefontset_FindFontFaceReference(IDWriteFontSet3 *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 97caa7b31a2..4dcbbc4d077 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9454,22 +9454,23 @@ static void test_fontsetbuilder(void) setcount = IDWriteFontSet_GetFontCount(fontset); ok(setcount == 1, "Unexpected font count %u.\n", setcount); + ref2 = (void *)0xdeadbeef; + hr = IDWriteFontSet_GetFontFaceReference(fontset, setcount, &ref2); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!ref2, "Unexpected pointer.\n"); + ref2 = NULL; hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref2); - todo_wine ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); ok(ref2 != ref, "Unexpected reference.\n"); ref3 = NULL; hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref3); - todo_wine { ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); ok(ref2 != ref3, "Unexpected reference.\n"); - } - if (ref3) - IDWriteFontFaceReference_Release(ref3); - if (ref2) - IDWriteFontFaceReference_Release(ref2); + + IDWriteFontFaceReference_Release(ref3); + IDWriteFontFaceReference_Release(ref2); for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; ++id) {

1 0

Hugh McMaster : reg/tests: Pass __FILE__ from the caller so the correct filename is shown in error logs.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: e3a738b1562de68bd92c4be6bc948ea31f6a2d79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3a738b1562de68bd92c4be6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 4 21:42:49 2021 +1100 reg/tests: Pass __FILE__ from the caller so the correct filename is shown in error logs. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 26 ++++++++++---------- programs/reg/tests/export.c | 5 ++-- programs/reg/tests/import.c | 2 +- programs/reg/tests/reg_test.h | 56 ++++++++++++++++++++++--------------------- 4 files changed, 47 insertions(+), 42 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bd0888ae831..a34bcf7c9ac 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -22,7 +22,7 @@ #define TODO_REG_SIZE (0x0002u) #define TODO_REG_DATA (0x0004u) -BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) +BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc) { STARTUPINFOA si = {sizeof(STARTUPINFOA)}; PROCESS_INFORMATION pi; @@ -51,8 +51,8 @@ BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) return bret; } -void verify_reg_(unsigned line, HKEY hkey, const char* value, DWORD exp_type, - const void *exp_data, DWORD exp_size, DWORD todo) +void verify_reg_(const char *file, unsigned line, HKEY hkey, const char *value, + DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD todo) { DWORD type, size; BYTE data[256]; @@ -76,7 +76,7 @@ void verify_reg_(unsigned line, HKEY hkey, const char* value, DWORD exp_type, } } -void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) +void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey, const char *value) { LONG err; @@ -85,7 +85,8 @@ void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) (value && *value) ? value : "(Default)", err); } -void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam, HKEY *hkey) +void open_key_(const char *file, unsigned line, const HKEY base, const char *path, + const DWORD sam, HKEY *hkey) { LONG err; @@ -93,7 +94,7 @@ void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err); } -void close_key_(unsigned line, HKEY hkey) +void close_key_(const char *file, unsigned line, HKEY hkey) { LONG err; @@ -101,7 +102,7 @@ void close_key_(unsigned line, HKEY hkey) lok(err == ERROR_SUCCESS, "RegCloseKey failed: %d\n", err); } -void verify_key_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_(const char *file, unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -113,7 +114,7 @@ void verify_key_(unsigned line, HKEY key_base, const char *subkey) RegCloseKey(hkey); } -void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +void verify_key_nonexist_(const char *file, unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -126,7 +127,7 @@ void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) RegCloseKey(hkey); } -void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) +void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path, HKEY *subkey) { LONG err; @@ -135,7 +136,7 @@ void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); } -void delete_key_(unsigned line, const HKEY hkey, const char *path) +void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *path) { if (path && *path) { @@ -188,7 +189,8 @@ cleanup: return ret; } -void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size) +void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, + DWORD type, const void *data, size_t size) { LONG err; @@ -196,7 +198,7 @@ void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const vo lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err); } -void delete_value_(unsigned line, const HKEY hkey, const char *name) +void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name) { LONG err; diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 9a3f7d5fbf0..32c99e36376 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -20,8 +20,9 @@ #define TODO_REG_COMPARE (0x0008u) -#define compare_export(f,e,todo) compare_export_(__LINE__,f,e,todo) -static BOOL compare_export_(unsigned line, const char *filename, const char *expected, DWORD todo) +#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) +static BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo) { FILE *fp; long file_size; diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 58831625fa5..9b7a90ac99c 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -37,7 +37,7 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc) +BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc) { int lenA; BOOL ret; diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 2f4bdf36437..14afa02930c 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -24,52 +24,54 @@ #include "wine/test.h" /* Common #defines */ -#define lok ok_(__FILE__,line) +#define lok ok_(file,line) #define KEY_WINE "Software\\Wine" #define KEY_BASE KEY_WINE "\\reg_test" #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 /* add.c */ -#define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) -BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc); +#define run_reg_exe(c,r) run_reg_exe_(__FILE__,__LINE__,c,r) +BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc); -#define verify_reg(k,v,t,d,s,todo) verify_reg_(__LINE__,k,v,t,d,s,todo) -void verify_reg_(unsigned line, HKEY hkey, const char* value, DWORD exp_type, - const void *exp_data, DWORD exp_size, DWORD todo); +#define verify_reg(k,v,t,d,s,todo) verify_reg_(__FILE__,__LINE__,k,v,t,d,s,todo) +void verify_reg_(const char *file, unsigned line, HKEY hkey, const char *value, + DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD todo); -#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) -void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value); +#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__FILE__,__LINE__,k,v) +void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey, const char *value); -#define open_key(b,p,s,k) open_key_(__LINE__,b,p,s,k) -void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam, HKEY *hkey); +#define open_key(b,p,s,k) open_key_(__FILE__,__LINE__,b,p,s,k) +void open_key_(const char *file, unsigned line, const HKEY base, const char *path, + const DWORD sam, HKEY *hkey); -#define close_key(k) close_key_(__LINE__,k) -void close_key_(unsigned line, HKEY hkey); +#define close_key(k) close_key_(__FILE__,__LINE__,k) +void close_key_(const char *file, unsigned line, HKEY hkey); -#define verify_key(k,s) verify_key_(__LINE__,k,s) -void verify_key_(unsigned line, HKEY key_base, const char *subkey); +#define verify_key(k,s) verify_key_(__FILE__,__LINE__,k,s) +void verify_key_(const char *file, unsigned line, HKEY key_base, const char *subkey); -#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) -void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey); +#define verify_key_nonexist(k,s) verify_key_nonexist_(__FILE__,__LINE__,k,s) +void verify_key_nonexist_(const char *file, unsigned line, HKEY key_base, const char *subkey); -#define add_key(k,p,s) add_key_(__LINE__,k,p,s) -void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey); +#define add_key(k,p,s) add_key_(__FILE__,__LINE__,k,p,s) +void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path, HKEY *subkey); -#define delete_key(k,p) delete_key_(__LINE__,k,p) -void delete_key_(unsigned line, const HKEY hkey, const char *path); +#define delete_key(k,p) delete_key_(__FILE__,__LINE__,k,p) +void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *path); LONG delete_tree(const HKEY key, const char *subkey); -#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) -void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size); +#define add_value(k,n,t,d,s) add_value_(__FILE__,__LINE__,k,n,t,d,s) +void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, + DWORD type, const void *data, size_t size); -#define delete_value(k,n) delete_value_(__LINE__,k,n) -void delete_value_(unsigned line, const HKEY hkey, const char *name); +#define delete_value(k,n) delete_value_(__FILE__,__LINE__,k,n) +void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name); /* import.c */ -#define test_import_str(c,r) import_reg(__LINE__,c,FALSE,r) -#define test_import_wstr(c,r) import_reg(__LINE__,c,TRUE,r) -BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc); +#define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) +#define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r) +BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc); #endif /* __REG_TEST_H__ */

1 0

Alexandre Julliard : ntdll: Predefine the SystemRoot and SystemDrive variables.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 9443a7397df534383aeb37abdb62be266a33339b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9443a7397df534383aeb37ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 10:56:54 2021 +0100 ntdll: Predefine the SystemRoot and SystemDrive variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 ++ loader/wine.inf.in | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 97a43a90000..7836cd1144d 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1239,6 +1239,8 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) append_envA( env, pos, size, "WINELOCALE", system_locale ); append_envA( env, pos, size, "WINEUSERLOCALE", strcmp( user_locale, system_locale ) ? user_locale : NULL ); + append_envA( env, pos, size, "SystemDrive", "C:" ); + append_envA( env, pos, size, "SystemRoot", "C:\\windows" ); } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d5dd2d5b66b..627d98a9e66 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -639,14 +639,12 @@ HKLM,%Control%\Session Manager,HeapDeCommitFreeBlockThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 -HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" -HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem;%11%\WindowsPowershell\v1.0" +HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem;%SystemRoot%\system32\WindowsPowershell\v1.0" HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" -HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" -HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%" -HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp" -HKLM,%Control%\Session Manager\Environment,"TMP",0x00020002,"%10%\temp" -HKLM,%Control%\Session Manager\Environment,"windir",0x00020000,"%10%" +HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%SystemRoot%\temp" +HKLM,%Control%\Session Manager\Environment,"TMP",0x00020002,"%SystemRoot%\temp" +HKLM,%Control%\Session Manager\Environment,"windir",0x00020000,"%SystemRoot%" HKLM,%Control%\Session Manager\Environment,"winsysdir",,"%11%" HKLM,%Control%\Session Manager\Memory Management,PagingFiles,,"%24%\pagefile.sys 27 77" HKLM,%Control%\Session Manager\Memory Management,WriteWatch,0x00040002,1

1 0

Giovanni Mascellani : dwrite/tests: Do not assume that fonts have a en-us name.
by Alexandre Julliard March 4, 2021

March 4, 2021

Module: wine Branch: master Commit: 0e4172a0c22a6f293cc3c5e1de265b2a5b480880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4172a0c22a6f293cc3c5e1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 3 12:38:50 2021 +0100 dwrite/tests: Do not assume that fonts have a en-us name. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 6dd251270c7..0294bbfb719 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1500,7 +1500,10 @@ static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, unsig hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(exists, "Failed to find locale name %d.\n", exists); + + /* Not all fonts have an en-us name! */ + if (!exists) + index = 0; hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); ok(hr == S_OK, "Failed to get name string, hr %#x.\n", hr);

1 0