November 2020 - Wine-commits

Paul Gofman : crypt32: Prevent gnutls from using system priority file.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 11d09da60f2eb0db690cf477a0c2238b1bd9d22c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d09da60f2eb0db690cf477… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 19:01:32 2020 +0300 crypt32: Prevent gnutls from using system priority file. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/unixlib.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 47be5691005..035f2d936bb 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -86,8 +86,19 @@ static void gnutls_log( int level, const char *msg ) BOOL gnutls_initialize(void) { + const char *env_str; int ret; + if ((env_str = getenv("GNUTLS_SYSTEM_PRIORITY_FILE"))) + { + WARN("GNUTLS_SYSTEM_PRIORITY_FILE is %s.\n", debugstr_a(env_str)); + } + else + { + WARN("Setting GNUTLS_SYSTEM_PRIORITY_FILE to \"/dev/null\".\n"); + setenv("GNUTLS_SYSTEM_PRIORITY_FILE", "/dev/null", 0); + } + if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW ))) { ERR_(winediag)( "failed to load libgnutls, no support for pfx import/export\n" );

1 0

Paul Gofman : secur32: Prevent gnutls from using system priority file.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: c654839178b417c099d7723efb3aba0ca73a2919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c654839178b417c099d7723e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 19:01:33 2020 +0300 secur32: Prevent gnutls from using system priority file. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index c4a36a899a0..784c1ffe6e8 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -977,8 +977,19 @@ static void schan_gnutls_log(int level, const char *msg) BOOL schan_imp_init(void) { + const char *env_str; int ret; + if ((env_str = getenv("GNUTLS_SYSTEM_PRIORITY_FILE"))) + { + WARN("GNUTLS_SYSTEM_PRIORITY_FILE is %s.\n", debugstr_a(env_str)); + } + else + { + WARN("Setting GNUTLS_SYSTEM_PRIORITY_FILE to \"/dev/null\".\n"); + setenv("GNUTLS_SYSTEM_PRIORITY_FILE", "/dev/null", 0); + } + libgnutls_handle = dlopen(SONAME_LIBGNUTLS, RTLD_NOW); if (!libgnutls_handle) {

1 0

Biswapriyo Nath : include: Add D2D1_PROPERTY enumeration in d2d1_1.idl.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: a5ccffff8a8cf1e0c755fb3bac0d47b002735e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5ccffff8a8cf1e0c755fb3b… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 5 21:43:34 2020 +0530 include: Add D2D1_PROPERTY enumeration in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 6eab3959cd1..4dccf6a8618 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -187,6 +187,21 @@ typedef enum D2D1_PROPERTY_TYPE D2D1_PROPERTY_TYPE_FORCE_DWORD = 0xffffffff, } D2D1_PROPERTY_TYPE; +typedef enum D2D1_PROPERTY +{ + D2D1_PROPERTY_CLSID = 0x80000000, + D2D1_PROPERTY_DISPLAYNAME = 0x80000001, + D2D1_PROPERTY_AUTHOR = 0x80000002, + D2D1_PROPERTY_CATEGORY = 0x80000003, + D2D1_PROPERTY_DESCRIPTION = 0x80000004, + D2D1_PROPERTY_INPUTS = 0x80000005, + D2D1_PROPERTY_CACHED = 0x80000006, + D2D1_PROPERTY_PRECISION = 0x80000007, + D2D1_PROPERTY_MIN_INPUTS = 0x80000008, + D2D1_PROPERTY_MAX_INPUTS = 0x80000009, + D2D1_PROPERTY_FORCE_DWORD = 0xffffffff +} D2D1_PROPERTY; + typedef enum D2D1_THREADING_MODE { D2D1_THREADING_MODE_SINGLE_THREADED = D2D1_FACTORY_TYPE_SINGLE_THREADED,

1 0

Biswapriyo Nath : include: Add D2D1_SUBPROPERTY enumeration in d2d1_1.idl.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 48dad92d0492b6f2db66966f52db5bcd2ffc6d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48dad92d0492b6f2db66966f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 5 21:43:34 2020 +0530 include: Add D2D1_SUBPROPERTY enumeration in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4dccf6a8618..a19486cfb55 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -202,6 +202,18 @@ typedef enum D2D1_PROPERTY D2D1_PROPERTY_FORCE_DWORD = 0xffffffff } D2D1_PROPERTY; +typedef enum D2D1_SUBPROPERTY +{ + D2D1_SUBPROPERTY_DISPLAYNAME = 0x80000000, + D2D1_SUBPROPERTY_ISREADONLY = 0x80000001, + D2D1_SUBPROPERTY_MIN = 0x80000002, + D2D1_SUBPROPERTY_MAX = 0x80000003, + D2D1_SUBPROPERTY_DEFAULT = 0x80000004, + D2D1_SUBPROPERTY_FIELDS = 0x80000005, + D2D1_SUBPROPERTY_INDEX = 0x80000006, + D2D1_SUBPROPERTY_FORCE_DWORD = 0xffffffff +} D2D1_SUBPROPERTY; + typedef enum D2D1_THREADING_MODE { D2D1_THREADING_MODE_SINGLE_THREADED = D2D1_FACTORY_TYPE_SINGLE_THREADED,

1 0

Biswapriyo Nath : include: Add D2D1_POINT_DESCRIPTION structure in d2d1_1.idl.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 4f19dd963f8097a2f64f33b8910dd978055b4b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f19dd963f8097a2f64f33b8… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 5 21:43:34 2020 +0530 include: Add D2D1_POINT_DESCRIPTION structure in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index a19486cfb55..0bc03d28a10 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -312,6 +312,15 @@ typedef struct D2D1_EFFECT_INPUT_DESCRIPTION D2D1_RECT_F inputRectangle; } D2D1_EFFECT_INPUT_DESCRIPTION; +typedef struct D2D1_POINT_DESCRIPTION +{ + D2D1_POINT_2F point; + D2D1_POINT_2F unitTangentVector; + UINT32 endSegment; + UINT32 endFigure; + float lengthToEndSegment; +} D2D1_POINT_DESCRIPTION; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [

1 0

Biswapriyo Nath : include: Add ID2D1GdiMetafileSink interface in d2d1_1.idl.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 0a73216ae2183f597e083103f6dd2f9b4476e7f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a73216ae2183f597e083103… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 5 21:43:34 2020 +0530 include: Add ID2D1GdiMetafileSink interface in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 0bc03d28a10..707d93780c6 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -323,6 +323,20 @@ typedef struct D2D1_POINT_DESCRIPTION typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); +[ + object, + uuid(82237326-8111-4f7c-bcf4-b5c1175564fe), + local, +] +interface ID2D1GdiMetafileSink : IUnknown +{ + HRESULT ProcessRecord( + [in] DWORD type, + [in, optional] const void *data, + [in] DWORD size + ); +} + [ object, uuid(483473d7-cd46-4f9d-9d3a-3112aa80159d),

1 0

Biswapriyo Nath : include: Add ID2D1GdiMetafile interface in d2d1_1.idl.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 0e0a0f2444dfe7713d8e3018f21d314ff08d189c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e0a0f2444dfe7713d8e3018… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 5 21:43:34 2020 +0530 include: Add ID2D1GdiMetafile interface in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 707d93780c6..2ed1ce7cdf4 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -21,7 +21,6 @@ import "d2d1.idl"; interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; -interface ID2D1GdiMetafile; interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; @@ -337,6 +336,21 @@ interface ID2D1GdiMetafileSink : IUnknown ); } +[ + object, + uuid(2f543dc3-cfc1-4211-864f-cfd91c6f3395), + local, +] +interface ID2D1GdiMetafile : ID2D1Resource +{ + HRESULT Stream( + [in] ID2D1GdiMetafileSink *sink + ); + HRESULT GetBounds( + [out] D2D1_RECT_F *bounds + ); +} + [ object, uuid(483473d7-cd46-4f9d-9d3a-3112aa80159d),

1 0

Biswapriyo Nath : include: Add ID2D1PrintControl interface in d2d1_1.idl.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 9c069476786758527e0744c7ba3706edb8c230aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c069476786758527e0744c7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Nov 5 21:43:34 2020 +0530 include: Add ID2D1PrintControl interface in d2d1_1.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 2ed1ce7cdf4..a72a6a9e9be 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -629,6 +629,23 @@ interface ID2D1CommandList : ID2D1Image HRESULT Close(); } +[ + object, + uuid(2c1d867d-c290-41c8-ae7e-34a98702e9a5), + local, +] +interface ID2D1PrintControl : IUnknown +{ + HRESULT AddPage( + [in] ID2D1CommandList *list, + [in] D2D_SIZE_F size, + [in, optional] IStream *stream, + [out, optional] D2D1_TAG *tag1, + [out, optional] D2D1_TAG *tag2 + ); + HRESULT Close(); +} + [ object, uuid(e8f7fe7a-191c-466d-ad95-975678bda998),

1 0

Dmitry Timoshkov : crypt32: Make helper for copying CMSG_CMS_SIGNER_INFO attributes more generic.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 1b87f222eddac50b0840eccae3c1b01a57b55cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b87f222eddac50b0840ecca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:01 2020 +0300 crypt32: Make helper for copying CMSG_CMS_SIGNER_INFO attributes more generic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b71c52bb0f6..88c27a1c664 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2995,15 +2995,14 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } -static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, - const CMSG_CMS_SIGNER_INFO *in) +static BOOL CRYPT_CopyAttr(void *pvData, DWORD *pcbData, const CRYPT_ATTRIBUTES *attr) { DWORD size; BOOL ret; - TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, attr); - size = CRYPT_SizeOfAttributes(&in->UnauthAttrs); + size = CRYPT_SizeOfAttributes(attr); if (!pvData) { *pcbData = size; @@ -3016,12 +3015,8 @@ static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, ret = FALSE; } else - { - CRYPT_ATTRIBUTES *out = pvData; + ret = CRYPT_ConstructAttributes(pvData, attr); - CRYPT_ConstructAttributes(out,&in->UnauthAttrs); - ret = TRUE; - } TRACE("returning %d\n", ret); return ret; } @@ -3205,8 +3200,8 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, if (dwIndex >= msg->u.signed_data.info->cSignerInfo) SetLastError(CRYPT_E_INVALID_INDEX); else - ret = CRYPT_CopyUnauthAttr(pvData, pcbData, - &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].UnauthAttrs); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE);

1 0

Dmitry Timoshkov : crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 4c9c6ca417f81d64153903d97e31b580a0842332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9c6ca417f81d64153903d9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:05 2020 +0300 crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 88c27a1c664..ba3690b2642 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3194,6 +3194,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_SIGNER_AUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].AuthAttrs); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_SIGNER_UNAUTH_ATTR_PARAM: if (msg->u.signed_data.info) {

1 0