- Wine-Devel - list.winehq.org

[PATCH v3 2/2] msvcrt: Reject UTF-8 locales in setlocale function.
by Piotr Caban May 12, 2022

May 12, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr110/tests/msvcr110.c | 2 +- dlls/msvcrt/locale.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[PATCH v3 1/2] msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled.
by Piotr Caban May 12, 2022

May 12, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52937 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr110/tests/msvcr110.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)

1 0

[PATCH v2 vkd3d] vkd3d-shader/hlsl: Handle over/underflow when parsing integer literals.
by Matteo Bruni May 12, 2022

May 12, 2022

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Don't duplicate parse_integer(). Supersedes 235242. This fixes arithmetic-int.shader_test on 32-bit Linux for me. libs/vkd3d-shader/hlsl.l | 6 ++--- libs/vkd3d-shader/preproc.y | 34 +----------------------- libs/vkd3d-shader/vkd3d_shader_main.c | 32 ++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 267c8c30..ff7b712f 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -197,15 +197,15 @@ row_major {return KW_ROW_MAJOR; } return C_FLOAT; } 0x[0-9a-fA-F]+ { - sscanf(yytext, "0x%x", &yylval->intval); + yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } 0[0-7]+ { - sscanf(yytext, "0%o", &yylval->intval); + yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } [0-9]+ { - yylval->intval = (atoi(yytext)); + yylval->intval = vkd3d_parse_integer(yytext); return C_INTEGER; } diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 3f02ac03..009c35ff 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -165,38 +165,6 @@ static bool preproc_push_if(struct preproc_ctx *ctx, bool condition) return true; } -static int char_to_int(char c) -{ - if ('0' <= c && c <= '9') - return c - '0'; - if ('A' <= c && c <= 'F') - return c - 'A' + 10; - if ('a' <= c && c <= 'f') - return c - 'a' + 10; - return -1; -} - -static uint32_t preproc_parse_integer(const char *s) -{ - uint32_t base = 10, ret = 0; - int digit; - - if (*s == '0') - { - base = 8; - ++s; - if (*s == 'x' || *s == 'X') - { - base = 16; - ++s; - } - } - - while ((digit = char_to_int(*s++)) >= 0) - ret = ret * base + (uint32_t)digit; - return ret; -} - static int default_open_include(const char *filename, bool local, const char *parent_data, void *context, struct vkd3d_shader_code *out) { @@ -691,7 +659,7 @@ directive primary_expr : T_INTEGER { - $$ = preproc_parse_integer($1); + $$ = vkd3d_parse_integer($1); vkd3d_free($1); } | T_IDENTIFIER diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 62baf17f..6fd32435 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -24,6 +24,38 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); +static inline int char_to_int(char c) +{ + if ('0' <= c && c <= '9') + return c - '0'; + if ('A' <= c && c <= 'F') + return c - 'A' + 10; + if ('a' <= c && c <= 'f') + return c - 'a' + 10; + return -1; +} + +uint32_t vkd3d_parse_integer(const char *s) +{ + uint32_t base = 10, ret = 0; + int digit; + + if (*s == '0') + { + base = 8; + ++s; + if (*s == 'x' || *s == 'X') + { + base = 16; + ++s; + } + } + + while ((digit = char_to_int(*s++)) >= 0) + ret = ret * base + (uint32_t)digit; + return ret; +} + void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { buffer->buffer_size = 16; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 29e178cc..8bde5523 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1035,6 +1035,8 @@ static inline size_t bytecode_get_size(struct vkd3d_bytecode_buffer *buffer) return buffer->size; } +uint32_t vkd3d_parse_integer(const char *s); + struct vkd3d_shader_message_context { enum vkd3d_shader_log_level log_level; -- 2.35.1

4 3

[PATCH vkd3d] include: Add more D3D12_ROOT_SIGNATURE_FLAGS enums.
by Andrey Gusev May 12, 2022

May 12, 2022

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- include/vkd3d_d3d12.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2d0800b9..5190b9d7 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -916,6 +916,11 @@ typedef enum D3D12_ROOT_SIGNATURE_FLAGS D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS = 0x10, D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20, D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40, + D3D12_ROOT_SIGNATURE_FLAG_LOCAL_ROOT_SIGNATURE = 0x80, + D3D12_ROOT_SIGNATURE_FLAG_DENY_AMPLIFICATION_SHADER_ROOT_ACCESS = 0x100, + D3D12_ROOT_SIGNATURE_FLAG_DENY_MESH_SHADER_ROOT_ACCESS = 0x200, + D3D12_ROOT_SIGNATURE_FLAG_CBV_SRV_UAV_HEAP_DIRECTLY_INDEXED = 0x400, + D3D12_ROOT_SIGNATURE_FLAG_SAMPLER_HEAP_DIRECTLY_INDEXED = 0x800, } D3D12_ROOT_SIGNATURE_FLAGS; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_SIGNATURE_FLAGS);") -- 2.35.3

2 1

[PATCH 0/5] MR62: windows.gaming.input: More force feedback implementation.
by Rémi Bernon May 12, 2022

May 12, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/62

2 6

[PATCH 2/2] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov May 12, 2022

May 12, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index bab3575c431..579f942b919 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -297,9 +297,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return E_INVALIDARG; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.35.3

1 0

[PATCH 0/1] MR58: crypt32/tests: Handle CERT_NAME_SEARCH_ALL_NAMES_FLAG being unsupported before Win8.
by Paul Gofman (＠gofman) May 12, 2022

May 12, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52961 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/58

3 2

[PATCH v2] mshtml/tests: Fix Number toLocaleString test on updated Win 8.1.
by Jacek Caban May 12, 2022

May 12, 2022

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52969 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: use broken() dlls/mshtml/tests/es5.js | 21 ++++++++++++++------- dlls/mshtml/tests/winetest.js | 5 +++++ 2 files changed, 19 insertions(+), 7 deletions(-)

1 0

[PATCH 0/1] MR60: d3drm: Support IDirect3D3 when creating device
by Alistair Leslie-Hughes (＠alesliehughes) May 12, 2022

May 12, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39346 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/60

3 3

[PATCH] dbghelp: Use RtlGetVersion() for system version detection instead.
by Jactry Zeng May 12, 2022

May 12, 2022

Inspired by patch 235260, I tested MiniDumpWriteDump() on Windows 10 and it always returns its real system version. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/dbghelp/minidump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 172847529f1..4d3818a8f54 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -607,7 +607,7 @@ static unsigned dump_system_info(struct dump_context* dc) { MINIDUMP_SYSTEM_INFO mdSysInfo; SYSTEM_INFO sysInfo; - OSVERSIONINFOW osInfo; + RTL_OSVERSIONINFOEXW osInfo; DWORD written; ULONG slen; DWORD wine_extra = 0; @@ -620,7 +620,7 @@ static unsigned dump_system_info(struct dump_context* dc) GetSystemInfo(&sysInfo); osInfo.dwOSVersionInfoSize = sizeof(osInfo); - GetVersionExW(&osInfo); + RtlGetVersion(&osInfo); wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); -- 2.35.1

1 0