wine-devel December 2021

wine-devel@winehq.org

85 participants
585 discussions

[PATCH v2 2/5] winevulkan: Pass Unix call arguments as a struct.
by Jacek Caban 10 Dec '21

10 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 31 +++- dlls/winevulkan/make_vulkan | 100 +++++++++---- dlls/winevulkan/vulkan.c | 285 +++++++++++++++++++++++++++--------- 3 files changed, 306 insertions(+), 110 deletions(-)

1 0

[PATCH 1/6] winevulkan: Use __wine_unix_call interface for Unix lib initialization.
by Jacek Caban 10 Dec '21

10 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch is interesting on its own. It bypasses syscall interface, but at least eliminates the need for __wine_init_unix_lib mechanism. Later patches use the interface in more places. We still can't call drivers from Unix stack. Since both mechanisms are supported in make_vulkan for now, it's easy to tweak needs_unix_call() if needed. dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/loader.c | 24 +++++++++++++++--------- dlls/winevulkan/make_vulkan | 12 ++++++++++++ dlls/winevulkan/vulkan.c | 29 +++++++++++------------------ dlls/winevulkan/vulkan_loader.h | 13 +++++++++++++ dlls/winevulkan/vulkan_private.h | 2 ++ 6 files changed, 54 insertions(+), 27 deletions(-)

2 2

[PATCH 1/2] win32u/tests: Add tests for NtUserEnumDisplayDevices return value.
by Torge Matthies 09 Dec '21

09 Dec '21

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/win32u/tests/win32u.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index a7c2e5ef029..7d1b7f3caa8 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -16,12 +16,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include "wine/test.h" #include "winbase.h" #include "ntuser.h" +static void test_NtUserEnumDisplayDevices(void) +{ + NTSTATUS ret; + DISPLAY_DEVICEW info; + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 0, &info, 0 ); + todo_wine ok( !ret && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserEnumDisplayDevices( NULL, 12345, &info, 0 ); + todo_wine ok( ret == STATUS_UNSUCCESSFUL && GetLastError() == 0xdeadbeef, + "NtUserEnumDisplayDevices returned %x %u\n", ret, + GetLastError() ); +} + static void test_NtUserCloseWindowStation(void) { BOOL ret; @@ -67,6 +88,7 @@ START_TEST(win32u) /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ GetDesktopWindow(); + test_NtUserEnumDisplayDevices(); /* Must run before test_NtUserCloseWindowStation. */ test_NtUserCloseWindowStation(); test_window_props(); } -- 2.34.1

2 2

[PATCH v4] ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.
by Bastien Orivel 09 Dec '21

09 Dec '21

According to MSDN [1], the `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..5ac88c47b2e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2868,8 +2868,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..464a6e5c8ea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,59 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.0

3 2

[PATCH 8/8] wined3d: Trace CS packet pointers.
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Zebediah Figura <zfigura(a)codeweavers.com> This makes it easier to "unwind" through the CS thread when debugging. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2edaff01446..bb629d9b27f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3217,6 +3217,7 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined size_t packet_size; packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); InterlockedExchange(&queue->head, (queue->head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1)); @@ -3429,7 +3430,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { opcode = *(const enum wined3d_cs_op *)packet->data; - TRACE("Executing %s.\n", debug_cs_op(opcode)); + TRACE("Executing %s at %p.\n", debug_cs_op(opcode), packet); if (opcode >= WINED3D_CS_OP_STOP) { if (opcode > WINED3D_CS_OP_STOP) @@ -3440,7 +3441,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) wined3d_cs_command_lock(cs); wined3d_cs_op_handlers[opcode](cs, packet->data); wined3d_cs_command_unlock(cs); - TRACE("%s executed.\n", debug_cs_op(opcode)); + TRACE("%s at %p executed.\n", debug_cs_op(opcode), packet); } tail &= (WINED3D_CS_QUEUE_SIZE - 1); -- 2.30.2

1 0

[PATCH 7/8] Revert "wined3d: Acquire references to shaders in deferred contexts."
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> This reverts commit 908fb50728a33da6f7238cafcc8163065785ab0a. Moved to wined3d_cs_packet_{in/de}cref_objects(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 48 ---------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 49 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0bfe5e28822..2edaff01446 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -72,9 +72,6 @@ struct wined3d_command_list SIZE_T depth_stencil_state_count; struct wined3d_depth_stencil_state **depth_stencil_states; - - SIZE_T shader_count; - struct wined3d_shader **shaders; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -568,12 +565,6 @@ static inline void wined3d_device_context_acquire_depth_stencil_state(struct win context->ops->acquire_depth_stencil_state(context, depth_stencil_state); } -static inline void wined3d_device_context_acquire_shader(struct wined3d_device_context *context, - struct wined3d_shader *shader) -{ - context->ops->acquire_shader(context, shader); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1795,8 +1786,6 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte op->type = type; op->shader = shader; - if (shader) - wined3d_device_context_acquire_shader(context, shader); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2974,11 +2963,6 @@ static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context { } -static void wined3d_cs_acquire_shader(struct wined3d_device_context *context, - struct wined3d_shader *shader) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3219,7 +3203,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, - wined3d_cs_acquire_shader, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3350,7 +3333,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, - wined3d_cs_acquire_shader, }; static void poll_queries(struct wined3d_cs *cs) @@ -3651,9 +3633,6 @@ struct wined3d_deferred_context SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; struct wined3d_depth_stencil_state **depth_stencil_states; - - SIZE_T shader_count, shaders_capacity; - struct wined3d_shader **shaders; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3890,18 +3869,6 @@ static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_ wined3d_depth_stencil_state_incref(depth_stencil_state); } -static void wined3d_deferred_context_acquire_shader(struct wined3d_device_context *context, - struct wined3d_shader *shader) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->shaders, &deferred->shaders_capacity, - deferred->shader_count + 1, sizeof(*deferred->shaders))) - return; - - deferred->shaders[deferred->shader_count++] = shader; - wined3d_shader_incref(shader); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3917,7 +3884,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, wined3d_deferred_context_acquire_depth_stencil_state, - wined3d_deferred_context_acquire_shader, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3988,10 +3954,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); heap_free(deferred->depth_stencil_states); - for (i = 0; i < deferred->shader_count; ++i) - wined3d_shader_decref(deferred->shaders[i]); - heap_free(deferred->shaders); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -4020,7 +3982,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) - + deferred->shader_count * sizeof(*object->shaders) + deferred->data_size); if (!memory) @@ -4080,12 +4041,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); /* Transfer our references to the depth stencil states to the command list. */ - object->shaders = memory; - memory = &object->shaders[deferred->shader_count]; - object->shader_count = deferred->shader_count; - memcpy(object->shaders, deferred->shaders, deferred->shader_count * sizeof(*object->shaders)); - /* Transfer our references to the shaders to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4098,7 +4053,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; deferred->depth_stencil_state_count = 0; - deferred->shader_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4160,8 +4114,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); for (i = 0; i < list->depth_stencil_state_count; ++i) wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); - for (i = 0; i < list->shader_count; ++i) - wined3d_shader_decref(list->shaders[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3805fdc48a7..71481a8c9c8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4853,7 +4853,6 @@ struct wined3d_device_context_ops struct wined3d_rasterizer_state *rasterizer_state); void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state); - void (*acquire_shader)(struct wined3d_device_context *context, struct wined3d_shader *shader); }; struct wined3d_device_context -- 2.30.2

1 0

[PATCH 6/8] wined3d: Acquire shader references for command lists by inspecting CS packets.
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b1d39580d30..0bfe5e28822 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3574,6 +3574,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_SHADER: + { + struct wined3d_cs_set_shader *op = (struct wined3d_cs_set_shader *)packet->data; + + if (op->shader) + wined3d_shader_decref(op->shader); + break; + } + default: break; } @@ -3598,6 +3607,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_SHADER: + { + struct wined3d_cs_set_shader *op = (struct wined3d_cs_set_shader *)packet->data; + + if (op->shader) + wined3d_shader_incref(op->shader); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 5/8] Revert "wined3d: Acquire references to samplers in deferred contexts."
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> This reverts commit 0056ebf91ef3dd6a903e87adbdc1460bc08b4181. Sampler references in deferred contexts are now managed by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase. dlls/wined3d/cs.c | 55 ---------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 57 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ed7e3b2b630..b1d39580d30 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -75,9 +75,6 @@ struct wined3d_command_list SIZE_T shader_count; struct wined3d_shader **shaders; - - SIZE_T sampler_count; - struct wined3d_sampler **samplers; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -577,12 +574,6 @@ static inline void wined3d_device_context_acquire_shader(struct wined3d_device_c context->ops->acquire_shader(context, shader); } -static inline void wined3d_device_context_acquire_samplers(struct wined3d_device_context *context, - struct wined3d_sampler * const *samplers, unsigned int count) -{ - context->ops->acquire_samplers(context, samplers, count); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1779,7 +1770,6 @@ void wined3d_device_context_emit_set_samplers(struct wined3d_device_context *con op->count = count; memcpy(op->samplers, samplers, count * sizeof(*samplers)); - wined3d_device_context_acquire_samplers(context, samplers, count); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2989,11 +2979,6 @@ static void wined3d_cs_acquire_shader(struct wined3d_device_context *context, { } -static void wined3d_cs_acquire_samplers(struct wined3d_device_context *context, - struct wined3d_sampler * const *samplers, unsigned int count) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3235,7 +3220,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, wined3d_cs_acquire_shader, - wined3d_cs_acquire_samplers, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3367,7 +3351,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_rasterizer_state, wined3d_cs_acquire_depth_stencil_state, wined3d_cs_acquire_shader, - wined3d_cs_acquire_samplers, }; static void poll_queries(struct wined3d_cs *cs) @@ -3653,9 +3636,6 @@ struct wined3d_deferred_context SIZE_T shader_count, shaders_capacity; struct wined3d_shader **shaders; - - SIZE_T sampler_count, samplers_capacity; - struct wined3d_sampler **samplers; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3904,26 +3884,6 @@ static void wined3d_deferred_context_acquire_shader(struct wined3d_device_contex wined3d_shader_incref(shader); } -static void wined3d_deferred_context_acquire_samplers(struct wined3d_device_context *context, - struct wined3d_sampler * const *samplers, unsigned int count) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - unsigned int i; - - if (!wined3d_array_reserve((void **)&deferred->samplers, &deferred->samplers_capacity, - deferred->sampler_count + count, sizeof(*deferred->samplers))) - return; - - for (i = 0; i < count; ++i) - { - if (samplers[i]) - { - deferred->samplers[deferred->sampler_count++] = samplers[i]; - wined3d_sampler_incref(samplers[i]); - } - } -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3940,7 +3900,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_rasterizer_state, wined3d_deferred_context_acquire_depth_stencil_state, wined3d_deferred_context_acquire_shader, - wined3d_deferred_context_acquire_samplers, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -4015,10 +3974,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_shader_decref(deferred->shaders[i]); heap_free(deferred->shaders); - for (i = 0; i < deferred->sampler_count; ++i) - wined3d_sampler_decref(deferred->samplers[i]); - heap_free(deferred->samplers); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -4048,7 +4003,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + deferred->shader_count * sizeof(*object->shaders) - + deferred->sampler_count * sizeof(*object->samplers) + deferred->data_size); if (!memory) @@ -4114,12 +4068,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->shaders, deferred->shaders, deferred->shader_count * sizeof(*object->shaders)); /* Transfer our references to the shaders to the command list. */ - object->samplers = memory; - memory = &object->samplers[deferred->sampler_count]; - object->sampler_count = deferred->sampler_count; - memcpy(object->samplers, deferred->samplers, deferred->sampler_count * sizeof(*object->samplers)); - /* Transfer our references to the samplers to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4133,7 +4081,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->rasterizer_state_count = 0; deferred->depth_stencil_state_count = 0; deferred->shader_count = 0; - deferred->sampler_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4197,8 +4144,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); for (i = 0; i < list->shader_count; ++i) wined3d_shader_decref(list->shaders[i]); - for (i = 0; i < list->sampler_count; ++i) - wined3d_sampler_decref(list->samplers[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b30a4108b0b..3805fdc48a7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4854,8 +4854,6 @@ struct wined3d_device_context_ops void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state); void (*acquire_shader)(struct wined3d_device_context *context, struct wined3d_shader *shader); - void (*acquire_samplers)(struct wined3d_device_context *context, struct wined3d_sampler * const *samplers, - unsigned int count); }; struct wined3d_device_context -- 2.30.2

1 0

[PATCH 4/8] wined3d: Acquire sampler references for command lists by inspecting CS packets.
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Avoid some forward declarations. - Minor style changes. dlls/wined3d/cs.c | 76 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2889b3ec38c..ed7e3b2b630 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3572,6 +3572,54 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) heap_free(cs); } +static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op = (struct wined3d_cs_set_samplers *)packet->data; + + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_decref(op->samplers[i]); + } + break; + } + + default: + break; + } +} + +static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; + unsigned int i; + + switch (opcode) + { + case WINED3D_CS_OP_SET_SAMPLERS: + { + struct wined3d_cs_set_samplers *op = (struct wined3d_cs_set_samplers *)packet->data; + + for (i = 0; i < op->count; ++i) + { + if (op->samplers[i]) + wined3d_sampler_incref(op->samplers[i]); + } + break; + } + + default: + break; + } +} + struct wined3d_deferred_context { struct wined3d_device_context c; @@ -3634,16 +3682,18 @@ static void *wined3d_deferred_context_require_space(struct wined3d_device_contex packet = (struct wined3d_cs_packet *)((BYTE *)deferred->data + deferred->data_size); TRACE("size was %zu, adding %zu\n", (size_t)deferred->data_size, packet_size); - deferred->data_size += packet_size; packet->size = packet_size - header_size; return &packet->data; } static void wined3d_deferred_context_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { - assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + struct wined3d_cs_packet *packet; - /* Nothing to do. */ + assert(queue_id == WINED3D_CS_QUEUE_DEFAULT); + packet = wined3d_next_cs_packet(deferred->data, &deferred->data_size); + wined3d_cs_packet_incref_objects(packet); } static void wined3d_deferred_context_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -3925,7 +3975,8 @@ HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, str void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *context) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - SIZE_T i; + const struct wined3d_cs_packet *packet; + SIZE_T i, offset = 0; TRACE("context %p.\n", context); @@ -3968,6 +4019,12 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_sampler_decref(deferred->samplers[i]); heap_free(deferred->samplers); + while (offset < deferred->data_size) + { + packet = wined3d_next_cs_packet(deferred->data, &offset); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -4117,13 +4174,13 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { ULONG refcount = InterlockedDecrement(&list->refcount); struct wined3d_device *device = list->device; + const struct wined3d_cs_packet *packet; + SIZE_T i, offset; TRACE("%p decreasing refcount to %u.\n", list, refcount); if (!refcount) { - SIZE_T i; - for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) @@ -4143,6 +4200,13 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->sampler_count; ++i) wined3d_sampler_decref(list->samplers[i]); + offset = 0; + while (offset < list->data_size) + { + packet = wined3d_next_cs_packet(list->data, &offset); + wined3d_cs_packet_decref_objects(packet); + } + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); -- 2.30.2

1 0

[PATCH 3/8] wined3d: Move the command list reference counting functions to the end of cs.c.
by Henri Verbeet 09 Dec '21

09 Dec '21

These are part of the public API, so there's not need for them to be at the start of the file. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- And in fact, it's somewhat counter-productive when we need to call local functions, as in the next patch in this series. dlls/wined3d/cs.c | 120 +++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index da32e1c2804..2889b3ec38c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -80,66 +80,6 @@ struct wined3d_command_list struct wined3d_sampler **samplers; }; -static void wined3d_command_list_destroy_object(void *object) -{ - struct wined3d_command_list *list = object; - SIZE_T i; - - TRACE("list %p.\n", list); - - for (i = 0; i < list->upload_count; ++i) - heap_free(list->uploads[i].sysmem); - - heap_free(list); -} - -ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) -{ - ULONG refcount = InterlockedIncrement(&list->refcount); - - TRACE("%p increasing refcount to %u.\n", list, refcount); - - return refcount; -} - -ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) -{ - ULONG refcount = InterlockedDecrement(&list->refcount); - struct wined3d_device *device = list->device; - - TRACE("%p decreasing refcount to %u.\n", list, refcount); - - if (!refcount) - { - SIZE_T i; - - for (i = 0; i < list->command_list_count; ++i) - wined3d_command_list_decref(list->command_lists[i]); - for (i = 0; i < list->resource_count; ++i) - wined3d_resource_decref(list->resources[i]); - for (i = 0; i < list->upload_count; ++i) - wined3d_resource_decref(list->uploads[i].resource); - for (i = 0; i < list->query_count; ++i) - wined3d_query_decref(list->queries[i].query); - for (i = 0; i < list->blend_state_count; ++i) - wined3d_blend_state_decref(list->blend_states[i]); - for (i = 0; i < list->rasterizer_state_count; ++i) - wined3d_rasterizer_state_decref(list->rasterizer_states[i]); - for (i = 0; i < list->depth_stencil_state_count; ++i) - wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); - for (i = 0; i < list->shader_count; ++i) - wined3d_shader_decref(list->shaders[i]); - for (i = 0; i < list->sampler_count; ++i) - wined3d_sampler_decref(list->samplers[i]); - - wined3d_mutex_lock(); - wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); - wined3d_mutex_unlock(); - } - - return refcount; -} - static void invalidate_client_address(struct wined3d_resource *resource) { struct wined3d_client_resource *client = &resource->client; @@ -4150,3 +4090,63 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device return S_OK; } + +static void wined3d_command_list_destroy_object(void *object) +{ + struct wined3d_command_list *list = object; + SIZE_T i; + + TRACE("list %p.\n", list); + + for (i = 0; i < list->upload_count; ++i) + heap_free(list->uploads[i].sysmem); + + heap_free(list); +} + +ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) +{ + ULONG refcount = InterlockedIncrement(&list->refcount); + + TRACE("%p increasing refcount to %u.\n", list, refcount); + + return refcount; +} + +ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) +{ + ULONG refcount = InterlockedDecrement(&list->refcount); + struct wined3d_device *device = list->device; + + TRACE("%p decreasing refcount to %u.\n", list, refcount); + + if (!refcount) + { + SIZE_T i; + + for (i = 0; i < list->command_list_count; ++i) + wined3d_command_list_decref(list->command_lists[i]); + for (i = 0; i < list->resource_count; ++i) + wined3d_resource_decref(list->resources[i]); + for (i = 0; i < list->upload_count; ++i) + wined3d_resource_decref(list->uploads[i].resource); + for (i = 0; i < list->query_count; ++i) + wined3d_query_decref(list->queries[i].query); + for (i = 0; i < list->blend_state_count; ++i) + wined3d_blend_state_decref(list->blend_states[i]); + for (i = 0; i < list->rasterizer_state_count; ++i) + wined3d_rasterizer_state_decref(list->rasterizer_states[i]); + for (i = 0; i < list->depth_stencil_state_count; ++i) + wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); + for (i = 0; i < list->shader_count; ++i) + wined3d_shader_decref(list->shaders[i]); + for (i = 0; i < list->sampler_count; ++i) + wined3d_sampler_decref(list->samplers[i]); + + wined3d_mutex_lock(); + wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); + wined3d_mutex_unlock(); + } + + return refcount; +} -- 2.30.2

1 0

[PATCH 2/8] wined3d: Use wined3d_next_cs_packet() in wined3d_cs_exec_execute_command_list().
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Move this patch earlier in the series. dlls/wined3d/cs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 20019e0260c..da32e1c2804 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3112,14 +3112,14 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_execute_command_list *op = data; - size_t start = 0, end = op->list->data_size; + SIZE_T start = 0, end = op->list->data_size; const BYTE *cs_data = op->list->data; TRACE("Executing command list %p.\n", op->list); while (start < end) { - const struct wined3d_cs_packet *packet = (const struct wined3d_cs_packet *)&cs_data[start]; + const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start); enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; if (opcode >= WINED3D_CS_OP_STOP) @@ -3127,8 +3127,6 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo else wined3d_cs_op_handlers[opcode](cs, packet->data); TRACE("%s executed.\n", debug_cs_op(opcode)); - - start += offsetof(struct wined3d_cs_packet, data[packet->size]); } } -- 2.30.2

1 0

[PATCH 1/8] wined3d: Introduce a helper function to extract a packet from a command stream.
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Move this patch earlier in the series. - Move wined3d_next_cs_packet() after the structure definitions. dlls/wined3d/cs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2c94b7aed76..20019e0260c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -708,6 +708,15 @@ static const char *debug_cs_op(enum wined3d_cs_op op) return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset) +{ + struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[*offset]; + + *offset += offsetof(struct wined3d_cs_packet, data[packet->size]); + + return packet; +} + static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) { } @@ -3478,7 +3487,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) enum wined3d_cs_op opcode; HMODULE wined3d_module; unsigned int poll = 0; - LONG tail; + SIZE_T tail; TRACE("Started.\n"); @@ -3512,7 +3521,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) spin_count = 0; tail = queue->tail; - packet = (struct wined3d_cs_packet *)&queue->data[tail]; + packet = wined3d_next_cs_packet(queue->data, &tail); if (packet->size) { opcode = *(const enum wined3d_cs_op *)packet->data; @@ -3531,7 +3540,6 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) TRACE("%s executed.\n", debug_cs_op(opcode)); } - tail += FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); tail &= (WINED3D_CS_QUEUE_SIZE - 1); InterlockedExchange(&queue->tail, tail); } -- 2.30.2

1 0

[PATCH v2 1/2] wined3d: Pass a wined3d_device_gl pointer to wined3d_device_delete_opengl_contexts_cs().
by Zebediah Figura 09 Dec '21

09 Dec '21

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Retain the trace... dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index fc7a8964923..6cc2f0cd9a8 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4577,7 +4577,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); wined3d_device_destroy_default_samplers(device); - wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); + wined3d_cs_destroy_object(device->cs, wined3d_device_gl_delete_opengl_contexts_cs, wined3d_device_gl(device)); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 067d54d58e3..93c738ad955 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -955,18 +955,18 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); } -void wined3d_device_delete_opengl_contexts_cs(void *object) +void wined3d_device_gl_delete_opengl_contexts_cs(void *object) { + struct wined3d_device_gl *device_gl = object; struct wined3d_swapchain_gl *swapchain_gl; - struct wined3d_device *device = object; struct wined3d_context_gl *context_gl; - struct wined3d_device_gl *device_gl; struct wined3d_context *context; + struct wined3d_device *device; struct wined3d_shader *shader; - TRACE("device %p.\n", device); + TRACE("device %p.\n", device_gl); - device_gl = wined3d_device_gl(device); + device = &device_gl->d; LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8f24c41fd5..ecb5182eb13 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3920,7 +3920,6 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, @@ -3964,6 +3963,7 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device } void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; +void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; struct wined3d_null_resources_vk { -- 2.34.1

3 5

[PATCH] wined3d: Trace CS packet pointers.
by Zebediah Figura 09 Dec '21

09 Dec '21

This makes it easier to "unwind" through the CS thread when debugging. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2c94b7aed76..a149de8d628 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3303,6 +3303,7 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined size_t packet_size; packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); InterlockedExchange(&queue->head, (queue->head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1)); @@ -3517,7 +3518,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { opcode = *(const enum wined3d_cs_op *)packet->data; - TRACE("Executing %s.\n", debug_cs_op(opcode)); + TRACE("Executing %s at %p.\n", debug_cs_op(opcode), packet); if (opcode >= WINED3D_CS_OP_STOP) { if (opcode > WINED3D_CS_OP_STOP) @@ -3528,7 +3529,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) wined3d_cs_command_lock(cs); wined3d_cs_op_handlers[opcode](cs, packet->data); wined3d_cs_command_unlock(cs); - TRACE("%s executed.\n", debug_cs_op(opcode)); + TRACE("%s at %p executed.\n", debug_cs_op(opcode), packet); } tail += FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); -- 2.34.1

1 0

[PATCH 1/4] wined3d: Pass a wined3d_device_gl pointer to wined3d_device_create_primary_opengl_context_cs().
by Zebediah Figura 09 Dec '21

09 Dec '21

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 9864093c999..fc7a8964923 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4564,7 +4564,7 @@ static HRESULT adapter_gl_init_3d(struct wined3d_device *device) { TRACE("device %p.\n", device); - wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); + wined3d_cs_init_object(device->cs, wined3d_device_gl_create_primary_opengl_context_cs, wined3d_device_gl(device)); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!wined3d_swapchain_gl(device->swapchains[0])->context_count) return E_FAIL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c516594c269..067d54d58e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -989,17 +989,19 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) } } -void wined3d_device_create_primary_opengl_context_cs(void *object) +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) { - struct wined3d_device *device = object; + struct wined3d_device_gl *device_gl = object; struct wined3d_context_gl *context_gl; struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; + struct wined3d_device *device; HRESULT hr; - TRACE("device %p.\n", device); + TRACE("device %p.\n", device_gl); + device = &device_gl->d; swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; if (!(context = context_acquire(device, target, 0))) @@ -1032,7 +1034,7 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); + wined3d_device_gl_create_dummy_textures(device_gl, context_gl); wined3d_device_create_default_samplers(device, context); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b30a4108b0b..c8f24c41fd5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3920,7 +3920,6 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, @@ -3964,6 +3963,8 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; -- 2.34.1

3 8

[PATCH] server: Avoid reqeuests with null pointer but invalid size.
by Bernhard Übelacker 09 Dec '21

09 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51770 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ dlls/ntdll/unix/file.c | 2 ++ include/wine/server.h | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 723dfabb817..6934ea3044e 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -618,6 +618,7 @@ static void test_disk_query_property(void) STORAGE_PROPERTY_QUERY query = {0}; STORAGE_DESCRIPTOR_HEADER header = {0}; STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + STORAGE_DEVICE_NUMBER device_number = {0}; HANDLE handle; DWORD error; DWORD size; @@ -654,6 +655,21 @@ static void test_disk_query_property(void) ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %d\n", descriptor.Version); ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %d\n", descriptor.Size); + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + + /* unclean call with correctly in_buffer=NULL but incorrectly in_size=4 */ + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 4, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + CloseHandle(handle); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 10d8f3de4a3..a47a371cb82 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4921,6 +4921,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (status != STATUS_PENDING) free( async ); + if (wait_handle && status == STATUS_ACCESS_VIOLATION) + ERR("Sending request failed but wait requested. Expect the application to hang.\n"); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } diff --git a/include/wine/server.h b/include/wine/server.h index 57bcdbbb00d..d0cc2a98874 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -71,7 +71,7 @@ static inline data_size_t wine_server_reply_size( const void *reply ) static inline void wine_server_add_data( void *req_ptr, const void *ptr, data_size_t size ) { struct __server_request_info * const req = req_ptr; - if (size) + if (size && ptr != NULL) { req->data[req->data_count].ptr = ptr; req->data[req->data_count++].size = size; -- 2.33.0

1 0

[PATCH v2 01/10] winmm: Correctly check parameters in joyGetDevCaps(A|W).
by Rémi Bernon 09 Dec '21

09 Dec '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Pass a size to joyGetDevCapsW matching the one passed to joyGetDevCapsA, fixing some tests, as the winejoystick.drv isn't accepting JOYCAPS2W sizes for the moment. dlls/winmm/joystick.c | 99 ++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 2b1811d3778..bb8142a29a9 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -167,64 +167,77 @@ UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) /************************************************************************** * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, UINT size ) { - if (wID >= MAXJOYSTICK) return JOYERR_PARMS; - if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); - lpCaps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ - lpCaps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSW) && size != sizeof(JOYCAPS2W)) return JOYERR_PARMS; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETDEVCAPS, (LPARAM)lpCaps, wSize); + if (id >= MAXJOYSTICK) return JOYERR_PARMS; + if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; + + caps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ + caps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + + return SendDriverMessage( JOY_Sticks[id].hDriver, JDD_GETDEVCAPS, (LPARAM)caps, size ); } /************************************************************************** * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA( UINT_PTR id, JOYCAPSA *caps, UINT size ) { - JOYCAPSW jcw; - MMRESULT ret; + UINT size_w = sizeof(JOYCAPS2W); + JOYCAPS2W caps_w; + MMRESULT res; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); - ret = joyGetDevCapsW(wID, &jcw, sizeof(jcw)); + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSA) && size != sizeof(JOYCAPS2A)) return JOYERR_PARMS; - if (ret == JOYERR_NOERROR) + if (size == sizeof(JOYCAPSA)) size_w = sizeof(JOYCAPSW); + res = joyGetDevCapsW( id, (JOYCAPSW *)&caps_w, size_w ); + if (res) return res; + + caps->wMid = caps_w.wMid; + caps->wPid = caps_w.wPid; + WideCharToMultiByte( CP_ACP, 0, caps_w.szPname, -1, caps->szPname, + sizeof(caps->szPname), NULL, NULL ); + caps->wXmin = caps_w.wXmin; + caps->wXmax = caps_w.wXmax; + caps->wYmin = caps_w.wYmin; + caps->wYmax = caps_w.wYmax; + caps->wZmin = caps_w.wZmin; + caps->wZmax = caps_w.wZmax; + caps->wNumButtons = caps_w.wNumButtons; + caps->wPeriodMin = caps_w.wPeriodMin; + caps->wPeriodMax = caps_w.wPeriodMax; + caps->wRmin = caps_w.wRmin; + caps->wRmax = caps_w.wRmax; + caps->wUmin = caps_w.wUmin; + caps->wUmax = caps_w.wUmax; + caps->wVmin = caps_w.wVmin; + caps->wVmax = caps_w.wVmax; + caps->wCaps = caps_w.wCaps; + caps->wMaxAxes = caps_w.wMaxAxes; + caps->wNumAxes = caps_w.wNumAxes; + caps->wMaxButtons = caps_w.wMaxButtons; + WideCharToMultiByte( CP_ACP, 0, caps_w.szRegKey, -1, caps->szRegKey, + sizeof(caps->szRegKey), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, caps_w.szOEMVxD, -1, caps->szOEMVxD, + sizeof(caps->szOEMVxD), NULL, NULL ); + + if (size == sizeof(JOYCAPS2A)) { - lpCaps->wMid = jcw.wMid; - lpCaps->wPid = jcw.wPid; - WideCharToMultiByte( CP_ACP, 0, jcw.szPname, -1, lpCaps->szPname, - sizeof(lpCaps->szPname), NULL, NULL ); - lpCaps->wXmin = jcw.wXmin; - lpCaps->wXmax = jcw.wXmax; - lpCaps->wYmin = jcw.wYmin; - lpCaps->wYmax = jcw.wYmax; - lpCaps->wZmin = jcw.wZmin; - lpCaps->wZmax = jcw.wZmax; - lpCaps->wNumButtons = jcw.wNumButtons; - lpCaps->wPeriodMin = jcw.wPeriodMin; - lpCaps->wPeriodMax = jcw.wPeriodMax; - - if (wSize >= sizeof(JOYCAPSA)) { /* Win95 extensions ? */ - lpCaps->wRmin = jcw.wRmin; - lpCaps->wRmax = jcw.wRmax; - lpCaps->wUmin = jcw.wUmin; - lpCaps->wUmax = jcw.wUmax; - lpCaps->wVmin = jcw.wVmin; - lpCaps->wVmax = jcw.wVmax; - lpCaps->wCaps = jcw.wCaps; - lpCaps->wMaxAxes = jcw.wMaxAxes; - lpCaps->wNumAxes = jcw.wNumAxes; - lpCaps->wMaxButtons = jcw.wMaxButtons; - WideCharToMultiByte( CP_ACP, 0, jcw.szRegKey, -1, lpCaps->szRegKey, - sizeof(lpCaps->szRegKey), NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, jcw.szOEMVxD, -1, lpCaps->szOEMVxD, - sizeof(lpCaps->szOEMVxD), NULL, NULL ); - } + JOYCAPS2A *caps2_a = (JOYCAPS2A *)caps; + caps2_a->ManufacturerGuid = caps_w.ManufacturerGuid; + caps2_a->ProductGuid = caps_w.ProductGuid; + caps2_a->NameGuid = caps_w.NameGuid; } - return ret; + return JOYERR_NOERROR; } /************************************************************************** -- 2.34.0

3 21

[PATCH v4 1/5] include: Define fast fail codes and the __fastfail() intrinsic.
by Jinoh Kang 09 Dec '21

09 Dec '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..e80c10bd49c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -915,6 +915,122 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +#if defined(__GNUC__) +#if defined(__x86_64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("rcx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__i386__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("ecx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__aarch64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("x0") = code; + __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__arm__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("r0") = code; + __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#endif /* __x86_64__ */ +#elif defined(_MSC_VER) && (_MSC_VER >= 1610) +DECLSPEC_NORETURN void __fastfail(unsigned int); +#pragma intrinsic(__fastfail) +#endif /* __GNUC__ */ + + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 -- 2.34.1

3 6

[PATCH 2/2] d3d11: Handle D3D11_FEATURE_D3D9_OPTIONS in d3d11_device_CheckFeatureSupport().
by Henri Verbeet 09 Dec '21

09 Dec '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Just implement the feature query. dlls/d3d11/device.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 417638bf314..546449037ce 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3941,6 +3941,28 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_D3D9_OPTIONS: + { + D3D11_FEATURE_DATA_D3D9_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + options->FullNonPow2TextureSupport = !(wined3d_caps.TextureCaps & WINED3DPTEXTURECAPS_POW2); + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; -- 2.30.2

1 0

[PATCH 1/2] wined3d: Use the access flags used to create the bo for persistent maps in wined3d_bo_gl_map().
by Henri Verbeet 09 Dec '21

09 Dec '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 6391f6788e9..c08e44ce372 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2711,14 +2711,24 @@ map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_BUFFER_STORAGE]) - { - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, - GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | wined3d_resource_gl_map_flags(bo, flags))))) - { - if (wined3d_map_persistent()) - bo->b.map_ptr = map_ptr; - } + if (gl_info->supported[ARB_BUFFER_STORAGE] && wined3d_map_persistent()) + { + GLbitfield gl_flags; + + /* When mapping the bo persistently, we need to use the access flags + * used to create the bo, instead of the access flags passed to the + * map call. Otherwise, if for example the initial map call that + * caused the bo to be persistently mapped was a read-only map, + * subsequent write access to the bo would be undefined. */ + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)))) + bo->b.map_ptr = map_ptr; } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { -- 2.30.2

1 0

[PATCH v2] ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes.
by Jinoh Kang 09 Dec '21

09 Dec '21

HP-UX libunwind uses the sign of error code to indicate whether the operation was successful; however, LLVM always returns positive error codes. Normalise the sign of the error code so that it handles all flavours of libunwind. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 5 +++-- dlls/ntdll/unix/signal_arm64.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f4987f902e0..48c2bc159b5 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,12 +248,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ae44fb02982..4cdbd888bf0 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,12 +212,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 3d7b8e256b4..d1e2e27c46c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1415,6 +1415,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *c *frame = context->Rsp; rc = unw_get_proc_info(&cursor, &info); + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); -- 2.34.1

1 0

[PATCH v5 1/4] include: Define fast fail codes and the __fastfail() intrinsic.
by Jinoh Kang 09 Dec '21

09 Dec '21

1 3

[PATCH] ntdll: Fix unwinding leaf functions of builtin modules in ARM/ARM64.
by Jinoh Kang 09 Dec '21

09 Dec '21

Commit 5c101ed58f5 (ntdll: Fix unwinding of leaf functions on ARM64., 2019-10-23) changed the sign of UNW_ENOINFO when testing for error from libunwind. However, unw_get_proc_info() does not return a sign-flipped error code. Thus, comparing it with -UNW_ENOINFO is a no-op. Fix this by not negating UNW_ENOINFO. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: As a result of this change, Unix-side non-leaf functions that lack asynchronous unwind tables may erroneously be recognised as leaf functions. To fix this, ideally unwind_builtin_dll shall never be called for PE modules (builtin or not). dlls/ntdll/unix/signal_arm.c | 4 ++-- dlls/ntdll/unix/signal_arm64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f4987f902e0..4f65a03793e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,12 +248,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ae44fb02982..40c484c530b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,12 +212,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); -- 2.34.1

2 2

[PATCH 1/9] mshtml: Implement value construction for HTMLOptionElementFactory.
by Gabriel Ivăncescu 09 Dec '21

09 Dec '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 46 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 7869a8e..b2c10f7 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -590,14 +590,58 @@ static const IHTMLOptionElementFactoryVtbl HTMLOptionElementFactoryVtbl = { HTMLOptionElementFactory_create }; +static inline HTMLOptionElementFactory *HTMLOptionElementFactory_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLOptionElementFactory, dispex); +} + +static HRESULT HTMLOptionElementFactory_value(DispatchEx *dispex, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, + IServiceProvider *caller) +{ + HTMLOptionElementFactory *This = HTMLOptionElementFactory_from_DispatchEx(dispex); + unsigned int i, argc = params->cArgs - params->cNamedArgs; + IHTMLOptionElement *opt; + VARIANT empty, *arg[4]; + HRESULT hres; + + if(flags != DISPATCH_CONSTRUCT) { + FIXME("flags %x not supported\n", flags); + return E_NOTIMPL; + } + + V_VT(res) = VT_NULL; + V_VT(&empty) = VT_EMPTY; + + for(i = 0; i < ARRAY_SIZE(arg); i++) + arg[i] = argc > i ? &params->rgvarg[params->cArgs - 1 - i] : ∅ + + hres = IHTMLOptionElementFactory_create(&This->IHTMLOptionElementFactory_iface, + *arg[0], *arg[1], *arg[2], *arg[3], &opt); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)opt; + + return S_OK; +} + static const tid_t HTMLOptionElementFactory_iface_tids[] = { IHTMLOptionElementFactory_tid, 0 }; +static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = { + HTMLOptionElementFactory_value, + NULL, + NULL, + NULL +}; + static dispex_static_data_t HTMLOptionElementFactory_dispex = { L"Function", - NULL, + &HTMLOptionElementFactory_dispex_vtbl, IHTMLOptionElementFactory_tid, HTMLOptionElementFactory_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ea5b210..0c065a2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2190,10 +2190,12 @@ static void _set_object_name(unsigned line, IHTMLElement *elem, const WCHAR *nam static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const WCHAR *txt, const WCHAR *val) { + VARIANT text, value, empty, option_var, args[2]; + DISPPARAMS dp = { args, NULL, 2, 0 }; IHTMLOptionElementFactory *factory; IHTMLOptionElement *option; IHTMLWindow2 *window; - VARIANT text, value, empty; + IDispatch *disp; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -2211,6 +2213,24 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do V_BSTR(&value) = SysAllocString(val); V_VT(&empty) = VT_EMPTY; + hres = IHTMLOptionElementFactory_QueryInterface(factory, &IID_IDispatch, (void**)&disp); + ok_(__FILE__,line)(hres == S_OK, "Could not get IDispatch: %08x\n", hres); + + args[1] = text; + args[0] = value; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_CONSTRUCT, &dp, &option_var, NULL, NULL); + IDispatch_Release(disp); + ok_(__FILE__,line)(hres == S_OK, "Invoke(DISPID_VALUE) returned: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&option_var) == VT_DISPATCH, "VT(option_var) = %d\n", V_VT(&option_var)); + hres = IDispatch_QueryInterface(V_DISPATCH(&option_var), &IID_IHTMLOptionElement, (void**)&option); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLOptionElement: %08x\n", hres); + VariantClear(&option_var); + + _test_option_text(line, option, txt); + _test_option_value(line, option, val); + _test_option_selected(line, option, VARIANT_FALSE); + IHTMLOptionElement_Release(option); + hres = IHTMLOptionElementFactory_create(factory, text, value, empty, empty, &option); ok_(__FILE__,line) (hres == S_OK, "create failed: %08x\n", hres); -- 2.31.1

3 49

[PATCH 1/5] winebus.sys: Scale the force feedback gain value to the Linux FF_GAIN range.
by Rémi Bernon 09 Dec '21

09 Dec '21

From: Ivo Ivanov <logos128(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 540a4da508f..88b5bddf532 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -949,7 +949,7 @@ static NTSTATUS lnxev_device_physical_device_set_gain(struct unix_device *iface, { .type = EV_FF, .code = FF_GAIN, - .value = percent, + .value = 0xffff * percent / 100, }; TRACE("iface %p, percent %#x.\n", iface, percent); -- 2.34.0

1 4

← Newer
1
...
12
13
14
15
16
17
18
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2021