wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Jinoh Kang : server: Add mark_pending field to set_async_direct_result request.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: be9a875fc17b81df9abfc85073d6134cb59436fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=be9a875fc17b81df9abfc850… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Mar 20 07:28:27 2022 +0900 server: Add mark_pending field to set_async_direct_result request. The client can set mark_pending to indicate that the full-blown I/O completion mechanism shall be triggered (asynchronous completion) even if the status indicates failure. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/sync.c | 9 +++++---- dlls/ntdll/unix/unix_private.h | 2 +- include/wine/server_protocol.h | 4 ++-- server/async.c | 11 ++++++++--- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 8 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 23059e3cff8..2f8bd6e62bf 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -767,7 +767,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi release_fileio( &async->io ); } - if (alerted) set_async_direct_result( &wait_handle, status, information ); + if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index ee25dfd0099..0786454dad2 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2514,7 +2514,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG /* Notify direct completion of async and close the wait handle if it is no longer needed. * This function is a no-op (returns status as-is) if the supplied handle is NULL. */ -void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information ) +void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) { NTSTATUS ret; @@ -2522,9 +2522,10 @@ void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PT SERVER_START_REQ( set_async_direct_result ) { - req->handle = wine_server_obj_handle( *optional_handle ); - req->status = status; - req->information = information; + req->handle = wine_server_obj_handle( *optional_handle ); + req->status = status; + req->information = information; + req->mark_pending = mark_pending; ret = wine_server_call( req ); if (ret == STATUS_SUCCESS) *optional_handle = wine_server_ptr_handle( reply->handle ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 434f98cdc5a..86e87e6e29a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -274,7 +274,7 @@ extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *inf extern void init_files(void) DECLSPEC_HIDDEN; extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN; -extern void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information ); +extern void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ); extern void dbg_init(void) DECLSPEC_HIDDEN; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e32ef8e1479..75b48d7601c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2913,7 +2913,7 @@ struct set_async_direct_result_request obj_handle_t handle; apc_param_t information; unsigned int status; - char __pad_28[4]; + int mark_pending; }; struct set_async_direct_result_reply { @@ -6284,7 +6284,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 746 +#define SERVER_PROTOCOL_VERSION 747 /* ### protocol_version end ### */ diff --git a/server/async.c b/server/async.c index d49fb8b7c04..a92798fcd39 100644 --- a/server/async.c +++ b/server/async.c @@ -772,10 +772,15 @@ DECL_HANDLER(set_async_direct_result) async->direct_result = 0; async->pending = 1; } + else if (req->mark_pending) + { + async->pending = 1; + } - /* if the I/O has completed successfully, the client would have already - * set the IOSB. therefore, we can skip waiting on wait_handle and do - * async_set_result() directly. + /* if the I/O has completed successfully (or unsuccessfully, and + * async->pending is set), the client would have already set the IOSB. + * therefore, we can do async_set_result() directly and let the client skip + * waiting on wait_handle. */ async_set_result( &async->obj, status, req->information ); diff --git a/server/protocol.def b/server/protocol.def index 9d90544fa41..66c6c97b1e0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2168,6 +2168,7 @@ enum message_type obj_handle_t handle; /* wait handle */ apc_param_t information; /* IO_STATUS_BLOCK Information */ unsigned int status; /* completion status */ + int mark_pending; /* set async to pending before completion? */ @REPLY obj_handle_t handle; /* wait handle, or NULL if closed */ @END diff --git a/server/request.h b/server/request.h index 2c7889bd197..434041490c0 100644 --- a/server/request.h +++ b/server/request.h @@ -1401,6 +1401,7 @@ C_ASSERT( sizeof(struct get_async_result_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_request, information) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_request, status) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_request, mark_pending) == 28 ); C_ASSERT( sizeof(struct set_async_direct_result_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_reply, handle) == 8 ); C_ASSERT( sizeof(struct set_async_direct_result_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 61e592b0ffa..75bc35b6b56 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2763,6 +2763,7 @@ static void dump_set_async_direct_result_request( const struct set_async_direct_ fprintf( stderr, " handle=%04x", req->handle ); dump_uint64( ", information=", &req->information ); fprintf( stderr, ", status=%08x", req->status ); + fprintf( stderr, ", mark_pending=%d", req->mark_pending ); } static void dump_set_async_direct_result_reply( const struct set_async_direct_result_reply *req )

1 0

Jinoh Kang : ws2_32/tests: Continue sending remaining data on short write in test_write_events.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 29883e2db98b548e9c22b12e25b7f6d8360df220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29883e2db98b548e9c22b12e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Mar 20 07:28:17 2022 +0900 ws2_32/tests: Continue sending remaining data on short write in test_write_events. Today, we assert that a short write clears the FD_WRITE event bit; however, short writes can never happen on Windows in the first place. We're testing for a property of a socket behaviour that does not exist on Windows, but currently happens to be exhibited by Wine. Ignore short writes, and continue sending until it fails with EWOULDBLOCK. This way, the test won't care whether or not a short write clears FD_WRITE. This allows us some flexibility in implementation of send(). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6cb8ff0a7a8..cc74e301f60 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5666,14 +5666,11 @@ static void test_write_events(struct event_test_ctx *ctx) if (!broken(1)) { - while ((ret = send(server, buffer, buffer_size, 0)) == buffer_size); /* Windows will never send less than buffer_size bytes here, but Linux * may do a short write. */ - todo_wine_if (ret > 0) - { - ok(ret == -1, "got %d\n", ret); - ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - } + while ((ret = send(server, buffer, buffer_size, 0)) > 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); while (recv(client, buffer, buffer_size, 0) > 0); ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError());

1 0

Jinoh Kang : server: Ensure initial status is set in async_set_result().
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: d162a3e2f19b152de1cb132f4b68835b60a63e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d162a3e2f19b152de1cb132f… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Mar 20 07:28:05 2022 +0900 server: Ensure initial status is set in async_set_result(). Shift the resposibility of setting initial status from set_async_direct_result request handler to async_set_result(). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/async.c b/server/async.c index 6d663a6a553..d49fb8b7c04 100644 --- a/server/async.c +++ b/server/async.c @@ -481,6 +481,8 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota assert( async->terminated ); /* it must have been woken up if we get a result */ + if (async->unknown_status) async_set_initial_status( async, status ); + if (async->alerted && status == STATUS_PENDING) /* restart it */ { async->terminated = 0; @@ -765,8 +767,6 @@ DECL_HANDLER(set_async_direct_result) return; } - async_set_initial_status( async, status ); - if (status == STATUS_PENDING) { async->direct_result = 0;

1 0

Jinoh Kang : server: Actually set initial status in set_async_direct_result handler.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: b632ddedcd37b28c42e20dc3c7b47df418ba64b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b632ddedcd37b28c42e20dc3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Mar 20 07:28:01 2022 +0900 server: Actually set initial status in set_async_direct_result handler. Commit 15483b1a126 (server: Allow calling async_handoff() with status code STATUS_ALERTED., 2022-02-10) introduced the set_async_direct_result handler which calls async_set_initial_status(). However, the async_set_initial_status() call does nothing since async->terminated is set, leaving the async in a confusing state (unknown_status = 1 but pending/completed). So far, this issue is unlikely to have been a problem in practice for the following reasons: 1. async_set_initial_status() would have unset unknown_status, but it remains set instead. This is usually not a problem, since unknown_status is usually ever read by code paths effectively unreachable for non-device (e.g. socket) asyncs. It would still potentially allow set_async_direct_result to be called multiple times, but it wouldn't actually happen in practice unless something goes wrong. 2. async_set_initial_status() would have set initial_status; however, it is left with the default value STATUS_PENDING. If the actual status is something other than that, the handler closes the wait handle and async_satisfied (the only real consumer of initial_status) would never be called anyway. For reasons above, this issue is not effectively observable or testable. Nonetheless, the current code does leave the async object in an inconsistent state. Fix this by removing the !async->terminated check in async_set_initial_status(). Also, remove assert( async->unknown_status ). The client can now trigger the assert() by calling set_async_direct_result on a device async, thereby causing async_set_initial_status() to be called twice. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/async.c b/server/async.c index 7d0ff10f7a4..6d663a6a553 100644 --- a/server/async.c +++ b/server/async.c @@ -302,12 +302,8 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da * the initial status may be STATUS_PENDING */ void async_set_initial_status( struct async *async, unsigned int status ) { - assert( async->unknown_status ); - if (!async->terminated) - { - async->initial_status = status; - async->unknown_status = 0; - } + async->initial_status = status; + async->unknown_status = 0; } void set_async_pending( struct async *async )

1 0

Alexandre Julliard : ntdll: Use RtlLcidToLocaleName() in the preferred UI language stub.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: c3023a123ef3fc95226fa9df257a5a71b650a0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3023a123ef3fc95226fa9df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:41:56 2022 +0100 ntdll: Use RtlLcidToLocaleName() in the preferred UI language stub. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 7 ++----- dlls/ntdll/locale.c | 33 ++++++++++----------------------- dlls/ntdll/ntdll_misc.h | 1 - 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f84746b7f1b..b6cc53763af 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -81,8 +81,6 @@ const WCHAR windows_dir[] = L"C:\\windows"; /* system directory with trailing backslash */ const WCHAR system_dir[] = L"C:\\windows\\system32\\"; -HMODULE kernel32_handle = 0; - /* system search path */ static const WCHAR system_path[] = L"C:\\windows\\system32;C:\\windows\\system;C:\\windows"; @@ -4117,17 +4115,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } - kernel32_handle = kernel32->ldr.DllBase; node_kernel32 = kernel32->ldr.DdagNode; RtlInitAnsiString( &func_name, "BaseThreadInitThunk" ); - if ((status = LdrGetProcedureAddress( kernel32_handle, &func_name, + if ((status = LdrGetProcedureAddress( kernel32->ldr.DllBase, &func_name, 0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS) { MESSAGE( "wine: could not find BaseThreadInitThunk in kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); } RtlInitAnsiString( &func_name, "CtrlRoutine" ); - LdrGetProcedureAddress( kernel32_handle, &func_name, 0, (void **)&pCtrlRoutine ); + LdrGetProcedureAddress( kernel32->ldr.DllBase, &func_name, 0, (void **)&pCtrlRoutine ); locale_init(); actctx_init(); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 4333ca2cd6f..158f068b03d 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -107,26 +107,6 @@ static const NLS_LOCALE_LCID_INDEX *lcids_index; static const NLS_LOCALE_LCNAME_INDEX *lcnames_index; static const NLS_LOCALE_HEADER *locale_table; -static NTSTATUS load_string( ULONG id, LANGID lang, WCHAR *buffer, ULONG len ) -{ - const IMAGE_RESOURCE_DATA_ENTRY *data; - LDR_RESOURCE_INFO info; - NTSTATUS status; - WCHAR *p; - int i; - - info.Type = 6; /* RT_STRING */ - info.Name = (id >> 4) + 1; - info.Language = lang; - if ((status = LdrFindResource_U( kernel32_handle, &info, 3, &data ))) return status; - p = (WCHAR *)((char *)kernel32_handle + data->OffsetToData); - for (i = 0; i < (id & 0x0f); i++) p += *p + 1; - if (*p >= len) return STATUS_BUFFER_TOO_SMALL; - memcpy( buffer, p + 1, *p * sizeof(WCHAR) ); - buffer[*p] = 0; - return STATUS_SUCCESS; -} - static DWORD mbtowc_size( const CPTABLEINFO *info, LPCSTR str, UINT len ) { @@ -625,9 +605,16 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); - status = load_string( (flags & MUI_LANGUAGE_ID) ? LOCALE_ILANGUAGE : LOCALE_SNAME, - lang, name, ARRAY_SIZE(name) ); - if (status) return status; + if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lx", lang ); + else + { + UNICODE_STRING str; + + str.Buffer = name; + str.MaximumLength = sizeof(name); + status = RtlLcidToLocaleName( lang, &str, 0, FALSE ); + if (status) return status; + } len = wcslen( name ) + 2; name[len - 1] = 0; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 571b49e844c..d55083ae34c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -80,7 +80,6 @@ extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; -extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void *) DECLSPEC_HIDDEN; extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Implement RtlLcidToLocaleName().
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: a2d44e89eac11ed2efb9c5450f38d39e8d0f9d2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d44e89eac11ed2efb9c545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:32:32 2022 +0100 ntdll: Implement RtlLcidToLocaleName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/locale.c | 63 ++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 4 files changed, 157 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2d44e89eac11ed2efb9…

1 0

Alexandre Julliard : ntdll: Implement RtlIsValidLocaleName().
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: ea9a776d7d57941bcf57ce7a776db47eefd8a782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9a776d7d57941bcf57ce7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:32:13 2022 +0100 ntdll: Implement RtlIsValidLocaleName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 78 +++++++++++++++++++++++++++++++++++++------- dlls/ntdll/locale.c | 14 ++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 4 files changed, 83 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 68bab2094e5..06b3d84c97a 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -63,6 +63,7 @@ static BOOL (WINAPI *pEnumSystemLocalesEx)(LOCALE_ENUMPROCEX, DWORD, LPARAM, LPV static INT (WINAPI *pLCMapStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPWSTR, INT, LPNLSVERSIONINFO, LPVOID, LPARAM); static LCID (WINAPI *pLocaleNameToLCID)(LPCWSTR, DWORD); static NTSTATUS (WINAPI *pRtlLocaleNameToLcid)(LPCWSTR, LCID *, DWORD); +static BOOLEAN (WINAPI *pRtlIsValidLocaleName)(const WCHAR *,ULONG); static INT (WINAPI *pLCIDToLocaleName)(LCID, LPWSTR, INT, DWORD); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); static INT (WINAPI *pIdnToNameprepUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); @@ -145,6 +146,7 @@ static void InitFunctionPointers(void) mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); X(RtlLocaleNameToLcid); + X(RtlIsValidLocaleName); X(RtlNormalizeString); X(RtlIsNormalizedString); X(NtGetNlsSectionPtr); @@ -4734,11 +4736,6 @@ static void test_GetLocaleInfoEx(void) static void test_IsValidLocaleName(void) { - static const WCHAR enusW[] = {'e','n','-','U','S',0}; - static const WCHAR enW[] = {'e','n',0}; - static const WCHAR zzW[] = {'z','z',0}; - static const WCHAR zz_zzW[] = {'z','z','-','Z','Z',0}; - static const WCHAR zzzzW[] = {'z','z','z','z',0}; BOOL ret; if (!pIsValidLocaleName) @@ -4747,20 +4744,79 @@ static void test_IsValidLocaleName(void) return; } - ret = pIsValidLocaleName(enusW); + ret = pIsValidLocaleName(L"en-US"); + ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(L"en"); + ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(L"es-es"); + ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(L"de-DE_phoneb"); ok(ret, "IsValidLocaleName failed\n"); - ret = pIsValidLocaleName(enW); + ret = pIsValidLocaleName(L"DE_de-phoneb"); ok(ret || broken(!ret), "IsValidLocaleName failed\n"); - ret = pIsValidLocaleName(zzW); + ret = pIsValidLocaleName(L"DE_de_PHONEB"); + ok(ret || broken(!ret), "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(L"DE_de+phoneb"); + ok(!ret, "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(L"zz"); + ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(L"zz-ZZ"); ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); - ret = pIsValidLocaleName(zz_zzW); + ret = pIsValidLocaleName(L"zzz"); ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); - ret = pIsValidLocaleName(zzzzW); + ret = pIsValidLocaleName(L"zzz-ZZZ"); + ok(!ret, "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(L"zzzz"); ok(!ret, "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(LOCALE_NAME_INVARIANT); ok(ret, "IsValidLocaleName failed\n"); - ret = pIsValidLocaleName(NULL); + ret = pIsValidLocaleName(LOCALE_NAME_USER_DEFAULT); + ok(!ret, "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(LOCALE_NAME_SYSTEM_DEFAULT); ok(!ret, "IsValidLocaleName should have failed\n"); + + if (!pRtlIsValidLocaleName) + { + win_skip( "RtlIsValidLocaleName not available\n" ); + return; + } + + ret = pRtlIsValidLocaleName( L"en-US", 0 ); + ok(ret, "RtlIsValidLocaleName failed\n"); + ret = pRtlIsValidLocaleName( L"en", 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"en", 1 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"en", 2 ); + ok(ret, "RtlIsValidLocaleName failed\n"); + ret = pRtlIsValidLocaleName( L"en-RR", 2 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"es-es", 0 ); + ok(ret, "RtlIsValidLocaleName failed\n"); + ret = pRtlIsValidLocaleName( L"de-DE_phoneb", 0 ); + ok(ret, "RtlIsValidLocaleName failed\n"); + ret = pRtlIsValidLocaleName( L"DE_de_PHONEB", 0 ); + ok(ret || broken(!ret), "RtlIsValidLocaleName failed\n"); + ret = pRtlIsValidLocaleName( L"DE_de+phoneb", 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"zz", 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"zz", 2 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"zz-ZZ", 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"zzz", 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"zzz-ZZZ", 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( L"zzzz", 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( LOCALE_NAME_INVARIANT, 0 ); + ok(ret, "RtlIsValidLocaleName failed\n"); + ret = pRtlIsValidLocaleName( LOCALE_NAME_USER_DEFAULT, 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); + ret = pRtlIsValidLocaleName( LOCALE_NAME_SYSTEM_DEFAULT, 0 ); + ok(!ret, "RtlIsValidLocaleName should have failed\n"); } static void test_CompareStringOrdinal(void) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index b266bc0af3d..695524decb7 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1224,6 +1224,20 @@ WCHAR __cdecl towupper( WCHAR ch ) } +/****************************************************************** + * RtlIsValidLocaleName (NTDLL.@) + */ +BOOLEAN WINAPI RtlIsValidLocaleName( const WCHAR *name, ULONG flags ) +{ + const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( name ); + + if (!entry) return FALSE; + /* reject neutral locale unless flag 2 is set */ + if (!(flags & 2) && !get_locale_data( entry->idx )->inotneutral) return FALSE; + return TRUE; +} + + /****************************************************************** * RtlLocaleNameToLcid (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4c7b9be1d9f..14a828d7d0c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -834,6 +834,7 @@ # @ stub RtlIsThreadWithinLoaderCallout @ stdcall RtlIsValidHandle(ptr ptr) @ stdcall RtlIsValidIndexHandle(ptr long ptr) +@ stdcall RtlIsValidLocaleName(wstr long) @ stdcall -arch=win32 -ret64 RtlLargeIntegerAdd(int64 int64) @ stdcall -arch=win32 -ret64 RtlLargeIntegerArithmeticShift(int64 long) @ stdcall -arch=win32 -ret64 RtlLargeIntegerDivide(int64 int64 ptr) diff --git a/include/winternl.h b/include/winternl.h index d4f360bd2a7..07a8755dc87 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4402,6 +4402,7 @@ NTSYSAPI BOOLEAN WINAPI RtlIsProcessorFeaturePresent(UINT); NTSYSAPI BOOLEAN WINAPI RtlIsTextUnicode(LPCVOID,INT,INT *); NTSYSAPI BOOLEAN WINAPI RtlIsValidHandle(const RTL_HANDLE_TABLE *, const RTL_HANDLE *); NTSYSAPI BOOLEAN WINAPI RtlIsValidIndexHandle(const RTL_HANDLE_TABLE *, ULONG Index, RTL_HANDLE **); +NTSYSAPI BOOLEAN WINAPI RtlIsValidLocaleName(const WCHAR*,ULONG); NTSYSAPI NTSTATUS WINAPI RtlLeaveCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI DWORD WINAPI RtlLengthRequiredSid(DWORD); NTSYSAPI ULONG WINAPI RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR);

1 0

Alexandre Julliard : ntdll: Reimplement RtlLocaleNameToLcid() using the locale.nls data.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: b631c147027c35fae5a8f5afef903958cadbed0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b631c147027c35fae5a8f5af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:31:58 2022 +0100 ntdll: Reimplement RtlLocaleNameToLcid() using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 90 +++++++++++++------------- dlls/ntdll/locale.c | 146 +++++++++++++------------------------------ 2 files changed, 91 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b631c147027c35fae5a8…

1 0

Alexandre Julliard : ntdll: Load the locale.nls file at startup.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 4b0f1163fae90e0852e97c07043c85b975f2cede URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0f1163fae90e0852e97c07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:30:01 2022 +0100 ntdll: Load the locale.nls file at startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + dlls/ntdll/locale.c | 35 ++++++++++++++++++++++++++++++++++- dlls/ntdll/ntdll_misc.h | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d3b63dc7ada..f84746b7f1b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4129,6 +4129,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR RtlInitAnsiString( &func_name, "CtrlRoutine" ); LdrGetProcedureAddress( kernel32_handle, &func_name, 0, (void **)&pCtrlRoutine ); + locale_init(); actctx_init(); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 360496dd7e1..c60e6f2cf3e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -100,9 +100,12 @@ struct norm_table /* WORD[] composition character sequences */ }; +static const WCHAR *locale_strings; static NLSTABLEINFO nls_info; static struct norm_table *norm_tables[16]; - +static const NLS_LOCALE_LCID_INDEX *lcids_index; +static const NLS_LOCALE_LCNAME_INDEX *lcnames_index; +static const NLS_LOCALE_HEADER *locale_table; static NTSTATUS load_string( ULONG id, LANGID lang, WCHAR *buffer, ULONG len ) { @@ -235,6 +238,36 @@ invalid: } +void locale_init(void) +{ + LARGE_INTEGER unused; + LCID system_lcid; + NTSTATUS status; + struct + { + UINT ctypes; + UINT unknown1; + UINT unknown2; + UINT unknown3; + UINT locales; + UINT charmaps; + UINT geoids; + UINT scripts; + } *header; + + status = RtlGetLocaleFileMappingAddress( (void **)&header, &system_lcid, &unused ); + if (status) + { + ERR( "locale init failed %x\n", status ); + return; + } + 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); + locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); +} + + static BYTE rol( BYTE val, BYTE count ) { return (val << count) | (val >> (8 - count)); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index d7c5ade5bc1..571b49e844c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -66,6 +66,7 @@ extern const char *debugstr_exception_code( DWORD code ) DECLSPEC_HIDDEN; extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; +extern void locale_init(void) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : include: Add some structures for the undocumented locale.nls layout.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: f161195859f1f851f43c709f08838ace4f38b0b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f161195859f1f851f43c709f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 22 10:29:34 2022 +0100 include: Add some structures for the undocumented locale.nls layout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 3fa5fad9b46..d4f360bd2a7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4739,6 +4739,145 @@ typedef struct WCHAR curdir_buffer[MAX_PATH]; } WIN16_SUBSYSTEM_TIB; +/* Undocumented: layout of the locale data in the locale.nls file */ + +typedef struct +{ + UINT sname; /* 000 LOCALE_SNAME */ + UINT sopentypelanguagetag; /* 004 LOCALE_SOPENTYPELANGUAGETAG */ + USHORT ilanguage; /* 008 LOCALE_ILANGUAGE */ + USHORT unique_lcid; /* 00a unique id if lcid == 0x1000 */ + USHORT idigits; /* 00c LOCALE_IDIGITS */ + USHORT inegnumber; /* 00e LOCALE_INEGNUMBER */ + USHORT icurrdigits; /* 010 LOCALE_ICURRDIGITS*/ + USHORT icurrency; /* 012 LOCALE_ICURRENCY */ + USHORT inegcurr; /* 014 LOCALE_INEGCURR */ + USHORT ilzero; /* 016 LOCALE_ILZERO */ + USHORT inotneutral; /* 018 LOCALE_INEUTRAL (inverted) */ + USHORT ifirstdayofweek; /* 01a LOCALE_IFIRSTDAYOFWEEK (monday=0) */ + USHORT ifirstweekofyear; /* 01c LOCALE_IFIRSTWEEKOFYEAR */ + USHORT icountry; /* 01e LOCALE_ICOUNTRY */ + USHORT imeasure; /* 020 LOCALE_IMEASURE */ + USHORT idigitsubstitution; /* 022 LOCALE_IDIGITSUBSTITUTION */ + UINT sgrouping; /* 024 LOCALE_SGROUPING (as binary string) */ + UINT smongrouping; /* 028 LOCALE_SMONGROUPING (as binary string) */ + UINT slist; /* 02c LOCALE_SLIST */ + UINT sdecimal; /* 030 LOCALE_SDECIMAL */ + UINT sthousand; /* 034 LOCALE_STHOUSAND */ + UINT scurrency; /* 038 LOCALE_SCURRENCY */ + UINT smondecimalsep; /* 03c LOCALE_SMONDECIMALSEP */ + UINT smonthousandsep; /* 040 LOCALE_SMONTHOUSANDSEP */ + UINT spositivesign; /* 044 LOCALE_SPOSITIVESIGN */ + UINT snegativesign; /* 048 LOCALE_SNEGATIVESIGN */ + UINT s1159; /* 04c LOCALE_S1159 */ + UINT s2359; /* 050 LOCALE_S2359 */ + UINT snativedigits; /* 054 LOCALE_SNATIVEDIGITS (array of single digits) */ + UINT stimeformat; /* 058 LOCALE_STIMEFORMAT (array of formats) */ + UINT sshortdate; /* 05c LOCALE_SSHORTDATE (array of formats) */ + UINT slongdate; /* 060 LOCALE_SLONGDATE (array of formats) */ + UINT syearmonth; /* 064 LOCALE_SYEARMONTH (array of formats) */ + UINT sduration; /* 068 LOCALE_SDURATION (array of formats) */ + USHORT idefaultlanguage; /* 06c LOCALE_IDEFAULTLANGUAGE */ + USHORT idefaultansicodepage; /* 06e LOCALE_IDEFAULTANSICODEPAGE */ + USHORT idefaultcodepage; /* 070 LOCALE_IDEFAULTCODEPAGE */ + USHORT idefaultmaccodepage; /* 072 LOCALE_IDEFAULTMACCODEPAGE */ + USHORT idefaultebcdiccodepage; /* 074 LOCALE_IDEFAULTEBCDICCODEPAGE */ + USHORT old_geoid; /* 076 LOCALE_IGEOID (older version?) */ + USHORT ipapersize; /* 078 LOCALE_IPAPERSIZE */ + BYTE islamic_cal[2]; /* 07a calendar id for islamic calendars (?) */ + UINT scalendartype; /* 07c string, first char is LOCALE_ICALENDARTYPE, next chars are LOCALE_IOPTIONALCALENDAR */ + UINT sabbrevlangname; /* 080 LOCALE_SABBREVLANGNAME */ + UINT siso639langname; /* 084 LOCALE_SISO639LANGNAME */ + UINT senglanguage; /* 088 LOCALE_SENGLANGUAGE */ + UINT snativelangname; /* 08c LOCALE_SNATIVELANGNAME */ + UINT sengcountry; /* 090 LOCALE_SENGCOUNTRY */ + UINT snativectryname; /* 094 LOCALE_SNATIVECTRYNAME */ + UINT sabbrevctryname; /* 098 LOCALE_SABBREVCTRYNAME */ + UINT siso3166ctryname; /* 09c LOCALE_SISO3166CTRYNAME */ + UINT sintlsymbol; /* 0a0 LOCALE_SINTLSYMBOL */ + UINT sengcurrname; /* 0a4 LOCALE_SENGCURRNAME */ + UINT snativecurrname; /* 0a8 LOCALE_SNATIVECURRNAME */ + UINT fontsignature; /* 0ac LOCALE_FONTSIGNATURE (binary string) */ + UINT siso639langname2; /* 0b0 LOCALE_SISO639LANGNAME2 */ + UINT siso3166ctryname2; /* 0b4 LOCALE_SISO3166CTRYNAME2 */ + UINT sparent; /* 0b8 LOCALE_SPARENT */ + UINT sdayname; /* 0bc LOCALE_SDAYNAME1 (array of days 1..7) */ + UINT sabbrevdayname; /* 0c0 LOCALE_SABBREVDAYNAME1 (array of days 1..7) */ + UINT smonthname; /* 0c4 LOCALE_SMONTHNAME1 (array of months 1..13) */ + UINT sabbrevmonthname; /* 0c8 LOCALE_SABBREVMONTHNAME1 (array of months 1..13) */ + UINT sgenitivemonth; /* 0cc equivalent of LOCALE_SMONTHNAME1 for genitive months */ + UINT sabbrevgenitivemonth; /* 0d0 equivalent of LOCALE_SABBREVMONTHNAME1 for genitive months */ + UINT calnames; /* 0d4 array of calendar names */ + UINT customsorts; /* 0d8 array of custom sort names */ + USHORT inegativepercent; /* 0dc LOCALE_INEGATIVEPERCENT */ + USHORT ipositivepercent; /* 0de LOCALE_IPOSITIVEPERCENT */ + USHORT unknown1; /* 0e0 */ + USHORT ireadinglayout; /* 0e2 LOCALE_IREADINGLAYOUT */ + USHORT unknown2[2]; /* 0e4 */ + UINT unused1; /* 0e8 unused? */ + UINT sengdisplayname; /* 0ec LOCALE_SENGLISHDISPLAYNAME */ + UINT snativedisplayname; /* 0f0 LOCALE_SNATIVEDISPLAYNAME */ + UINT spercent; /* 0f4 LOCALE_SPERCENT */ + UINT snan; /* 0f8 LOCALE_SNAN */ + UINT sposinfinity; /* 0fc LOCALE_SPOSINFINITY */ + UINT sneginfinity; /* 100 LOCALE_SNEGINFINITY */ + UINT unused2; /* 104 unused? */ + UINT serastring; /* 108 CAL_SERASTRING */ + UINT sabbreverastring; /* 10c CAL_SABBREVERASTRING */ + UINT unused3; /* 110 unused? */ + UINT sconsolefallbackname; /* 114 LOCALE_SCONSOLEFALLBACKNAME */ + UINT sshorttime; /* 118 LOCALE_SSHORTTIME (array of formats) */ + UINT sshortestdayname; /* 11c LOCALE_SSHORTESTDAYNAME1 (array of days 1..7) */ + UINT unused4; /* 120 unused? */ + UINT ssortlocale; /* 124 LOCALE_SSORTLOCALE */ + UINT skeyboardstoinstall; /* 128 LOCALE_SKEYBOARDSTOINSTALL */ + UINT sscripts; /* 12c LOCALE_SSCRIPTS */ + UINT srelativelongdate; /* 130 LOCALE_SRELATIVELONGDATE */ + UINT igeoid; /* 134 LOCALE_IGEOID */ + UINT sshortestam; /* 138 LOCALE_SSHORTESTAM */ + UINT sshortestpm; /* 13c LOCALE_SSHORTESTPM */ + UINT smonthday; /* 140 LOCALE_SMONTHDAY (array of formats) */ + UINT keyboard_layout; /* 144 keyboard layouts */ +} NLS_LOCALE_DATA; + +typedef struct +{ + UINT id; /* 00 lcid */ + USHORT idx; /* 04 index in locales array */ + USHORT name; /* 06 locale name */ +} NLS_LOCALE_LCID_INDEX; + +typedef struct +{ + USHORT name; /* 00 locale name */ + USHORT idx; /* 02 index in locales array */ + UINT id; /* 04 lcid */ +} NLS_LOCALE_LCNAME_INDEX; + +typedef struct +{ + UINT offset; /* 00 offset to version, always 8? */ + UINT unknown1; /* 04 */ + UINT version; /* 08 file format version */ + UINT magic; /* 0c magic 'NSDS' */ + UINT unknown2[3]; /* 10 */ + USHORT header_size; /* 1c size of this header (?) */ + USHORT nb_lcids; /* 1e number of lcids in index */ + USHORT nb_locales; /* 20 number of locales in array */ + USHORT locale_size; /* 22 size of NLS_LOCALE_DATA structure */ + UINT locales_offset; /* 24 offset of locales array */ + USHORT nb_lcnames; /* 28 number of lcnames in index */ + USHORT pad; /* 2a */ + UINT lcids_offset; /* 2c offset of lcids index */ + UINT lcnames_offset; /* 30 offset of lcnames index */ + UINT unknown3; /* 34 */ + USHORT nb_calendars; /* 38 number of calendars in array */ + USHORT calendar_size; /* 3a size of calendar structure */ + UINT calendars_offset; /* 3c offset of calendars array */ + UINT strings_offset; /* 40 offset of strings data */ + USHORT unknown4[4]; /* 44 */ +} NLS_LOCALE_HEADER; + #endif /* __WINESRC__ */ #ifdef __cplusplus

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022