April 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Move nt_to_unix_file_name_attr() to avoid forward declarations.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 90024e492dcefd204c6c953a804c0d51544db5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90024e492dcefd204c6c953a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 16:19:50 2021 +0200 ntdll: Move nt_to_unix_file_name_attr() to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 126 ++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b87da541f1d..45c220a1d63 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3216,69 +3216,6 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer } -/****************************************************************************** - * nt_to_unix_file_name_attr - */ -static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char **name_ret, - UNICODE_STRING *nt_name, UINT disposition ) -{ - enum server_fd_type type; - int old_cwd, root_fd, needs_close; - const WCHAR *name; - char *unix_name; - int name_len, unix_len; - NTSTATUS status; - - if (!attr->RootDirectory) /* without root dir fall back to normal lookup */ - return nt_to_unix_file_name( attr->ObjectName, name_ret, nt_name, disposition ); - - name = attr->ObjectName->Buffer; - name_len = attr->ObjectName->Length / sizeof(WCHAR); - - if (name_len && name[0] == '\\') return STATUS_INVALID_PARAMETER; - - unix_len = name_len * 3 + MAX_DIR_ENTRY_LEN + 3; - if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; - unix_name[0] = '.'; - - if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) - { - if (type != FD_TYPE_DIR) - { - if (needs_close) close( root_fd ); - status = STATUS_BAD_DEVICE_TYPE; - } - else - { - mutex_lock( &dir_mutex ); - if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) - { - status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE ); - if (fchdir( old_cwd ) == -1) chdir( "/" ); - } - else status = errno_to_status( errno ); - mutex_unlock( &dir_mutex ); - if (old_cwd != -1) close( old_cwd ); - if (needs_close) close( root_fd ); - } - } - else if (status == STATUS_OBJECT_TYPE_MISMATCH) status = STATUS_BAD_DEVICE_TYPE; - - if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) - { - TRACE( "%s -> %s\n", debugstr_us(attr->ObjectName), debugstr_a(unix_name) ); - *name_ret = unix_name; - if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); - } - else - { - TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); - free( unix_name ); - } - return status; -} - - /****************************************************************************** * nt_to_unix_file_name * @@ -3393,6 +3330,69 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret } +/****************************************************************************** + * nt_to_unix_file_name_attr + */ +static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char **name_ret, + UNICODE_STRING *nt_name, UINT disposition ) +{ + enum server_fd_type type; + int old_cwd, root_fd, needs_close; + const WCHAR *name; + char *unix_name; + int name_len, unix_len; + NTSTATUS status; + + if (!attr->RootDirectory) /* without root dir fall back to normal lookup */ + return nt_to_unix_file_name( attr->ObjectName, name_ret, nt_name, disposition ); + + name = attr->ObjectName->Buffer; + name_len = attr->ObjectName->Length / sizeof(WCHAR); + + if (name_len && name[0] == '\\') return STATUS_INVALID_PARAMETER; + + unix_len = name_len * 3 + MAX_DIR_ENTRY_LEN + 3; + if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; + unix_name[0] = '.'; + + if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) + { + if (type != FD_TYPE_DIR) + { + if (needs_close) close( root_fd ); + status = STATUS_BAD_DEVICE_TYPE; + } + else + { + mutex_lock( &dir_mutex ); + if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) + { + status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE ); + if (fchdir( old_cwd ) == -1) chdir( "/" ); + } + else status = errno_to_status( errno ); + mutex_unlock( &dir_mutex ); + if (old_cwd != -1) close( old_cwd ); + if (needs_close) close( root_fd ); + } + } + else if (status == STATUS_OBJECT_TYPE_MISMATCH) status = STATUS_BAD_DEVICE_TYPE; + + if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) + { + TRACE( "%s -> %s\n", debugstr_us(attr->ObjectName), debugstr_a(unix_name) ); + *name_ret = unix_name; + if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); + } + else + { + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); + free( unix_name ); + } + return status; +} + + /****************************************************************************** * wine_nt_to_unix_file_name *

1 0

Dmitry Timoshkov : crypt32/tests: Add a test to verify certificate signature.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 8601953ebd175db598b9c4aa1589344ef24a786e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8601953ebd175db598b9c4aa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:14:51 2021 +0300 crypt32/tests: Add a test to verify certificate signature. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/Makefile.in | 2 +- dlls/crypt32/tests/cert.c | 95 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/Makefile.in b/dlls/crypt32/tests/Makefile.in index d96ad1cd6f1..339cff30e0f 100644 --- a/dlls/crypt32/tests/Makefile.in +++ b/dlls/crypt32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = crypt32.dll -IMPORTS = crypt32 advapi32 user32 shlwapi shell32 +IMPORTS = crypt32 advapi32 user32 shlwapi shell32 bcrypt C_SRCS = \ base64.c \ diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 745770f0095..15ed98e0e30 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -28,6 +28,7 @@ #include <winreg.h> #include <winerror.h> #include <wincrypt.h> +#include <bcrypt.h> #include "wine/test.h" @@ -60,7 +61,6 @@ static void init_function_pointers(void) GET_PROC(hCrypt32, CryptVerifyCertificateSignatureEx) GET_PROC(hAdvapi32, CryptAcquireContextA) - #undef GET_PROC } @@ -4237,6 +4237,98 @@ static void testKeyProvInfo(void) CertCloseStore(store, 0); } +static void test_VerifySignature(void) +{ + PCCERT_CONTEXT cert; + PCERT_SIGNED_CONTENT_INFO info; + DWORD size; + BOOL ret; + HCRYPTPROV prov; + HCRYPTKEY key; + HCRYPTHASH hash; + BYTE hash_value[20], *sig_value; + DWORD hash_len, i; + BCRYPT_KEY_HANDLE bkey; + BCRYPT_HASH_HANDLE bhash; + BCRYPT_ALG_HANDLE alg; + BCRYPT_PKCS1_PADDING_INFO pad; + NTSTATUS status; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); + ok(cert != NULL, "CertCreateCertificateContext error %#x\n", GetLastError()); + + /* 1. Verify certificate signature with Crypto API */ + ret = CryptVerifyCertificateSignature(0, cert->dwCertEncodingType, + cert->pbCertEncoded, cert->cbCertEncoded, &cert->pCertInfo->SubjectPublicKeyInfo); + ok(ret, "CryptVerifyCertificateSignature error %#x\n", GetLastError()); + + /* 2. Verify certificate signature with Crypto API manually */ + ret = pCryptAcquireContextA(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %#x\n", GetLastError()); + + ret = CryptImportPublicKeyInfoEx(prov, cert->dwCertEncodingType, &cert->pCertInfo->SubjectPublicKeyInfo, 0, 0, NULL, &key); + ok(ret, "CryptImportPublicKeyInfoEx error %#x\n", GetLastError()); + + ret = CryptDecodeObjectEx(cert->dwCertEncodingType, X509_CERT, + cert->pbCertEncoded, cert->cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ok(ret, "CryptDecodeObjectEx error %#x\n", GetLastError()); + + ret = CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); + ok(ret, "CryptCreateHash error %#x\n", GetLastError()); + + ret = CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0); + ok(ret, "CryptHashData error %#x\n", GetLastError()); + + ret = CryptVerifySignatureW(hash, info->Signature.pbData, info->Signature.cbData, key, NULL, 0); + ok(ret, "CryptVerifySignature error %#x\n", GetLastError()); + + CryptDestroyHash(hash); + CryptDestroyKey(key); + CryptReleaseContext(prov, 0); + + /* 3. Verify certificate signature with CNG */ + ret = CryptImportPublicKeyInfoEx2(cert->dwCertEncodingType, &cert->pCertInfo->SubjectPublicKeyInfo, 0, NULL, &bkey); + ok(ret, "CryptImportPublicKeyInfoEx error %#x\n", GetLastError()); + + status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(!status, "got %#x\n", status); + + status = BCryptCreateHash(alg, &bhash, NULL, 0, NULL, 0, 0); + ok(!status || broken(status == STATUS_INVALID_PARAMETER) /* Vista */, "got %#x\n", status); + if (status == STATUS_INVALID_PARAMETER) + { + win_skip("broken BCryptCreateHash\n"); + goto done; + } + + status = BCryptHashData(bhash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0); + ok(!status, "got %#x\n", status); + + status = BCryptFinishHash(bhash, hash_value, sizeof(hash_value), 0); + ok(!status, "got %#x\n", status); + ok(!memcmp(hash_value, selfSignedSignatureHash, sizeof(hash_value)), "got wrong hash value\n"); + + status = BCryptGetProperty(bhash, BCRYPT_HASH_LENGTH, (BYTE *)&hash_len, sizeof(hash_len), &size, 0); + ok(!status, "got %#x\n", status); + ok(hash_len == sizeof(hash_value), "got %u\n", hash_len); + + sig_value = HeapAlloc(GetProcessHeap(), 0, info->Signature.cbData); + for (i = 0; i < info->Signature.cbData; i++) + sig_value[i] = info->Signature.pbData[info->Signature.cbData - i - 1]; + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + status = BCryptVerifySignature(bkey, &pad, hash_value, sizeof(hash_value), sig_value, info->Signature.cbData, BCRYPT_PAD_PKCS1); + ok(!status, "got %#x\n", status); + + HeapFree(GetProcessHeap(), 0, sig_value); + BCryptDestroyHash(bhash); +done: + BCryptCloseAlgorithmProvider(alg, 0); + + LocalFree(info); + CertFreeCertificateContext(cert); +} + START_TEST(cert) { init_function_pointers(); @@ -4270,4 +4362,5 @@ START_TEST(cert) testAcquireCertPrivateKey(); testGetPublicKeyLength(); testIsRDNAttrsInCertificateName(); + test_VerifySignature(); }

1 0

Hans Leidekker : wldap32: Move support for compare functions to the Unix library.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: e32a6026a34bc418058bf5df6d918bc6bef6bff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32a6026a34bc418058bf5df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:28 2021 +0200 wldap32: Move support for compare functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/compare.c | 355 ++++++++++++------------------------------------- dlls/wldap32/libldap.c | 17 +++ dlls/wldap32/libldap.h | 8 ++ 3 files changed, 108 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e32a6026a34bc418058b…

1 0

Zhiyi Zhang : winedump: Dump EMR_ALPHABLEND record.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 2c47d0b58b6864b0d5c7790cc939c19ed190be72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c47d0b58b6864b0d5c7790c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 14 15:26:40 2021 +0800 winedump: Dump EMR_ALPHABLEND record. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index d44f7a806a5..d5630f6812b 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -397,7 +397,30 @@ static int dump_emfrecord(void) EMRCASE(EMR_COLORCORRECTPALETTE); EMRCASE(EMR_SETICMPROFILEA); EMRCASE(EMR_SETICMPROFILEW); - EMRCASE(EMR_ALPHABLEND); + + case EMR_ALPHABLEND: + { + const EMRALPHABLEND *blend = PRD(offset, sizeof(*blend)); + const BITMAPINFOHEADER *bmih = (const BITMAPINFOHEADER *)((const unsigned char *)blend + blend->offBmiSrc); + + printf("%-20s %08x\n", "EMR_ALPHABLEND", length); + printf("bounds (%d,%d - %d,%d) dst %d,%d %dx%d src %d,%d %dx%d rop %#x xform (%f, %f, %f, %f, %f, %f)\n" + "bk_color %#x usage %#x bmi_offset %#x bmi_size %#x bits_offset %#x bits_size %#x\n", + blend->rclBounds.left, blend->rclBounds.top, blend->rclBounds.right, blend->rclBounds.bottom, + blend->xDest, blend->yDest, blend->cxDest, blend->cyDest, + blend->xSrc, blend->ySrc, blend->cxSrc, blend->cySrc, blend->dwRop, + blend->xformSrc.eM11, blend->xformSrc.eM12, blend->xformSrc.eM21, + blend->xformSrc.eM22, blend->xformSrc.eDx, blend->xformSrc.eDy, + blend->crBkColorSrc, blend->iUsageSrc, blend->offBmiSrc, blend->cbBmiSrc, + blend->offBitsSrc, blend->cbBitsSrc); + printf("BITMAPINFOHEADER biSize %#x biWidth %d biHeight %d biPlanes %d biBitCount %d biCompression %#x\n" + "biSizeImage %#x biXPelsPerMeter %d biYPelsPerMeter %d biClrUsed %#x biClrImportant %#x\n", + bmih->biSize, bmih->biWidth, bmih->biHeight, bmih->biPlanes, bmih->biBitCount, + bmih->biCompression, bmih->biSizeImage, bmih->biXPelsPerMeter, bmih->biYPelsPerMeter, + bmih->biClrUsed, bmih->biClrImportant); + break; + } + EMRCASE(EMR_SETLAYOUT); EMRCASE(EMR_TRANSPARENTBLT); EMRCASE(EMR_RESERVED_117);

1 0

Nikolay Sivov : mfplat: Release queue subscriber on queue release.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: ce37290a5a7b630207c4303c90c44a9a09a8ab2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce37290a5a7b630207c4303c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 14 09:49:10 2021 +0300 mfplat: Release queue subscriber on queue release. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 ++---- dlls/mfplat/tests/mfplat.c | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e23c648c823..5a35350f5c5 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7019,6 +7019,7 @@ static void event_queue_cleanup(struct event_queue *queue) while ((event = queue_pop_event(queue))) IMFMediaEvent_Release(event); + event_queue_clear_subscriber(queue); } static HRESULT WINAPI eventqueue_QueryInterface(IMFMediaEventQueue *iface, REFIID riid, void **out) @@ -7162,9 +7163,7 @@ static HRESULT WINAPI eventqueue_EndGetEvent(IMFMediaEventQueue *iface, IMFAsync else if (queue->subscriber == (IRtwqAsyncResult *)result) { *event = queue_pop_event(queue); - if (queue->subscriber) - IRtwqAsyncResult_Release(queue->subscriber); - queue->subscriber = NULL; + event_queue_clear_subscriber(queue); queue->notified = FALSE; hr = *event ? S_OK : E_FAIL; } @@ -7265,7 +7264,6 @@ static HRESULT WINAPI eventqueue_Shutdown(IMFMediaEventQueue *iface) if (!queue->is_shut_down) { event_queue_cleanup(queue); - event_queue_clear_subscriber(queue); queue->is_shut_down = TRUE; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 603dbbe22ff..fd9a27d599c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -326,6 +326,7 @@ static WCHAR *load_resource(const WCHAR *name) struct test_callback { IMFAsyncCallback IMFAsyncCallback_iface; + LONG refcount; HANDLE event; DWORD param; IMFMediaEvent *media_event; @@ -352,12 +353,14 @@ static HRESULT WINAPI testcallback_QueryInterface(IMFAsyncCallback *iface, REFII static ULONG WINAPI testcallback_AddRef(IMFAsyncCallback *iface) { - return 2; + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + return InterlockedIncrement(&callback->refcount); } static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) { - return 1; + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + return InterlockedDecrement(&callback->refcount); } static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) @@ -2462,6 +2465,7 @@ static void init_test_callback(struct test_callback *callback) { callback->IMFAsyncCallback_iface.lpVtbl = &testcallbackvtbl; callback->event = NULL; + callback->refcount = 1; } static void test_MFCreateAsyncResult(void) @@ -3114,6 +3118,19 @@ static void test_event_queue(void) IMFMediaEventQueue_Release(queue); + /* Release while subscribed. */ + init_test_callback(&callback); + + hr = MFCreateEventQueue(&queue); + ok(hr == S_OK, "Failed to create event queue, hr %#x.\n", hr); + + hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback.IMFAsyncCallback_iface, NULL); + ok(hr == S_OK, "Failed to Begin*, hr %#x.\n", hr); + EXPECT_REF(&callback.IMFAsyncCallback_iface, 2); + + IMFMediaEventQueue_Release(queue); + EXPECT_REF(&callback.IMFAsyncCallback_iface, 1); + hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); }

1 0

Rémi Bernon : mfplat: Release queue subscriber on Shutdown.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: e9a29249b80a8ad7e82f0c8b9510d891850921a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a29249b80a8ad7e82f0c8b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 14 09:49:09 2021 +0300 mfplat: Release queue subscriber on Shutdown. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index de2b5c6ee51..e23c648c823 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7006,6 +7006,13 @@ static IMFMediaEvent *queue_pop_event(struct event_queue *queue) return event; } +static void event_queue_clear_subscriber(struct event_queue *queue) +{ + if (queue->subscriber) + IRtwqAsyncResult_Release(queue->subscriber); + queue->subscriber = NULL; +} + static void event_queue_cleanup(struct event_queue *queue) { IMFMediaEvent *event; @@ -7258,6 +7265,7 @@ static HRESULT WINAPI eventqueue_Shutdown(IMFMediaEventQueue *iface) if (!queue->is_shut_down) { event_queue_cleanup(queue); + event_queue_clear_subscriber(queue); queue->is_shut_down = TRUE; }

1 0

Nikolay Sivov : mfplat: Use RTWQ* type in BeginGetEvent().
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 3d6669cca37ad90b32afa27671481c674d7ff80a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6669cca37ad90b32afa276… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 14 09:49:08 2021 +0300 mfplat: Use RTWQ* type in BeginGetEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 9078702c854..de2b5c6ee51 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7109,7 +7109,7 @@ static void queue_notify_subscriber(struct event_queue *queue) static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsyncCallback *callback, IUnknown *state) { struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); - MFASYNCRESULT *result_data; + RTWQASYNCRESULT *result_data; HRESULT hr; TRACE("%p, %p, %p.\n", iface, callback, state); @@ -7121,9 +7121,9 @@ static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsy if (queue->is_shut_down) hr = MF_E_SHUTDOWN; - else if ((result_data = (MFASYNCRESULT *)queue->subscriber)) + else if ((result_data = (RTWQASYNCRESULT *)queue->subscriber)) { - if (result_data->pCallback == callback) + if (result_data->pCallback == (IRtwqAsyncCallback *)callback) hr = IRtwqAsyncResult_GetStateNoAddRef(queue->subscriber) == state ? MF_S_MULTIPLE_BEGIN : MF_E_MULTIPLE_BEGIN; else

1 0

Andrew Eikum : mmdevapi: Support device ID paths in ActivateAudioInterfaceAsync.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 6de9bd06bace6f57aa987c357b7a9fdb8c311756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de9bd06bace6f57aa987c35… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 13 17:19:54 2021 -0500 mmdevapi: Support device ID paths in ActivateAudioInterfaceAsync. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index eac1da28f18..455e6682001 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -413,6 +413,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev static const WCHAR DEVINTERFACE_AUDIO_RENDER_WSTR[] = L"{E6327CAD-DCEC-4949-AE8A-991E976A79D2}"; static const WCHAR DEVINTERFACE_AUDIO_CAPTURE_WSTR[] = L"{2EEF81BE-33FA-4800-9670-1CD474972C3F}"; + static const WCHAR MMDEV_PATH_PREFIX[] = L"\\\\?\\SWD#MMDEVAPI#"; hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); if (FAILED(hr)) { @@ -424,8 +425,15 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, mmdev); } else if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_CAPTURE_WSTR)){ hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eCapture, eMultimedia, mmdev); + } else if (!memcmp(path, MMDEV_PATH_PREFIX, sizeof(MMDEV_PATH_PREFIX) - sizeof(WCHAR))) { + WCHAR device_id[56]; /* == strlen("{0.0.1.00000000}.{fd47d9cc-4218-4135-9ce2-0c195c87405b}") + 1 */ + + wcsncpy(device_id, path + (ARRAY_SIZE(MMDEV_PATH_PREFIX) - 1), ARRAY_SIZE(device_id)); + device_id[ARRAY_SIZE(device_id) - 1] = 0; + + hr = IMMDeviceEnumerator_GetDevice(devenum, device_id, mmdev); } else { - FIXME("How to map path to device id? %s\n", debugstr_w(path)); + FIXME("Unrecognized device id format: %s\n", debugstr_w(path)); hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); }

1 0

Hans Leidekker : wldap32: Move support for bind functions to the Unix library.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: db26894eeea5943892a872ea818471732ee66404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db26894eeea5943892a872ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:27 2021 +0200 wldap32: Move support for bind functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/bind.c | 419 ++++++++++++----------------------------- dlls/wldap32/libldap.c | 58 +++++- dlls/wldap32/libldap.h | 52 ++++- dlls/wldap32/main.c | 6 +- dlls/wldap32/option.c | 6 +- dlls/wldap32/winldap_private.h | 2 +- 6 files changed, 234 insertions(+), 309 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db26894eeea5943892a8…

1 0

Hans Leidekker : wldap32: Move support for add functions to a new Unix library.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 1805b3a1fc6ce23f8ac88cfacedf3b248c6a94fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1805b3a1fc6ce23f8ac88cfa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:25 2021 +0200 wldap32: Move support for add functions to a new Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/add.c | 274 +++---------- dlls/wldap32/init.c | 10 +- dlls/wldap32/libldap.c | 81 ++++ dlls/wldap32/libldap.h | 72 ++++ dlls/wldap32/main.c | 12 +- dlls/wldap32/winldap_private.h | 910 ++++++++++++++++++++++++++++++++++++++++- dlls/wldap32/wldap32.h | 30 +- 8 files changed, 1137 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1805b3a1fc6ce23f8ac8…

1 0