January 2019 - Wine-Commits

Józef Kucia : ddraw: Pass correct box when mapping system memory vertex buffers.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 445b97b2a26d9d4d9cf9fcbb9fa7e15bb068fe20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=445b97b2a26d9d4d9cf9fcbb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 18:29:43 2019 +0330 ddraw: Pass correct box when mapping system memory vertex buffers. This fixes a regression introduced by commit 5a8e430b96ab429a85f82f26ba9d2de4729954c2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46536 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index af9f28d..d2f11c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4410,6 +4410,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); wined3d_mutex_lock(); + wined3d_box.left = start_vertex * stride; + wined3d_box.right = wined3d_box.left + vertex_count * stride; wined3d_resource = wined3d_buffer_get_resource(vb_impl->wined3d_buffer); if (FAILED(hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, WINED3D_MAP_READ))) @@ -4417,8 +4419,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_unlock(); return D3DERR_VERTEXBUFFERLOCKED; } - hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, vb_impl->fvf, wined3d_map_desc.data, - start_vertex + vertex_count, indices, index_count, flags); + hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, vb_impl->fvf, + wined3d_map_desc.data, vertex_count, indices, index_count, flags); wined3d_resource_unmap(wined3d_resource, 0); wined3d_mutex_unlock(); return hr;

1 0

Andrey Gusev : d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 8bf63a4c37e534d02b0eeebf91135d99b8ee4a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf63a4c37e534d02b0eeebf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 30 22:41:49 2019 +0200 d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42078 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/d3dx11_43.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 76a3916..dde8821 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)

1 0

Nikolay Sivov : dwrite: Add a helper to get shaped glyph positions.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: d1c73489971d0576b1867a5218a52f0c17697017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c73489971d0576b1867a52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 31 11:35:26 2019 +0300 dwrite: Add a helper to get shaped glyph positions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 134 ++++++++++++++++++++----------------------- dlls/dwrite/dwrite_private.h | 36 ++++++++++-- dlls/dwrite/font.c | 49 +++++++++++++++- dlls/dwrite/shape.c | 48 ++++++++++------ 4 files changed, 172 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1c73489971d0576b186…

1 0

Dmitry Timoshkov : crypt32: Add support for CERT_COMPARE_KEY_IDENTIFIER to CertFindCertificateInStore.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: e020d6c99d1328ca867511f9ada7b49b46a0ce4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e020d6c99d1328ca867511f9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 31 16:35:32 2019 +0800 crypt32: Add support for CERT_COMPARE_KEY_IDENTIFIER to CertFindCertificateInStore. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f4cde69..dde6528 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1769,6 +1769,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT ret; CertFindFunc find = NULL; CertCompareFunc compare = NULL; + CERT_ID cert_id; TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType, dwFlags, dwType, pvPara, pPrevCertContext); @@ -1799,6 +1800,11 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break; + case CERT_COMPARE_KEY_IDENTIFIER: + cert_id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + cert_id.u.KeyId = *(const CRYPT_HASH_BLOB *)pvPara; + pvPara = &cert_id; + /* fall through */ case CERT_COMPARE_CERT_ID: compare = compare_cert_by_cert_id; break;

1 0

Alistair Leslie-Hughes : crypt32: Fix compile error on older gnutls.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 66ca1fa4bd2336d56e8604fc4d877cb2c73fa860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66ca1fa4bd2336d56e8604fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 00:40:05 2019 +0000 crypt32: Fix compile error on older gnutls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index cde2f19..46bf356 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -45,6 +45,8 @@ int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password, gnutls_x509_crt_t **extra_certs, unsigned int *extra_certs_len, gnutls_x509_crl_t * crl, unsigned int flags); +int gnutls_x509_privkey_get_pk_algorithm2(gnutls_x509_privkey_t, unsigned int*); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_global_deinit);

1 0

Józef Kucia : include: Define __C89_NAMELESS early.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: vkd3d Branch: master Commit: 499294766198172d072969eb6a84735729e730ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=499294766198172d072969e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:32 2019 +0100 include: Define __C89_NAMELESS early. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_windows.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 58432fb..7d63ead 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -20,6 +20,17 @@ #define __VKD3D_WINDOWS_H #ifndef _INC_WINDOWS +/* Nameless unions */ +#ifndef __C89_NAMELESS +# ifdef NONAMELESSUNION +# define __C89_NAMELESS +# define __C89_NAMELESSUNIONNAME u +# else +# define __C89_NAMELESS +# define __C89_NAMELESSUNIONNAME +# endif /* NONAMELESSUNION */ +#endif /* __C89_NAMELESS */ + #if !defined(_WIN32) || defined(__WIDL__) # if !defined(__WIDL__) && !defined(VKD3D_WIN32_WCHAR) @@ -223,17 +234,6 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; #endif /* _WIN32 */ -/* Nameless unions */ -#ifndef __C89_NAMELESS -# ifdef NONAMELESSUNION -# define __C89_NAMELESS -# define __C89_NAMELESSUNIONNAME u -# else -# define __C89_NAMELESS -# define __C89_NAMELESSUNIONNAME -# endif /* NONAMELESSUNION */ -#endif /* __C89_NAMELESS */ - /* Define DECLSPEC_HIDDEN */ #ifndef DECLSPEC_HIDDEN # if defined(__MINGW32__)

1 0

Józef Kucia : vkd3d-common: Add support for naming debug environment variable.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: vkd3d Branch: master Commit: 52015b30b3ef8ac240842180284949cb51eadeda URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52015b30b3ef8ac24084218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:28 2019 +0100 vkd3d-common: Add support for naming debug environment variable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 4 +++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d/vkd3d_main.c | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index e5e938d..8b4c77d 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -57,6 +57,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name + static inline const char *debugstr_guid(const GUID *guid) { if (!guid) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index b838045..ee23ab0 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -28,6 +28,8 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 +extern const char *vkd3d_dbg_env_name DECLSPEC_HIDDEN; + static const char *debug_level_names[] = { /* VKD3D_DBG_LEVEL_NONE */ "none", @@ -46,7 +48,7 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) if (level != ~0u) return level; - if (!(vkd3d_debug = getenv("VKD3D_DEBUG"))) + if (!(vkd3d_debug = getenv(vkd3d_dbg_env_name))) vkd3d_debug = ""; for (i = 0; i < ARRAY_SIZE(debug_level_names); ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index dfd6b72..0718808 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,6 +20,8 @@ #include <stdio.h> +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index fa6e5f8..03f9f52 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -18,6 +18,8 @@ #include "vkd3d_utils_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 63dabda..ba55056 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -19,6 +19,8 @@ #define INITGUID #include "vkd3d_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device) {

1 0

Józef Kucia : include: Avoid redefining ARRAY_SIZE().
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: vkd3d Branch: master Commit: c8e05a93b4e6680bcf82b0fbe7e81c8b5020b44b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c8e05a93b4e6680bcf82b0f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:34 2019 +0100 include: Avoid redefining ARRAY_SIZE(). winnt.h from Wine defines ARRAY_SIZE() when __WINESRC__ is defined. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d942acf..1129f1e 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -22,7 +22,9 @@ #include "config.h" #include "vkd3d_windows.h" -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#endif #define DIV_ROUND_UP(a, b) ((a) % (b) == 0 ? (a) / (b) : (a) / (b) + 1)

1 0

Józef Kucia : include: Include stdlib.h for malloc().
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: vkd3d Branch: master Commit: b402ae96a6401fc7828ab92d872164283f0073ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b402ae96a6401fc7828ab92… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:33 2019 +0100 include: Include stdlib.h for malloc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_memory.h | 1 + programs/vkd3d-compiler/main.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index 4df92db..df93abf 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -21,6 +21,7 @@ #include <assert.h> #include <stdbool.h> +#include <stdlib.h> #include "vkd3d_debug.h" diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index b363435..047abcd 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -19,6 +19,7 @@ #include <fcntl.h> #include <stdbool.h> #include <stdio.h> +#include <stdlib.h> #include <sys/stat.h> #include <unistd.h>

1 0

Józef Kucia : vkd3d-shader: Use VKD3D_SHADER_DEBUG instead of VKD3D_DEBUG.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: vkd3d Branch: master Commit: 97c3aa0cdca31ce06785b024acf81faef6429ac8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=97c3aa0cdca31ce06785b02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:29 2019 +0100 vkd3d-shader: Use VKD3D_SHADER_DEBUG instead of VKD3D_DEBUG. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0718808..2bfdad0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,7 +20,7 @@ #include <stdio.h> -VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); +VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS);

1 0