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

Jacek Caban : win32u: Move NtUserSetMenuDefaultItem implementation from user32.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 172ae86945cb861d672cba37790e65782dac722f URL: https://source.winehq.org/git/wine.git/?a=commit;h=172ae86945cb861d672cba37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:45:25 2022 +0200 win32u: Move NtUserSetMenuDefaultItem 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/mdi.c | 2 +- dlls/user32/menu.c | 58 +------------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 48 ++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++++++++ include/ntuser.h | 1 + 9 files changed, 64 insertions(+), 60 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 69957af1380..df470f74762 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -894,7 +894,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) NtUserEnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED); NtUserEnableMenuItem(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED); NtUserEnableMenuItem(hSysPopup, SC_MAXIMIZE, MF_BYCOMMAND | MF_GRAYED); - SetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); + NtUserSetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE); /* redraw menu */ DrawMenuBar(frame); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 36aed74c6c6..6fb9422cf9d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -375,7 +375,7 @@ static HMENU MENU_CopySysPopup(BOOL mdi) SetMenuItemInfoW( hMenu, SC_MAXIMIZE, FALSE, &miteminfo); miteminfo.hbmpItem = HBMMENU_POPUP_MINIMIZE; SetMenuItemInfoW( hMenu, SC_MINIMIZE, FALSE, &miteminfo); - SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE); + NtUserSetMenuDefaultItem( hMenu, SC_CLOSE, FALSE ); } else ERR("Unable to load default system menu\n" ); @@ -4875,62 +4875,6 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, return ret; } -static BOOL set_menu_default_item(POPUPMENU *menu, UINT uItem, UINT bypos) -{ - unsigned int i; - MENUITEM *item; - - /* reset all default-item flags */ - item = menu->items; - for (i = 0; i < menu->nItems; i++, item++) - { - item->fState &= ~MFS_DEFAULT; - } - - /* no default item */ - if (-1 == uItem) - return TRUE; - - item = menu->items; - if ( bypos ) - { - if ( uItem >= menu->nItems ) return FALSE; - item[uItem].fState |= MFS_DEFAULT; - return TRUE; - } - else - { - for (i = 0; i < menu->nItems; i++, item++) - { - if (item->wID == uItem) - { - item->fState |= MFS_DEFAULT; - return TRUE; - } - } - } - - return FALSE; -} - -/********************************************************************** - * SetMenuDefaultItem (USER32.@) - * - */ -BOOL WINAPI SetMenuDefaultItem(HMENU hmenu, UINT uItem, UINT bypos) -{ - POPUPMENU *menu; - BOOL ret; - - TRACE("(%p,%d,%d)\n", hmenu, uItem, bypos); - - if (!(menu = grab_menu_ptr(hmenu))) return FALSE; - ret = set_menu_default_item(menu, uItem, bypos); - release_menu_ptr(menu); - - return ret; -} - /********************************************************************** * GetMenuDefaultItem (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 727a21a5935..f8683a78426 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -680,7 +680,7 @@ @ stdcall SetLogonNotifyWindow(long long) @ stdcall SetMenu(long long) NtUserSetMenu @ stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId -@ stdcall SetMenuDefaultItem(long long long) +@ stdcall SetMenuDefaultItem(long long long) NtUserSetMenuDefaultItem @ stdcall SetMenuInfo(long ptr) @ stdcall SetMenuItemBitmaps(long long long long long) @ stdcall SetMenuItemInfoA(long long long ptr) diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index dee68a95aa2..5d1a5ec12d6 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -541,3 +541,51 @@ BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ) release_menu_ptr( menu ); return TRUE; } + +/********************************************************************** + * NtUserSetMenuDefaultItem (win32u.@) + */ +BOOL WINAPI NtUserSetMenuDefaultItem( HMENU handle, UINT item, UINT bypos ) +{ + MENUITEM *menu_item; + POPUPMENU *menu; + unsigned int i; + BOOL ret = FALSE; + + TRACE( "(%p,%d,%d)\n", handle, item, bypos ); + + if (!(menu = grab_menu_ptr( handle ))) return FALSE; + + /* reset all default-item flags */ + menu_item = menu->items; + for (i = 0; i < menu->nItems; i++, menu_item++) + { + menu_item->fState &= ~MFS_DEFAULT; + } + + if (item != -1) + { + menu_item = menu->items; + + if (bypos) + { + ret = item < menu->nItems; + if (ret) menu->items[item].fState |= MFS_DEFAULT; + } + else + { + for (i = 0; i < menu->nItems; i++) + { + if (menu->items[i].wID == item) + { + menu->items[i].fState |= MFS_DEFAULT; + ret = TRUE; + } + } + } + } + else ret = TRUE; + + release_menu_ptr( menu ); + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d543465d4d7..0be0863b992 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -157,6 +157,7 @@ static void * const syscalls[] = NtUserRemoveProp, NtUserSetKeyboardState, NtUserSetMenuContextHelpId, + NtUserSetMenuDefaultItem, NtUserSetObjectInformation, NtUserSetProcessDpiAwarenessContext, NtUserSetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index cfbf4ac1ad1..f3e2f9ca2f5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1208,7 +1208,7 @@ @ stub NtUserSetManipulationInputTarget @ stdcall NtUserSetMenu(long long) @ stdcall -syscall NtUserSetMenuContextHelpId(long long) -@ stub NtUserSetMenuDefaultItem +@ stdcall -syscall NtUserSetMenuDefaultItem(long long long) @ stub NtUserSetMenuFlagRtoL @ stub NtUserSetMirrorRendering @ stub NtUserSetMonitorWorkArea diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index f3cee62b577..124506bdb05 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -144,6 +144,7 @@ SYSCALL_ENTRY( NtUserRemoveProp ) \ SYSCALL_ENTRY( NtUserSetKeyboardState ) \ SYSCALL_ENTRY( NtUserSetMenuContextHelpId ) \ + SYSCALL_ENTRY( NtUserSetMenuDefaultItem ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessDpiAwarenessContext ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 38905fd8a57..3e8004b005c 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -659,6 +659,15 @@ NTSTATUS WINAPI wow64_NtUserSetMenuContextHelpId( UINT *args ) return NtUserSetMenuContextHelpId( menu, id ); } +NTSTATUS WINAPI wow64_NtUserSetMenuDefaultItem( UINT *args ) +{ + HMENU handle = get_handle( &args ); + UINT item = get_ulong( &args ); + UINT bypos = get_ulong( &args ); + + return NtUserSetMenuDefaultItem( handle, item, bypos ); +} + NTSTATUS WINAPI wow64_NtUserThunkedMenuInfo( UINT *args ) { HMENU menu = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index cdac581f193..7fc52979e7e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -556,6 +556,7 @@ BOOL WINAPI NtUserSetKeyboardState( BYTE *state ); BOOL WINAPI NtUserSetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ); BOOL WINAPI NtUserSetMenu( HWND hwnd, HMENU menu ); BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ); +BOOL WINAPI NtUserSetMenuDefaultItem( HMENU handle, UINT item, UINT bypos ); HWND WINAPI NtUserSetParent( HWND hwnd, HWND parent ); BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle );

1 0

Mohamad Al-Jaf : include: Add CLSID_MSVPxDecoder declaration.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: cc83e8526374c4012f85328c867da2f54afcdb56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc83e8526374c4012f85328c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Apr 22 01:59:38 2022 -0400 include: Add CLSID_MSVPxDecoder declaration. Needed by Chromium-based browsers including CEF. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 7034378f585..e492bf8daf0 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1630,6 +1630,7 @@ cpp_quote("EXTERN_GUID(CLSID_MSMPEGDecoderMFT, 0x2d709e52, 0x123f, 0x49b5, 0x9c, cpp_quote("EXTERN_GUID(CLSID_MSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1, 0x5d, 0x45, 0x28, 0x31, 0xa8, 0x7d, 0x9d);") cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, 0x79, 0xa4, 0x33, 0x05, 0x16, 0x5e, 0x35);") cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420a51a3, 0xd605, 0x430c, 0xb4, 0xfc, 0x45, 0x27, 0x4f, 0xa6, 0xc5, 0x62);") +cpp_quote("EXTERN_GUID(CLSID_MSVPxDecoder, 0xe3aaf548, 0xc9a4, 0x4c6e, 0x23, 0x4d, 0x5a, 0xda, 0x37, 0x4b, 0x00, 0x00);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);")

1 0

Alexandre Julliard : gdi32: Support UTF-8 codepage in TranslateCharsetInfo().
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 7500fc1ce92e51cb99687d7d49905c342ded8f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7500fc1ce92e51cb99687d7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 12:40:48 2022 +0200 gdi32: Support UTF-8 codepage in TranslateCharsetInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52847 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/text.c | 82 ++++++++++++++++-------------------------- dlls/win32u/font.c | 82 ++++++++++++++++-------------------------- 3 files changed, 156 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7500fc1ce92e51cb9968…

1 0

Eric Pouech : kernel32/tests: Make the console tests pass if current console is shell-no-window.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: fdfd19cb47ff6039b085afdbdcc61723e716024f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdfd19cb47ff6039b085afdb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 21 17:39:11 2022 +0200 kernel32/tests: Make the console tests pass if current console is shell-no-window. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8f18a0d37a7..d94cecd3462 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1541,8 +1541,13 @@ static void test_Console(void) startup.hStdOutput = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0); /* first, we need to be sure we're attached to a console */ - if (!is_console(startup.hStdInput) || !is_console(startup.hStdOutput)) + if (startup.hStdInput == INVALID_HANDLE_VALUE || startup.hStdOutput == INVALID_HANDLE_VALUE) { + /* this fails either when this test process is run detached from console + * (unlikely, as this very process must be explicitly created with detached flag), + * or is attached to a Wine's shell-no-window kind of console (if the later, detach from it) + */ + FreeConsole(); /* we're not attached to a console, let's do it */ AllocConsole(); startup.hStdInput = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0);

1 0

Eric Pouech : kernel32/tests: Adapt duplicate console handle test to non-Win7 handles.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 56056f39d991ea97d9ebde8c98b68f7c028c6747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56056f39d991ea97d9ebde8c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 21 17:39:17 2022 +0200 kernel32/tests: Adapt duplicate console handle test to non-Win7 handles. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d94cecd3462..c1312bd8916 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1507,11 +1507,6 @@ static void test_DebuggingFlag(void) DeleteFileA(resfile); } -static BOOL is_console(HANDLE h) -{ - return h != INVALID_HANDLE_VALUE && ((ULONG_PTR)h & 3) == 3; -} - static void test_Console(void) { char buffer[2 * MAX_PATH + 35]; @@ -2500,17 +2495,11 @@ static void test_DuplicateHandle(void) DeleteFileA(file_name); f = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - if (!is_console(f)) - { - skip("DuplicateHandle on console handle\n"); - CloseHandle(f); - return; - } - + ok(f != INVALID_HANDLE_VALUE, "Failed to open CONIN$ %lu\n", GetLastError()); r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); ok(r, "DuplicateHandle error %lu\n", GetLastError()); - todo_wine ok(f != out, "f == out\n"); + ok(f == out || broken(/* Win7 */ (((ULONG_PTR)f & 3) == 3) && (f != out)), "f != out\n"); CloseHandle(out); }

1 0

Huw Davies : winealsa: Pass a client ptr to the callback instead of a stream.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 3f545935e0d7c28466cc5fc1c200a565c6e838c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f545935e0d7c28466cc5fc1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 22 08:37:53 2022 +0100 winealsa: Pass a client ptr to the callback instead of a stream. This is to allow stream handles to be larger than sizeof(void *). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7dc01940dc9..81967f9ffe0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -243,10 +243,10 @@ static HRESULT alsa_stream_release(struct alsa_stream *stream, HANDLE timer_thre static DWORD WINAPI alsa_timer_thread(void *user) { - struct alsa_stream *stream = user; struct timer_loop_params params; + struct ACImpl *This = user; - params.stream = stream; + params.stream = This->stream; ALSA_CALL(timer_loop, &params); @@ -954,7 +954,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) ALSA_CALL(start, &params); if(SUCCEEDED(params.result) && !This->timer_thread){ - This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This->stream, 0, NULL); + This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); }

1 0

Huw Davies : winealsa: Use UINT64 handles to represent the stream.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 3dfd1fdc1431fe558464f7cec78e1a4f5ddd43ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dfd1fdc1431fe558464f7ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 22 08:37:54 2022 +0100 winealsa: Use UINT64 handles to represent the stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 43 ++++++++++++++++++++++++------------------- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- dlls/winealsa.drv/unixlib.h | 40 ++++++++++++++++++++-------------------- 3 files changed, 47 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dfd1fdc1431fe558464…

1 0

Huw Davies : winealsa: Return offsets rather than ptrs to the strings.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 73a5009510361546c30115a8caa871f6ecf468ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a5009510361546c30115a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 22 08:37:55 2022 +0100 winealsa: Return offsets rather than ptrs to the strings. This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 26 +++++++++++++++----------- dlls/winealsa.drv/mmdevdrv.c | 9 ++++++--- dlls/winealsa.drv/unixlib.h | 4 ++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 9cf99f5b459..0e86185e441 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -291,10 +291,16 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCH return ret; } +struct endpt +{ + WCHAR *name; + char *device; +}; + struct endpoints_info { unsigned int num, size; - struct endpoint *endpoints; + struct endpt *endpoints; }; static void endpoints_add(struct endpoints_info *endpoints, WCHAR *name, char *device) @@ -467,10 +473,9 @@ static NTSTATUS get_endpoint_ids(void *args) static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; struct get_endpoint_ids_params *params = args; struct endpoints_info endpoints_info; - unsigned int i, needed, name_len, device_len; + unsigned int i, needed, name_len, device_len, offset; struct endpoint *endpoint; int err, card; - char *ptr; card = -1; @@ -505,9 +510,8 @@ static NTSTATUS get_endpoint_ids(void *args) if(err != 0) WARN("Got a failure during card enumeration: %d (%s)\n", err, snd_strerror(err)); - needed = endpoints_info.num * sizeof(*params->endpoints); + offset = needed = endpoints_info.num * sizeof(*params->endpoints); endpoint = params->endpoints; - ptr = (char *)(endpoint + endpoints_info.num); for(i = 0; i < endpoints_info.num; i++){ name_len = wcslen(endpoints_info.endpoints[i].name) + 1; @@ -515,12 +519,12 @@ static NTSTATUS get_endpoint_ids(void *args) needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); if(needed <= params->size){ - endpoint->name = (WCHAR *)ptr; - memcpy(endpoint->name, endpoints_info.endpoints[i].name, name_len * sizeof(WCHAR)); - ptr += name_len * sizeof(WCHAR); - endpoint->device = ptr; - memcpy(endpoint->device, endpoints_info.endpoints[i].device, device_len); - ptr += (device_len + 1) & ~1; + endpoint->name = offset; + memcpy((char *)params->endpoints + offset, endpoints_info.endpoints[i].name, name_len * sizeof(WCHAR)); + offset += name_len * sizeof(WCHAR); + endpoint->device = offset; + memcpy((char *)params->endpoints + offset, endpoints_info.endpoints[i].device, device_len); + offset += (device_len + 1) & ~1; endpoint++; } free(endpoints_info.endpoints[i].name); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 24e778db931..1a99f0ac26c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -366,14 +366,17 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + char *device = (char *)params.endpoints + params.endpoints[i].device; + unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); + ids[i] = HeapAlloc(GetProcessHeap(), 0, size); if(!ids[i]){ params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], params.endpoints[i].name, size); - get_device_guid(flow, params.endpoints[i].device, guids + i); + memcpy(ids[i], name, size); + get_device_guid(flow, device, guids + i); } *def_index = params.default_idx; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ed769d81948..56507ef9f0a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -22,8 +22,8 @@ typedef UINT64 stream_handle; struct endpoint { - WCHAR *name; - char *device; + unsigned int name; + unsigned int device; }; struct get_endpoint_ids_params

1 0

Huw Davies : winealsa: Limit Wow64 buffer allocations to 32-bit addresses.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: wine Branch: master Commit: 0985b03872e18f76769f48ee5d63462feba31b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0985b03872e18f76769f48ee… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 22 08:37:56 2022 +0100 winealsa: Limit Wow64 buffer allocations to 32-bit addresses. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 0e86185e441..272040f8047 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -766,6 +766,15 @@ static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 fram memset(buffer, 0, frames * stream->fmt->nBlockAlign); } +static ULONG_PTR zero_bits(void) +{ +#ifdef _WIN64 + return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; +#else + return 0; +#endif +} + static NTSTATUS create_stream(void *args) { struct create_stream_params *params = args; @@ -948,7 +957,7 @@ static NTSTATUS create_stream(void *args) stream->fmt = &fmtex->Format; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; @@ -1661,7 +1670,7 @@ static NTSTATUS get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -1764,7 +1773,7 @@ static NTSTATUS get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY);

1 0

Francois Gouget : testbot/web: Tweak the Login and ResetPassword GetInputType() formatting.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: tools Branch: master Commit: 3c23a41ff24936fbe32eac56cac5b954615f4e42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c23a41ff24936fbe32eac5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 22 00:02:56 2022 +0200 testbot/web: Tweak the Login and ResetPassword GetInputType() formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Login.pl | 9 +++------ testbot/web/ResetPassword.pl | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 837617d..7b9a6ff 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -65,12 +65,9 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetName() eq "Password") - { - return "password"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); + my $PropertyName = $PropertyDescriptor->GetName(); + return $PropertyName eq "Password" ? "password" : + $self->SUPER::GetInputType($PropertyDescriptor); } sub GenerateFields($) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 4f672ea..081e27f 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -63,12 +63,9 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if (substr($PropertyDescriptor->GetName(), 0, 8) eq "Password") - { - return "password"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); + my $PropertyName = substr($PropertyDescriptor->GetName(), 0, 8); + return $PropertyName eq "Password" ? "password" : + $self->SUPER::GetInputType($PropertyDescriptor); } sub GetActions($)

1 0