January 2022 - Wine-Commits

Jan Sikorski : wined3d: Acquire references to constant buffers for command lists by inspecting CS packets.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: d5e13912b26e630ebcc2017c181afe47eabd18f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e13912b26e630ebcc2017c… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jan 24 13:59:00 2022 +0100 wined3d: Acquire references to constant buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 221a79faa0c..76db5b5184e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3594,6 +3594,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_CONSTANT_BUFFERS: + { + struct wined3d_cs_set_constant_buffers *op; + + op = (struct wined3d_cs_set_constant_buffers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->buffers[i].buffer) + wined3d_buffer_decref(op->buffers[i].buffer); + } + break; + } + default: break; } @@ -3706,6 +3719,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_CONSTANT_BUFFERS: + { + struct wined3d_cs_set_constant_buffers *op; + + op = (struct wined3d_cs_set_constant_buffers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->buffers[i].buffer) + wined3d_buffer_incref(op->buffers[i].buffer); + } + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to cleared unordered-access views for command lists by inspecting CS packets.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: 4f7837a584e2048ccc2cebf277b9480ac8394bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7837a584e2048ccc2cebf2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jan 24 13:59:01 2022 +0100 wined3d: Acquire references to cleared unordered-access views for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 76db5b5184e..ae120b1790d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3607,6 +3607,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW: + { + struct wined3d_cs_clear_unordered_access_view *op; + + op = (struct wined3d_cs_clear_unordered_access_view *)packet->data; + wined3d_unordered_access_view_decref(op->view); + break; + } + default: break; } @@ -3732,6 +3741,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW: + { + struct wined3d_cs_clear_unordered_access_view *op; + + op = (struct wined3d_cs_clear_unordered_access_view *)packet->data; + wined3d_unordered_access_view_incref(op->view); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to unordered-access views for command lists by inspecting CS packets.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: e6b61128e5645972fbf4fb1a273ddd3aa40933d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6b61128e5645972fbf4fb1a… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jan 24 13:58:58 2022 +0100 wined3d: Acquire references to unordered-access views for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 914941d18ae..bb38dd0d3ab 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3571,6 +3571,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEWS: + { + struct wined3d_cs_set_unordered_access_views *op; + + op = (struct wined3d_cs_set_unordered_access_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->uavs[i].view) + wined3d_unordered_access_view_decref(op->uavs[i].view); + } + break; + } + default: break; } @@ -3660,6 +3673,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEWS: + { + struct wined3d_cs_set_unordered_access_views *op; + + op = (struct wined3d_cs_set_unordered_access_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->uavs[i].view) + wined3d_unordered_access_view_incref(op->uavs[i].view); + } + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to depth/stencil views for command lists by inspecting CS packets.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: e7810388e2ee6550876457fb26bbab6a7b627c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7810388e2ee6550876457fb… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jan 24 13:58:59 2022 +0100 wined3d: Acquire references to depth/stencil views for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bb38dd0d3ab..221a79faa0c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3584,6 +3584,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW: + { + struct wined3d_cs_set_depth_stencil_view *op; + + op = (struct wined3d_cs_set_depth_stencil_view *)packet->data; + if (op->view) + wined3d_rendertarget_view_decref(op->view); + break; + } + default: break; } @@ -3686,6 +3696,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW: + { + struct wined3d_cs_set_depth_stencil_view *op; + + op = (struct wined3d_cs_set_depth_stencil_view *)packet->data; + if (op->view) + wined3d_rendertarget_view_incref(op->view); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to cleared render-target views for command lists by inspecting CS packets.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: 18a6d9ab0e356855a9b73da4ea350877f0d3d251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18a6d9ab0e356855a9b73da4… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jan 24 13:59:02 2022 +0100 wined3d: Acquire references to cleared render-target views for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ae120b1790d..9f7421e865f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3616,6 +3616,20 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_CLEAR: + { + struct wined3d_cs_clear *op = (struct wined3d_cs_clear *)packet->data; + + for (i = 0; i < op->rt_count; ++i) + { + if (op->fb.render_targets[i]) + wined3d_rendertarget_view_decref(op->fb.render_targets[i]); + } + if (op->fb.depth_stencil) + wined3d_rendertarget_view_decref(op->fb.depth_stencil); + break; + } + default: break; } @@ -3750,6 +3764,20 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_CLEAR: + { + struct wined3d_cs_clear *op = (struct wined3d_cs_clear *)packet->data; + + for (i = 0; i < op->rt_count; ++i) + { + if (op->fb.render_targets[i]) + wined3d_rendertarget_view_incref(op->fb.render_targets[i]); + } + if (op->fb.depth_stencil) + wined3d_rendertarget_view_incref(op->fb.depth_stencil); + break; + } + default: break; }

1 0

Henri Verbeet : wined3d: Properly compare integers in wined3d_bo_slab_vk_compare().
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: 162fc7bd46402b35b6ad7957d43279cfaba4824c URL: https://source.winehq.org/git/wine.git/?a=commit;h=162fc7bd46402b35b6ad7957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 24 13:59:03 2022 +0100 wined3d: Properly compare integers in wined3d_bo_slab_vk_compare(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 11 ++++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index cf6247387ca..686c9fe090f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1883,12 +1883,13 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr { const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); const struct wined3d_bo_slab_vk_key *k = key; + int ret; - if (k->memory_type != slab->requested_memory_type) - return k->memory_type - slab->requested_memory_type; - if (k->usage != slab->bo.usage) - return k->usage - slab->bo.usage; - return k->size - slab->bo.size; + if ((ret = wined3d_uint32_compare(k->memory_type, slab->requested_memory_type))) + return ret; + if ((ret = wined3d_uint32_compare(k->usage, slab->bo.usage))) + return ret; + return wined3d_uint64_compare(k->size, slab->bo.size); } static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context_vk *context_vk) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e297169b6e1..95a3b08f78a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -452,6 +452,11 @@ static inline int wined3d_uint32_compare(uint32_t x, uint32_t y) return (x > y) - (x < y); } +static inline int wined3d_uint64_compare(uint64_t x, uint64_t y) +{ + return (x > y) - (x < y); +} + #define ORM_BACKBUFFER 0 #define ORM_FBO 1

1 0

Alexandre Julliard : include: Fix prototype mismatch for server functions.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: 2aae3489be5de3bc51ca1e5ccff32908e66e9fa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aae3489be5de3bc51ca1e5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 24 21:44:36 2022 +0100 include: Fix prototype mismatch for server functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/server.h b/include/wine/server.h index 57bcdbbb00d..b05271b7522 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -50,8 +50,8 @@ struct __server_request_info }; extern unsigned int CDECL wine_server_call( void *req_ptr ); -extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); -extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); +extern NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); +extern NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); /* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr )

1 0

Fabian Maurer : adsldp/tests: Fix misleading indentation warnings.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: f1094172950d75c03a12892ae5c6ef18327b226e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1094172950d75c03a12892a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jan 23 20:09:11 2022 +0100 adsldp/tests: Fix misleading indentation warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 10 +++++----- dlls/adsldp/tests/sysinfo.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index fe9801a3972..161fc5d0bbc 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -190,7 +190,7 @@ static void test_ParseDisplayName(void) count = 0xdeadbeef; hr = MkParseDisplayName(bc, test[i].path, &count, &mk); -todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) + todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) ok(hr == test[i].hr, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) { @@ -394,7 +394,7 @@ static void test_DirectorySearch(void) ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); hr = IDirectorySearch_GetPreviousRow(ds, sh); -todo_wine + todo_wine ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); while (IDirectorySearch_GetNextRow(ds, sh) != S_ADS_NOMORE_ROWS) @@ -430,9 +430,9 @@ todo_wine name = NULL; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == S_ADS_NOMORE_COLUMNS) /* XP */, "got %#x\n", hr); -todo_wine + todo_wine ok((name && !wcscmp(name, L"ADsPath")) || broken(!name) /* XP */, "got %s\n", wine_dbgstr_w(name)); FreeADsMem(name); @@ -488,7 +488,7 @@ static void test_DirectoryObject(void) ok(hr == S_OK, "got %#x\n", hr); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADsOpenDSObject, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "got %#x\n", hr); if (hr == S_OK) IUnknown_Release(unk); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDispatch, (void **)&unk); diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index c7495dcb88b..4e7b0b405a9 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -123,7 +123,7 @@ static void test_UserName(void) ok(hr == S_OK, "got %#x\n", hr); hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); -todo_wine + todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); if (hr == S_OK) { @@ -164,7 +164,7 @@ static void test_sysinfo(void) SysFreeString(bstr); hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); -todo_wine + todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); if (hr != S_OK) goto done; SysFreeString(bstr);

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in geometry_shader_init_stream_output().
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: e9a109835fe484c0ce885bf5e25b30535e7b36dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a109835fe484c0ce885bf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 24 13:59:05 2022 +0100 wined3d: Use wined3d_mask_from_size() in geometry_shader_init_stream_output(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 24d08a02a38..157aa6283ac 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3882,7 +3882,7 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, return E_INVALIDARG; } - mask = ((1u << e->component_count) - 1) << component_idx; + mask = wined3d_mask_from_size(e->component_count) << component_idx; if ((output->mask & 0xff & mask) != mask) { WARN("Invalid component range %u-%u (mask %#x), output mask %#x.\n",

1 0

Paul Gofman : winhttp: Factor out socket_send_complete() function.
by Alexandre Julliard Jan. 24, 2022

Jan. 24, 2022

Module: wine Branch: master Commit: 7dd66e8450ab63a41aee7543812a3cbc063cade6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd66e8450ab63a41aee7543… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 24 12:43:12 2022 +0300 winhttp: Factor out socket_send_complete() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f4f81af42da..1a93c13081c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3240,6 +3240,25 @@ static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) } } +static void socket_send_complete( struct socket *socket, DWORD ret, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, DWORD len ) +{ + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = len; + status.eBufferType = type; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_WRITE_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_SEND_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } +} + static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, BOOL async ) { @@ -3247,24 +3266,7 @@ static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE DWORD ret; ret = send_frame( socket, opcode, 0, buf, len, TRUE ); - if (async) - { - if (!ret) - { - WINHTTP_WEB_SOCKET_STATUS status; - status.dwBytesTransferred = len; - status.eBufferType = type; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, &status, sizeof(status) ); - } - else - { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_WRITE_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_SEND_OPERATION; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } + if (async) socket_send_complete( socket, ret, type, len ); return ret; }

1 0