wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Eric Pouech : conhost: Support IME input in window mode.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 80342a0c10c73342e52b3b6ff4998c8e72281211 URL: https://gitlab.winehq.org/wine/wine/-/commit/80342a0c10c73342e52b3b6ff4998c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu May 23 12:42:40 2024 +0200 conhost: Support IME input in window mode. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/conhost/conhost.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 4272e8b12f5..7610cb69c72 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2841,6 +2841,12 @@ static NTSTATUS process_console_ioctls( struct console *console ) } } +static BOOL is_key_message( const MSG *msg ) +{ + return msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN || + msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP; +} + static int main_loop( struct console *console, HANDLE signal ) { HANDLE signal_event = NULL; @@ -2875,10 +2881,15 @@ static int main_loop( struct console *console, HANDLE signal ) if (res == WAIT_OBJECT_0 + wait_cnt) { MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) { + BOOL translated = FALSE; if (msg.message == WM_QUIT) return 0; - DispatchMessageW(&msg); + if (is_key_message( &msg ) && msg.wParam == VK_PROCESSKEY) + translated = TranslateMessage( &msg ); + if (!translated || msg.hwnd != console->win) + DispatchMessageW( &msg ); } continue; }

1 0

Eric Pouech : conhost: Handle WM_CHAR for window console.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: b85c6f5bbb82492fb686a66766b64f073d050be2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b85c6f5bbb82492fb686a66766b64f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 13 10:06:35 2024 +0200 conhost: Handle WM_CHAR for window console. This lets some characters (like diacritics, generated by two keys, (eg. circumflex-e on a French keyboard layout)) have usable key-down INPUT_RECORD. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/conhost/window.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a5dd9979534..9817c5fdac9 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1237,6 +1237,25 @@ static void record_key_input( struct console *console, BOOL down, WPARAM wparam, write_console_input( console, &ir, 1, TRUE ); } +/* generate input_record from WM_CHAR message. */ +static void record_char_input( struct console *console, WCHAR ch, LPARAM lparam ) +{ + INPUT_RECORD ir; + SHORT sh = VkKeyScanW( ch ); + + if (sh == ~0) return; + ir.EventType = KEY_EVENT; + ir.Event.KeyEvent.bKeyDown = TRUE; + ir.Event.KeyEvent.wRepeatCount = 0; + ir.Event.KeyEvent.wVirtualKeyCode = LOBYTE(sh); + ir.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW( LOBYTE(sh), 0 ); + ir.Event.KeyEvent.uChar.UnicodeChar = ch; + ir.Event.KeyEvent.dwControlKeyState = 0; + if (lparam & (1u << 24)) ir.Event.KeyEvent.dwControlKeyState |= ENHANCED_KEY; + + write_console_input( console, &ir, 1, TRUE ); +} + static void record_mouse_input( struct console *console, COORD c, WPARAM wparam, DWORD event ) { BYTE key_state[256]; @@ -2124,6 +2143,13 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp record_key_input( console, msg == WM_SYSKEYDOWN, wparam, lparam ); break; + case WM_CHAR: + if (console->window && console->window->in_selection) + handle_selection_key( console, TRUE, LOBYTE( VkKeyScanW( (WCHAR)wparam ) ), lparam ); + else + record_char_input( console, (WCHAR)wparam, lparam ); + break; + case WM_LBUTTONDOWN: if (console->window && (console->window->quick_edit || console->window->in_selection)) {

1 0

Elizabeth Figura : ntdll: Move IOCTL_SERIAL_WAIT_ON_MASK to the server.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 35de72453c4e60876c8ff79280982efd50aeb681 URL: https://gitlab.winehq.org/wine/wine/-/commit/35de72453c4e60876c8ff79280982e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 28 18:12:14 2024 -0500 ntdll: Move IOCTL_SERIAL_WAIT_ON_MASK to the server. Tested with a serial pair with a null modem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55947 --- dlls/ntdll/unix/serial.c | 225 +++++++++++++++++++++-------------------------- server/serial.c | 49 +++++++++++ 2 files changed, 149 insertions(+), 125 deletions(-)

1 0

Brendan McGrath : ntdll: Treat XDG_SESSION_TYPE as special env variable.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 05c0a50454f278fef0f142e11d5491890a979893 URL: https://gitlab.winehq.org/wine/wine/-/commit/05c0a50454f278fef0f142e11d5491… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu Jun 13 07:37:01 2024 +1000 ntdll: Treat XDG_SESSION_TYPE as special env variable. This can be used to incorrectly determine the availability of X graphics. --- dlls/ntdll/unix/env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index b15db0ec23c..36949b905fb 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -341,7 +341,8 @@ static BOOL is_special_env_var( const char *var ) STARTS_WITH( var, "TEMP=" ) || STARTS_WITH( var, "TMP=" ) || STARTS_WITH( var, "QT_" ) || - STARTS_WITH( var, "VK_" )); + STARTS_WITH( var, "VK_" ) || + STARTS_WITH( var, "XDG_SESSION_TYPE=" )); } /* check if an environment variable changes dynamically in every new process */

1 0

Alexandre Julliard : ntdll: Move the memory copy Rtl functions to string.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 9062376bbf227738558f9475595471ff6d006b39 URL: https://gitlab.winehq.org/wine/wine/-/commit/9062376bbf227738558f9475595471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:50:24 2024 +0200 ntdll: Move the memory copy Rtl functions to string.c. --- dlls/ntdll/rtl.c | 128 ---------------------------------------------------- dlls/ntdll/string.c | 73 ++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 128 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 047cce1e0d5..1288b57f11c 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -243,112 +243,6 @@ void * WINAPI RtlLookupElementGenericTable(RTL_GENERIC_TABLE *table, void *buffe return NULL; } -/****************************************************************************** - * RtlMoveMemory [NTDLL.@] - * - * Move a block of memory that may overlap. - * - * PARAMS - * Destination [O] End destination for block - * Source [O] Where to start copying from - * Length [I] Number of bytes to copy - * - * RETURNS - * Nothing. - */ -#undef RtlMoveMemory -VOID WINAPI RtlMoveMemory( void *Destination, const void *Source, SIZE_T Length ) -{ - memmove(Destination, Source, Length); -} - -/****************************************************************************** - * RtlFillMemory [NTDLL.@] - * - * Set a block of memory with a value. - * - * PARAMS - * Destination [O] Block to fill - * Length [I] Number of bytes to fill - * Fill [I] Value to set - * - * RETURNS - * Nothing. - */ -#undef RtlFillMemory -VOID WINAPI RtlFillMemory( VOID *Destination, SIZE_T Length, BYTE Fill ) -{ - memset(Destination, Fill, Length); -} - -/****************************************************************************** - * RtlZeroMemory [NTDLL.@] - * - * Set a block of memory with 0's. - * - * PARAMS - * Destination [O] Block to fill - * Length [I] Number of bytes to fill - * - * RETURNS - * Nothing. - */ -#undef RtlZeroMemory -VOID WINAPI RtlZeroMemory( VOID *Destination, SIZE_T Length ) -{ - memset(Destination, 0, Length); -} - -/****************************************************************************** - * RtlCompareMemory [NTDLL.@] - * - * Compare one block of memory with another - * - * PARAMS - * Source1 [I] Source block - * Source2 [I] Block to compare to Source1 - * Length [I] Number of bytes to compare - * - * RETURNS - * The length of the first byte at which Source1 and Source2 differ, or Length - * if they are the same. - */ -SIZE_T WINAPI RtlCompareMemory( const VOID *Source1, const VOID *Source2, SIZE_T Length) -{ - SIZE_T i; - for(i=0; (i<Length) && (((const BYTE*)Source1)[i]==((const BYTE*)Source2)[i]); i++); - return i; -} - -/****************************************************************************** - * RtlCompareMemoryUlong [NTDLL.@] - * - * Compare a block of memory with a value, a ULONG at a time - * - * PARAMS - * Source1 [I] Source block. This must be ULONG aligned - * Length [I] Number of bytes to compare. This should be a multiple of 4 - * dwVal [I] Value to compare to - * - * RETURNS - * The byte position of the first byte at which Source1 is not dwVal. - */ -SIZE_T WINAPI RtlCompareMemoryUlong(VOID *Source1, SIZE_T Length, ULONG dwVal) -{ - SIZE_T i; - for(i = 0; i < Length/sizeof(ULONG) && ((ULONG *)Source1)[i] == dwVal; i++); - return i * sizeof(ULONG); -} - -/****************************************************************************** - * RtlCopyMemory [NTDLL.@] - */ -#undef RtlCopyMemory -void WINAPI RtlCopyMemory(void *dest, const void *src, SIZE_T len) -{ - memcpy(dest, src, len); -} - /****************************************************************************** * RtlAssert [NTDLL.@] * @@ -366,28 +260,6 @@ void WINAPI RtlAssert(void *assertion, void *filename, ULONG linenumber, char *m linenumber, debugstr_a(message)); } -/************************************************************************* - * RtlFillMemoryUlong [NTDLL.@] - * - * Fill memory with a 32 bit (dword) value. - * - * PARAMS - * lpDest [I] Bitmap pointer - * ulCount [I] Number of dwords to write - * ulValue [I] Value to fill with - * - * RETURNS - * Nothing. - */ -VOID WINAPI RtlFillMemoryUlong(ULONG* lpDest, ULONG ulCount, ULONG ulValue) -{ - TRACE("(%p,%lu,%lu)\n", lpDest, ulCount, ulValue); - - ulCount /= sizeof(ULONG); - while(ulCount--) - *lpDest++ = ulValue; -} - /********************************************************************* * RtlComputeCrc32 [NTDLL.@] * diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index a48496b65c6..46fb80a3a69 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -248,6 +248,79 @@ void *__cdecl memset( void *dst, int c, size_t n ) } +/****************************************************************************** + * RtlCopyMemory (NTDLL.@) + */ +#undef RtlCopyMemory +void WINAPI RtlCopyMemory( void *dest, const void *src, SIZE_T len ) +{ + memcpy( dest, src, len ); +} + + +/****************************************************************************** + * RtlMoveMemory (NTDLL.@) + */ +#undef RtlMoveMemory +void WINAPI RtlMoveMemory( void *dest, const void *src, SIZE_T len ) +{ + memmove( dest, src, len ); +} + + +/****************************************************************************** + * RtlFillMemory (NTDLL.@) + */ +#undef RtlFillMemory +void WINAPI RtlFillMemory( VOID *dest, SIZE_T len, BYTE fill ) +{ + memset( dest, fill, len ); +} + + +/****************************************************************************** + * RtlZeroMemory (NTDLL.@) + */ +#undef RtlZeroMemory +void WINAPI RtlZeroMemory( VOID *dest, SIZE_T len ) +{ + memset( dest, 0, len ); +} + + +/****************************************************************************** + * RtlCompareMemory (NTDLL.@) + */ +SIZE_T WINAPI RtlCompareMemory( const void *src1, const void *src2, SIZE_T len ) +{ + SIZE_T i = 0; + while (i < len && ((const BYTE *)src1)[i] == ((const BYTE *)src2)[i]) i++; + return i; +} + + +/****************************************************************************** + * RtlCompareMemoryUlong (NTDLL.@) + */ +SIZE_T WINAPI RtlCompareMemoryUlong( void *src, SIZE_T len, ULONG val ) +{ + SIZE_T i = 0; + len /= sizeof(ULONG); + while (i < len && ((ULONG *)src)[i] == val) i++; + return i * sizeof(ULONG); +} + + +/************************************************************************* + * RtlFillMemoryUlong (NTDLL.@) + */ +void WINAPI RtlFillMemoryUlong( ULONG *dest, ULONG len, ULONG val ) +{ + len /= sizeof(ULONG); + while (len--) *dest++ = val; +} + + /********************************************************************* * strcat (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Move the PEB lock Rtl functions to env.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: b563ff18cea031aa674c500b1496ee47267fbae8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b563ff18cea031aa674c500b1496ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:41:49 2024 +0200 ntdll: Move the PEB lock Rtl functions to env.c. --- dlls/ntdll/env.c | 16 ++++++++++++++++ dlls/ntdll/rtl.c | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 14f00ab1538..720597dcaf9 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -106,6 +106,22 @@ static void set_wow64_environment( WCHAR **env ) } +/****************************************************************************** + * RtlAcquirePebLock [NTDLL.@] + */ +void WINAPI RtlAcquirePebLock(void) +{ + RtlEnterCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); +} + +/****************************************************************************** + * RtlReleasePebLock [NTDLL.@] + */ +void WINAPI RtlReleasePebLock(void) +{ + RtlLeaveCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); +} + /****************************************************************************** * RtlCreateEnvironment [NTDLL.@] */ diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 31c98424aca..047cce1e0d5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -183,22 +183,6 @@ NTSTATUS WINAPI vDbgPrintExWithPrefix( LPCSTR prefix, ULONG id, ULONG level, LPC return STATUS_SUCCESS; } -/****************************************************************************** - * RtlAcquirePebLock [NTDLL.@] - */ -VOID WINAPI RtlAcquirePebLock(void) -{ - RtlEnterCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); -} - -/****************************************************************************** - * RtlReleasePebLock [NTDLL.@] - */ -VOID WINAPI RtlReleasePebLock(void) -{ - RtlLeaveCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); -} - /****************************************************************************** * RtlInitializeGenericTable [NTDLL.@] */

1 0

Alexandre Julliard : ntdll: Move the error mode Rtl functions to thread.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 30816b0ca0e29449cc778af75b54c7561b4abdf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/30816b0ca0e29449cc778af75b54c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:41:24 2024 +0200 ntdll: Move the error mode Rtl functions to thread.c. --- dlls/ntdll/rtl.c | 41 ----------------------------------------- dlls/ntdll/thread.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 6253bb0a4a5..31c98424aca 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1536,47 +1536,6 @@ NTSTATUS WINAPI RtlDecompressBuffer(USHORT format, PUCHAR uncompressed, ULONG un compressed, compressed_size, 0, final_size, NULL); } -/*********************************************************************** - * RtlSetThreadErrorMode [NTDLL.@] - * - * Set the thread local error mode. - * - * PARAMS - * mode [I] The new error mode - * oldmode [O] Destination of the old error mode (may be NULL) - * - * RETURNS - * Success: STATUS_SUCCESS - * Failure: STATUS_INVALID_PARAMETER_1 - */ -NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) -{ - if (mode & ~0x70) - return STATUS_INVALID_PARAMETER_1; - - if (oldmode) - *oldmode = NtCurrentTeb()->HardErrorMode; - - NtCurrentTeb()->HardErrorMode = mode; - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlGetThreadErrorMode [NTDLL.@] - * - * Get the thread local error mode. - * - * PARAMS - * None. - * - * RETURNS - * The current thread local error mode. - */ -DWORD WINAPI RtlGetThreadErrorMode( void ) -{ - return NtCurrentTeb()->HardErrorMode; -} - /****************************************************************************** * RtlGetCurrentTransaction [NTDLL.@] */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1206d5b24b8..26cf99cdad0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -414,6 +414,31 @@ BOOLEAN WINAPI RtlIsCurrentThread( HANDLE handle ) } +/*********************************************************************** + * RtlSetThreadErrorMode (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetThreadErrorMode( DWORD mode, LPDWORD oldmode ) +{ + if (mode & ~0x70) + return STATUS_INVALID_PARAMETER_1; + + if (oldmode) + *oldmode = NtCurrentTeb()->HardErrorMode; + + NtCurrentTeb()->HardErrorMode = mode; + return STATUS_SUCCESS; +} + + +/*********************************************************************** + * RtlGetThreadErrorMode (NTDLL.@) + */ +DWORD WINAPI RtlGetThreadErrorMode( void ) +{ + return NtCurrentTeb()->HardErrorMode; +} + + /*********************************************************************** * _errno (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Move some synchronization Rtl functions to sync.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 94d1bc52c3845e0657b713a64b2042379e3c3aa1 URL: https://gitlab.winehq.org/wine/wine/-/commit/94d1bc52c3845e0657b713a64b2042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:40:59 2024 +0200 ntdll: Move some synchronization Rtl functions to sync.c. --- dlls/ntdll/rtl.c | 385 ------------------------------------------------------ dlls/ntdll/sync.c | 372 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 372 insertions(+), 385 deletions(-)

1 0

Alexandre Julliard : ntdll: Move some security Rtl functions to sec.c.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 88414d0c5b6352fd352b1f950033eb033961ee21 URL: https://gitlab.winehq.org/wine/wine/-/commit/88414d0c5b6352fd352b1f950033eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 11:40:12 2024 +0200 ntdll: Move some security Rtl functions to sec.c. --- dlls/ntdll/rtl.c | 133 ------------------------------------------------------- dlls/ntdll/sec.c | 54 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 133 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 948412071c5..fb51ee867b9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -761,139 +761,6 @@ ULONG WINAPI RtlRandomEx( ULONG *seed ) return RtlRandom( seed ); } -/************************************************************************* - * RtlAreAllAccessesGranted [NTDLL.@] - * - * Check if all desired accesses are granted - * - * RETURNS - * TRUE: All desired accesses are granted - * FALSE: Otherwise - */ -BOOLEAN WINAPI RtlAreAllAccessesGranted( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess) -{ - return (GrantedAccess & DesiredAccess) == DesiredAccess; -} - - -/************************************************************************* - * RtlAreAnyAccessesGranted [NTDLL.@] - * - * Check if at least one of the desired accesses is granted - * - * PARAMS - * GrantedAccess [I] Access mask of granted accesses - * DesiredAccess [I] Access mask of desired accesses - * - * RETURNS - * TRUE: At least one of the desired accesses is granted - * FALSE: Otherwise - */ -BOOLEAN WINAPI RtlAreAnyAccessesGranted( - ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess) -{ - return (GrantedAccess & DesiredAccess) != 0; -} - - -/************************************************************************* - * RtlMapGenericMask [NTDLL.@] - * - * Determine the nongeneric access rights specified by an access mask - * - * RETURNS - * Nothing. - */ -void WINAPI RtlMapGenericMask( - PACCESS_MASK AccessMask, - const GENERIC_MAPPING *GenericMapping) -{ - if (*AccessMask & GENERIC_READ) { - *AccessMask |= GenericMapping->GenericRead; - } /* if */ - - if (*AccessMask & GENERIC_WRITE) { - *AccessMask |= GenericMapping->GenericWrite; - } /* if */ - - if (*AccessMask & GENERIC_EXECUTE) { - *AccessMask |= GenericMapping->GenericExecute; - } /* if */ - - if (*AccessMask & GENERIC_ALL) { - *AccessMask |= GenericMapping->GenericAll; - } /* if */ - - *AccessMask &= 0x0FFFFFFF; -} - - -/************************************************************************* - * RtlCopyLuid [NTDLL.@] - * - * Copy a local unique ID. - * - * PARAMS - * LuidDest [O] Destination for the copied Luid - * LuidSrc [I] Source Luid to copy to LuidDest - * - * RETURNS - * Nothing. - */ -void WINAPI RtlCopyLuid (PLUID LuidDest, const LUID *LuidSrc) -{ - *LuidDest = *LuidSrc; -} - - -/************************************************************************* - * RtlEqualLuid [NTDLL.@] - * - * Compare two local unique IDs. - * - * PARAMS - * Luid1 [I] First Luid to compare to Luid2 - * Luid2 [I] Second Luid to compare to Luid1 - * - * RETURNS - * TRUE: The two LUIDs are equal. - * FALSE: Otherwise - */ -BOOLEAN WINAPI RtlEqualLuid (const LUID *Luid1, const LUID *Luid2) -{ - return (Luid1->LowPart == Luid2->LowPart && Luid1->HighPart == Luid2->HighPart); -} - - -/************************************************************************* - * RtlCopyLuidAndAttributesArray [NTDLL.@] - * - * Copy an array of local unique IDs and attributes. - * - * PARAMS - * Count [I] Number of Luid/attributes in Src - * Src [I] Source Luid/attributes to copy - * Dest [O] Destination for copied Luid/attributes - * - * RETURNS - * Nothing. - * - * NOTES - * Dest must be large enough to hold Src. - */ -void WINAPI RtlCopyLuidAndAttributesArray( - ULONG Count, - const LUID_AND_ATTRIBUTES *Src, - PLUID_AND_ATTRIBUTES Dest) -{ - ULONG i; - - for (i = 0; i < Count; i++) Dest[i] = Src[i]; -} - static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) { int base = 10, d; diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 4188faafb4b..2c09e31ac1a 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1540,6 +1540,60 @@ NTSTATUS WINAPI RtlGetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce ) return STATUS_SUCCESS; } +/************************************************************************* + * RtlAreAllAccessesGranted [NTDLL.@] + */ +BOOLEAN WINAPI RtlAreAllAccessesGranted( ACCESS_MASK granted, ACCESS_MASK desired ) +{ + return (granted & desired) == desired; +} + +/************************************************************************* + * RtlAreAnyAccessesGranted [NTDLL.@] + */ +BOOLEAN WINAPI RtlAreAnyAccessesGranted( ACCESS_MASK granted, ACCESS_MASK desired ) +{ + return (granted & desired) != 0; +} + +/************************************************************************* + * RtlMapGenericMask [NTDLL.@] + */ +void WINAPI RtlMapGenericMask( ACCESS_MASK *mask, const GENERIC_MAPPING *mapping ) +{ + if (*mask & GENERIC_READ) *mask |= mapping->GenericRead; + if (*mask & GENERIC_WRITE) *mask |= mapping->GenericWrite; + if (*mask & GENERIC_EXECUTE) *mask |= mapping->GenericExecute; + if (*mask & GENERIC_ALL) *mask |= mapping->GenericAll; + *mask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + +/************************************************************************* + * RtlCopyLuid [NTDLL.@] + */ +void WINAPI RtlCopyLuid( LUID *dest, const LUID *src ) +{ + *dest = *src; +} + +/************************************************************************* + * RtlEqualLuid [NTDLL.@] + */ +BOOLEAN WINAPI RtlEqualLuid( const LUID *luid1, const LUID *luid2 ) +{ + return (luid1->LowPart == luid2->LowPart && luid1->HighPart == luid2->HighPart); +} + +/************************************************************************* + * RtlCopyLuidAndAttributesArray [NTDLL.@] + */ +void WINAPI RtlCopyLuidAndAttributesArray( ULONG count, const LUID_AND_ATTRIBUTES *src, PLUID_AND_ATTRIBUTES dest ) +{ + ULONG i; + + for (i = 0; i < count; i++) dest[i] = src[i]; +} + /* * misc */

1 0

Alex Henrie : ntdll: Replace the whole string when using RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard 14 Jun '24

14 Jun '24

Module: wine Branch: master Commit: 54c3f962148c6ead2ec04b776c08fade390148f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/54c3f962148c6ead2ec04b776c08fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 13 22:48:49 2024 -0600 ntdll: Replace the whole string when using RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 7 ++++++- dlls/ntdll/tests/reg.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 044bf32f460..3cbd055f367 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -311,7 +311,12 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (str->Buffer == NULL) RtlCreateUnicodeString(str, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)); else - RtlAppendUnicodeToString(str, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)); + { + if (str->MaximumLength < len) + return STATUS_BUFFER_TOO_SMALL; + memcpy(str->Buffer, (char*)pInfo + pInfo->DataOffset, len); + str->Length = len - sizeof(WCHAR); + } break; case REG_MULTI_SZ: diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b6763e6e1d2..14227db755c 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2673,6 +2673,11 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, STATUS_SUCCESS, 0, 0, REG_SZ, L"C:" }, + { + {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"WindowsDrive", + &query_reg_values_direct_str }}, + STATUS_SUCCESS, 0, 0, REG_SZ, L"%SYSTEMDRIVE%" + }, /* DIRECT on a multi-string crashes on Windows without NOEXPAND */ /* { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"CapitalsOfEurope", &query_reg_values_direct_str }},

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
62
Older →

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 June 2024