May 2022 - Wine-Devel - list.winehq.org

[PATCH 1/2] ntdll: Partially implement NtUnmapViewOfSectionEx().
by Nikolay Sivov May 5, 2022

May 5, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/virtual.c | 9 +++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 13 +++++++++++++ include/winternl.h | 1 + 6 files changed, 27 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a7a39a0bce2..b1650ab4306 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -427,6 +427,7 @@ @ stdcall -syscall NtUnlockFile(long ptr ptr ptr ptr) @ stdcall -syscall NtUnlockVirtualMemory(long ptr ptr long) @ stdcall -syscall NtUnmapViewOfSection(long ptr) +@ stdcall -syscall NtUnmapViewOfSectionEx(long ptr long) # @ stub NtVdmControl # @ stub NtW32Call @ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr) @@ -1454,6 +1455,7 @@ @ stdcall -private -syscall ZwUnlockFile(long ptr ptr ptr ptr) NtUnlockFile @ stdcall -private -syscall ZwUnlockVirtualMemory(long ptr ptr long) NtUnlockVirtualMemory @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection +@ stdcall -private -syscall ZwUnmapViewOfSectionEx(long ptr long) NtUnmapViewOfSectionEx # @ stub ZwVdmControl # @ stub ZwW32Call @ stdcall -private -syscall ZwWaitForAlertByThreadId(ptr ptr) NtWaitForAlertByThreadId diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cad760a1445..7f85582adf3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -336,6 +336,7 @@ static void * const syscalls[] = NtUnlockFile, NtUnlockVirtualMemory, NtUnmapViewOfSection, + NtUnmapViewOfSectionEx, NtWaitForAlertByThreadId, NtWaitForDebugEvent, NtWaitForKeyedEvent, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 02478cceb06..6ecca9cb98a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4610,6 +4610,15 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) return status; } +/*********************************************************************** + * NtUnmapViewOfSectionEx (NTDLL.@) + * ZwUnmapViewOfSectionEx (NTDLL.@) + */ +NTSTATUS WINAPI NtUnmapViewOfSectionEx( HANDLE process, PVOID addr, ULONG flags ) +{ + if (flags) FIXME("Ignoring flags %#x.\n", flags); + return NtUnmapViewOfSection( process, addr ); +} /****************************************************************************** * virtual_fill_image_information diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 3b364d909d7..bd107ce0ef5 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -237,6 +237,7 @@ SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ + SYSCALL_ENTRY( NtUnmapViewOfSectionEx ) \ SYSCALL_ENTRY( NtWaitForAlertByThreadId ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 61c84e5d7be..c21464857fa 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -525,6 +525,19 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) } +/********************************************************************** + * wow64_NtUnmapViewOfSectionEx + */ +NTSTATUS WINAPI wow64_NtUnmapViewOfSectionEx( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = get_ptr( &args ); + ULONG flags = get_ulong( &args ); + + return NtUnmapViewOfSectionEx( process, addr, flags ); +} + + /********************************************************************** * wow64_NtWow64AllocateVirtualMemory64 */ diff --git a/include/winternl.h b/include/winternl.h index 1d358fc0b2d..84babcbb0e9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4160,6 +4160,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE); NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); +NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSectionEx(HANDLE,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); NTSYSAPI NTSTATUS WINAPI NtWaitForAlertByThreadId(const void*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*); -- 2.35.1

1 1

[PATCH 1/2] dlls/winealsa.drv: use correct integral types
by Eric Pouech May 5, 2022

May 5, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/winealsa.drv/alsa.c | 4 ++-- dlls/winealsa.drv/mmdevdrv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 8b6a87aa864c..33b405a884cf 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -637,7 +637,7 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) return format; } -static int alsa_channel_index(DWORD flag) +static int alsa_channel_index(UINT flag) { switch(flag){ case SPEAKER_FRONT_LEFT: @@ -702,7 +702,7 @@ static HRESULT map_channels(EDataFlow flow, const WAVEFORMATEX *fmt, int *alsa_c if(flow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - DWORD mask, flag = SPEAKER_FRONT_LEFT; + UINT mask, flag = SPEAKER_FRONT_LEFT; UINT i = 0; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1a99f0ac26c9..855fb68f457a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1363,7 +1363,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT32*)flags; params.devpos = devpos; params.qpcpos = qpcpos;

1 1

[PATCH 1/6] server: Do not signal read/write bits if there are read/write asyncs waiting.
by Zebediah Figura May 5, 2022

May 5, 2022

This is validated by tests introduced in 59beffb46c813a3de2eae6f28e3f7f321f666e89 etc. This commit alone doesn't fix said tests, because: * on this poll, we will alert the waiting async; * when reselecting, we will still request POLLIN, because the AFD_POLL_READ request is still active, * when POLLIN is subsequently signaled, we do not remove it in sock_dispatch_asyncs(), because we check async_waiting(), not async_queued(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 29dd1ca7fa8..db0df5ecf79 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1179,10 +1179,9 @@ static void sock_poll_event( struct fd *fd, int event ) break; } - complete_async_polls( sock, event, error ); - event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); + complete_async_polls( sock, event, error ); sock_reselect( sock ); } -- 2.34.1

1 5

[PATCH v6 1/5] include/ddk: Add winusbio.h file.
by Mohamad Al-Jaf May 5, 2022

May 5, 2022

Needed by winusb.h. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/ddk/winusbio.h | 66 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 include/ddk/winusbio.h diff --git a/include/Makefile.in b/include/Makefile.in index f3e62c4bb5a..58bf7db1e13 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -211,6 +211,7 @@ SOURCES = \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ + ddk/winusbio.h \ ddk/wsk.h \ ddraw.h \ ddrawgdi.h \ diff --git a/include/ddk/winusbio.h b/include/ddk/winusbio.h new file mode 100644 index 00000000000..14d8230d87f --- /dev/null +++ b/include/ddk/winusbio.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINUSBIO_H_ +#define _WINUSBIO_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(WinUSB_TestGuid, 0XDA812BFF, 0X12C3, 0X46A2, 0X8E, 0X2B, 0XDB, 0XD3, 0XB7, 0X83, 0X4C, 0X43); + +#define SHORT_PACKET_TERMINATE 0x01 +#define AUTO_CLEAR_STALL 0x02 +#define PIPE_TRANSFER_TIMEOUT 0x03 +#define IGNORE_SHORT_PACKETS 0x04 +#define ALLOW_PARTIAL_READS 0x05 +#define AUTO_FLUSH 0x06 +#define RAW_IO 0x07 +#define MAXIMUM_TRANSFER_SIZE 0x08 +#define RESET_PIPE_ON_RESUME 0x09 + +typedef struct _WINUSB_PIPE_INFORMATION { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; +} WINUSB_PIPE_INFORMATION, *PWINUSB_PIPE_INFORMATION; + +#define AUTO_SUSPEND 0x81 +#define SUSPEND_DELAY 0x83 + +#define DEVICE_SPEED 0x01 + +#define LowSpeed 0x01 +#define FullSpeed 0x02 +#define HighSpeed 0x03 + +typedef struct _WINUSB_PIPE_INFORMATION_EX { + USBD_PIPE_TYPE PipeType; + UCHAR PipeId; + USHORT MaximumPacketSize; + UCHAR Interval; + ULONG MaximumBytesPerInterval; +} WINUSB_PIPE_INFORMATION_EX, *PWINUSB_PIPE_INFORMATION_EX; + +#ifdef __cplusplus +} +#endif + +#endif /* _WINUSBIO_H_ */ -- 2.36.0

1 5

[PATCH v2 resend] ntdll: Avoid the lower 2GB region for large allocations on win64.
by Elaine Lefler May 5, 2022

May 5, 2022

Fixes a crash in PaintTool SAI when allocating more than 2GB of memory. Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com> --- v2: Removed todo_wine from appropriate tests, along with a note about why that test is broken on win32. --- dlls/ntdll/tests/info.c | 16 ++++++++++++---- dlls/ntdll/unix/virtual.c | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 89503093b17..4f2441d95d8 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1839,8 +1839,13 @@ static void test_query_process_vm(void) ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc", &pvi); - todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); +#ifndef _WIN64 + /* Fails on win32 due to mapping in reserved areas. The unused regions + * should be subtracted from VirtualSize for it to succeed. */ + todo_wine +#endif + ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); VirtualFree( ptr, 0, MEM_RELEASE); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessVmCounters, &pvi, sizeof(pvi), NULL); @@ -1856,8 +1861,11 @@ static void test_query_process_vm(void) ok( pvi.PrivateUsage == pvi.PagefileUsage, "wrong value %Iu/%Iu\n", pvi.PrivateUsage, pvi.PagefileUsage ); if (winetest_debug > 1) dump_vm_counters("VM counters after VirtualAlloc(MEM_RESERVE)", &pvi); - todo_wine ok( pvi.VirtualSize >= prev_size + alloc_size, - "Expected to be greater than %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); +#ifndef _WIN64 + todo_wine +#endif + ok( pvi.VirtualSize >= prev_size + alloc_size, + "Expected to be at least %Iu, got %Iu\n", prev_size + alloc_size, pvi.VirtualSize); prev_size = pvi.VirtualSize; ptr = VirtualAlloc(ptr, alloc_size, MEM_COMMIT, PAGE_READWRITE); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 02478cceb06..93a4495adb9 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1917,7 +1917,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, alloc.top_down = top_down; alloc.limit = (void*)(get_zero_bits_mask( zero_bits ) & (UINT_PTR)user_space_limit); - if (mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) + if ( +#ifdef _WIN64 + size < 2 * 1024 * 1024 && +#endif + mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); -- 2.32.0 (Apple Git-132)

2 1

[PATCH 1/3] shell32: Add SHBindToFolderIDListParent semi-stub.
by Mohamad Al-Jaf May 4, 2022

May 4, 2022

Called by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/shell32/pidl.c | 9 +++++++++ dlls/shell32/shell32.spec | 1 + include/shlobj.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 4c66a14c700..a87a8762a26 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1285,6 +1285,15 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si return SUCCEEDED(hr); } +/************************************************************************* + * SHBindToFolderIDListParent [SHELL32.@] + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +{ + FIXME("(%p, %p, %s, %p, %p) - semi-stub\n", psf, pidl, debugstr_guid(riid), ppv, ppidlLast); + return SHBindToParent(pidl, riid, ppv, ppidlLast); +} + /************************************************************************* * SHBindToParent [shell version 5.0] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..6348fcb3a6d 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -333,6 +333,7 @@ @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) diff --git a/include/shlobj.h b/include/shlobj.h index d30944662f7..f4ef2edf76b 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1639,6 +1639,11 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF */ HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *); +/**************************************************************************** + * SHBindToFolderIDListParent API + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast); + /**************************************************************************** * SHBindToParent API */ -- 2.36.0

2 6

[PATCH v3 1/2] ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31.
by Brendan Shanks May 4, 2022

May 4, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v3: Only run test on 64-bit (it can never fail on 32-bit). dlls/ntdll/tests/virtual.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..5d6a7d1eac0 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -904,6 +904,33 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL file image mapping */ + if (is_win64) + { + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + todo_wine + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + NtClose(mapping); + CloseHandle(file); + } + TerminateProcess(process, 0); CloseHandle(process); } -- 2.35.1

2 2

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Use a more sensible source location in add_constructor().
by Giovanni Mascellani May 4, 2022

May 4, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 905dbfc5..e518430f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2049,7 +2049,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type continue; } - initialize_var_components(ctx, params->instrs, var, &idx, arg, &loc); + initialize_var_components(ctx, params->instrs, var, &idx, arg, &arg->loc); } if (!(load = hlsl_new_var_load(ctx, var, loc))) -- 2.36.0

4 28

[PATCH 0/5] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl May 4, 2022

May 4, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/34

2 6

[PATCH 7/7] wineoss: Implement Wow64 aux entry point in the Unix library.
by Huw Davies May 4, 2022

May 4, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/oss.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 0c9fef90d58..e9616a84b36 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1961,6 +1961,29 @@ static NTSTATUS wow64_set_event_handle(void *args) return STATUS_SUCCESS; } +static NTSTATUS wow64_aux_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + } *params32 = args; + struct aux_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + }; + return aux_message(&params); +} + unixlib_entry_t __wine_unix_call_wow64_funcs[] = { test_connect, @@ -1990,7 +2013,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_midi_out_message, wow64_midi_in_message, wow64_midi_notify_wait, - aux_message, + wow64_aux_message, }; #endif /* _WIN64 */ -- 2.25.1

2 1