January 2022 - Wine-Commits

Daniel Lehman : msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 2e88169d7be6ccfed9a79344bec59d92e82e4da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e88169d7be6ccfed9a79344… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jan 26 17:24:35 2022 +0100 msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcp140_atomic_wait/Makefile.in | 4 ++ dlls/msvcp140_atomic_wait/main.c | 32 ++++++++++++ .../msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/Makefile.in | 4 ++ .../tests/msvcp140_atomic_wait.c | 60 ++++++++++++++++++++++ 7 files changed, 103 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ce3ecb0fee4..7760e43b8e9 100755 --- a/configure +++ b/configure @@ -22132,6 +22132,7 @@ wine_fn_config_makefile dlls/msvcp140/tests enable_tests wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1 wine_fn_config_makefile dlls/msvcp140_1/tests enable_tests wine_fn_config_makefile dlls/msvcp140_atomic_wait enable_msvcp140_atomic_wait +wine_fn_config_makefile dlls/msvcp140_atomic_wait/tests enable_tests wine_fn_config_makefile dlls/msvcp60 enable_msvcp60 wine_fn_config_makefile dlls/msvcp60/tests enable_tests wine_fn_config_makefile dlls/msvcp70 enable_msvcp70 diff --git a/configure.ac b/configure.ac index bf590be0072..181047ef0d8 100644 --- a/configure.ac +++ b/configure.ac @@ -3056,6 +3056,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_atomic_wait/Makefile.in b/dlls/msvcp140_atomic_wait/Makefile.in index 0d1aac64b53..42f8d7157b1 100644 --- a/dlls/msvcp140_atomic_wait/Makefile.in +++ b/dlls/msvcp140_atomic_wait/Makefile.in @@ -1 +1,5 @@ MODULE = msvcp140_atomic_wait.dll +IMPORTS = msvcp140 + +C_SRCS = \ + main.c diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c new file mode 100644 index 00000000000..5c430ffd959 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/main.c @@ -0,0 +1,32 @@ +/* + * Copyright 2022 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); + +extern unsigned int __cdecl _Thrd_hardware_concurrency(void); + +unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) +{ + TRACE("()\n"); + return _Thrd_hardware_concurrency(); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 34ca996f2f5..1e5d1a5128b 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -18,7 +18,7 @@ @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all @ stub __std_free_crt -@ stub __std_parallel_algorithms_hw_threads +@ stdcall __std_parallel_algorithms_hw_threads() @ stub __std_release_shared_mutex_for_instance @ stub __std_submit_threadpool_work @ stub __std_tzdb_delete_current_zone diff --git a/dlls/msvcp140_atomic_wait/tests/Makefile.in b/dlls/msvcp140_atomic_wait/tests/Makefile.in new file mode 100644 index 00000000000..7f58d06d8f3 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = msvcp140_atomic_wait.dll + +C_SRCS = \ + msvcp140_atomic_wait.c diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c new file mode 100644 index 00000000000..aee852afd98 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/test.h" + +static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static HMODULE init(void) +{ + HMODULE msvcp; + + if (!(msvcp = LoadLibraryA("msvcp140_atomic_wait.dll"))) + return NULL; + + SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + return msvcp; +} + +static void test___std_parallel_algorithms_hw_threads(void) +{ + SYSTEM_INFO si; + unsigned int nthr; + + GetSystemInfo(&si); + nthr = p___std_parallel_algorithms_hw_threads(); + ok(nthr == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, nthr); +} + +START_TEST(msvcp140_atomic_wait) +{ + HMODULE msvcp; + if (!(msvcp = init())) + { + win_skip("msvcp140_atomic_wait.dll not installed\n"); + return; + } + test___std_parallel_algorithms_hw_threads(); + FreeLibrary(msvcp); +}

1 0

Nikolay Sivov : shell32: Ignore KF_FLAG_NOT_PARENT_RELATIVE in SHGetKnownFolderPath().
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 1f5b3b9e84d91bf92365ece5eec66e8bb7a0de8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5b3b9e84d91bf92365ece5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 18:44:30 2022 +0300 shell32: Ignore KF_FLAG_NOT_PARENT_RELATIVE in SHGetKnownFolderPath(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 15 ++++++++++++++- dlls/shell32/tests/shellpath.c | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 7bfa504a62f..2f1573f8221 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3529,11 +3529,24 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); if (flags & ~(KF_FLAG_CREATE|KF_FLAG_SIMPLE_IDLIST|KF_FLAG_DONT_UNEXPAND| - KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) + KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH|KF_FLAG_NOT_PARENT_RELATIVE)) { FIXME("flags 0x%08x not supported\n", flags); return E_INVALIDARG; } + + if ((flags & (KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE)) == KF_FLAG_NOT_PARENT_RELATIVE) + { + WARN("Invalid flags mask %#x.\n", flags); + return E_INVALIDARG; + } + + if (flags & KF_FLAG_NOT_PARENT_RELATIVE) + { + FIXME("Ignoring KF_FLAG_NOT_PARENT_RELATIVE.\n"); + flags &= ~KF_FLAG_NOT_PARENT_RELATIVE; + } + folder |= flags & CSIDL_FLAG_MASK; shgfp_flags = flags & KF_FLAG_DEFAULT_PATH ? SHGFP_TYPE_DEFAULT : SHGFP_TYPE_CURRENT; diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0ba3734c518..7d0f725158a 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1910,6 +1910,19 @@ if (0) { /* crashes */ ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); CoTaskMemFree(path2); + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == E_INVALIDARG, "expected S_OK, got 0x%08x\n", hr); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + CoTaskMemFree(path); }

1 0

Stefan Dösinger : ddraw/tests: Don't insist on a different refresh rate if no refresh rate was requested.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 9a4992173e165b04ff79d5283f81064f7585e7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4992173e165b04ff79d528… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 26 11:52:26 2022 +0300 ddraw/tests: Don't insist on a different refresh rate if no refresh rate was requested. d4fdb1f62cf5 broke test_cursor_clipping by accident. It added a requirement that width, height and refresh rate are different from the old mode, but test_cursor_clipping does not use DDEDM_REFRESHRATES, so all refresh rates are 0. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8a6c4b41ac1..625776c652c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15116,7 +15116,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) + (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c229ab66341..9b8acb674e3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18153,7 +18153,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) + (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 18ebf849391..84789e8f177 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18427,7 +18427,7 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des * set 60hz in the advanced display properties manually. Usually the restriction to one refresh * rate applies to laptop panels. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) + (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight;

1 0

Henri Verbeet : wined3d: Use wined3d_uint32_compare() in compare_sig().
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: ceb9994669e8eb0802426cb3434c155fbdaba336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceb9994669e8eb0802426cb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:39 2022 +0100 wined3d: Use wined3d_uint32_compare() in compare_sig(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1abc64ccdd1..820ba0199e8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3855,16 +3855,16 @@ static int compare_sig(const struct wined3d_shader_signature *sig1, const struct if ((ret = strcmp(e1->semantic_name, e2->semantic_name))) return ret; - if (e1->semantic_idx != e2->semantic_idx) - return e1->semantic_idx < e2->semantic_idx ? -1 : 1; - if (e1->sysval_semantic != e2->sysval_semantic) - return e1->sysval_semantic < e2->sysval_semantic ? -1 : 1; - if (e1->component_type != e2->component_type) - return e1->component_type < e2->component_type ? -1 : 1; - if (e1->register_idx != e2->register_idx) - return e1->register_idx < e2->register_idx ? -1 : 1; - if (e1->mask != e2->mask) - return e1->mask < e2->mask ? -1 : 1; + if ((ret = wined3d_uint32_compare(e1->semantic_idx, e2->semantic_idx))) + return ret; + if ((ret = wined3d_uint32_compare(e1->sysval_semantic, e2->sysval_semantic))) + return ret; + if ((ret = wined3d_uint32_compare(e1->component_type, e2->component_type))) + return ret; + if ((ret = wined3d_uint32_compare(e1->register_idx, e2->register_idx))) + return ret; + if ((ret = wined3d_uint32_compare(e1->mask, e2->mask))) + return ret; } return 0; }

1 0

Paul Gofman : winhttp: Remove an extra pending_sends increment in WinHttpWebSocketSend().
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 7ea8192bb497283638f262c3a8597d8fa8c42b5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ea8192bb497283638f262c3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 26 15:25:24 2022 +0100 winhttp: Remove an extra pending_sends increment in WinHttpWebSocketSend(). 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 279e0522166..cbfe2b21bd0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3375,7 +3375,6 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ release_object( &socket->hdr ); free( s ); } - else ++socket->hdr.pending_sends; } else {

1 0

Paul Gofman : winhttp: Count queued websocket receive operations.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 2a812a5645c71d9d6b3503df7065d8a5434e2b6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a812a5645c71d9d6b3503df… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 26 15:25:21 2022 +0100 winhttp: Count queued websocket receive operations. 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 | 9 +++++++++ dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bddbf4a03b2..7666bae4e68 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3244,6 +3244,12 @@ static void send_io_complete( struct object_header *hdr ) assert( count >= 0 ); } +static void receive_io_complete( struct socket *socket ) +{ + LONG count = InterlockedDecrement( &socket->hdr.pending_receives ); + assert( count >= 0 ); +} + static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) { switch (type) @@ -3614,6 +3620,7 @@ static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void * TRACE("running %p\n", work); ret = socket_receive( r->socket, r->buf, r->len, &count, &type ); + receive_io_complete( r->socket ); if (!ret) { @@ -3667,8 +3674,10 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D r->len = len; addref_object( &socket->hdr ); + InterlockedIncrement( &socket->hdr.pending_receives ); if ((ret = queue_task( &socket->recv_q, task_socket_receive, r ))) { + InterlockedDecrement( &socket->hdr.pending_receives ); release_object( &socket->hdr ); free( r ); } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 5eb3e97a916..a6638aba30f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -52,6 +52,7 @@ struct object_header LONG recursion_count; struct list entry; volatile LONG pending_sends; + volatile LONG pending_receives; }; struct hostdata

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in vshader_get_input().
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: dc990b6b2b8d55eab0b50cd4529fb266e7dc321d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc990b6b2b8d55eab0b50cd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:41 2022 +0100 wined3d: Use wined3d_bit_scan() in vshader_get_input(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 43c6bb402c0..2731639d554 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3578,24 +3578,24 @@ static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_id return FALSE; } -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) { - WORD map = shader->reg_maps.input_registers; + uint32_t map = shader->reg_maps.input_registers & 0xffff; unsigned int i; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; - + i = wined3d_bit_scan(&map); if (match_usage(shader->u.vs.attributes[i].usage, shader->u.vs.attributes[i].usage_idx, usage_req, usage_idx_req)) { *regnum = i; - return TRUE; + return true; } } - return FALSE; + + return false; } static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e45b61c61e..e28fc3b880d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5759,8 +5759,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct vs_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare().
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 8350e026e81c039c2ebb155c129dd5785078be58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8350e026e81c039c2ebb155c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:40 2022 +0100 wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6381265def..e33cd5d5fe0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10978,24 +10978,20 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry const struct glsl_program_key *k = key; const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry, const struct glsl_shader_prog_link, program_lookup_entry); + int ret; - if (k->vs_id > prog->vs.id) return 1; - else if (k->vs_id < prog->vs.id) return -1; - - if (k->gs_id > prog->gs.id) return 1; - else if (k->gs_id < prog->gs.id) return -1; - - if (k->ps_id > prog->ps.id) return 1; - else if (k->ps_id < prog->ps.id) return -1; - - if (k->hs_id > prog->hs.id) return 1; - else if (k->hs_id < prog->hs.id) return -1; - - if (k->ds_id > prog->ds.id) return 1; - else if (k->ds_id < prog->ds.id) return -1; - - if (k->cs_id > prog->cs.id) return 1; - else if (k->cs_id < prog->cs.id) return -1; + if ((ret = wined3d_uint32_compare(k->vs_id, prog->vs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->gs_id, prog->gs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ps_id, prog->ps.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->hs_id, prog->hs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ds_id, prog->ds.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->cs_id, prog->cs.id))) + return ret; return 0; }

1 0

Jan Sikorski : wined3d: Acquire references to unordered-access view counter buffers for command lists by inspecting CS packets.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: a33ed42ffe8c33a0a8ae543244536acad0cfd025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a33ed42ffe8c33a0a8ae5432… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Jan 26 15:43:37 2022 +0100 wined3d: Acquire references to unordered-access view counter 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 408f9e97a25..e272bef14e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3704,6 +3704,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_COPY_UAV_COUNTER: + { + struct wined3d_cs_copy_uav_counter *op; + + op = (struct wined3d_cs_copy_uav_counter *)packet->data; + wined3d_buffer_decref(op->buffer); + wined3d_unordered_access_view_decref(op->view); + break; + } + default: break; } @@ -3926,6 +3936,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_COPY_UAV_COUNTER: + { + struct wined3d_cs_copy_uav_counter *op; + + op = (struct wined3d_cs_copy_uav_counter *)packet->data; + wined3d_buffer_incref(op->buffer); + wined3d_unordered_access_view_incref(op->view); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to blitted resources for command lists by inspecting CS packets.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 51c10cbc3347503f2c7678cddf1a8724cddb854b URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c10cbc3347503f2c7678cd… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Jan 26 15:43:36 2022 +0100 wined3d: Acquire references to blitted resources 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 42839e813c3..408f9e97a25 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3693,6 +3693,17 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_BLT_SUB_RESOURCE: + { + struct wined3d_cs_blt_sub_resource *op; + + op = (struct wined3d_cs_blt_sub_resource *)packet->data; + if (op->src_resource) + wined3d_resource_decref(op->src_resource); + wined3d_resource_decref(op->dst_resource); + break; + } + default: break; } @@ -3904,6 +3915,17 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_BLT_SUB_RESOURCE: + { + struct wined3d_cs_blt_sub_resource *op; + + op = (struct wined3d_cs_blt_sub_resource *)packet->data; + if (op->src_resource) + wined3d_resource_incref(op->src_resource); + wined3d_resource_incref(op->dst_resource); + break; + } + default: break; }

1 0