November 2020 - Wine-Commits

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

Nov. 12, 2020

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

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

Nov. 12, 2020

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

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

Nov. 12, 2020

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 ID2D1GdiMetafileSink interface in d2d1_1.idl.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

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

Francois Gouget : mmdevapi/tests: Work around Initialize() render breakage on Win 10.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 7bc0cbc078acd1c587d03270122a632629655a1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc0cbc078acd1c587d03270… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 9 17:40:25 2020 +0100 mmdevapi/tests: Work around Initialize() render breakage on Win 10. Calling Initialize() twice causes later Start() operations to report a failure on Windows 10 >= 1607. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8c82a1a81fd..a0aa1b18936 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -337,6 +337,14 @@ static void test_audioclient(void) trace("Initialize(duration=0) GetBufferSize is %u\n", num); } + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); + + hr = IAudioClient_Start(ac); + ok(hr == S_OK || + broken(hr == AUDCLNT_E_DEVICE_INVALIDATED), /* Win10 >= 1607 */ + "Start on a doubly initialized stream returns %08x\n", hr); + IAudioClient_Release(ac); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, @@ -406,9 +414,6 @@ static void test_audioclient(void) if(t2 == 0) win10 = TRUE; - hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); - hr = IAudioClient_SetEventHandle(ac, NULL); ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr);

1 0

Paul Gofman : bcrypt: Prevent gnutls from using system priority file.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: f15328b145b5652b92d264eb406faba13c70039e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f15328b145b5652b92d264eb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 19:01:31 2020 +0300 bcrypt: Prevent gnutls from using system priority file. Fedora 33 disabled protocols below TLS 1.2 through crypto policy. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e85085499ca..41df88ca8f6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -222,8 +222,19 @@ static void gnutls_log( int level, const char *msg ) static 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 encryption\n" );

1 0

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

Nov. 12, 2020

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

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

Nov. 12, 2020

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

Dmitry Timoshkov : crypt32: Add support for CMSG_ENCODED_MESSAGE for a being decoded signed message.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 4da1bca7c5e3cbb6aa3f194d32974829c6864354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da1bca7c5e3cbb6aa3f194d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:08 2020 +0300 crypt32: Add support for CMSG_ENCODED_MESSAGE 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ba3690b2642..fac9561bbbd 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3151,6 +3151,12 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_ENCODED_MESSAGE: + if (msg->msg_data.pbData) + ret = CRYPT_CopyParam(pvData, pcbData, msg->msg_data.pbData, msg->msg_data.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_ENCODED_SIGNER: if (msg->u.signed_data.info) {

1 0

Nikolay Sivov : evr/allocator: Fix released sample pointer check.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 2ef767dcee599d3ca74495d2b825e720ef9dcd96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef767dcee599d3ca74495d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:35 2020 +0300 evr/allocator: Fix released sample pointer check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index a44e3ef45c6..e84d7450c7f 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -796,15 +796,23 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback { struct sample_allocator *allocator = impl_from_IMFAsyncCallback(iface); struct queued_sample *iter; - IUnknown *sample = NULL; + IUnknown *object = NULL; + IMFSample *sample = NULL; + HRESULT hr; - EnterCriticalSection(&allocator->cs); + if (FAILED(IMFAsyncResult_GetObject(result, &object))) + return E_UNEXPECTED; - IMFAsyncResult_GetObject(result, (IUnknown **)&sample); + hr = IUnknown_QueryInterface(object, &IID_IMFSample, (void **)&sample); + IUnknown_Release(object); + if (FAILED(hr)) + return E_UNEXPECTED; + + EnterCriticalSection(&allocator->cs); LIST_FOR_EACH_ENTRY(iter, &allocator->used_samples, struct queued_sample, entry) { - if (sample == (IUnknown *)iter->sample) + if (sample == iter->sample) { list_remove(&iter->entry); list_add_tail(&allocator->free_samples, &iter->entry); @@ -813,7 +821,7 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback } } - IUnknown_Release(sample); + IMFSample_Release(sample); if (allocator->callback) IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback);

1 0