August 2021 - Wine-commits - list.winehq.org

Alex Henrie : dxtrans: Add stub DLL.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 7e07d00d29738d7ddb78f0ea27a1cfa11397175b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e07d00d29738d7ddb78f0ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 5 00:13:21 2021 -0600 dxtrans: Add stub DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50419 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dxtrans/Makefile.in | 1 + dlls/dxtrans/dxtrans.spec | 11 +++++++++++ 4 files changed, 15 insertions(+) diff --git a/configure b/configure index 8b1cbf407b1..d3c60b4ff4c 100755 --- a/configure +++ b/configure @@ -1305,6 +1305,7 @@ enable_dxerr8 enable_dxerr9 enable_dxgi enable_dxguid +enable_dxtrans enable_dxva2 enable_esent enable_evr @@ -20544,6 +20545,7 @@ wine_fn_config_makefile dlls/dxerr9 enable_dxerr9 wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests wine_fn_config_makefile dlls/dxguid enable_dxguid +wine_fn_config_makefile dlls/dxtrans enable_dxtrans wine_fn_config_makefile dlls/dxva2 enable_dxva2 wine_fn_config_makefile dlls/dxva2/tests enable_tests wine_fn_config_makefile dlls/esent enable_esent diff --git a/configure.ac b/configure.ac index a42c2aff272..5d9ca31099e 100644 --- a/configure.ac +++ b/configure.ac @@ -3205,6 +3205,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxguid) +WINE_CONFIG_MAKEFILE(dlls/dxtrans) WINE_CONFIG_MAKEFILE(dlls/dxva2) WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) WINE_CONFIG_MAKEFILE(dlls/esent) diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in new file mode 100644 index 00000000000..b5c1602917f --- /dev/null +++ b/dlls/dxtrans/Makefile.in @@ -0,0 +1 @@ +MODULE = dxtrans.dll diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec new file mode 100644 index 00000000000..7c2d605e534 --- /dev/null +++ b/dlls/dxtrans/dxtrans.spec @@ -0,0 +1,11 @@ +@ stub ?DXConstOverArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub ?DXConstUnderArray@@YGXPAVDXPMSAMPLE@@ABV1(a)K@Z +@ stub ?DXDitherArray@@YGXPBUDXDITHERDESC@@@Z +@ stub ?DXLinearInterpolateArray@@YGXPBVDXBASESAMPLE@@PAUDXLIMAPINFO@@PAV1(a)K@Z +@ stub ?DXOverArray@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z +@ stdcall -private DllCanUnloadNow() +@ stub DllEnumClassObjects +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Alexandre Julliard : wow64: Add thunks for ioctl/fsctl syscalls.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 2aea3368377f4322d93e5d3a4506af5a5da3c473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aea3368377f4322d93e5d3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 15:39:05 2021 +0200 wow64: Add thunks for ioctl/fsctl syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 2 ++ 2 files changed, 54 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index c8590437254..7d1c736e48c 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -352,6 +352,32 @@ NTSTATUS WINAPI wow64_NtDeleteFile( UINT *args ) } +/********************************************************************** + * wow64_NtDeviceIoControlFile + */ +NTSTATUS WINAPI wow64_NtDeviceIoControlFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG code = get_ulong( &args ); + void *in_buf = get_ptr( &args ); + ULONG in_len = get_ulong( &args ); + void *out_buf = get_ptr( &args ); + ULONG out_len = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), code, in_buf, in_len, out_buf, out_len ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtFlushBuffersFile */ @@ -369,6 +395,32 @@ NTSTATUS WINAPI wow64_NtFlushBuffersFile( UINT *args ) } +/********************************************************************** + * wow64_NtFsControlFile + */ +NTSTATUS WINAPI wow64_NtFsControlFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + ULONG code = get_ulong( &args ); + void *in_buf = get_ptr( &args ); + ULONG in_len = get_ulong( &args ); + void *out_buf = get_ptr( &args ); + ULONG out_len = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtFsControlFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), code, in_buf, in_len, out_buf, out_len ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtLockFile */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index f0b5b2ed668..6ae43e0e8ef 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -75,6 +75,7 @@ SYSCALL_ENTRY( NtDeleteFile ) \ SYSCALL_ENTRY( NtDeleteKey ) \ SYSCALL_ENTRY( NtDeleteValueKey ) \ + SYSCALL_ENTRY( NtDeviceIoControlFile ) \ SYSCALL_ENTRY( NtDisplayString ) \ SYSCALL_ENTRY( NtDuplicateObject ) \ SYSCALL_ENTRY( NtDuplicateToken ) \ @@ -88,6 +89,7 @@ SYSCALL_ENTRY( NtFlushProcessWriteBuffers ) \ SYSCALL_ENTRY( NtFlushVirtualMemory ) \ SYSCALL_ENTRY( NtFreeVirtualMemory ) \ + SYSCALL_ENTRY( NtFsControlFile ) \ SYSCALL_ENTRY( NtGetContextThread ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtGetNextThread ) \

1 0

Alexandre Julliard : ntdll: Avoid some duplicate async definitions.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 460755a007cdbb2cd7e702c67cc4d2b9e6049828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460755a007cdbb2cd7e702c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 17:22:35 2021 +0200 ntdll: Avoid some duplicate async definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 21 --------------------- dlls/ntdll/unix/socket.c | 20 -------------------- dlls/ntdll/unix/unix_private.h | 21 +++++++++++++++++++++ 3 files changed, 21 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 45e444d8576..9b9d9e92716 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -135,9 +135,6 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define MAX_DOS_DRIVES 26 -#define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) -#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) - /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH #undef EXT2_IOC_GETFLAGS @@ -4680,24 +4677,6 @@ struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE return io; } -static async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, - PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) -{ - async_data_t async; - async.handle = wine_server_obj_handle( handle ); - async.user = wine_server_client_ptr( user ); - async.iosb = wine_server_client_ptr( io ); - async.event = wine_server_obj_handle( event ); - async.apc = wine_server_client_ptr( apc ); - async.apc_context = wine_server_client_ptr( apc_context ); - return async; -} - -static NTSTATUS wait_async( HANDLE handle, BOOL alertable ) -{ - return NtWaitForSingleObject( handle, alertable, NULL ); -} - /* callback for irp async I/O completion */ static NTSTATUS irp_completion( void *user, ULONG_PTR *info, NTSTATUS status ) { diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index cc8d1426bb5..83b2fe504ab 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -96,26 +96,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); -#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) - -static async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, - PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) -{ - async_data_t async; - async.handle = wine_server_obj_handle( handle ); - async.user = wine_server_client_ptr( user ); - async.iosb = wine_server_client_ptr( io ); - async.event = wine_server_obj_handle( event ); - async.apc = wine_server_client_ptr( apc ); - async.apc_context = wine_server_client_ptr( apc_context ); - return async; -} - -static NTSTATUS wait_async( HANDLE handle, BOOL alertable ) -{ - return NtWaitForSingleObject( handle, alertable, NULL ); -} - union unix_sockaddr { struct sockaddr addr; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a51b04fb3c8..134b50a7f7d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -85,6 +85,9 @@ static const SIZE_T signal_stack_size = 0x10000 - 0x3800; static const SIZE_T kernel_stack_size = 0x20000; static const LONG teb_offset = 0x2000; +#define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) +#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) + /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; @@ -333,6 +336,24 @@ static inline void mutex_unlock( pthread_mutex_t *mutex ) if (!process_exiting) pthread_mutex_unlock( mutex ); } +static inline async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) +{ + async_data_t async; + async.handle = wine_server_obj_handle( handle ); + async.user = wine_server_client_ptr( user ); + async.iosb = wine_server_client_ptr( io ); + async.event = wine_server_obj_handle( event ); + async.apc = wine_server_client_ptr( apc ); + async.apc_context = wine_server_client_ptr( apc_context ); + return async; +} + +static inline NTSTATUS wait_async( HANDLE handle, BOOL alertable ) +{ + return NtWaitForSingleObject( handle, alertable, NULL ); +} + #ifdef _WIN64 typedef TEB32 WOW_TEB; static inline TEB64 *NtCurrentTeb64(void) { return NULL; }

1 0

Alexandre Julliard : ntdll: Add a helper function to get the iosb pointer to pass to the server.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 156c34ea03478329600b6fe1a6890155128e6640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=156c34ea03478329600b6fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 17:42:57 2021 +0200 ntdll: Add a helper function to get the iosb pointer to pass to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 43 +++++++++++++++++++++--------------------- dlls/ntdll/unix/socket.c | 12 +++++++----- dlls/ntdll/unix/unix_private.h | 9 +++++++-- 3 files changed, 36 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=156c34ea03478329600b…

1 0

Alexandre Julliard : ntdll: Only update the I/O status block at function exit.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 28754a04efed73df2a56b8ade0df691aafbd909e URL: https://source.winehq.org/git/wine.git/?a=commit;h=28754a04efed73df2a56b8ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 17:55:11 2021 +0200 ntdll: Only update the I/O status block at function exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 215 +++++++++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28754a04efed73df2a56…

1 0

Alexandre Julliard : ntdll: Set the I/O status block through the 32-bit pointer for Wow64 processes.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 61b123fae960766df8f51cff8be195e6755429c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61b123fae960766df8f51cff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 5 19:36:28 2021 +0200 ntdll: Set the I/O status block through the 32-bit pointer for Wow64 processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/serial.c | 20 ++++++-------------- dlls/ntdll/unix/server.c | 4 +--- dlls/ntdll/unix/unix_private.h | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 1d720c863f4..712f94ec43f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1966,7 +1966,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni OBJECT_ATTRIBUTES attr; UNICODE_STRING string; char *unix_name; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; HANDLE mountmgr; NTSTATUS status; int letter; @@ -4937,7 +4937,7 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG { /* GetCommTimeouts */ SERIAL_TIMEOUTS st; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ); @@ -5024,7 +5024,7 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL { /* GetCommTimeouts */ SERIAL_TIMEOUTS st; - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index e76e49ca69d..d7f3edf4330 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -407,7 +407,7 @@ static void set_stdio_fd( int stdin_fd, int stdout_fd ) */ static BOOL is_unix_console_handle( HANDLE handle ) { - IO_STATUS_BLOCK io; + IO_STATUS_BLOCK io = {0}; return !NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_CONDRV_IS_UNIX, NULL, 0, NULL, 0 ); } diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 9454185e172..ab2ef9330a5 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -841,7 +841,7 @@ typedef struct async_commio { HANDLE hDevice; DWORD* events; - IO_STATUS_BLOCK* iosb; + client_ptr_t iosb; HANDLE hEvent; DWORD evtmask; DWORD cookie; @@ -995,23 +995,15 @@ static void CALLBACK wait_for_event(LPVOID arg) } if (needs_close) close( fd ); } - if (commio->iosb) - { - if (*commio->events) - { - commio->iosb->u.Status = STATUS_SUCCESS; - commio->iosb->Information = sizeof(DWORD); - } - else - commio->iosb->u.Status = STATUS_CANCELLED; - } + if (*commio->events) set_async_iosb( commio->iosb, STATUS_SUCCESS, sizeof(DWORD) ); + else set_async_iosb( commio->iosb, STATUS_CANCELLED, 0 ); stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); free( commio ); NtTerminateThread( GetCurrentThread(), 0 ); } -static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK piosb, DWORD* events) +static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, client_ptr_t iosb_ptr, DWORD* events) { async_commio* commio; NTSTATUS status; @@ -1025,7 +1017,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK commio->hDevice = hDevice; commio->events = events; - commio->iosb = piosb; + commio->iosb = iosb_ptr; commio->hEvent = hEvent; commio->pending_write = 0; status = get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, TRUE); @@ -1315,7 +1307,7 @@ static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, vo case IOCTL_SERIAL_WAIT_ON_MASK: if (out_buffer && out_size == sizeof(DWORD)) { - if (!(status = wait_on(device, fd, event, io, out_buffer))) + if (!(status = wait_on(device, fd, event, iosb_client_ptr(io), out_buffer))) sz = sizeof(DWORD); } else diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 2ec70db9390..986eb6c3250 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -377,7 +377,6 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO break; case APC_ASYNC_IO: { - IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); ULONG_PTR info = 0; @@ -386,8 +385,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (result->async_io.status != STATUS_PENDING) { result->async_io.total = info; - iosb->Status = result->async_io.status; - iosb->Information = info; + set_async_iosb( call->async_io.sb, result->async_io.status, info ); } break; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c4af5831cdb..61c290c156d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -354,8 +354,42 @@ static inline NTSTATUS wait_async( HANDLE handle, BOOL alertable ) return NtWaitForSingleObject( handle, alertable, NULL ); } +static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR info ) +{ + if (!iosb) return; +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + struct iosb32 + { + NTSTATUS Status; + ULONG Information; + } *io = wine_server_get_ptr( iosb ); + io->Status = status; + io->Information = info; + } + else +#endif + { + IO_STATUS_BLOCK *io = wine_server_get_ptr( iosb ); +#ifdef NONAMELESSUNION + io->u.Status = status; +#else + io->Status = status; +#endif + io->Information = info; + } +} + static inline client_ptr_t iosb_client_ptr( IO_STATUS_BLOCK *io ) { +#ifdef _WIN64 +#ifdef NONAMELESSUNION + if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->u.Pointer ); +#else + if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->Pointer ); +#endif +#endif return wine_server_client_ptr( io ); }

1 0

Zebediah Figura : ws2_32: Move gethostname() to the Unix library.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: c1c3691bed231380b3b632a038f7f3cb8d7f5929 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c3691bed231380b3b632a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:43 2021 -0500 ws2_32: Move gethostname() to the Unix library. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 16 +++++++++------- dlls/ws2_32/unixlib.c | 10 ++++++++++ dlls/ws2_32/ws2_32_private.h | 1 + 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index c65e6b9674e..48e7e062d7f 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -913,6 +913,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) { struct WS_hostent *host = NULL; char hostname[100]; + int ret; TRACE( "%s\n", debugstr_a(name) ); @@ -922,9 +923,9 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) return NULL; } - if (gethostname( hostname, 100 ) == -1) + if ((ret = unix_funcs->gethostname( hostname, 100 ))) { - SetLastError( WSAENOBUFS ); + SetLastError( ret ); return NULL; } @@ -973,7 +974,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) int WINAPI WS_gethostname( char *name, int namelen ) { char buf[256]; - int len; + int len, ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -983,9 +984,9 @@ int WINAPI WS_gethostname( char *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) ) != 0) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } @@ -1009,6 +1010,7 @@ int WINAPI WS_gethostname( char *name, int namelen ) int WINAPI GetHostNameW( WCHAR *name, int namelen ) { char buf[256]; + int ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -1018,9 +1020,9 @@ int WINAPI GetHostNameW( WCHAR *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) )) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 2a5fcd1b60d..cde73198c16 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -30,6 +30,7 @@ #include <errno.h> #include <pthread.h> #include <stdarg.h> +#include <unistd.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -789,11 +790,20 @@ static int CDECL unix_gethostbyname( const char *name, struct WS_hostent *const #endif +static int CDECL unix_gethostname( char *name, int len ) +{ + if (!gethostname( name, len )) + return 0; + return errno_from_unix( errno ); +} + + static const struct unix_funcs funcs = { unix_getaddrinfo, unix_gethostbyaddr, unix_gethostbyname, + unix_gethostname, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 38454e1a9ba..973f24a10a9 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -203,6 +203,7 @@ struct unix_funcs int (CDECL *gethostbyaddr)( const void *addr, int len, int family, struct WS(hostent) *host, unsigned int *size ); int (CDECL *gethostbyname)( const char *name, struct WS(hostent) *host, unsigned int *size ); + int (CDECL *gethostname)( char *name, int len ); }; extern const struct unix_funcs *unix_funcs;

1 0

Zebediah Figura : ws2_32: Move getnameinfo() to the Unix library.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 01885acd5dc169df880f60f3358934864eed2d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01885acd5dc169df880f60f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:44 2021 -0500 ws2_32: Move getnameinfo() to the Unix library. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 89 +------------------ dlls/ws2_32/socket.c | 205 ------------------------------------------- dlls/ws2_32/unixlib.c | 139 +++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32_private.h | 14 +-- 4 files changed, 142 insertions(+), 305 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01885acd5dc169df880f…

1 0

Rémi Bernon : hidclass.sys: Use call_minidriver for IOCTL_HID_GET_INPUT_REPORT.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: a6435b3ddaa653354441c8728695048b8edf7bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6435b3ddaa653354441c872… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:02 2021 +0200 hidclass.sys: Use call_minidriver for IOCTL_HID_GET_INPUT_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 61126571ac6..3a577aabfbd 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -193,18 +193,11 @@ static DWORD CALLBACK hid_device_thread(void *args) { while(1) { - KEVENT event; - - KeInitializeEvent(&event, NotificationEvent, FALSE); - packet->reportBufferLen = report_size; packet->reportId = 0; - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, - NULL, 0, packet, sizeof(*packet), TRUE, &event, &irp_status); - - if (IoCallDriver(ext->u.pdo.parent_fdo, irp) == STATUS_PENDING) - KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, + sizeof(*packet), &irp_status ); if (irp_status.Status == STATUS_SUCCESS) {

1 0

Rémi Bernon : hidclass.sys: Use call_minidriver for IOCTL_HID_READ_REPORT.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: b87b6a96e06fee490f430d1e01a9eab57b1dd630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b87b6a96e06fee490f430d1e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 10:36:03 2021 +0200 hidclass.sys: Use call_minidriver for IOCTL_HID_READ_REPORT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 3a577aabfbd..ab449b9b0d9 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -178,7 +178,6 @@ static DWORD CALLBACK hid_device_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; - IRP *irp; IO_STATUS_BLOCK irp_status; HID_XFER_PACKET *packet; DWORD rc; @@ -221,15 +220,8 @@ static DWORD CALLBACK hid_device_thread(void *args) while(1) { - KEVENT event; - - KeInitializeEvent(&event, NotificationEvent, FALSE); - - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, - NULL, 0, packet->reportBuffer, report_size, TRUE, &event, &irp_status); - - if (IoCallDriver(ext->u.pdo.parent_fdo, irp) == STATUS_PENDING) - KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + call_minidriver( IOCTL_HID_READ_REPORT, ext->u.pdo.parent_fdo, NULL, 0, + packet->reportBuffer, report_size, &irp_status ); rc = WaitForSingleObject(ext->u.pdo.halt_event, 0); if (rc == WAIT_OBJECT_0)

1 0