May 2020 - Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Implement depth tests and writes for the Vulkan adapter.
by Henri Verbeet May 21, 2020

May 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97d05f1dc88..00d66ed052b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1811,6 +1811,15 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RENDER(WINED3D_RS_ZENABLE))) + { + key->ds_desc.depthTestEnable = !!state->render_states[WINED3D_RS_ZENABLE]; + key->ds_desc.depthWriteEnable = !!state->render_states[WINED3D_RS_ZWRITEENABLE]; + key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(state->render_states[WINED3D_RS_ZFUNC]); + + update = true; + } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_BLEND) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) { -- 2.20.1

1 0

[PATCH] ucrtbase: Use MSVCRT prefix for __stdio_common_vsprintf implementation.
by Jacek Caban May 21, 2020

May 21, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes PE-only builds with llvm-mingw (or any other mingw defaulting to ucrt). dlls/msvcrt/wcs.c | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH 1/5] dwrite: Remove feature duplicates before applying them.
by Nikolay Sivov May 21, 2020

May 21, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/shape.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 0372d739b56..82ad3a2a1e7 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -210,6 +210,27 @@ static void shape_add_feature(struct shaping_features *features, unsigned int ta features->features[features->count++].tag = tag; } +static int features_sorting_compare(const void *a, const void *b) +{ + const struct shaping_feature *left = a, *right = b; + return left->tag != right->tag ? (left->tag < right->tag ? -1 : 1) : 0; +}; + +static void shape_merge_features(struct shaping_features *features) +{ + unsigned int j = 0, i; + + /* Sort and merge duplicates. */ + qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); + + for (i = 1; i < features->count; ++i) + { + if (features->features[i].tag != features->features[j].tag) + features->features[++j] = features->features[i]; + } + features->count = j + 1; +} + HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) { static const unsigned int common_features[] = @@ -239,6 +260,8 @@ HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigne shape_add_feature(&features, horizontal_features[i]); } + shape_merge_features(&features); + /* Resolve script tag to actually supported script. */ if (cache->gpos.table.data) { @@ -322,6 +345,8 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i shape_add_feature(&features, horizontal_features[i]); } + shape_merge_features(&features); + /* Resolve script tag to actually supported script. */ if (cache->gsub.table.data) { -- 2.26.2

1 4

[PATCH] crypt32: pwszContainerName or pwszProvName could be NULL in CRYPT_KEY_PROV_INFO.
by Dmitry Timoshkov May 21, 2020

May 21, 2020

This patch makes behaviour of CRYPT_FixKeyProvInfoPointers match CRYPT_CopyKeyProvInfo, and fixes reading CRYPT_KEY_PROV_INFO certificate property from the store. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 48eaac082e..488b84001c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -525,13 +525,19 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) DWORD i, containerLen, provNameLen; LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); - info->pwszContainerName = (LPWSTR)data; - containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - data += containerLen; + if (info->pwszContainerName) + { + info->pwszContainerName = (LPWSTR)data; + containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); + data += containerLen; + } - info->pwszProvName = (LPWSTR)data; - provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - data += provNameLen; + if (info->pwszProvName) + { + info->pwszProvName = (LPWSTR)data; + provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + data += provNameLen; + } if (info->cProvParam) { -- 2.26.2

1 0

[PATCH] loader: http.sys belongs in the driver directory
by Alistair Leslie-Hughes May 20, 2020

May 20, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index db72468b4d..28dae9047d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,http.sys,- 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- @@ -2665,6 +2666,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,http.sys 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys -- 2.26.2

1 0

[PATCH 3/3] configure: Remove no longer needed -Wno-incompatible-library-redeclaration.
by Jacek Caban May 20, 2020

May 20, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 2 -- 1 file changed, 2 deletions(-)

1 0

[PATCH 2/3] stdlib.h: Provide strtold as an inline wrapper.
by Jacek Caban May 20, 2020

May 20, 2020

This allows using long double in the declaration, which fixes -Wincompatible-library-redeclaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdlib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] stdlib.h: Remove _strtold declaration.
by Jacek Caban May 20, 2020

May 20, 2020

It's not available in any DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stdlib.h | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] include: Avoid redefinition warnings when basetyps.h is used together with winnt.h or objbase.h.
by Jacek Caban May 20, 2020

May 20, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/basetyps.h | 32 ++++++++++++++++++++------------ include/objbase.h | 8 ++++++++ 2 files changed, 28 insertions(+), 12 deletions(-)

1 0

[PATCH] include: Raise default WINVER and _WIN32_WINNT values.
by Jacek Caban May 20, 2020

May 20, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/windef.h | 2 +- include/winresrc.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)

2 2