April 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : ntdll: Write a null terminator in NtQueryDirectoryObject.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 1e750b5b442f6cfbc5f38c8920e7ec1180d190ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e750b5b442f6cfbc5f38c89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 12 22:00:50 2022 -0500 ntdll: Write a null terminator in NtQueryDirectoryObject. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 15 +++++++-------- dlls/ntdll/unix/sync.c | 19 ++++++++++++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 89cd2b8e3f4..2e03abd13ed 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2532,7 +2532,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; @@ -2547,7 +2547,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2600,8 +2600,7 @@ static void test_query_directory(void) } check_unicode_string( &info[0].ObjectName, name1 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine - ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); @@ -2609,13 +2608,13 @@ static void test_query_directory(void) ok( context == 2, "got context %#lx\n", context ); check_unicode_string( &info[0].ObjectName, name2 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 2, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); @@ -2623,7 +2622,7 @@ static void test_query_directory(void) ok( context == 1, "got context %#lx\n", context ); check_unicode_string( &info[0].ObjectName, name1 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); needed_size = size; @@ -2650,7 +2649,7 @@ static void test_query_directory(void) ok( context == 1, "got context %#lx\n", context ); check_unicode_string( &info[0].ObjectName, name1 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index efbe363c210..1695e6ed570 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1108,14 +1108,14 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI { req->handle = wine_server_obj_handle( handle ); req->index = index; - if (size >= sizeof(*buffer) + 2 * sizeof(WCHAR)) - wine_server_set_reply( req, buffer + 1, size - sizeof(*buffer) - 2 * sizeof(WCHAR) ); + if (size >= 2 * sizeof(*buffer) + 2 * sizeof(WCHAR)) + wine_server_set_reply( req, buffer + 2, size - 2 * sizeof(*buffer) - 2 * sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { - buffer->ObjectName.Buffer = (WCHAR *)(buffer + 1); + buffer->ObjectName.Buffer = (WCHAR *)(buffer + 2); buffer->ObjectName.Length = reply->name_len; buffer->ObjectName.MaximumLength = reply->name_len + sizeof(WCHAR); - buffer->ObjectTypeName.Buffer = (WCHAR *)(buffer + 1) + reply->name_len/sizeof(WCHAR) + 1; + buffer->ObjectTypeName.Buffer = (WCHAR *)(buffer + 2) + reply->name_len/sizeof(WCHAR) + 1; buffer->ObjectTypeName.Length = wine_server_reply_size( reply ) - reply->name_len; buffer->ObjectTypeName.MaximumLength = buffer->ObjectTypeName.Length + sizeof(WCHAR); /* make room for the terminating null */ @@ -1123,11 +1123,20 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI buffer->ObjectTypeName.Length ); buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; + + memset( &buffer[1], 0, sizeof(buffer[1]) ); + *context = index + 1; } + else if (ret == STATUS_NO_MORE_ENTRIES) + { + if (size > sizeof(*buffer)) + memset( buffer, 0, sizeof(*buffer) ); + if (ret_size) *ret_size = sizeof(*buffer); + } if (ret_size && (!ret || ret == STATUS_BUFFER_TOO_SMALL)) - *ret_size = sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); + *ret_size = 2 * sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); } SERVER_END_REQ; }

1 0

Zebediah Figura : ntdll: Return the required length from NtQueryDirectoryObject().
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 0c7dcd9088c139a41d210baac5edf148e3bde23d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7dcd9088c139a41d210baa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 12 22:00:48 2022 -0500 ntdll: Return the required length from NtQueryDirectoryObject(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/unix/sync.c | 6 +++--- include/wine/server_protocol.h | 4 ++-- server/directory.c | 6 ++++-- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 3 ++- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 91eb2919cb6..7d7b4b09e73 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2638,7 +2638,7 @@ static void test_query_directory(void) memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); - todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); ok( !status, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index e1cc2d818b4..46facdd2b0e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1125,10 +1125,10 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; *context = index + 1; - - if (ret_size) - *ret_size = buffer->ObjectName.MaximumLength + buffer->ObjectTypeName.MaximumLength + sizeof(*buffer); } + + if (ret_size && (!ret || ret == STATUS_BUFFER_TOO_SMALL)) + *ret_size = sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); } SERVER_END_REQ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6cd901f1e56..8f883b2d97e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4646,10 +4646,10 @@ struct get_directory_entry_request struct get_directory_entry_reply { struct reply_header __header; + data_size_t total_len; data_size_t name_len; /* VARARG(name,unicode_str,name_len); */ /* VARARG(type,unicode_str); */ - char __pad_12[4]; }; @@ -6286,7 +6286,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 749 +#define SERVER_PROTOCOL_VERSION 750 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index caaf8c43d33..23d7eb0a2b7 100644 --- a/server/directory.c +++ b/server/directory.c @@ -546,9 +546,11 @@ DECL_HANDLER(get_directory_entry) const struct unicode_str *type_name = &obj->ops->type->name; const WCHAR *name = get_object_name( obj, &name_len ); - if (name_len + type_name->len <= get_reply_max_size()) + reply->total_len = name_len + type_name->len; + + if (reply->total_len <= get_reply_max_size()) { - void *ptr = set_reply_data_size( name_len + type_name->len ); + void *ptr = set_reply_data_size( reply->total_len ); if (ptr) { reply->name_len = name_len; diff --git a/server/protocol.def b/server/protocol.def index d9bed6855e9..9b7b99ae86a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3275,6 +3275,7 @@ struct handle_info obj_handle_t handle; /* handle to the directory */ unsigned int index; /* entry index */ @REPLY + data_size_t total_len; /* total length needed for strings */ data_size_t name_len; /* length of the entry name in bytes */ VARARG(name,unicode_str,name_len); /* entry name */ VARARG(type,unicode_str); /* entry type */ diff --git a/server/request.h b/server/request.h index ca99acbdbf6..9ed2f898e6d 100644 --- a/server/request.h +++ b/server/request.h @@ -2011,7 +2011,8 @@ C_ASSERT( sizeof(struct open_directory_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_directory_entry_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_directory_entry_request, index) == 16 ); C_ASSERT( sizeof(struct get_directory_entry_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_directory_entry_reply, name_len) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_directory_entry_reply, total_len) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_directory_entry_reply, name_len) == 12 ); C_ASSERT( sizeof(struct get_directory_entry_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_symlink_request, access) == 12 ); C_ASSERT( sizeof(struct create_symlink_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index a792b74dc05..d71561e1247 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3978,7 +3978,8 @@ static void dump_get_directory_entry_request( const struct get_directory_entry_r static void dump_get_directory_entry_reply( const struct get_directory_entry_reply *req ) { - fprintf( stderr, " name_len=%u", req->name_len ); + fprintf( stderr, " total_len=%u", req->total_len ); + fprintf( stderr, ", name_len=%u", req->name_len ); dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) ); dump_varargs_unicode_str( ", type=", cur_size ); }

1 0

Alexandre Julliard : ntdll: Initialize the system locale on the Unix side.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: d53bc38d34ee043e16d3b0abf523f4e9407db8cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53bc38d34ee043e16d3b0ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 14:38:05 2022 +0200 ntdll: Initialize the system locale on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 16 ++++---------- dlls/ntdll/locale.c | 9 +------- dlls/ntdll/unix/env.c | 57 ++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 95d7d77ecd7..25d6d76c0c4 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -366,10 +366,9 @@ static void load_locale_nls(void) UINT index_count; } *geo_header; - LCID lcid; LARGE_INTEGER dummy; - RtlGetLocaleFileMappingAddress( (void **)&header, &lcid, &dummy ); + RtlGetLocaleFileMappingAddress( (void **)&header, &system_lcid, &dummy ); locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); lcids_index = (const NLS_LOCALE_LCID_INDEX *)((char *)locale_table + locale_table->lcids_offset); lcnames_index = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); @@ -1766,17 +1765,10 @@ void init_locale( HMODULE module ) kernelbase_handle = module; load_locale_nls(); - NtQueryDefaultLocale( FALSE, &system_lcid ); - NtQueryDefaultLocale( TRUE, &user_lcid ); - if (!(system_locale = NlsValidateLocale( &system_lcid, 0 ))) - { - if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) - system_locale = get_locale_by_name( bufferW, &system_lcid ); - if (!system_locale) system_locale = get_locale_by_name( L"en-US", &system_lcid ); - } - system_lcid = system_locale->ilanguage; - if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = LOCALE_CUSTOM_DEFAULT; + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + system_locale = NlsValidateLocale( &system_lcid, 0 ); + NtQueryDefaultLocale( TRUE, &user_lcid ); if (!(user_locale = NlsValidateLocale( &user_lcid, 0 ))) { if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 36fe3e92863..597910e5639 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -183,23 +183,16 @@ void locale_init(void) value.Buffer = locale; value.MaximumLength = sizeof(locale); - RtlInitUnicodeString( &name, L"WINELOCALE" ); - if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) - { - const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); - if (entry) system_lcid = get_locale_data( entry->idx )->idefaultlanguage; - } RtlInitUnicodeString( &name, L"WINEUSERLOCALE" ); if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) { const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); if (entry) user_lcid = get_locale_data( entry->idx )->idefaultlanguage; } - if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); if (!user_lcid) user_lcid = system_lcid; NtSetDefaultUILanguage( user_lcid ); NtSetDefaultLocale( TRUE, user_lcid ); - NtSetDefaultLocale( FALSE, system_lcid ); } diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 3976e5b4365..ee958ae71f4 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -74,7 +74,7 @@ char **main_envp = NULL; WCHAR **main_wargv = NULL; static LCID user_lcid, system_lcid; -static LANGID user_ui_language, system_ui_language; +static LANGID user_ui_language; static char system_locale[LOCALE_NAME_MAX_LENGTH]; static char user_locale[LOCALE_NAME_MAX_LENGTH]; @@ -348,7 +348,6 @@ static BOOL is_dynamic_env_var( const char *var ) STARTS_WITH( var, "WINECONFIGDIR=" ) || STARTS_WITH( var, "WINEDLLDIR" ) || STARTS_WITH( var, "WINEUNIXCP=" ) || - STARTS_WITH( var, "WINELOCALE=" ) || STARTS_WITH( var, "WINEUSERLOCALE=" ) || STARTS_WITH( var, "WINEUSERNAME=" ) || STARTS_WITH( var, "WINEPRELOADRESERVE=" ) || @@ -762,6 +761,47 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) } +static LCID init_system_lcid( void *locale_ptr ) +{ + struct + { + UINT ctypes; + UINT unknown1; + UINT unknown2; + UINT unknown3; + UINT locales; + UINT charmaps; + UINT geoids; + UINT scripts; + } *header = locale_ptr; + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + const NLS_LOCALE_LCNAME_INDEX *lcnames; + const NLS_LOCALE_HEADER *locale_table; + const WCHAR *locale_strings; + int min, max; + + ascii_to_unicode( name, system_locale, strlen(system_locale) + 1 ); + locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); + locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); + lcnames = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); + min = 0; + max = locale_table->nb_lcnames - 1; + while (min <= max) + { + int pos = (min + max) / 2; + int res = wcsicmp( name, locale_strings + lcnames[pos].name + 1 ); + if (res < 0) max = pos - 1; + else if (res > 0) min = pos + 1; + else + { + ULONG offset = locale_table->locales_offset + lcnames[pos].idx * locale_table->locale_size; + return ((const NLS_LOCALE_DATA *)((const char *)locale_table + offset))->idefaultlanguage; + } + } + return MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); +} + + /****************************************************************** * init_locale */ @@ -1043,9 +1083,7 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) append_envA( env, pos, size, "WINEUNIXCP", str ); } else append_envW( env, pos, size, "WINEUNIXCP", NULL ); - 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, "WINEUSERLOCALE", user_locale ); append_envA( env, pos, size, "SystemDrive", "C:" ); append_envA( env, pos, size, "SystemRoot", "C:\\windows" ); } @@ -2179,6 +2217,7 @@ NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *siz status = map_section( handle, ptr, &mapsize, PAGE_READONLY ); NtClose( handle ); } + if (!status && !system_lcid) system_lcid = init_system_lcid( *ptr ); *lcid = system_lcid; return status; } @@ -2200,11 +2239,7 @@ NTSTATUS WINAPI NtQueryDefaultLocale( BOOLEAN user, LCID *lcid ) NTSTATUS WINAPI NtSetDefaultLocale( BOOLEAN user, LCID lcid ) { if (user) user_lcid = lcid; - else - { - system_lcid = lcid; - system_ui_language = LANGIDFROMLCID(lcid); /* there is no separate call to set it */ - } + else system_lcid = lcid; return STATUS_SUCCESS; } @@ -2234,7 +2269,7 @@ NTSTATUS WINAPI NtSetDefaultUILanguage( LANGID lang ) */ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) { - *lang = system_ui_language; + *lang = LANGIDFROMLCID(system_lcid); /* there is no separate call to set it */ return STATUS_SUCCESS; }

1 0

Alexandre Julliard : msvcrt: Fix mbcs initialization for UTF-8 codepage.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 83a3a5c75b84b779525de2ce92f0be2c487e1087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a3a5c75b84b779525de2ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 23 17:25:46 2022 +0100 msvcrt: Fix mbcs initialization for UTF-8 codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 166af32cd27..fa25a7092e3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -220,7 +220,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) WORD chartypes[256]; char bufA[256]; WCHAR bufW[256], lowW[256], upW[256]; - int charcount; + int charcount, maxchar; int ret; int i; @@ -288,7 +288,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) bytes += 2; } - if (cpi.MaxCharSize > 1) + if (cpi.MaxCharSize == 2) { /* trail bytes not available through kernel32 but stored in a structure in msvcrt */ struct cp_extra_info_t *cpextra = g_cpextrainfo; @@ -316,10 +316,12 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) else mbcinfo->ismbcodepage = 0; + maxchar = (newcp == CP_UTF8) ? 128 : 256; + /* we can't use GetStringTypeA directly because we don't have a locale - only a code page */ charcount = 0; - for (i = 0; i < 256; i++) + for (i = 0; i < maxchar; i++) if (!(mbcinfo->mbctype[i + 1] & _M1)) bufA[charcount++] = i; @@ -335,7 +337,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) LCMapStringW(lcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); charcount = 0; - for (i = 0; i < 256; i++) + for (i = 0; i < maxchar; i++) if (!(mbcinfo->mbctype[i + 1] & _M1)) { if (chartypes[charcount] & C1_UPPER) @@ -359,7 +361,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) } charcount = 0; - for (i = 0; i < 256; i++) + for (i = 0; i < maxchar; i++) { if(!(mbcinfo->mbctype[i + 1] & _M1)) {

1 0

Rémi Bernon : kernel32/tests: Add some GetProcessHeaps tests.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 13a4da538ce9132394d5a6fd16a8fa75febd0b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a4da538ce9132394d5a6fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 8 16:06:48 2022 +0200 kernel32/tests: Add some GetProcessHeaps tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 190e83cc208..80e5d588047 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -80,23 +80,40 @@ static void test_HeapCreate(void) { static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; + HANDLE heap, heap1, heaps[8]; BYTE *ptr, *ptr1, *ptrs[128]; - HANDLE heap, heap1; + DWORD heap_count, count; UINT_PTR align; BOOL ret; + heap_count = GetProcessHeaps( 0, NULL ); + ok( heap_count <= 6, "GetProcessHeaps returned %lu\n", heap_count ); + /* check heap alignment */ heap = HeapCreate( 0, 0, 0 ); ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + count = GetProcessHeaps( 0, NULL ); + ok( count == heap_count + 1, "GetProcessHeaps returned %lu\n", count ); heap1 = HeapCreate( 0, 0, 0 ); ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap1 & 0xffff), "wrong heap alignment\n" ); + count = GetProcessHeaps( 0, NULL ); + ok( count == heap_count + 2, "GetProcessHeaps returned %lu\n", count ); + count = GetProcessHeaps( ARRAY_SIZE(heaps), heaps ); + ok( count == heap_count + 2, "GetProcessHeaps returned %lu\n", count ); + ok( heaps[0] == GetProcessHeap(), "got wrong heap\n" ); + todo_wine + ok( heaps[heap_count + 0] == heap, "got wrong heap\n" ); + todo_wine + ok( heaps[heap_count + 1] == heap1, "got wrong heap\n" ); ret = HeapDestroy( heap1 ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + count = GetProcessHeaps( 0, NULL ); + ok( count == heap_count, "GetProcessHeaps returned %lu\n", count ); /* growable heap */

1 0

Paul Gofman : ntdll: Increase kernel stack size.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: dfd5f109fb4ebad859bf3ce3960b3b2b2ad1341d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfd5f109fb4ebad859bf3ce3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 11 13:26:31 2022 +0300 ntdll: Increase kernel stack size. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 86e87e6e29a..795fc148479 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -84,7 +84,7 @@ static const SIZE_T page_size = 0x1000; static const SIZE_T teb_size = 0x3800; /* TEB64 + TEB32 + debug info */ static const SIZE_T signal_stack_mask = 0xffff; static const SIZE_T signal_stack_size = 0x10000 - 0x3800; -static const SIZE_T kernel_stack_size = 0x20000; +static const SIZE_T kernel_stack_size = 0x100000; static const SIZE_T min_kernel_stack = 0x2000; static const LONG teb_offset = 0x2000;

1 0

Rafał Harabień : user32/tests: Remove duplicated SS_*RECT static control tests.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 66a639e96de2f4e12ddfe948bf5f6dd6fd5f7b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66a639e96de2f4e12ddfe948… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Sat Apr 9 13:14:40 2022 +0200 user32/tests: Remove duplicated SS_*RECT static control tests. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index a5af3315865..09e399990cd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME);

1 0

Eric Pouech : d3dx10: Fix long type warnings.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: be0be41fca9c8fe1bda3d12d8c447fd544d5b9dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0be41fca9c8fe1bda3d12d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 13 08:48:58 2022 +0200 d3dx10: Fix long type warnings. Missing from 74adbac296a786144e15833ff4918765d5bb32aa. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 6 +++--- dlls/d3dx10_43/d3dx10_43_main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 062a04d739c..db46a9353f6 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -220,7 +220,7 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) { - TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + TRACE("data %s, data_size %Iu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, @@ -261,7 +261,7 @@ HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, { struct asyncdataloader *object; - TRACE("data %p, data_size %lu, loader %p.\n", data, data_size, loader); + TRACE("data %p, data_size %Iu, loader %p.\n", data, data_size, loader); if (!data || !loader) return E_FAIL; @@ -398,7 +398,7 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult) { - FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, " + FIXME("data %s, data_size %Iu, filename %s, defines %p, include %p, pump %p, shader_text %p, " "errors %p, hresult %p stub!\n", debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 42f29ad6239..ec7407508d3 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -53,7 +53,7 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult) { - FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " + FIXME("data %p, datasize %Iu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " "device %p, pump %p, effectpool %p, errors %p, hresult %p.\n", data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, pump, effectpool, errors, hresult);

1 0

Rémi Bernon : kernel32/tests: Add some HeapWalk tests.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 0237d1702f77372bd923c2ac4591cebdcdeb2709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0237d1702f77372bd923c2ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 8 16:06:49 2022 +0200 kernel32/tests: Add some HeapWalk tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 270 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0237d1702f77372bd923…

1 0

Paul Gofman : ntdll: Remove unused PTHREAD_STACK_MIN definition.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 8c931c7129b2fb64de119d6ab5df413ab339fd9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c931c7129b2fb64de119d6a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 11 13:26:32 2022 +0300 ntdll: Remove unused PTHREAD_STACK_MIN definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index b8546edde87..503230e4634 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -71,10 +71,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); WINE_DECLARE_DEBUG_CHANNEL(seh); -#ifndef PTHREAD_STACK_MIN -#define PTHREAD_STACK_MIN 16384 -#endif - static int nb_threads = 1; static inline int get_unix_exit_code( NTSTATUS status )

1 0