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

Zebediah Figura : include: Rename Wine-specific socket ioctls.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 98d1dc31fb492ed13538d45527e50c30315446c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98d1dc31fb492ed13538d455… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:37 2021 -0500 include: Rename Wine-specific socket ioctls. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 ++++---- include/wine/afd.h | 8 ++++---- server/sock.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0a23b44cc68..6c03a57e325 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2341,7 +2341,7 @@ SOCKET WINAPI WS_accept( SOCKET s, struct WS_sockaddr *addr, int *len ) if (!(sync_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return INVALID_SOCKET; status = NtDeviceIoControlFile( SOCKET2HANDLE(s), (HANDLE)((ULONG_PTR)sync_event | 0), NULL, NULL, &io, - IOCTL_AFD_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); + IOCTL_AFD_WINE_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) @@ -2416,7 +2416,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D } status = NtDeviceIoControlFile( SOCKET2HANDLE(listener), overlapped->hEvent, NULL, cvalue, - (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_ACCEPT_INTO, &params, sizeof(params), + (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_WINE_ACCEPT_INTO, &params, sizeof(params), dest, recv_len + local_len + remote_len ); if (ret_len) *ret_len = overlapped->InternalHigh; @@ -4507,7 +4507,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; case WS_SIO_ADDRESS_LIST_CHANGE: - code = IOCTL_AFD_ADDRESS_LIST_CHANGE; + code = IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE; status = WSAEOPNOTSUPP; break; default: @@ -5921,7 +5921,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, create_params.protocol = protocol; create_params.flags = flags & ~(WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, - IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) + IOCTL_AFD_WINE_CREATE, &create_params, sizeof(create_params), NULL, 0))) { WARN("Failed to initialize socket, status %#x.\n", status); err = RtlNtStatusToDosError( status ); diff --git a/include/wine/afd.h b/include/wine/afd.h index 07320e7bab5..3562962d6a1 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,11 +24,11 @@ #include <winioctl.h> #include "wine/server_protocol.h" -#define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 340566cbb0a..dadcc607fbb 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1357,11 +1357,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); - if (code != IOCTL_AFD_CREATE && get_unix_fd( fd ) < 0) return 0; + if (code != IOCTL_AFD_WINE_CREATE && get_unix_fd( fd ) < 0) return 0; switch(code) { - case IOCTL_AFD_CREATE: + case IOCTL_AFD_WINE_CREATE: { const struct afd_create_params *params = get_req_data(); @@ -1374,7 +1374,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - case IOCTL_AFD_ACCEPT: + case IOCTL_AFD_WINE_ACCEPT: { struct sock *acceptsock; obj_handle_t handle; @@ -1409,7 +1409,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - case IOCTL_AFD_ACCEPT_INTO: + case IOCTL_AFD_WINE_ACCEPT_INTO: { static const int access = FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | FILE_READ_DATA; const struct afd_accept_into_params *params = get_req_data(); @@ -1459,7 +1459,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } - case IOCTL_AFD_ADDRESS_LIST_CHANGE: + case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { set_error( STATUS_DEVICE_NOT_READY );

1 0

Zebediah Figura : include: Use FILE_ANY_ACCESS for wine-specific socket ioctls.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: b07384c29250e1e01aa71a5de784d7cbafce332c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07384c29250e1e01aa71a5d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:38 2021 -0500 include: Use FILE_ANY_ACCESS for wine-specific socket ioctls. All native ioctls use FILE_ANY_ACCESS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 3562962d6a1..a711fba23a5 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,11 +24,11 @@ #include <winioctl.h> #include "wine/server_protocol.h" -#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : server: Implement IOCTL_AFD_LISTEN.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 6ccf61fbc730bfbb64ccb75ddbc226bb19968694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccf61fbc730bfbb64ccb75d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:39 2021 -0500 server: Implement IOCTL_AFD_LISTEN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 9 +++++++++ server/sock.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index a711fba23a5..e890020ca88 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,15 @@ #include <winioctl.h> #include "wine/server_protocol.h" +#define IOCTL_AFD_LISTEN CTL_CODE(FILE_DEVICE_BEEP, 0x802, METHOD_NEITHER, FILE_ANY_ACCESS) + +struct afd_listen_params +{ + int unknown1; + int backlog; + int unknown2; +}; + #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index dadcc607fbb..945895b51a4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1354,10 +1354,11 @@ static struct accept_req *alloc_accept_req( struct sock *sock, struct sock *acce static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct sock *sock = get_fd_user( fd ); + int unix_fd; assert( sock->obj.ops == &sock_ops ); - if (code != IOCTL_AFD_WINE_CREATE && get_unix_fd( fd ) < 0) return 0; + if (code != IOCTL_AFD_WINE_CREATE && (unix_fd = get_unix_fd( fd )) < 0) return 0; switch(code) { @@ -1459,6 +1460,32 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_LISTEN: + { + const struct afd_listen_params *params = get_req_data(); + + if (get_req_data_size() < sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (listen( unix_fd, params->backlog ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + + sock->pending_events &= ~FD_ACCEPT; + sock->reported_events &= ~FD_ACCEPT; + sock->state |= FD_WINE_LISTENING; + sock->state &= ~(FD_CONNECT | FD_WINE_CONNECTED); + + /* we may already be selecting for FD_ACCEPT */ + sock_reselect( sock ); + return 0; + } + case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) {

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_LISTEN.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: cdd24b1d9f0ddcc40cf9346aba28b919075c8db4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdd24b1d9f0ddcc40cf9346a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:40 2021 -0500 ws2_32: Use IOCTL_AFD_LISTEN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6c03a57e325..2ba1982b1d9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4566,37 +4566,36 @@ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) return WSAIoctl( s, cmd, argp, sizeof(WS_u_long), argp, sizeof(WS_u_long), &ret_size, NULL, NULL ); } + /*********************************************************************** - * listen (WS2_32.13) + * listen (ws2_32.13) */ -int WINAPI WS_listen(SOCKET s, int backlog) +int WINAPI WS_listen( SOCKET s, int backlog ) { - int fd = get_sock_fd( s, FILE_READ_DATA, NULL ), ret = SOCKET_ERROR; + struct afd_listen_params params = {.backlog = backlog}; + IO_STATUS_BLOCK io; + NTSTATUS status; + int fd, bound; - TRACE("socket %04lx, backlog %d\n", s, backlog); - if (fd != -1) - { - int bound = is_fd_bound(fd, NULL, NULL); + TRACE( "socket %#lx, backlog %d\n", s, backlog ); - if (bound <= 0) - { - SetLastError(bound == -1 ? wsaErrno() : WSAEINVAL); - } - else if (listen(fd, backlog) == 0) - { - _enable_event(SOCKET2HANDLE(s), FD_ACCEPT, - FD_WINE_LISTENING, - FD_CONNECT|FD_WINE_CONNECTED); - ret = 0; - } - else - SetLastError(wsaErrno()); - release_sock_fd( s, fd ); + if ((fd = get_sock_fd( s, FILE_READ_DATA, NULL )) == -1) + return -1; + bound = is_fd_bound( fd, NULL, NULL ); + release_sock_fd( s, fd ); + if (bound <= 0) + { + SetLastError( bound ? wsaErrno() : WSAEINVAL ); + return -1; } - return ret; + status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, + IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; } + /*********************************************************************** * recv (WS2_32.16) */

1 0

Derek Lesho : winegstreamer: Ensure that the source reports both PCM and floating point audio formats.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 865bbff0d984403fc608ec63bdd8dd6500240cf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865bbff0d984403fc608ec63… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu May 13 15:53:47 2021 +0200 winegstreamer: Ensure that the source reports both PCM and floating point audio formats. The patch is originally by Derek Lesho, with some changes by Giovanni Mascellani and Nikolay Sivov. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 3 --- dlls/winegstreamer/media_source.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index ded45afe771..e3ff7f6e7aa 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -752,9 +752,6 @@ static void test_source_reader(void) if (SUCCEEDED(hr)) IMFMediaType_Release(mediatype); - hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 1, &mediatype); - ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); - /* Current media type. */ hr = IMFSourceReader_GetCurrentMediaType(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, &mediatype); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..7f308973270 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -806,6 +806,31 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; } } + else if (format.major_type == WG_MAJOR_TYPE_AUDIO) + { + /* Expose at least one PCM and one floating point type for the + consumer to pick from. */ + static const enum wg_audio_format audio_types[] = + { + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_F32LE, + }; + + stream_types = malloc( sizeof(IMFMediaType *) * (ARRAY_SIZE(audio_types) + 1) ); + + stream_types[0] = mf_media_type_from_wg_format(&format); + type_count = 1; + + for (i = 0; i < ARRAY_SIZE(audio_types); i++) + { + struct wg_format new_format; + if (format.u.audio.format == audio_types[i]) + continue; + new_format = format; + new_format.u.audio.format = audio_types[i]; + stream_types[type_count++] = mf_media_type_from_wg_format(&new_format); + } + } else { stream_type = mf_media_type_from_wg_format(&format);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_transform().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 6f9e338599462ff75d0fe296022ec4449d76fddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e338599462ff75d0fe296… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:48 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_transform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e94d1a19dc2..6345aa4f634 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1832,17 +1832,17 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat device_invalidate_state(cs->c.device, STATE_TRANSFORM(op->state)); } -void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, - const struct wined3d_matrix *matrix) +void wined3d_device_context_emit_set_transform(struct wined3d_device_context *context, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix) { struct wined3d_cs_set_transform *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TRANSFORM; op->state = state; op->matrix = *matrix; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e62da01171c..e8be09d9e78 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1330,7 +1330,7 @@ static void wined3d_device_set_transform(struct wined3d_device *device, } device->cs->c.state->transforms[state] = *matrix; - wined3d_cs_emit_set_transform(device->cs, state, matrix); + wined3d_device_context_emit_set_transform(&device->cs->c, state, matrix); } static void wined3d_device_get_transform(const struct wined3d_device *device, @@ -1832,7 +1832,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i) { - wined3d_cs_emit_set_transform(device->cs, i, state->transforms + i); + wined3d_device_context_emit_set_transform(context, i, state->transforms + i); } for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c752be692fc..69021675fe7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4757,8 +4757,6 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, - const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; @@ -4828,6 +4826,8 @@ void wined3d_device_context_emit_set_texture(struct wined3d_device_context *cont struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage, enum wined3d_texture_stage_state state, unsigned int value) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_transform(struct wined3d_device_context *context, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_clip_plane().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 30501be16d486a3f334a303d9d7c27519524db15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30501be16d486a3f334a303d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:49 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_clip_plane(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6345aa4f634..201d8834252 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1853,16 +1853,17 @@ static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *da device_invalidate_state(cs->c.device, STATE_CLIPPLANE(op->plane_idx)); } -void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) +void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *context, + unsigned int plane_idx, const struct wined3d_vec4 *plane) { struct wined3d_cs_set_clip_plane *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_CLIP_PLANE; op->plane_idx = plane_idx; op->plane = *plane; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e8be09d9e78..f02e904accf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1493,7 +1493,7 @@ static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, clip_planes[plane_idx] = *plane; - wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); + wined3d_device_context_emit_set_clip_plane(&device->cs->c, plane_idx, plane); return WINED3D_OK; } @@ -1837,7 +1837,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) { - wined3d_cs_emit_set_clip_plane(device->cs, i, state->clip_planes + i); + wined3d_device_context_emit_set_clip_plane(context, i, state->clip_planes + i); } wined3d_cs_emit_set_material(device->cs, &state->material); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69021675fe7..12e908d341d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4746,8 +4746,6 @@ void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_reso void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, - const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; @@ -4791,6 +4789,8 @@ void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *context, unsigned int plane_idx, + const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_material().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 7da27fc327275f71c35b3256e2646a62d07c11b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da27fc327275f71c35b3256… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:50 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_material(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 201d8834252..fd8ebbbd40f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1957,15 +1957,16 @@ static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data device_invalidate_state(cs->c.device, STATE_MATERIAL); } -void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) +void wined3d_device_context_emit_set_material(struct wined3d_device_context *context, + const struct wined3d_material *material) { struct wined3d_cs_set_material *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_MATERIAL; op->material = *material; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f02e904accf..751df25f559 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1525,7 +1525,7 @@ static void wined3d_device_set_material(struct wined3d_device *device, const str TRACE("device %p, material %p.\n", device, material); device->cs->c.state->material = *material; - wined3d_cs_emit_set_material(device->cs, material); + wined3d_device_context_emit_set_material(&device->cs->c, material); } void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, @@ -1840,7 +1840,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_device_context_emit_set_clip_plane(context, i, state->clip_planes + i); } - wined3d_cs_emit_set_material(device->cs, &state->material); + wined3d_device_context_emit_set_material(context, &state->material); wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_device_context_emit_set_scissor_rects(context, state->scissor_rect_count, state->scissor_rects); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 12e908d341d..a338c39ef3c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4750,7 +4750,6 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, @@ -4801,6 +4800,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_material(struct wined3d_device_context *context, + const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context, struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light_enable().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 692a3128b4c8b539fdd85fa488a4d85c62f418ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=692a3128b4c8b539fdd85fa4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:51 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light_enable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fd8ebbbd40f..7ec3c428fc4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2039,16 +2039,16 @@ static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void * } } -void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) +void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, BOOL enable) { struct wined3d_cs_set_light_enable *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT_ENABLE; op->idx = idx; op->enable = enable; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_feature_level(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 751df25f559..905357571bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1469,7 +1469,7 @@ static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT } wined3d_light_state_enable_light(light_state, &device->adapter->d3d_info, light_info, enable); - wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); + wined3d_device_context_emit_set_light_enable(&device->cs->c, light_idx, enable); } static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, @@ -1850,7 +1850,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 LIST_FOR_EACH_ENTRY(light, &state->light_state.light_map[i], struct wined3d_light_info, entry) { wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_cs_emit_set_light_enable(device->cs, light->OriginalIndex, light->glIndex != -1); + wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a338c39ef3c..8e419ed9c0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4749,7 +4749,6 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, @@ -4800,6 +4799,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, + BOOL enable) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_material(struct wined3d_device_context *context, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: adb45b0ad80db90fcd5ce1bd31cb642f347f12e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb45b0ad80db90fcd5ce1bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:52 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7ec3c428fc4..21aaa2e54b6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2006,15 +2006,16 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) light_info->cutoff = op->light.cutoff; } -void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) +void wined3d_device_context_emit_set_light(struct wined3d_device_context *context, + const struct wined3d_light_info *light) { struct wined3d_cs_set_light *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT; op->light = *light; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 905357571bf..484130b3103 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1445,7 +1445,7 @@ static void wined3d_device_set_light(struct wined3d_device *device, FIXME("Unrecognized light type %#x.\n", light->type); } - wined3d_cs_emit_set_light(device->cs, object); + wined3d_device_context_emit_set_light(&device->cs->c, object); } static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e419ed9c0f..1be36467c53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4748,7 +4748,6 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, @@ -4799,6 +4798,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_light(struct wined3d_device_context *context, + const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_material(struct wined3d_device_context *context,

1 0