April 2022 - Wine-devel - list.winehq.org

[PATCH v2] msvcrt: Faster memcmp().
by Jan Sikorski 25 Apr '22

25 Apr '22

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2: Smarter unaligned implementation for non-x86 architectures. Use uint64_t blocks instead of size_t. Some renaming & clean up. --- dlls/msvcrt/string.c | 99 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 90 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3b352ac0bf2..7b42604c123 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2675,10 +2675,13 @@ int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU } #undef I10_OUTPUT_MAX_PREC -/********************************************************************* - * memcmp (MSVCRT.@) - */ -int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) +#ifdef WORDS_BIGENDIAN +# define MERGE(w1, sh1, w2, sh2) ((w1 << sh1) | (w2 >> sh2)) +#else +# define MERGE(w1, sh1, w2, sh2) ((w1 >> sh1) | (w2 << sh2)) +#endif + +static inline int memcmp_bytes(const void *ptr1, const void *ptr2, size_t n) { const unsigned char *p1, *p2; @@ -2690,6 +2693,89 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) return 0; } +static int memcmp_aligned(const uint64_t *p1, const uint64_t *p2, size_t size) +{ + const size_t block_size = sizeof(*p1); + + size_t remainder = size & (block_size - 1); + size_t block_count = size / block_size; + + while (block_count) + { + if (*p1 != *p2) + return memcmp_bytes(p1, p2, block_size); + + p1++; + p2++; + block_count--; + } + + return memcmp_bytes(p1, p2, remainder); +} + +static int memcmp_unaligned(const uint64_t *aligned, const unsigned char *unaligned, int offset, size_t size) +{ + const size_t block_size = sizeof(*aligned); + size_t remainder = size & (block_size - 1); + size_t block_count = size / block_size; + + int shift_prev = 8 * offset; + int shift_next = 8 * (block_size - offset); + + const uint64_t *block = (const uint64_t *)(unaligned - offset); + uint64_t prev, next, merged; + + prev = block[0]; + while (block_count) + { + next = block[1]; + merged = MERGE(prev, shift_prev, next, shift_next); + if (merged != *aligned) + return memcmp_bytes(aligned, &merged, block_size); + + aligned++; + block++; + block_count--; + + prev = next; + } + + return memcmp_bytes(aligned, (const char *)block + offset, remainder); +} + +/********************************************************************* + * memcmp (MSVCRT.@) + */ +int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) +{ + const unsigned char *p1 = ptr1, *p2 = ptr2; + const size_t block_size = 8; + size_t align, offset; + int result; + + if (n < block_size) + return memcmp_bytes(p1, p2, n); + + align = -(uintptr_t)p1 & (block_size - 1); + + if ((result = memcmp_bytes(p1, p2, align))) + return result; + + p1 += align; + p2 += align; + n -= align; + +#if defined(__i386__) || defined(__x86_64__) + return memcmp_aligned((const uint64_t *)p1, (const uint64_t *)p2, n); +#endif + + offset = (uintptr_t)p2 & (block_size - 1); + if (!offset) + return memcmp_aligned((const uint64_t *)p1, (const uint64_t *)p2, n); + + return memcmp_unaligned((const uint64_t *)p1, p2, offset, n); +} + #if defined(__i386__) || defined(__x86_64__) #ifdef __i386__ @@ -2946,11 +3032,6 @@ __ASM_GLOBAL_FUNC( sse2_memmove, /********************************************************************* * memmove (MSVCRT.@) */ -#ifdef WORDS_BIGENDIAN -# define MERGE(w1, sh1, w2, sh2) ((w1 << sh1) | (w2 >> sh2)) -#else -# define MERGE(w1, sh1, w2, sh2) ((w1 >> sh1) | (w2 << sh2)) -#endif void * __cdecl memmove(void *dst, const void *src, size_t n) { #ifdef __x86_64__ -- 2.32.0

2 1

[PATCH] msvcrt: Use TICKSPERMSEC define in concurrency functions.
by Piotr Caban 25 Apr '22

25 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 3/4] wined3d: Pass "quality_levels" as an unsigned int pointer to wined3d_check_device_multisample_type().
by Henri Verbeet 25 Apr '22

25 Apr '22

The equivalent d3d11 function takes a UINT pointer, while the equivalent d3d9 function takes a DWORD pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d105a57237..c9a62c6997a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1650,7 +1650,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d_adapter *ad HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, - enum wined3d_multisample_type multisample_type, DWORD *quality_levels) + enum wined3d_multisample_type multisample_type, unsigned int *quality_levels) { const struct wined3d_format *format; HRESULT hr = WINED3D_OK; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7fbff07a3ad..ee241ab3b1d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2323,7 +2323,7 @@ HRESULT __cdecl wined3d_check_device_format_conversion(const struct wined3d_outp enum wined3d_format_id target_format_id); HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, - enum wined3d_multisample_type multisample_type, DWORD *quality_levels); + enum wined3d_multisample_type multisample_type, unsigned int *quality_levels); HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, const struct wined3d_output *output, enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, -- 2.30.2

1 0

[PATCH v3 1/5] wined3d: Clear the texture BO when loading textures into WINED3D_LOCATION_BUFFER.
by Zebediah Figura 25 Apr '22

25 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Avoid calling wined3d_context_map_bo_address() with a NULL context. dlls/wined3d/texture.c | 55 +++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eaa7cdf3ea5..dd1b0c88830 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -799,23 +799,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return TRUE; } - if (current & WINED3D_LOCATION_CLEARED) - { - struct wined3d_bo_address addr; - - /* FIXME: Clear textures on the GPU if possible. */ - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) - return FALSE; - wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); - memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); - current |= WINED3D_LOCATION_SYSMEM; - - if (current & location) - return TRUE; - } - if (!current) { ERR("Sub-resource %u of texture %p does not have any up to date location.\n", @@ -824,22 +807,54 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return wined3d_texture_load_location(texture, sub_resource_idx, context, location); } - if ((location & wined3d_texture_sysmem_locations) && (current & wined3d_texture_sysmem_locations)) + if ((location & wined3d_texture_sysmem_locations) + && (current & (wined3d_texture_sysmem_locations | WINED3D_LOCATION_CLEARED))) { struct wined3d_bo_address source, destination; struct wined3d_range range; + void *map_ptr; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; - wined3d_texture_get_bo_address(texture, sub_resource_idx, &source, (current & wined3d_texture_sysmem_locations)); wined3d_texture_get_bo_address(texture, sub_resource_idx, &destination, location); range.offset = 0; range.size = texture->sub_resources[sub_resource_idx].size; - wined3d_context_copy_bo_address(context, &destination, &source, 1, &range); + if (current & WINED3D_LOCATION_CLEARED) + { + if (destination.buffer_object) + map_ptr = wined3d_context_map_bo_address(context, &destination, range.size, + WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD); + else + map_ptr = destination.addr; + memset(map_ptr, 0, range.size); + if (destination.buffer_object) + wined3d_context_unmap_bo_address(context, &destination, 1, &range); + } + else + { + wined3d_texture_get_bo_address(texture, sub_resource_idx, + &source, (current & wined3d_texture_sysmem_locations)); + wined3d_context_copy_bo_address(context, &destination, &source, 1, &range); + } ret = TRUE; } else + { + if (current & WINED3D_LOCATION_CLEARED) + { + struct wined3d_bo_address addr; + + /* FIXME: Clear textures on the GPU if possible. */ + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + } + ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); + } if (ret) wined3d_texture_validate_location(texture, sub_resource_idx, location); -- 2.35.1

3 9

[PATCH v5 0/4] Partial IShellItemImageFactory implementation (#52673)
by Jinoh Kang 25 Apr '22

25 Apr '22

Jinoh Kang (4): include: Add definition for IShellItemImageFactory. shell32/tests: Add tests for IShellItemImageFactory. shell32: Add stub for IShellItemImageFactory. shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail). dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellitem.c | 239 +++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 51 +++++++ include/shobjidl.idl | 30 +++++ 4 files changed, 321 insertions(+), 1 deletion(-) -- 2.34.1

5 11

[PATCH v4 1/6] include: Add defines for ID2D1VertexBuffer.
by Ziqing Hui 25 Apr '22

25 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v4: Include the new header file to effect.c. dlls/d2d1/effect.c | 1 + include/Makefile.in | 1 + include/d2d1effectauthor.idl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 include/d2d1effectauthor.idl diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 601932b005b..350ac3c7bbf 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,6 +17,7 @@ */ #include "d2d1_private.h" +#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/include/Makefile.in b/include/Makefile.in index dff2f341568..90d451ba5b1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -107,6 +107,7 @@ SOURCES = \ d2d1effects.idl \ d2d1effects_1.idl \ d2d1effects_2.idl \ + d2d1effectauthor.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl new file mode 100644 index 00000000000..407c6f91819 --- /dev/null +++ b/include/d2d1effectauthor.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Ziqing Hui for CodeWeavers + * + * 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 + */ + + import "d2d1_1.idl"; + +[ + object, + uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), + local, +] +interface ID2D1VertexBuffer : IUnknown +{ + HRESULT Map( + [out] BYTE **data, + [in] UINT32 size + ); + HRESULT Unmap(); +}; -- 2.25.1

2 6

[PATCH v2 4/4] winex11: Use libc for driver memory allocation.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed freeing wine_get_dos_file_name and wine_get_unix_file_name results. dlls/winex11.drv/bitblt.c | 22 ++++--- dlls/winex11.drv/brush.c | 3 +- dlls/winex11.drv/clipboard.c | 106 ++++++++++++++++----------------- dlls/winex11.drv/desktop.c | 17 +++--- dlls/winex11.drv/graphics.c | 59 +++++++++--------- dlls/winex11.drv/init.c | 4 +- dlls/winex11.drv/keyboard.c | 10 ++-- dlls/winex11.drv/mouse.c | 26 ++++---- dlls/winex11.drv/opengl.c | 36 +++++------ dlls/winex11.drv/palette.c | 29 +++++---- dlls/winex11.drv/pen.c | 4 +- dlls/winex11.drv/settings.c | 25 ++++---- dlls/winex11.drv/vulkan.c | 13 ++-- dlls/winex11.drv/window.c | 47 +++++++-------- dlls/winex11.drv/x11drv_main.c | 13 ++-- dlls/winex11.drv/xinerama.c | 17 +++--- dlls/winex11.drv/xrandr.c | 45 +++++++------- dlls/winex11.drv/xrender.c | 79 ++++++++++-------------- dlls/winex11.drv/xvidmode.c | 13 ++-- 19 files changed, 266 insertions(+), 302 deletions(-)

2 1

[PATCH v2 3/4] winex11: Remove unused cf_xdnd from XDNDDATA.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xdnd.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-)

2 1

[PATCH v2 2/4] win32u: Move clipboard data management from user32.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/clipboard.c | 292 ++++++----------------------------- dlls/user32/edit.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 16 ++ dlls/user32/user_private.h | 2 + dlls/win32u/clipboard.c | 302 +++++++++++++++++++++++++++++++++++-- dlls/win32u/sysparams.c | 4 - include/ntuser.h | 25 ++- 8 files changed, 383 insertions(+), 262 deletions(-)

2 1

[PATCH v2 1/4] win32u: Add more clipboard stubs.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/clipboard.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 4 ++++ dlls/win32u/win32u.spec | 8 ++++---- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/wrappers.c | 24 ++++++++++++++++++++++++ include/ntuser.h | 14 ++++++++++++++ 6 files changed, 87 insertions(+), 4 deletions(-)

2 1