wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Alexandre Julliard : patches: Also handle vkd3d merge requests.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: tools Branch: master Commit: 6baebd034fbd0ab5f79d6f845c6cb87fe1adfb8f URL: https://gitlab.winehq.org/winehq/tools/-/commit/6baebd034fbd0ab5f79d6f845c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 20:24:29 2022 +0200 patches: Also handle vkd3d merge requests. --- patches/update | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index 8f79da9c..7739f3b6 100755 --- a/patches/update +++ b/patches/update @@ -86,7 +86,7 @@ my @legend = my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; -my $gitlab = "https://gitlab.winehq.org/wine/wine"; +my $gitlab = "https://gitlab.winehq.org/wine"; my %patches; my %messages; my %subdirs; @@ -220,9 +220,9 @@ foreach my $file (readdir DIR) if (defined $patch{"msgid"}) { $messages{$patch{"msgid"}} = \%patch; - if ($patch{msgid} =~ /<wine-wine-mr(\d+)-v\d+.*\@gitlab-mail-bridge>/) + if ($patch{msgid} =~ /<wine-(wine|vkd3d)-mr(\d+)-v\d+.*\@gitlab-mail-bridge>/) { - $patch{mr} = "$gitlab/-/merge_requests/$1"; + $patch{mr} = "$gitlab/$1/-/merge_requests/$2"; $patch{status} = "mergereq" if $patch{status} eq "nil"; } }

1 0

Rémi Bernon : ntdll: Fixup the RtlWalkHeap entry pointer before subheap lookup.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 1d65bc06b303dc19307c1a1c26603d690ffa7f12 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d65bc06b303dc19307c1a1c26603d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 25 18:35:56 2022 +0200 ntdll: Fixup the RtlWalkHeap entry pointer before subheap lookup. The commit end of a subheap may be equal to the beginning of another subheap, in which case find_subheap() will return that one, when we pass it the previously returned uncommitted range lpData, and we may effectively skip backwards in the subheap list. This fixes a hang on starting or loading a game with Bloodrayne: Terminal Cut. Based on a patch from Zebediah Figura. --- dlls/ntdll/heap.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4d39291bdb8..ef91096f258 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1812,17 +1812,13 @@ BOOLEAN WINAPI RtlValidateHeap( HANDLE handle, ULONG flags, const void *ptr ) } -static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subheap, struct rtl_heap_entry *entry ) +static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subheap, + const struct block *block, struct rtl_heap_entry *entry ) { const char *base = subheap_base( subheap ), *commit_end = subheap_commit_end( subheap ), *end = base + subheap_size( subheap ); - const struct block *block, *blocks = first_block( subheap ); - char *data = entry->lpData; + const struct block *blocks = first_block( subheap ); if (entry->lpData == commit_end) return STATUS_NO_MORE_ENTRIES; - - if (entry->wFlags & RTL_HEAP_ENTRY_BUSY) block = (struct block *)data - 1; - else block = (struct block *)(data - sizeof(struct list)) - 1; - if (entry->lpData == base) block = blocks; else if (!(block = next_block( subheap, block ))) { @@ -1859,21 +1855,26 @@ static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subhea static NTSTATUS heap_walk( const struct heap *heap, struct rtl_heap_entry *entry ) { - const struct block *block = (struct block *)entry->lpData - 1; + const char *data = entry->lpData; const ARENA_LARGE *large = NULL; + const struct block *block; const struct list *next; const SUBHEAP *subheap; NTSTATUS status; char *base; + if (!data || entry->wFlags & RTL_HEAP_ENTRY_REGION) block = (struct block *)data; + else if (entry->wFlags & RTL_HEAP_ENTRY_BUSY) block = (struct block *)data - 1; + else block = (struct block *)(data - sizeof(struct list)) - 1; + if (find_large_block( heap, block )) { large = CONTAINING_RECORD( block, ARENA_LARGE, block ); next = &large->entry; } - else if ((subheap = find_subheap( heap, entry->lpData, TRUE ))) + else if ((subheap = find_subheap( heap, block, TRUE ))) { - if (!(status = heap_walk_blocks( heap, subheap, entry ))) return STATUS_SUCCESS; + if (!(status = heap_walk_blocks( heap, subheap, block, entry ))) return STATUS_SUCCESS; else if (status != STATUS_NO_MORE_ENTRIES) return status; next = &subheap->entry; }

1 0

Rémi Bernon : ntdll: Pass a struct block to (find|validate)_large_block.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 0984389ca6cd58be02e8a1afd1e051c9cad50b73 URL: https://gitlab.winehq.org/wine/wine/-/commit/0984389ca6cd58be02e8a1afd1e051… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 25 15:43:54 2022 +0200 ntdll: Pass a struct block to (find|validate)_large_block. --- dlls/ntdll/heap.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b3c7c7701ec..4d39291bdb8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -869,22 +869,22 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct /*********************************************************************** * find_large_block */ -static ARENA_LARGE *find_large_block( const struct heap *heap, const void *ptr ) +static BOOL find_large_block( const struct heap *heap, const struct block *block ) { ARENA_LARGE *arena; LIST_FOR_EACH_ENTRY( arena, &heap->large_list, ARENA_LARGE, entry ) - if (ptr == arena + 1) return arena; + if (block == &arena->block) return TRUE; - return NULL; + return FALSE; } -static BOOL validate_large_arena( const struct heap *heap, const ARENA_LARGE *arena ) +static BOOL validate_large_block( const struct heap *heap, const struct block *block ) { - const struct block *block = &arena->block; + const ARENA_LARGE *arena = CONTAINING_RECORD( block, ARENA_LARGE, block ); const char *err = NULL; - if ((ULONG_PTR)arena & COMMIT_MASK) + if (ROUND_ADDR( block, COMMIT_MASK ) != arena) err = "invalid block alignment"; else if (block_get_size( block )) err = "invalid block size"; @@ -1193,21 +1193,20 @@ static BOOL validate_used_block( const struct heap *heap, const SUBHEAP *subheap static BOOL heap_validate_ptr( const struct heap *heap, const void *ptr, SUBHEAP **subheap ) { - const struct block *arena = (struct block *)ptr - 1; - const ARENA_LARGE *large_arena; + const struct block *block = (struct block *)ptr - 1; - if (!(*subheap = find_subheap( heap, arena, FALSE ))) + if (!(*subheap = find_subheap( heap, block, FALSE ))) { - if (!(large_arena = find_large_block( heap, ptr ))) + if (!find_large_block( heap, block )) { if (WARN_ON(heap)) WARN("heap %p, ptr %p: block region not found\n", heap, ptr ); return FALSE; } - return validate_large_arena( heap, large_arena ); + return validate_large_block( heap, block ); } - return validate_used_block( heap, *subheap, arena ); + return validate_used_block( heap, *subheap, block ); } static BOOL heap_validate( const struct heap *heap ) @@ -1239,7 +1238,7 @@ static BOOL heap_validate( const struct heap *heap ) } LIST_FOR_EACH_ENTRY( large_arena, &heap->large_list, ARENA_LARGE, entry ) - if (!validate_large_arena( heap, large_arena )) return FALSE; + if (!validate_large_block( heap, &large_arena->block )) return FALSE; return TRUE; } @@ -1263,7 +1262,7 @@ static inline struct block *unsafe_block_from_ptr( const struct heap *heap, cons if (!*subheap) { - if (find_large_block( heap, ptr )) return block; + if (find_large_block( heap, block )) return block; err = "block region not found"; } else if ((ULONG_PTR)ptr % ALIGNMENT) @@ -1860,14 +1859,18 @@ static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subhea static NTSTATUS heap_walk( const struct heap *heap, struct rtl_heap_entry *entry ) { - const ARENA_LARGE *large; + const struct block *block = (struct block *)entry->lpData - 1; + const ARENA_LARGE *large = NULL; const struct list *next; const SUBHEAP *subheap; NTSTATUS status; char *base; - if ((large = find_large_block( heap, entry->lpData ))) + if (find_large_block( heap, block )) + { + large = CONTAINING_RECORD( block, ARENA_LARGE, block ); next = &large->entry; + } else if ((subheap = find_subheap( heap, entry->lpData, TRUE ))) { if (!(status = heap_walk_blocks( heap, subheap, entry ))) return STATUS_SUCCESS;

1 0

Rémi Bernon : ntdll: Use a block member in large blocks.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 5c98b608e4c26e0216d0012c18374ae6b38511ab URL: https://gitlab.winehq.org/wine/wine/-/commit/5c98b608e4c26e0216d0012c18374a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 29 16:28:34 2022 +0200 ntdll: Use a block member in large blocks. --- dlls/kernel32/tests/heap.c | 1 - dlls/ntdll/heap.c | 120 +++++++++++++++++++++++++++------------------ 2 files changed, 71 insertions(+), 50 deletions(-)

1 0

Zhiyi Zhang : ntdll: Restore the timezone bias cache.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 45b5661c69d73bd777485b1707e355e0088ea825 URL: https://gitlab.winehq.org/wine/wine/-/commit/45b5661c69d73bd777485b1707e355… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 25 12:01:07 2022 +0800 ntdll: Restore the timezone bias cache. After 7161dcd, the timezone bias is calculated every time when SystemTimeOfDayInformation is queried. This restores the cache for timezone bias. Improve HROT framerate from ~100fps to ~500fps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index f374fdec131..902b63c2b2f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -236,6 +236,8 @@ static unsigned int logical_proc_info_len, logical_proc_info_alloc_len; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *logical_proc_info_ex; static unsigned int logical_proc_info_ex_size, logical_proc_info_ex_alloc_size; +static pthread_mutex_t timezone_mutex = PTHREAD_MUTEX_INITIALIZER; + /******************************************************************************* * Architecture specific feature detection for CPUs * @@ -2562,17 +2564,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemTimeOfDayInformation: /* 3 */ { + static LONGLONG last_bias; + static time_t last_utc; struct tm *tm; - time_t now; + time_t utc; SYSTEM_TIMEOFDAY_INFORMATION sti = {{{ 0 }}}; sti.BootTime.QuadPart = server_start_time; - now = time( NULL ); - tm = gmtime( &now ); - sti.TimeZoneBias.QuadPart = mktime( tm ) - now; - tm = localtime( &now ); - if (tm->tm_isdst) sti.TimeZoneBias.QuadPart -= 3600; - sti.TimeZoneBias.QuadPart *= TICKSPERSEC; + + utc = time( NULL ); + pthread_mutex_lock( &timezone_mutex ); + if (utc != last_utc) + { + last_utc = utc; + tm = gmtime( &utc ); + last_bias = mktime( tm ) - utc; + tm = localtime( &utc ); + if (tm->tm_isdst) last_bias -= 3600; + last_bias *= TICKSPERSEC; + } + sti.TimeZoneBias.QuadPart = last_bias; + pthread_mutex_unlock( &timezone_mutex ); + NtQuerySystemTime( &sti.SystemTime ); if (size <= sizeof(sti))

1 0

Hugh McMaster : regedit: Free temporary buffer when working with REG_DWORD and REG_QWORD values.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 57f45013d82280e9dabdb754ab638c2c817577de URL: https://gitlab.winehq.org/wine/wine/-/commit/57f45013d82280e9dabdb754ab638c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 26 12:19:43 2022 +1000 regedit: Free temporary buffer when working with REG_DWORD and REG_QWORD values. --- programs/regedit/edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 537bcbd4541..20a0c32adda 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -104,11 +104,13 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) params->size = sizeof(DWORD); params->data = malloc(params->size); swscanf(buf, isDecimal ? L"%lu" : L"%lx", params->data); + free(buf); break; case REG_QWORD: params->size = sizeof(UINT64); params->data = malloc(params->size); swscanf(buf, isDecimal ? L"%I64u" : L"%I64x", params->data); + free(buf); break; case REG_MULTI_SZ: {

1 0

Alexandre Julliard : gitlab: Add CI script to create a release.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: aa222ccd320db0a4a7955ff4c8c76f230ba4bfcb URL: https://gitlab.winehq.org/wine/wine/-/commit/aa222ccd320db0a4a7955ff4c8c76f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 15:27:46 2022 +0200 gitlab: Add CI script to create a release. --- .gitlab-ci.yml | 2 ++ tools/gitlab/release.yml | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 413745f6758..67830facbc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,9 @@ stages: - image - build + - deploy include: - local: "/tools/gitlab/image.yml" - local: "/tools/gitlab/build.yml" + - local: "/tools/gitlab/release.yml" diff --git a/tools/gitlab/release.yml b/tools/gitlab/release.yml new file mode 100644 index 00000000000..aee9072bb72 --- /dev/null +++ b/tools/gitlab/release.yml @@ -0,0 +1,23 @@ +# CI script for creating releases + +create-release: + stage: deploy + image: registry.gitlab.com/gitlab-org/release-cli:latest + rules: + - if: $CI_COMMIT_TAG && $CI_PROJECT_PATH == "wine/wine" + script: + - VERSION=$(expr "$CI_COMMIT_TAG" ":" 'wine-$.*$') + - URL=$(grep -o "https://dl.winehq.org/.*" ANNOUNCE) + - FILEPATH=$(expr "$URL" ":" '.*$/.*$') + - | + sed -e '/^The source/,/^----------/d + /^----------/,$d + /^Bugs fixed/i-------- + s/^ *$[0-9][0-9]*$ / - #\1/ + s/^\*\*\*/###/' ANNOUNCE >announce.md + - release-cli create + --name "Wine $VERSION" + --tag-name "$CI_COMMIT_TAG" + --released-at "$CI_COMMIT_TIMESTAMP" + --description announce.md + --assets-link "{\"name\":\"Source code\",\"url\":\"$URL\",\"link_type\":\"other\",\"filepath\":\"$FILEPATH\"}"

1 0

Jacek Caban : wow64win: Sort gdi syscall thunks.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 104d6a12057d73f2c1d842a320b1a9fd56c781bc URL: https://gitlab.winehq.org/wine/wine/-/commit/104d6a12057d73f2c1d842a320b1a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 25 19:41:09 2022 +0200 wow64win: Sort gdi syscall thunks. --- dlls/wow64win/gdi.c | 668 ++++++++++++++++++++++++++-------------------------- 1 file changed, 334 insertions(+), 334 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserSystemParametersInfo.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 35a59e07b923e42d9bb391b0fef7acd25a9eb9d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/35a59e07b923e42d9bb391b0fef7ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 25 18:37:52 2022 +0200 win32u: Use syscall interface for NtUserSystemParametersInfo. --- dlls/win32u/gdiobj.c | 2 - dlls/win32u/syscall.c | 2 + dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 3 -- dlls/win32u/wrappers.c | 12 ----- dlls/wow64win/syscall.h | 2 + dlls/wow64win/user.c | 110 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 116 insertions(+), 19 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 0ace308c7ca..cb5297c5676 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1143,8 +1143,6 @@ static struct unix_funcs unix_funcs = NtUserReleaseDC, NtUserScrollDC, NtUserSelectPalette, - NtUserSystemParametersInfo, - NtUserSystemParametersInfoForDpi, NtUserUpdateLayeredWindow, SetDIBits, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 54a0e2436b7..532c08ef2e0 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -281,6 +281,8 @@ static void * const syscalls[] = NtUserShowScrollBar, NtUserShowWindow, NtUserShowWindowAsync, + NtUserSystemParametersInfo, + NtUserSystemParametersInfoForDpi, NtUserThunkedMenuInfo, NtUserThunkedMenuItemInfo, NtUserToUnicodeEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index e67db13f5c1..979fa8475b2 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1271,8 +1271,8 @@ @ stub NtUserSoundSentry @ stub NtUserStopAndEndInertia @ stub NtUserSwitchDesktop -@ stdcall NtUserSystemParametersInfo(long long ptr long) -@ stdcall NtUserSystemParametersInfoForDpi(long long ptr long long) +@ stdcall -syscall NtUserSystemParametersInfo(long long ptr long) +@ stdcall -syscall NtUserSystemParametersInfoForDpi(long long ptr long long) @ stub NtUserTestForInteractiveUser @ stdcall -syscall NtUserThunkedMenuInfo(long ptr) @ stdcall -syscall NtUserThunkedMenuItemInfo(long long long long ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e1f6b5ba155..d8509c83445 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -195,9 +195,6 @@ struct unix_funcs BOOL (WINAPI *pNtUserScrollDC)( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); HPALETTE (WINAPI *pNtUserSelectPalette)( HDC hdc, HPALETTE hpal, WORD bkg ); - BOOL (WINAPI *pNtUserSystemParametersInfo)( UINT action, UINT val, PVOID ptr, UINT winini ); - BOOL (WINAPI *pNtUserSystemParametersInfoForDpi)( UINT action, UINT val, PVOID ptr, - UINT winini, UINT dpi ); BOOL (WINAPI *pNtUserUpdateLayeredWindow)( HWND hwnd, HDC hdc_dst, const POINT *pts_dst, const SIZE *size, HDC hdc_src, const POINT *pts_src, COLORREF key, const BLENDFUNCTION *blend, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 57951643399..f331039714e 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -763,18 +763,6 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) return unix_funcs->pNtUserSelectPalette( hdc, hpal, bkg ); } -BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, PVOID ptr, UINT winini ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserSystemParametersInfo( action, val, ptr, winini ); -} - -BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserSystemParametersInfoForDpi( action, val, ptr, winini, dpi ); -} - BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_dst, const SIZE *size, HDC hdc_src, const POINT *pts_src, COLORREF key, const BLENDFUNCTION *blend, DWORD flags, const RECT *dirty ) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 16774a25165..3c59dd00b3e 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -268,6 +268,8 @@ SYSCALL_ENTRY( NtUserShowScrollBar ) \ SYSCALL_ENTRY( NtUserShowWindow ) \ SYSCALL_ENTRY( NtUserShowWindowAsync ) \ + SYSCALL_ENTRY( NtUserSystemParametersInfo ) \ + SYSCALL_ENTRY( NtUserSystemParametersInfoForDpi ) \ SYSCALL_ENTRY( NtUserThunkedMenuInfo ) \ SYSCALL_ENTRY( NtUserThunkedMenuItemInfo ) \ SYSCALL_ENTRY( NtUserToUnicodeEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 5328edd5375..4f54921ff02 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2286,6 +2286,116 @@ NTSTATUS WINAPI wow64_NtUserShowWindowAsync( UINT *args ) return NtUserShowWindowAsync( hwnd, cmd ); } +NTSTATUS WINAPI wow64_NtUserSystemParametersInfo( UINT *args ) +{ + UINT action = get_ulong( &args ); + UINT val = get_ulong( &args ); + void *ptr = get_ptr( &args ); + UINT winini = get_ulong( &args ); + + switch (action) + { + case SPI_GETSERIALKEYS: + if (ptr) + { + struct + { + UINT cbSize; + DWORD dwFlags; + ULONG lpszActivePort; + ULONG lpszPort; + UINT iBaudRate; + UINT iPortState; + UINT iActive; + } *keys32 = ptr; + SERIALKEYSW keys; + + if (keys32->cbSize != sizeof(*keys32)) return FALSE; + keys.cbSize = sizeof(keys); + if (!NtUserSystemParametersInfo( action, val, &keys, winini )) return FALSE; + keys32->dwFlags = keys.dwFlags; + keys32->lpszActivePort = PtrToUlong( keys.lpszActivePort ); + keys32->lpszPort = PtrToUlong( keys.lpszPort ); + keys32->iBaudRate = keys.iBaudRate; + keys32->iPortState = keys.iPortState; + keys32->iActive = keys.iActive; + return TRUE; + } + break; + + case SPI_GETSOUNDSENTRY: + if (ptr) + { + struct + { + UINT cbSize; + DWORD dwFlags; + DWORD iFSTextEffect; + DWORD iFSTextEffectMSec; + DWORD iFSTextEffectColorBits; + DWORD iFSGrafEffect; + DWORD iFSGrafEffectMSec; + DWORD iFSGrafEffectColor; + DWORD iWindowsEffect; + DWORD iWindowsEffectMSec; + ULONG lpszWindowsEffectDLL; + DWORD iWindowsEffectOrdinal; + } *entry32 = ptr; + SOUNDSENTRYW entry; + + if (entry32->cbSize != sizeof(*entry32)) return FALSE; + entry.cbSize = sizeof(entry); + if (!NtUserSystemParametersInfo( action, val, &entry, winini )) return FALSE; + entry32->dwFlags = entry.dwFlags; + entry32->iFSTextEffect = entry.iFSTextEffect; + entry32->iFSTextEffectMSec = entry.iFSTextEffectMSec; + entry32->iFSTextEffectColorBits = entry.iFSTextEffectColorBits; + entry32->iFSGrafEffect = entry.iFSGrafEffect; + entry32->iFSGrafEffectMSec = entry.iFSGrafEffectMSec; + entry32->iFSGrafEffectColor = entry.iFSGrafEffectColor; + entry32->iWindowsEffect = entry.iWindowsEffect; + entry32->iWindowsEffectMSec = entry.iWindowsEffectMSec; + entry32->lpszWindowsEffectDLL = PtrToUlong( entry.lpszWindowsEffectDLL ); + entry32->iWindowsEffectOrdinal = entry.iWindowsEffectOrdinal; + return TRUE; + } + break; + + case SPI_GETHIGHCONTRAST: + if (ptr) + { + struct + { + UINT cbSize; + DWORD dwFlags; + ULONG lpszDefaultScheme; + } *info32 = ptr; + HIGHCONTRASTW info; + + if (info32->cbSize != sizeof(*info32)) return FALSE; + info.cbSize = sizeof(info); + if (!NtUserSystemParametersInfo( action, val, &info, winini )) return FALSE; + info32->dwFlags = info.dwFlags; + info32->lpszDefaultScheme = PtrToUlong( info.lpszDefaultScheme ); + return TRUE; + } + break; + } + + return NtUserSystemParametersInfo( action, val, ptr, winini ); +} + +NTSTATUS WINAPI wow64_NtUserSystemParametersInfoForDpi( UINT *args ) +{ + UINT action = get_ulong( &args ); + UINT val = get_ulong( &args ); + void *ptr = get_ptr( &args ); + UINT winini = get_ulong( &args ); + UINT dpi = get_ulong( &args ); + + return NtUserSystemParametersInfoForDpi( action, val, ptr, winini, dpi ); +} + NTSTATUS WINAPI wow64_NtUserThunkedMenuInfo( UINT *args ) { HMENU menu = get_handle( &args );

1 0

Jacek Caban : win32u: Use syscall interface for window class functions.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 2ebfe2fd55ee73a8d8bc172801080d1ec594bf89 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ebfe2fd55ee73a8d8bc172801080d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 22:08:21 2022 +0200 win32u: Use syscall interface for window class functions. --- dlls/win32u/gdiobj.c | 6 -- dlls/win32u/syscall.c | 6 ++ dlls/win32u/win32u.spec | 12 ++-- dlls/win32u/win32u_private.h | 11 --- dlls/win32u/wrappers.c | 40 ----------- dlls/wow64win/syscall.h | 6 ++ dlls/wow64win/user.c | 161 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 179 insertions(+), 63 deletions(-)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
64
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 July 2022