wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

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

26 Jan '22

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

Daniel Lehman : msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads.
by Alexandre Julliard 26 Jan '22

26 Jan '22

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

Daniel Lehman : msvcp140_atomic_wait: Add stub dll.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: d04e7f25c31e87bf62b95a57bd4df4db51b9dd3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d04e7f25c31e87bf62b95a57… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 21 15:48:35 2022 -0800 msvcp140_atomic_wait: Add stub dll. 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 | 2 ++ configure.ac | 1 + dlls/msvcp140_atomic_wait/Makefile.in | 1 + .../msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 32 ++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/configure b/configure index b6d22f896ea..ce3ecb0fee4 100755 --- a/configure +++ b/configure @@ -1517,6 +1517,7 @@ enable_msvcp120 enable_msvcp120_app enable_msvcp140 enable_msvcp140_1 +enable_msvcp140_atomic_wait enable_msvcp60 enable_msvcp70 enable_msvcp71 @@ -22130,6 +22131,7 @@ wine_fn_config_makefile dlls/msvcp140 enable_msvcp140 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/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 0b1a53f3ff9..bf590be0072 100644 --- a/configure.ac +++ b/configure.ac @@ -3055,6 +3055,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140) 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/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 new file mode 100644 index 00000000000..0d1aac64b53 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/Makefile.in @@ -0,0 +1 @@ +MODULE = msvcp140_atomic_wait.dll diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec new file mode 100644 index 00000000000..34ca996f2f5 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -0,0 +1,32 @@ +@ stub __std_acquire_shared_mutex_for_instance +@ stub __std_atomic_compare_exchange_128 +@ stub __std_atomic_get_mutex +@ stub __std_atomic_has_cmpxchg16b +@ stub __std_atomic_notify_all_direct +@ stub __std_atomic_notify_all_indirect +@ stub __std_atomic_notify_one_direct +@ stub __std_atomic_notify_one_indirect +@ stub __std_atomic_set_api_level +@ stub __std_atomic_wait_direct +@ stub __std_atomic_wait_get_deadline +@ stub __std_atomic_wait_get_remaining_timeout +@ stub __std_atomic_wait_indirect +@ stub __std_bulk_submit_threadpool_work +@ stub __std_calloc_crt +@ stub __std_close_threadpool_work +@ stub __std_create_threadpool_work +@ stub __std_execution_wait_on_uchar +@ stub __std_execution_wake_by_address_all +@ stub __std_free_crt +@ stub __std_parallel_algorithms_hw_threads +@ stub __std_release_shared_mutex_for_instance +@ stub __std_submit_threadpool_work +@ stub __std_tzdb_delete_current_zone +@ stub __std_tzdb_delete_leap_seconds +@ stub __std_tzdb_delete_sys_info +@ stub __std_tzdb_delete_time_zones +@ stub __std_tzdb_get_current_zone +@ stub __std_tzdb_get_leap_seconds +@ stub __std_tzdb_get_sys_info +@ stub __std_tzdb_get_time_zones +@ stub __std_wait_for_threadpool_work_callbacks

1 0

Daniel Lehman : msvcp140: Add importlib.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 4ba0dd1ddb62925cd886c488c3bcd7bd96466b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba0dd1ddb62925cd886c488… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 25 07:25:56 2022 -0800 msvcp140: Add importlib. 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> --- dlls/msvcp140/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcp140/Makefile.in b/dlls/msvcp140/Makefile.in index d82b1a1eaae..eb0c8c3ef39 100644 --- a/dlls/msvcp140/Makefile.in +++ b/dlls/msvcp140/Makefile.in @@ -1,6 +1,7 @@ MODULE = msvcp140.dll EXTRADEFS = -D_MSVCP_VER=140 PARENTSRC = ../msvcp90 +IMPORTLIB = msvcp140 C_SRCS = \ details.c \

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in context_update_stream_info().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: caea3d10fa2d6b3a279d78f64eed33033cd0615d URL: https://source.winehq.org/git/wine.git/?a=commit;h=caea3d10fa2d6b3a279d78f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:43 2022 +0100 wined3d: Use wined3d_bit_scan() in context_update_stream_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ed7fa32f74c..6aa5ae4e997 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -266,20 +266,19 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi const struct wined3d_d3d_info *d3d_info = context->d3d_info; DWORD prev_all_vbo = stream_info->all_vbo; unsigned int i; - WORD map; + uint32_t map; wined3d_stream_info_from_declaration(stream_info, state, d3d_info); stream_info->all_vbo = 1; - for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) + map = stream_info->use_map; + while (map) { struct wined3d_stream_info_element *element; struct wined3d_bo_address data; struct wined3d_buffer *buffer; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer;

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in wined3d_device_process_vertices().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 1e33280864ec2feace44aa41bfa95331f674bf2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e33280864ec2feace44aa41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:42 2022 +0100 wined3d: Use wined3d_bit_scan() in wined3d_device_process_vertices(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b3e0fcc8ca..aa456d3e702 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3509,8 +3509,8 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_box box = {0}; struct wined3d_shader *vs; unsigned int i, j; + uint32_t map; HRESULT hr; - WORD map; TRACE("device %p, src_start_idx %u, dst_idx %u, vertex_count %u, " "dst_buffer %p, declaration %p, flags %#x, dst_fvf %#x.\n", @@ -3530,14 +3530,13 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, * VBOs in those buffers and fix up the stream_info structure. * * Also apply the start index. */ - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { struct wined3d_stream_info_element *e; struct wined3d_map_desc map_desc; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); e = &stream_info.elements[i]; resource = &state->streams[e->stream_idx].buffer->resource; box.left = src_start_idx * e->stride; @@ -3545,10 +3544,12 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) { ERR("Failed to map resource.\n"); - for (j = 0, map = stream_info.use_map; map && j < i; map >>= 1, ++j) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; + j = wined3d_bit_scan(&map); + if (j >= i) + break; e = &stream_info.elements[j]; resource = &state->streams[e->stream_idx].buffer->resource; @@ -3564,11 +3565,10 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, hr = process_vertices_strided(device, dst_idx, vertex_count, &stream_info, dst_buffer, flags, dst_fvf); - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); resource = &state->streams[stream_info.elements[i].stream_idx].buffer->resource; if (FAILED(wined3d_resource_unmap(resource, 0))) ERR("Failed to unmap resource.\n");

1 0

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

26 Jan '22

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 26 Jan '22

26 Jan '22

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

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

26 Jan '22

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

Jan Sikorski : wined3d: Acquire references to mip-map generation shader resource views for command lists by inspecting CS packets.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: b49062303e50468851cb0e718d6f6bb427306952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49062303e50468851cb0e71… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Jan 26 15:43:38 2022 +0100 wined3d: Acquire references to mip-map generation shader resource 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 e272bef14e1..e8eb8f313e3 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3714,6 +3714,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_GENERATE_MIPMAPS: + { + struct wined3d_cs_generate_mipmaps *op; + + op = (struct wined3d_cs_generate_mipmaps *)packet->data; + wined3d_shader_resource_view_decref(op->view); + break; + } + default: break; } @@ -3946,6 +3955,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_GENERATE_MIPMAPS: + { + struct wined3d_cs_generate_mipmaps *op; + + op = (struct wined3d_cs_generate_mipmaps *)packet->data; + wined3d_shader_resource_view_incref(op->view); + break; + } + default: break; }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
73
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-commits January 2022