wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Nikolay Sivov : dwrite: Collect and sort positional lookups.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: wine Branch: master Commit: b57db6f8fe4f5938fa6c47bdf495fdec86f4ba63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b57db6f8fe4f5938fa6c47bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 31 11:35:28 2019 +0300 dwrite: Collect and sort positional lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 27 ++++++ dlls/dwrite/opentype.c | 201 +++++++++++++++++++++++++++++++++---------- 2 files changed, 183 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b57db6f8fe4f5938fa6c…

1 0

Nikolay Sivov : dwrite: Resolve script and language to apply positional features.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: wine Branch: master Commit: 3d1d9a1defef2cca14458e1622525e7a965e048c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d1d9a1defef2cca14458e16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 31 11:35:27 2019 +0300 dwrite: Resolve script and language to apply positional features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 6 ++ dlls/dwrite/dwrite_private.h | 27 +++++++ dlls/dwrite/opentype.c | 181 +++++++++++++++++++++++++++++++++---------- dlls/dwrite/shape.c | 81 ++++++++++++++++++- 4 files changed, 255 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d1d9a1defef2cca1445…

1 0

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

31 Jan '19

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 31 Jan '19

31 Jan '19

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 31 Jan '19

31 Jan '19

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: Avoid redefining ARRAY_SIZE().
by Alexandre Julliard 31 Jan '19

31 Jan '19

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 31 Jan '19

31 Jan '19

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 : include: Define __C89_NAMELESS early.
by Alexandre Julliard 31 Jan '19

31 Jan '19

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 : build: Add option to disable tests.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 0bbf92404dc16da8d0c8dd32789e90eecfcd09db URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0bbf92404dc16da8d0c8dd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:31 2019 +0100 build: Add option to disable tests. 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> --- Makefile.am | 4 +++- configure.ac | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e0b31a6..3e9ddea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,12 +137,14 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la LDADD = libvkd3d.la libvkd3d-utils.la -check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) AM_DEFAULT_SOURCE_EXT = .c +if BUILD_TESTS +check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la +endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ diff --git a/configure.ac b/configure.ac index e539d98..37e1edd 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,12 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) -AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) +AC_ARG_ENABLE([demos], + AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, + [enable_demos=no]) +AC_ARG_ENABLE([tests], + AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),, + [enable_tests=yes]) AC_USE_SYSTEM_EXTENSIONS @@ -107,10 +112,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP dnl Makefiles -AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) +AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) @@ -129,6 +134,7 @@ AS_ECHO([" Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} + Building tests: ${enable_tests} Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])])

1 0

Józef Kucia : build: Build DLLs for Windows.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 50fe2b76382c676262879789fa2c042e4f58ee0c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=50fe2b76382c67626287978… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:30 2019 +0100 build: Build DLLs for Windows. 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> --- Makefile.am | 7 ++++--- configure.ac | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 487d2ea..e0b31a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = @VKD3D_CFLAGS@ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private +AM_LDFLAGS = -no-undefined widl_headers = \ include/vkd3d_d3d12.h \ @@ -79,7 +80,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -104,7 +105,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = -version-info 2:0:1 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -114,7 +115,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = -version-info 1:1:0 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index 6e55279..e539d98 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) LT_PREREQ([2.4.2]) -LT_INIT +LT_INIT([win32-dll]) gl_LD_VERSION_SCRIPT

1 0

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 2019