September 2021 - Wine-Commits

Francois Gouget : windowscodecs: Make the jpeg_encoder_*() functions static.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 8b9f1e12841298591387e2b7590191610a37986e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b9f1e12841298591387e2b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 3 11:50:45 2021 +0200 windowscodecs: Make the jpeg_encoder_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libjpeg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 96a9b79f358..dff13c90db2 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -535,7 +535,7 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo) } } -HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) +static HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -570,7 +570,7 @@ HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) return S_OK; } -HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, +static HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -590,7 +590,7 @@ HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pix return S_OK; } -HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) +static HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -629,7 +629,7 @@ HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct enco return S_OK; } -HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, +static HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, DWORD line_count, DWORD stride) { struct jpeg_encoder *This = impl_from_encoder(iface); @@ -690,7 +690,7 @@ HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, return S_OK; } -HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -705,12 +705,12 @@ HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) return S_OK; } -HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) { return S_OK; } -void CDECL jpeg_encoder_destroy(struct encoder* iface) +static void CDECL jpeg_encoder_destroy(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); if (This->cinfo_initialized)

1 0

Zebediah Figura : server: Return void from the read callback.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 6d499911880df47f6b604dc2df3a24cc63ed667a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d499911880df47f6b604dc2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:51 2021 -0500 server: Return void from the read callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 16 ++++++++-------- server/device.c | 6 +++--- server/fd.c | 3 +-- server/file.h | 4 ++-- server/named_pipe.c | 13 ++++++------- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/server/console.c b/server/console.c index 9c7fbaa003d..597bff994a2 100644 --- a/server/console.c +++ b/server/console.c @@ -100,7 +100,7 @@ static const struct object_ops console_ops = static enum server_fd_type console_get_fd_type( struct fd *fd ); static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); static void console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); -static int console_read( struct fd *fd, struct async *async, file_pos_t pos ); +static void console_read( struct fd *fd, struct async *async, file_pos_t pos ); static int console_flush( struct fd *fd, struct async *async ); static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -325,7 +325,7 @@ static const struct object_ops console_input_ops = console_input_destroy /* destroy */ }; -static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); +static void console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); static int console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -948,16 +948,16 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async } } -static int console_read( struct fd *fd, struct async *async, file_pos_t pos ) +static void console_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct console *console = get_fd_user( fd ); if (!console->server) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return queue_host_ioctl( console->server, IOCTL_CONDRV_READ_FILE, 0, async, &console->ioctl_q ); + queue_host_ioctl( console->server, IOCTL_CONDRV_READ_FILE, 0, async, &console->ioctl_q ); } static int console_flush( struct fd *fd, struct async *async ) @@ -1349,16 +1349,16 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * return console_ioctl( console->fd, code, async ); } -static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ) +static void console_input_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct console *console = current->process->console; if (!console) { set_error( STATUS_INVALID_HANDLE ); - return 0; + return; } - return console_read( console->fd, async, pos ); + console_read( console->fd, async, pos ); } static int console_input_flush( struct fd *fd, struct async *async ) diff --git a/server/device.c b/server/device.c index e4a5c2f9670..4dd9213811a 100644 --- a/server/device.c +++ b/server/device.c @@ -201,7 +201,7 @@ static struct list *device_file_get_kernel_obj_list( struct object *obj ); static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); -static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); +static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); static int device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -625,7 +625,7 @@ static void device_file_get_volume_info( struct fd *fd, struct async *async, uns queue_irp( file, &params, async ); } -static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ) +static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); irp_params_t params; @@ -634,7 +634,7 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos params.read.type = IRP_CALL_READ; params.read.key = 0; params.read.pos = pos; - return queue_irp( file, &params, async ); + queue_irp( file, &params, async ); } static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) diff --git a/server/fd.c b/server/fd.c index 93359ea03a5..c2cab0da1fe 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2292,10 +2292,9 @@ static void unmount_device( struct fd *device_fd ) } /* default read() routine */ -int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) +void no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); - return 0; } /* default write() routine */ diff --git a/server/file.h b/server/file.h index 6b949537084..e4b8422660a 100644 --- a/server/file.h +++ b/server/file.h @@ -57,7 +57,7 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform a read on the file */ - int (*read)(struct fd *, struct async *, file_pos_t ); + void (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ int (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ @@ -109,7 +109,7 @@ extern void default_poll_event( struct fd *fd, int event ); extern void fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); -extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); +extern void no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 72a61253a54..b81e167ddfc 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -143,7 +143,7 @@ static struct security_descriptor *pipe_end_get_sd( struct object *obj ); static int pipe_end_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ); -static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); +static void pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); static void pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); @@ -893,7 +893,7 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) reselect_read_queue( reader, 0 ); } -static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) +static void pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); @@ -903,25 +903,24 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) if ((pipe_end->flags & NAMED_PIPE_NONBLOCKING_MODE) && list_empty( &pipe_end->message_queue )) { set_error( STATUS_PIPE_EMPTY ); - return 0; + return; } break; case FILE_PIPE_DISCONNECTED_STATE: set_error( STATUS_PIPE_DISCONNECTED ); - return 0; + return; case FILE_PIPE_LISTENING_STATE: set_error( STATUS_PIPE_LISTENING ); - return 0; + return; case FILE_PIPE_CLOSING_STATE: if (!list_empty( &pipe_end->message_queue )) break; set_error( STATUS_PIPE_BROKEN ); - return 0; + return; } queue_async( &pipe_end->read_q, async ); reselect_read_queue( pipe_end, 0 ); set_error( STATUS_PENDING ); - return 1; } static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos )

1 0

Rémi Bernon : winebus.sys: Create devices using a struct device_desc descriptor.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 08f943b5954e4e7b0deaa4f97922fab0c2c4dc5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f943b5954e4e7b0deaa4f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 09:30:48 2021 +0200 winebus.sys: Create devices using a struct device_desc descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 5 +-- dlls/winebus.sys/bus_iohid.c | 34 +++++++++-------- dlls/winebus.sys/bus_sdl.c | 44 ++++++++++------------ dlls/winebus.sys/bus_udev.c | 73 ++++++++++++++++++------------------ dlls/winebus.sys/main.c | 88 +++++++++++++++----------------------------- dlls/winebus.sys/unixlib.c | 16 ++++++++ dlls/winebus.sys/unixlib.h | 22 +++++++++++ 7 files changed, 145 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08f943b5954e4e7b0dea…

1 0

Rémi Bernon : winebus.sys: Move device vtable to the struct unix_device side.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 4366cba6e68d248fc4ebd5765280bd9a83dcee04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4366cba6e68d248fc4ebd576… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 09:30:49 2021 +0200 winebus.sys: Move device vtable to the struct unix_device side. And name the callbacks a bit more consistently. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 19 +----- dlls/winebus.sys/bus_iohid.c | 61 ++++++++--------- dlls/winebus.sys/bus_sdl.c | 53 ++++++++------- dlls/winebus.sys/bus_udev.c | 108 +++++++++++++++++------------- dlls/winebus.sys/main.c | 120 ++++++++++++++++++++++++++++----- dlls/winebus.sys/unix_private.h | 13 ++++ dlls/winebus.sys/unixlib.c | 144 +++++++++++++++++++++++++++++++--------- dlls/winebus.sys/unixlib.h | 44 ++++++++++++ 8 files changed, 390 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4366cba6e68d248fc4eb…

1 0

Zebediah Figura : server: Mark the async as pending in IOCTL_AFD_EVENT_SELECT.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 285700a52640762756e0b9186fb218915316b04e URL: https://source.winehq.org/git/wine.git/?a=commit;h=285700a52640762756e0b918… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:48 2021 -0500 server: Mark the async as pending in IOCTL_AFD_EVENT_SELECT. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index e06f914686e..bf109eb781a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2398,6 +2398,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) obj_handle_t event_handle; int mask; + set_async_pending( async, 0 ); + if (is_machine_64bit( current->process->machine )) { const struct afd_event_select_params_64 *params = get_req_data();

1 0

Rémi Bernon : xinput1_3: Use the internal WINEXINPUT device interface class.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: f299b42738207c18dd66b17366431672f9004341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f299b42738207c18dd66b173… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 07:57:39 2021 +0200 xinput1_3: Use the internal WINEXINPUT device interface class. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 4770b64681e..44493ddb2a1 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -43,6 +43,8 @@ #include "wine/debug.h" +DEFINE_GUID(GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x47,0x67,0x50,0xc5,0xe1,0xa6); + /* Not defined in the headers, used only by XInputGetStateEx */ #define XINPUT_GAMEPAD_GUIDE 0x0400 @@ -324,7 +326,7 @@ static void update_controller_list(void) GUID guid; int i; - HidD_GetHidGuid(&guid); + guid = GUID_DEVINTERFACE_WINEXINPUT; set = SetupDiGetClassDevsW(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); detail->cbSize = sizeof(*detail); @@ -335,8 +337,6 @@ static void update_controller_list(void) if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, sizeof(buffer), NULL, NULL)) continue; - if (!wcsstr(detail->DevicePath, L"IG_")) continue; - if (find_opened_device(detail, &i)) continue; /* already opened */ if (i == XUSER_MAX_COUNT) break; /* no more slots */

1 0

Jacek Caban : gdi32: Use internal get_stock_object in ntgdi functions.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 072a100f66215763a67edc4629fe5d3b73f6734c URL: https://source.winehq.org/git/wine.git/?a=commit;h=072a100f66215763a67edc46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 3 13:59:51 2021 +0100 gdi32: Use internal get_stock_object in ntgdi functions. 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/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/dc.c | 20 ++++++++++---------- dlls/gdi32/dibdrv/objects.c | 8 ++++---- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdiobj.c | 23 +++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/painting.c | 2 +- dlls/gdi32/palette.c | 8 ++++---- dlls/gdi32/pen.c | 2 +- 10 files changed, 47 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=072a100f66215763a67e…

1 0

Zebediah Figura : server: Mark the async as pending in IOCTL_AFD_BIND.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: be3ff3d6588311132f4fe0121cd0a6b49ec249f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3ff3d6588311132f4fe012… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:47 2021 -0500 server: Mark the async as pending in IOCTL_AFD_BIND. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index 1e31b806986..e06f914686e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2527,6 +2527,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) #endif } + set_async_pending( async, 0 ); + if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) { if (errno == EADDRINUSE)

1 0

Zebediah Figura : server: Use a separate function and flag to communicate that the initial status of an async is not known yet.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: dd58bf9ce236092a584b08e33c0cd16dd0a2e564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd58bf9ce236092a584b08e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:46 2021 -0500 server: Use a separate function and flag to communicate that the initial status of an async is not known yet. Mostly just to simplify the interface, so that we don't need to use the return value to communicate this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 23 +++++++++++++++++------ server/device.c | 4 ++-- server/file.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/server/async.c b/server/async.c index e8d95a62d4b..4e9f3253759 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ unsigned int terminated :1; /* async has been terminated */ + unsigned int unknown_status :1; /* initial status is not known yet */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -258,6 +259,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->direct_result = 0; async->alerted = 0; async->terminated = 0; + async->unknown_status = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -284,6 +286,7 @@ void set_async_pending( struct async *async, int signal ) if (!async->terminated) { async->pending = 1; + async->unknown_status = 0; if (signal && !async->signaled) { async->signaled = 1; @@ -295,14 +298,15 @@ void set_async_pending( struct async *async, int signal ) /* return async object status and wait handle to client */ obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ) { + if (async->unknown_status) + { + /* even the initial status is not known yet */ + set_error( STATUS_PENDING ); + return async->wait_handle; + } + if (!success) { - if (get_error() == STATUS_PENDING) - { - /* we don't know the result yet, so client needs to wait */ - async->direct_result = 0; - return async->wait_handle; - } close_handle( async->thread->process, async->wait_handle ); async->wait_handle = 0; return 0; @@ -381,6 +385,13 @@ void async_request_complete_alloc( struct async *async, unsigned int status, dat async_request_complete( async, status, result, out_size, out_data_copy ); } +/* mark an async as having unknown initial status */ +void async_set_unknown_status( struct async *async ) +{ + async->unknown_status = 1; + async->direct_result = 0; +} + /* set the timeout of an async operation */ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ) { diff --git a/server/device.c b/server/device.c index 29b36845e68..8892651d048 100644 --- a/server/device.c +++ b/server/device.c @@ -605,8 +605,8 @@ static int queue_irp( struct device_file *file, const irp_params_t *params, stru irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file->device->manager, irp, current ); release_object( irp ); - set_error( STATUS_PENDING ); - return 0; + async_set_unknown_status( async ); + return 1; } static enum server_fd_type device_file_get_fd_type( struct fd *fd ) diff --git a/server/file.h b/server/file.h index 8e42cd3704e..9b8a620359e 100644 --- a/server/file.h +++ b/server/file.h @@ -224,6 +224,7 @@ extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); extern void async_set_completion_callback( struct async *async, async_completion_callback func, void *private ); +extern void async_set_unknown_status( struct async *async ); extern void set_async_pending( struct async *async, int signal ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status );

1 0

Rémi Bernon : winebus.sys: Remove the now useless bus_enumerate_hid_devices.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 60740e874551a02b82064b2dd4d5e9ced0e6e5d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60740e874551a02b82064b2d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 09:30:51 2021 +0200 winebus.sys: Remove the now useless bus_enumerate_hid_devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 3 --- dlls/winebus.sys/main.c | 25 ------------------------- 2 files changed, 28 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index a5615bb31b5..15238538328 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -27,15 +27,12 @@ #include "unixlib.h" -typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); - struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; /* HID Plug and Play Bus */ DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct unix_device *unix_device) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN; /* General Bus Functions */ BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 0aa3c2b7a63..6093a0b79eb 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -408,31 +408,6 @@ DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) return ret; } -DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) -{ - struct device_extension *ext, *next; - DEVICE_OBJECT *ret = NULL; - int cont; - - TRACE("bus_id %s\n", debugstr_w(bus_id)); - - EnterCriticalSection(&device_list_cs); - LIST_FOR_EACH_ENTRY_SAFE(ext, next, &device_list, struct device_extension, entry) - { - if (strcmpW(ext->desc.busid, bus_id)) continue; - LeaveCriticalSection(&device_list_cs); - cont = function(ext->device, context); - EnterCriticalSection(&device_list_cs); - if (!cont) - { - ret = ext->device; - break; - } - } - LeaveCriticalSection(&device_list_cs); - return ret; -} - static void bus_unlink_hid_device(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension;

1 0