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

Rémi Bernon : ntdll: Use a dedicated member for shared heap flag.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 9d34933f24e9152296f7ae3ca5bd0003afb1413b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d34933f24e9152296f7ae3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:31 2022 +0200 ntdll: Use a dedicated member for shared heap flag. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 346bcf3c10c..01364016271 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -153,6 +153,7 @@ typedef struct tagHEAP /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ + BOOL shared; /* System shared heap */ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ @@ -687,7 +688,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) /* Decommit the end of the heap */ - if (!(subheap->heap->flags & HEAP_SHARED)) HEAP_Decommit( subheap, pFree + 1 ); + if (!(subheap->heap->shared)) HEAP_Decommit( subheap, pFree + 1 ); } @@ -922,6 +923,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap = address; heap->flags = flags; + heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); list_init( &heap->subheap_list ); @@ -967,7 +969,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap->critSection.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HEAP.critSection"); } - if (flags & HEAP_SHARED) + if (heap->shared) { /* let's assume that only one thread at a time will try to do this */ HANDLE sem = heap->critSection.LockSemaphore;

1 0

Rémi Bernon : kernel32/tests: Tweak tests results for w7pro64.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: af6dd8eb0c84287553ea982bd93f1f43f6aa13c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af6dd8eb0c84287553ea982b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:29 2022 +0200 kernel32/tests: Tweak tests results for w7pro64. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 53cff284c6f..a131a7f56e0 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -328,10 +328,12 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x80 * sizeof(void *)) ); + /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + + ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); size = HeapSize( heap, 0, ptr ); - ok( size == alloc_size - (0x400 + 0x80 * sizeof(void *)), + ok( size == alloc_size - (0x400 + 0x100 * sizeof(void *)), "HeapSize returned %#Ix, error %lu\n", size, GetLastError() ); ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); @@ -438,7 +440,7 @@ static void test_HeapCreate(void) "got Region.dwCommittedSize %#lx\n", entries[0].Region.dwCommittedSize ); todo_wine ok( entries[0].Region.dwUnCommittedSize == 0x10000 - entries[0].Region.dwCommittedSize || - entries[0].Region.dwUnCommittedSize == 0x40000 - entries[0].Region.dwCommittedSize /* win7 */, + entries[0].Region.dwUnCommittedSize == 0x10000 * sizeof(void *) - entries[0].Region.dwCommittedSize /* win7 */, "got Region.dwUnCommittedSize %#lx\n", entries[0].Region.dwUnCommittedSize ); todo_wine ok( (BYTE *)entries[0].Region.lpFirstBlock == (BYTE *)entries[0].lpData + entries[0].cbData + 2 * sizeof(void *) || @@ -493,7 +495,7 @@ static void test_HeapCreate(void) ok( entries[3].lpData == ptr, "got lpData %p\n", entries[3].lpData ); todo_wine ok( entries[3].cbData == 5 * alloc_size, "got cbData %#lx\n", entries[3].cbData ); - ok( entries[3].cbOverhead == 0 || entries[3].cbOverhead == 0x20 /* win7 */, + ok( entries[3].cbOverhead == 0 || entries[3].cbOverhead == 8 * sizeof(void *) /* win7 */, "got cbOverhead %#x\n", entries[3].cbOverhead ); todo_wine ok( entries[3].iRegionIndex == 64, "got iRegionIndex %d\n", entries[3].iRegionIndex ); @@ -520,7 +522,7 @@ static void test_HeapCreate(void) ok( entries[4].lpData == ptr1, "got lpData %p\n", entries[4].lpData ); todo_wine ok( entries[4].cbData == 5 * alloc_size, "got cbData %#lx\n", entries[4].cbData ); - ok( entries[4].cbOverhead == 0 || entries[4].cbOverhead == 0x20 /* win7 */, + ok( entries[4].cbOverhead == 0 || entries[4].cbOverhead == 8 * sizeof(void *) /* win7 */, "got cbOverhead %#x\n", entries[4].cbOverhead ); todo_wine ok( entries[4].iRegionIndex == 64, "got iRegionIndex %d\n", entries[4].iRegionIndex );

1 0

Hugh McMaster : regedit: Mark WCHAR szFrameClass static.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: a6a92b66c7610ace096606870957463b1f314972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a92b66c7610ace09660687… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:41 2022 +1000 regedit: Mark WCHAR szFrameClass static. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 +- programs/regedit/main.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 99706b531d5..664821f6a5d 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -53,7 +53,7 @@ UINT nClipboardFormat; #define MAX_LOADSTRING 100 WCHAR szTitle[MAX_LOADSTRING]; const WCHAR szChildClass[] = L"REGEDIT"; -const WCHAR szFrameClass[] = L"RegEdit_RegEdit"; +static const WCHAR szFrameClass[] = L"RegEdit_RegEdit"; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { diff --git a/programs/regedit/main.h b/programs/regedit/main.h index ae034405646..d32000f78ac 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -96,7 +96,6 @@ extern HFONT hFont; extern enum OPTION_FLAGS Options; extern WCHAR szTitle[]; -extern const WCHAR szFrameClass[]; extern const WCHAR szChildClass[]; extern const WCHAR szHexEditClass[]; extern WCHAR g_pszDefaultValueName[];

1 0

Hugh McMaster : regedit: Use wide character string literals in treeview.c.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 85fb14ff284d15bb7f599117a2b80af74fb1f9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85fb14ff284d15bb7f599117… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:38 2022 +1000 regedit: Use wide character string literals in treeview.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 15a51360a30..5ba4628681a 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -543,12 +543,12 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) { TVINSERTSTRUCTW tvins; HTREEITEM hRoot; - static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, - hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, - hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, - hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}, - hkcc[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, - hkdd[] = {'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0}; + static WCHAR hkcr[] = L"HKEY_CLASSES_ROOT", + hkcu[] = L"HKEY_CURRENT_USER", + hklm[] = L"HKEY_LOCAL_MACHINE", + hku[] = L"HKEY_USERS", + hkcc[] = L"HKEY_CURRENT_CONFIG", + hkdd[] = L"HKEY_DYN_DATA"; tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ @@ -694,11 +694,10 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) { RECT rcClient; HWND hwndTV; - WCHAR TreeView[] = {'T','r','e','e',' ','V','i','e','w',0}; /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); - hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, + hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, L"Tree View", WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, 0, 0, rcClient.right, rcClient.bottom,

1 0

Hugh McMaster : regedit: Use wide character string literals in edit.c.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 789cf2837520f2969744ae5558a872bf2178c324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=789cf2837520f2969744ae55… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:33 2022 +1000 regedit: Use wide character string literals in edit.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 3f99626dd23..b808c38c51c 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -85,15 +85,12 @@ static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) { - static const WCHAR percent_u[] = {'%','u',0}; - static const WCHAR percent_x[] = {'%','x',0}; - WCHAR buf[128]; DWORD val; if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, ARRAY_SIZE(buf))) return FALSE; - if (!swscanf(buf, toHex ? percent_u : percent_x, &val)) return FALSE; - wsprintfW(buf, toHex ? percent_x : percent_u, val); + if (!swscanf(buf, toHex ? L"%u" : L"%x", &val)) return FALSE; + wsprintfW(buf, toHex ? L"%x" : L"%u", val); return SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf); } @@ -281,10 +278,9 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } } else if ( type == REG_DWORD ) { - static const WCHAR x[] = {'%','x',0}; DWORD value = *((DWORD*)stringValueData); stringValueData = heap_xrealloc(stringValueData, 64); - wsprintfW(stringValueData, x, value); + wsprintfW(stringValueData, L"%x", value); if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData);

1 0

Rémi Bernon : ntdll: Fix main heap struct layout and flags members.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 43fe980818d93e8f407eb6447aaf7eb4381c3cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=43fe980818d93e8f407eb644… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:32 2022 +0200 ntdll: Fix main heap struct layout and flags members. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 3 -- dlls/ntdll/heap.c | 72 +++++++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e1cda94f78c..104eced3bf4 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1974,9 +1974,7 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags if (global_flag & FLG_HEAP_ENABLE_TAGGING) heap_flags |= HEAP_SHARED; if (!(global_flag & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); - todo_wine_if( force_flags & (HEAP_PRIVATE|HEAP_NO_SERIALIZE) ) ok( heap->force_flags == force_flags, "got force_flags %#x\n", heap->force_flags ); - todo_wine_if( heap_flags & (HEAP_VALIDATE_ALL|HEAP_VALIDATE_PARAMS|HEAP_SHARED|HEAP_PRIVATE) ) ok( heap->flags == heap_flags, "got flags %#x\n", heap->flags ); if (heap->flags & HEAP_PAGE_ALLOCS) @@ -1990,7 +1988,6 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags } else { - todo_wine ok( heap->ffeeffee == 0xffeeffee, "got ffeeffee %#x\n", heap->ffeeffee ); ok( heap->auto_flags == (heap_flags & HEAP_GROWABLE) || !heap->auto_flags, "got auto_flags %#x\n", heap->auto_flags ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 01364016271..298c39f24ff 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -142,17 +142,17 @@ typedef struct tagSUBHEAP #define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) typedef struct tagHEAP -{ - DWORD_PTR unknown1[2]; - DWORD unknown2[2]; - DWORD_PTR unknown3[4]; - DWORD unknown4; - DWORD_PTR unknown5[2]; - DWORD unknown6[3]; - DWORD_PTR unknown7[2]; - /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ - DWORD flags; /* Heap flags */ - DWORD force_flags; /* Forced heap flags for debugging */ +{ /* win32/win64 */ + DWORD_PTR unknown1[2]; /* 0000/0000 */ + DWORD ffeeffee; /* 0008/0010 */ + DWORD auto_flags; /* 000c/0014 */ + DWORD_PTR unknown2[7]; /* 0010/0018 */ + DWORD unknown3[2]; /* 002c/0050 */ + DWORD_PTR unknown4[3]; /* 0034/0058 */ + DWORD flags; /* 0040/0070 */ + DWORD force_flags; /* 0044/0074 */ + /* end of the Windows 10 compatible struct layout */ + BOOL shared; /* System shared heap */ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ @@ -173,6 +173,7 @@ typedef struct tagHEAP #define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ +#define HEAP_PRIVATE 0x00001000 #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 #define HEAP_VALIDATE_ALL 0x20000000 @@ -922,7 +923,9 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* If this is a primary subheap, initialize main heap */ heap = address; - heap->flags = flags; + heap->ffeeffee = 0xffeeffee; + heap->auto_flags = (flags & HEAP_GROWABLE); + heap->flags = (flags & ~HEAP_SHARED); heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); @@ -1438,6 +1441,25 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE return ret; } +static DWORD heap_flags_from_global_flag( DWORD flag ) +{ + DWORD ret = 0; + + if (flag & FLG_HEAP_ENABLE_TAIL_CHECK) + ret |= HEAP_TAIL_CHECKING_ENABLED; + if (flag & FLG_HEAP_ENABLE_FREE_CHECK) + ret |= HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_PARAMETERS) + ret |= HEAP_VALIDATE_PARAMS | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_ALL) + ret |= HEAP_VALIDATE_ALL | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_DISABLE_COALESCING) + ret |= HEAP_DISABLE_COALESCE_ON_FREE; + if (flag & FLG_HEAP_PAGE_ALLOCS) + ret |= HEAP_PAGE_ALLOCS; + + return ret; +} /*********************************************************************** * heap_set_debug_flags @@ -1446,27 +1468,21 @@ static void heap_set_debug_flags( HANDLE handle ) { HEAP *heap = HEAP_GetPtr( handle ); ULONG global_flags = RtlGetNtGlobalFlags(); - ULONG flags = 0; + DWORD flags, force_flags; if (TRACE_ON(heap)) global_flags |= FLG_HEAP_VALIDATE_ALL; if (WARN_ON(heap)) global_flags |= FLG_HEAP_VALIDATE_PARAMETERS; - if (global_flags & FLG_HEAP_ENABLE_TAIL_CHECK) flags |= HEAP_TAIL_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_ENABLE_FREE_CHECK) flags |= HEAP_FREE_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_DISABLE_COALESCING) flags |= HEAP_DISABLE_COALESCE_ON_FREE; - if (global_flags & FLG_HEAP_PAGE_ALLOCS) flags |= HEAP_PAGE_ALLOCS | HEAP_GROWABLE; + flags = heap_flags_from_global_flag( global_flags ); + force_flags = (heap->flags | flags) & ~(HEAP_SHARED|HEAP_DISABLE_COALESCE_ON_FREE); - if (global_flags & FLG_HEAP_VALIDATE_PARAMETERS) - flags |= HEAP_VALIDATE | HEAP_VALIDATE_PARAMS | - HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_VALIDATE_ALL) - flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL | - HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (global_flags & FLG_HEAP_ENABLE_TAGGING) flags |= HEAP_SHARED; + if (!(global_flags & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); if (RUNNING_ON_VALGRIND) flags = 0; /* no sense in validating since Valgrind catches accesses */ heap->flags |= flags; - heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE); + heap->force_flags |= force_flags; if (flags & (HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED)) /* fix existing blocks */ { @@ -1541,11 +1557,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c /* Allocate the heap block */ - if (!totalSize) - { - totalSize = HEAP_DEF_SIZE; - flags |= HEAP_GROWABLE; - } + if (processHeap) flags |= HEAP_PRIVATE; + if (!processHeap || !totalSize || (flags & HEAP_SHARED)) flags |= HEAP_GROWABLE; + if (!totalSize) totalSize = HEAP_DEF_SIZE; if (!(subheap = HEAP_CreateSubHeap( NULL, addr, flags, commitSize, totalSize ))) return 0;

1 0

Jacek Caban : win32u: Move NtUserFindWindowEx implementation from user32.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 0528f37fdd9b11cc95d074bb9e261d5127cb6ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0528f37fdd9b11cc95d074bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:34:44 2022 +0200 win32u: Move NtUserFindWindowEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 61 ++++++++----------------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 49 +++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 16 +++++++++++++ include/ntuser.h | 2 ++ 7 files changed, 80 insertions(+), 52 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 511aa363af7..99ee93adba7 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -738,65 +738,24 @@ BOOL WINAPI OpenIcon( HWND hwnd ) /*********************************************************************** * FindWindowExW (USER32.@) */ -HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR title ) +HWND WINAPI FindWindowExW( HWND parent, HWND child, const WCHAR *class, const WCHAR *title ) { - HWND *list; - HWND retvalue = 0; - int i = 0, len = 0; - WCHAR *buffer = NULL; - - if (!parent && child) parent = GetDesktopWindow(); - else if (parent == HWND_MESSAGE) parent = get_hwnd_message_parent(); - - if (title) - { - len = lstrlenW(title) + 1; /* one extra char to check for chars beyond the end */ - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return 0; - } - - if (className) - { - UNICODE_STRING str; - if (IS_INTRESOURCE(className)) - { - str.Buffer = (WCHAR *)className; - str.Length = str.MaximumLength = 0; - } - else RtlInitUnicodeString( &str, className ); - list = list_window_children( 0, parent, &str, 0 ); - } - else list = list_window_children( 0, parent, NULL, 0 ); - if (!list) goto done; + UNICODE_STRING class_str, title_str; - if (child) - { - child = WIN_GetFullHandle( child ); - while (list[i] && list[i] != child) i++; - if (!list[i]) goto done; - i++; /* start from next window */ - } + if (title) RtlInitUnicodeString( &title_str, title ); - if (title) + if (class) { - while (list[i]) + if (IS_INTRESOURCE(class)) { - if (NtUserInternalGetWindowText( list[i], buffer, len + 1 )) - { - if (!wcsicmp( buffer, title )) break; - } - else - { - if (!title[0]) break; - } - i++; + class_str.Buffer = (WCHAR *)class; + class_str.Length = class_str.MaximumLength = 0; } + else RtlInitUnicodeString( &class_str, class ); } - retvalue = list[i]; - done: - HeapFree( GetProcessHeap(), 0, list ); - HeapFree( GetProcessHeap(), 0, buffer ); - return retvalue; + return NtUserFindWindowEx( parent, child, class ? &class_str : NULL, + title ? &title_str : NULL, 0 ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 437fe6d0758..f88b8fa30da 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -116,6 +116,7 @@ static void * const syscalls[] = NtUserCreateWindowStation, NtUserDestroyAcceleratorTable, NtUserFindExistingCursorIcon, + NtUserFindWindowEx, NtUserGetAncestor, NtUserGetAtomName, NtUserGetClassName, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index afb413f8726..98bfbb33a2d 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -882,7 +882,7 @@ @ stdcall NtUserExcludeUpdateRgn(long long) @ stub NtUserFillWindow @ stdcall -syscall NtUserFindExistingCursorIcon(ptr ptr ptr) -@ stub NtUserFindWindowEx +@ stdcall -syscall NtUserFindWindowEx(long long ptr ptr long) @ stdcall NtUserFlashWindowEx(ptr) @ stub NtUserForceWindowToDpiForTest @ stub NtUserFrostCrashedWindow diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 1026b706832..93d92c60de6 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2513,6 +2513,55 @@ NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULON return STATUS_SUCCESS; } +/*********************************************************************** + * NtUserFindWindowEx (USER32.@) + */ +HWND WINAPI NtUserFindWindowEx( HWND parent, HWND child, UNICODE_STRING *class, UNICODE_STRING *title, + ULONG unk ) +{ + HWND *list; + HWND retvalue = 0; + int i = 0, len = 0, title_len; + WCHAR *buffer = NULL; + + if (!parent && child) parent = get_desktop_window(); + else if (parent == HWND_MESSAGE) parent = get_hwnd_message_parent(); + + if (title) + { + len = title->Length / sizeof(WCHAR) + 1; /* one extra char to check for chars beyond the end */ + if (!(buffer = malloc( (len + 1) * sizeof(WCHAR) ))) return 0; + } + + if (!(list = list_window_children( 0, parent, class, 0 ))) goto done; + + if (child) + { + child = get_full_window_handle( child ); + while (list[i] && list[i] != child) i++; + if (!list[i]) goto done; + i++; /* start from next window */ + } + + if (title) + { + while (list[i]) + { + title_len = NtUserInternalGetWindowText( list[i], buffer, len + 1 ); + if (title_len * sizeof(WCHAR) == title->Length && + (!title_len || !wcsnicmp( buffer, title->Buffer, title_len ))) + break; + i++; + } + } + retvalue = list[i]; + + done: + free( list ); + free( buffer ); + return retvalue; +} + /* Retrieve the window text from the server. */ static data_size_t get_server_window_text( HWND hwnd, WCHAR *text, data_size_t count ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index c4e4f7ac219..c1d41c2be43 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -103,6 +103,7 @@ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ + SYSCALL_ENTRY( NtUserFindWindowEx ) \ SYSCALL_ENTRY( NtUserGetAncestor ) \ SYSCALL_ENTRY( NtUserGetAtomName ) \ SYSCALL_ENTRY( NtUserGetClassName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 2af398cfed9..d916680660a 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -259,6 +259,22 @@ NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) return status; } +NTSTATUS WINAPI wow64_NtUserFindWindowEx( UINT *args ) +{ + HWND parent = get_handle( &args ); + HWND child = get_handle( &args ); + UNICODE_STRING32 *class32 = get_ptr( &args ); + UNICODE_STRING32 *title32 = get_ptr( &args ); + ULONG unk = get_ulong( &args ); + + UNICODE_STRING class, title; + HWND ret; + + ret = NtUserFindWindowEx( parent, child, unicode_str_32to64( &class, class32 ), + unicode_str_32to64( &title, title32 ), unk ); + return HandleToUlong( ret ); +} + NTSTATUS WINAPI wow64_NtUserInternalGetWindowText( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 8eafd78beef..879eed4bf79 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -458,6 +458,8 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, INT WINAPI NtUserExcludeUpdateRgn( HDC hdc, HWND hwnd ); HICON WINAPI NtUserFindExistingCursorIcon( UNICODE_STRING *module, UNICODE_STRING *res_name, void *desc ); +HWND WINAPI NtUserFindWindowEx( HWND parent, HWND child, UNICODE_STRING *class, + UNICODE_STRING *title, ULONG unk ); BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ); HWND WINAPI NtUserGetAncestor( HWND hwnd, UINT type ); SHORT WINAPI NtUserGetAsyncKeyState( INT key );

1 0

Jacek Caban : winex11: Use NtUserBuildHwndList for has_owned_popup implementation.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 2425488ef66d774485ba3da9277fc9973c8a6669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2425488ef66d774485ba3da9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:30:18 2022 +0200 winex11: Use NtUserBuildHwndList for has_owned_popup implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3f20fc9c7d2..c1fc008b7d3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -39,6 +39,8 @@ /* avoid conflict with field names in included win32 headers */ #undef Status +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -161,12 +163,6 @@ static void remove_startup_notification(Display *display, Window window) } -struct has_popup_result -{ - HWND hwnd; - BOOL found; -}; - static BOOL is_managed( HWND hwnd ) { struct x11drv_win_data *data = get_win_data( hwnd ); @@ -175,24 +171,39 @@ static BOOL is_managed( HWND hwnd ) return ret; } -static BOOL CALLBACK has_managed_popup( HWND hwnd, LPARAM lparam ) +static HWND *build_hwnd_list(void) { - struct has_popup_result *result = (struct has_popup_result *)lparam; + NTSTATUS status; + HWND *list; + UINT count = 128; - if (hwnd == result->hwnd) return FALSE; /* popups are always above owner */ - if (GetWindow( hwnd, GW_OWNER ) != result->hwnd) return TRUE; - result->found = is_managed( hwnd ); - return !result->found; + for (;;) + { + if (!(list = malloc( count * sizeof(*list) ))) return NULL; + status = NtUserBuildHwndList( 0, 0, 0, 0, 0, count, list, &count ); + if (!status) return list; + free( list ); + if (status != STATUS_BUFFER_TOO_SMALL) return NULL; + } } static BOOL has_owned_popups( HWND hwnd ) { - struct has_popup_result result; + HWND *list; + UINT i; + BOOL ret = FALSE; - result.hwnd = hwnd; - result.found = FALSE; - EnumWindows( has_managed_popup, (LPARAM)&result ); - return result.found; + if (!(list = build_hwnd_list())) return FALSE; + + for (i = 0; list[i] != HWND_BOTTOM; i++) + { + if (list[i] == hwnd) break; /* popups are always above owner */ + if (NtUserGetWindowRelative( list[i], GW_OWNER ) != hwnd) continue; + if ((ret = is_managed( list[i] ))) break; + } + + free( list ); + return ret; }

1 0

Huw Davies : wineoss: Remove preprocessor checks for SNDCTL_SEQ_NRMIDIS.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: ce0904f4b22b377a73835c3a7304fb2bd82edbc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0904f4b22b377a73835c3a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 07:38:43 2022 +0100 wineoss: Remove preprocessor checks for SNDCTL_SEQ_NRMIDIS. It's been in the linux kernel since at least 2005 and in OSS's tree since at least 2008 (In both cases it's in the first commit in the respective repos). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 03c329680e5..1cf19b7be1a 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -63,8 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#ifdef SNDCTL_SEQ_NRMIDIS - typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ MIDIOPENDESC midiDesc; @@ -1616,8 +1614,6 @@ static DWORD modReset(WORD wDevID) return MMSYSERR_NOERROR; } -#endif /* SNDCTL_SEQ_NRMIDIS */ - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -1631,7 +1627,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT: @@ -1660,11 +1655,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); -#else - case DRVM_INIT: - case MIDM_GETNUMDEVS: - return 0; -#endif default: TRACE("Unsupported message\n"); } @@ -1681,7 +1671,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT: @@ -1712,11 +1701,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); -#else - case DRVM_INIT: - case MODM_GETNUMDEVS: - return 0; -#endif default: TRACE("Unsupported message\n"); }

1 0

Huw Davies : wineoss: Move midi_init to the unixlib.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: c4d7bfddff00b89fe4ce909c5db058f5a74b81d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d7bfddff00b89fe4ce909c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 07:38:44 2022 +0100 wineoss: Move midi_init to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/Makefile.in | 3 +- dlls/wineoss.drv/midi.c | 276 ++++------------------------------- dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 335 +++++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 38 +++++ 5 files changed, 403 insertions(+), 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4d7bfddff00b89fe4ce…

1 0