March 2022 - Wine-commits - list.winehq.org

Bernhard Kölbl : windows.media.speech: Implement ISpeechRecognizer_get_Constraints.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 1f35e2fe4ff6d42116e72e7e83bcea8e8b0fddf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f35e2fe4ff6d42116e72e7e… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 30 21:00:38 2022 +0200 windows.media.speech: Implement ISpeechRecognizer_get_Constraints. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/recognizer.c | 6 ++++-- dlls/windows.media.speech/tests/speech.c | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 0894f91b36a..36836f83a98 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -324,8 +324,10 @@ static HRESULT WINAPI recognizer_GetTrustLevel( ISpeechRecognizer *iface, TrustL static HRESULT WINAPI recognizer_get_Constraints( ISpeechRecognizer *iface, IVector_ISpeechRecognitionConstraint **vector ) { - FIXME("iface %p, operation %p stub!\n", iface, vector); - return E_NOTIMPL; + struct recognizer *impl = impl_from_ISpeechRecognizer(iface); + TRACE("iface %p, operation %p.\n", iface, vector); + IVector_ISpeechRecognitionConstraint_AddRef((*vector = impl->constraints)); + return S_OK; } static HRESULT WINAPI recognizer_get_CurrentLanguage( ISpeechRecognizer *iface, ILanguage **language ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index ea160eec9da..8093c4b95b8 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -729,6 +729,7 @@ static void test_VoiceInformation(void) static void test_SpeechRecognizer(void) { static const WCHAR *speech_recognition_name = L"Windows.Media.SpeechRecognition.SpeechRecognizer"; + IVector_ISpeechRecognitionConstraint *constraints = NULL; ISpeechContinuousRecognitionSession *session = NULL; ISpeechRecognizerFactory *sr_factory = NULL; ISpeechRecognizerStatics *sr_statics = NULL; @@ -841,6 +842,12 @@ static void test_SpeechRecognizer(void) hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr); + hr = ISpeechRecognizer_get_Constraints(recognizer, &constraints); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_get_Constraints failed, hr %#lx.\n", hr); + + ref = IVector_ISpeechRecognitionConstraint_Release(constraints); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); + ref = ISpeechContinuousRecognitionSession_Release(session); ok(ref == 1, "Got unexpected ref %lu.\n", ref);

1 0

Nikolay Sivov : fusion: Use CRT memory allocation functions.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: d3fe9faff0ebe8e9ff53c513442f2e47b0ffd6b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3fe9faff0ebe8e9ff53c513… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 09:47:46 2022 +0300 fusion: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmcache.c | 44 ++++++++++++++++++++++---------------------- dlls/fusion/asmenum.c | 14 +++++++------- dlls/fusion/asmname.c | 46 ++++++++++++++++++++++------------------------ dlls/fusion/assembly.c | 26 +++++++++++++------------- dlls/fusion/fusionpriv.h | 14 -------------- 5 files changed, 64 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3fe9faff0ebe8e9ff53…

1 0

Nikolay Sivov : sxs: Use CRT memory allocation functions.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: a31b107924e91e653b65b02ddf470aa6b1ea0002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31b107924e91e653b65b02d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 09:48:15 2022 +0300 sxs: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/cache.c | 76 +++++++++++++++++++++++++------------------------- dlls/sxs/name.c | 34 +++++++++++----------- dlls/sxs/sxs.c | 6 ++-- dlls/sxs/sxs_private.h | 10 ------- 4 files changed, 58 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a31b107924e91e653b65…

1 0

Zhiyi Zhang : setupapi: Return CR_SUCCESS for CM_Get_DevNode_Status{_Ex}.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: f9d838423d3aa2f5f97af172514ea4493cd1e0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9d838423d3aa2f5f97af172… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 30 14:57:35 2022 +0800 setupapi: Return CR_SUCCESS for CM_Get_DevNode_Status{_Ex}. One Piece: Pirate Warriors 4 relies on CM_Get_DevNode_Status() to return CR_SUCCESS. Otherwise, it shows a graphics driver error dialog and exits. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/stubs.c | 5 ++--- include/cfgmgr32.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4b1585c8df6..75185de047c 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -455,8 +455,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, ULONG flags) { - FIXME("%p %p 0x%08lx 0x%08lx: stub\n", status, problem, dev, flags); - return CR_FAILURE; + return CM_Get_DevNode_Status_Ex(status, problem, dev, flags, NULL); } /*********************************************************************** @@ -466,7 +465,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST ULONG flags, HMACHINE machine) { FIXME("%p %p 0x%08lx 0x%08lx %p: stub\n", status, problem, dev, flags, machine); - return CR_FAILURE; + return CR_SUCCESS; } /*********************************************************************** diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 7c4f4714126..d300c4babaa 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -234,6 +234,8 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void);

1 0

Hans Leidekker : crypt32: Correctly free memory in CNG_ImportRSAPubKey().
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: dd91e541b66a0c0cba404c760bfbc7a661661dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd91e541b66a0c0cba404c76… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 11:47:44 2022 +0200 crypt32: Correctly free memory in CNG_ImportRSAPubKey(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..b7789fd6fcd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2720,7 +2720,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k else { FIXME("Unsupported RSA algorithm: %#x\n", hdr->aiKeyAlg); - CryptMemFree(hdr); + LocalFree(hdr); SetLastError(NTE_BAD_ALGID); return FALSE; } @@ -2762,7 +2762,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k CryptMemFree(rsakey); done: - CryptMemFree(hdr); + LocalFree(hdr); if (alg) BCryptCloseAlgorithmProvider(alg, 0); if (status) SetLastError(RtlNtStatusToDosError(status)); return !status; @@ -2773,7 +2773,6 @@ BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); - if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_RSA_RSA)) return CNG_ImportRSAPubKey(pubKeyInfo, key);

1 0

Hans Leidekker : crypt32: Consistently use CryptMemAlloc/Free().
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 1fb28509f748ac4b1e582f05fba00f02e5da0114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb28509f748ac4b1e582f05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 11:47:45 2022 +0200 crypt32: Consistently use CryptMemAlloc/Free(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 12 ++++++------ dlls/crypt32/chain.c | 4 ++-- dlls/crypt32/msg.c | 4 ++-- dlls/crypt32/pfx.c | 12 +++++------- dlls/crypt32/rootstore.c | 9 ++++----- dlls/crypt32/serialize.c | 4 ++-- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b7789fd6fcd..ad39b7d18c7 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -677,7 +677,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties for (i = 0; i < info->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; - prop = HeapAlloc(GetProcessHeap(), 0, size); + prop = CryptMemAlloc(size); if (!prop) { SetLastError(ERROR_OUTOFMEMORY); @@ -687,7 +687,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties copy_KeyProvInfoProperty(info, prop); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, (const BYTE *)prop, size); - HeapFree(GetProcessHeap(), 0, prop); + CryptMemFree(prop); return ret; } @@ -865,7 +865,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl CERT_KEY_PROV_INFO_PROP_ID, 0, &size); if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (info) { ret = CertGetCertificateContextProperty(pCert, @@ -901,7 +901,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl SetLastError(CRYPT_E_NO_KEY_PROPERTY); } if (allocated) - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); return ret; } @@ -953,7 +953,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); ret = CertGetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); if (ret) @@ -1003,7 +1003,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, } } } - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); return ret; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3e9bdb66e0a..cf244f2ac6c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2007,7 +2007,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con if(!res) return NULL; - urls = HeapAlloc(GetProcessHeap(), 0, size); + urls = CryptMemAlloc(size); if(!urls) return NULL; @@ -2045,7 +2045,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con } } - HeapFree(GetProcessHeap(), 0, urls); + CryptMemFree(urls); return issuer; } diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 6087f423f8c..63884d0c275 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1666,12 +1666,12 @@ static BOOL CRYPT_ExportEncryptedKey(CMSG_CONTENT_ENCRYPT_INFO *info, DWORD i, static LPVOID WINAPI mem_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, size); + return CryptMemAlloc(size); } static VOID WINAPI mem_free(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + CryptMemFree(pv); } diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index fbcc7c72c89..54eb7f25e1b 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -28,7 +27,6 @@ #include "crypt32_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -55,17 +53,17 @@ static HCRYPTPROV import_key( cert_store_data_t data, DWORD flags ) } } - params.buf = key = malloc( size ); + params.buf = key = CryptMemAlloc( size ); if (CRYPT32_CALL( import_store_key, &params ) || !CryptImportKey( prov, key, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey )) { WARN( "CryptImportKey failed %08lx\n", GetLastError() ); CryptReleaseContext( prov, 0 ); - free( key ); + CryptMemFree( key ); return 0; } CryptDestroyKey( cryptkey ); - free( key ); + CryptMemFree( key ); return prov; } @@ -177,10 +175,10 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor struct import_store_cert_params import_params = { data, i, NULL, &size }; if (CRYPT32_CALL( import_store_cert, &import_params ) != STATUS_BUFFER_TOO_SMALL) break; - import_params.buf = cert = malloc( size ); + import_params.buf = cert = CryptMemAlloc( size ); if (!CRYPT32_CALL( import_store_cert, &import_params )) ctx = CertCreateContext( CERT_STORE_CERTIFICATE_CONTEXT, X509_ASN_ENCODING, cert, size, 0, NULL ); - free( cert ); + CryptMemFree( cert ); if (!ctx) { WARN( "CertCreateContext failed %08lx\n", GetLastError() ); diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 43256c71039..ab3a396b651 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -622,19 +621,19 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) if (from) { - params.buffer = malloc( params.size ); + params.buffer = CryptMemAlloc( params.size ); while (!CRYPT32_CALL( enum_root_certs, &params )) { if (needed > params.size) { - free( params.buffer ); - params.buffer = malloc( needed ); + CryptMemFree( params.buffer ); + params.buffer = CryptMemAlloc( needed ); params.size = needed; } else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, params.buffer, needed, CERT_STORE_ADD_NEW, NULL ); } - free( params.buffer ); + CryptMemFree( params.buffer ); check_and_store_certs(from, store); } CertCloseStore(from, 0); diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e1e2593169d..47ab834bf48 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -72,7 +72,7 @@ static DWORD serialize_KeyProvInfoProperty(const CRYPT_KEY_PROV_INFO *info, stru if (!ret) return size; - store = HeapAlloc(GetProcessHeap(), 0, size); + store = CryptMemAlloc(size); if (!store) return 0; param = (struct store_CRYPT_KEY_PROV_PARAM *)(store + 1); @@ -331,7 +331,7 @@ static DWORD read_serialized_KeyProvInfoProperty(const struct store_CRYPT_KEY_PR for (i = 0; i < store->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + param[i].cbData; - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (!info) { SetLastError(ERROR_OUTOFMEMORY);

1 0

Hans Leidekker : crypt32: Use CRT allocation functions.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 8516a9e9317f8708f98ab112f40d1ab7166a8c6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8516a9e9317f8708f98ab112… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 11:47:46 2022 +0200 crypt32: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index cce90125bc0..4a94bed9b6b 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <stdio.h> #include "windef.h" @@ -136,17 +137,17 @@ HLRUCACHE WINAPI I_CryptFreeLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) LPVOID WINAPI CryptMemAlloc(ULONG cbSize) { - return HeapAlloc(GetProcessHeap(), 0, cbSize); + return malloc(cbSize); } LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize) { - return HeapReAlloc(GetProcessHeap(), 0, pv, cbSize); + return realloc(pv, cbSize); } VOID WINAPI CryptMemFree(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + free(pv); } DWORD WINAPI I_CryptAllocTls(void)

1 0

Rémi Bernon : mf/tests: Fix incorrect array index when formatting blob value.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: edef14126cbdb64dda218688a51b6e170cb4909b URL: https://source.winehq.org/git/wine.git/?a=commit;h=edef14126cbdb64dda218688… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:27 2022 +0200 mf/tests: Fix incorrect array index when formatting blob value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 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/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0df524b4e16..b2d2880bea6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -147,7 +147,7 @@ static void check_attributes_(int line, IMFAttributes *attributes, const struct case VT_VECTOR | VT_UI1: buf += sprintf(buf, "size %lu, data {", value.caub.cElems); for (j = 0; j < 16 && j < value.caub.cElems; ++j) - buf += sprintf(buf, "0x%02x,", value.caub.pElems[i + j]); + buf += sprintf(buf, "0x%02x,", value.caub.pElems[j]); if (value.caub.cElems > 16) buf += sprintf(buf, "...}"); else

1 0

Rémi Bernon : mf/tests: Increase the H264 decoder tests video frame size.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: 7735b4800685f94ed2eaaecd4461fcffaf19dfe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7735b4800685f94ed2eaaecd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:28 2022 +0200 mf/tests: Increase the H264 decoder tests video frame size. GStreamer vaapi decoder suffers from bugs which are causing double frees when the frame size is too small. Test file has been generated with: gst-launch-1.0 videotestsrc num-buffers=60 ! \ video/x-raw,format=I420,width=82,height=84,framerate=30000/1001 ! \ videoconvert ! x264enc ! filesink location=dlls/mf/tests/h264data.bin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 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/mf/tests/h264data.bin | Bin 49137 -> 52276 bytes dlls/mf/tests/mf.c | 53 ++++++++++++++++++++++---------------------- dlls/mf/tests/nv12frame.bin | Bin 9600 -> 13824 bytes 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/mf/tests/h264data.bin b/dlls/mf/tests/h264data.bin index d014052ca49..d06aa5fb5f2 100644 Binary files a/dlls/mf/tests/h264data.bin and b/dlls/mf/tests/h264data.bin differ diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b2d2880bea6..48eeeeffde2 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6541,17 +6541,18 @@ static void test_h264_decoder(void) ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), {0}, }; - static const MFVideoArea actual_aperture = {.Area={78, 74}}; - static const media_type_desc actual_outputs[] = + static const MFVideoArea actual_aperture = {.Area={82,84}}; + static const DWORD actual_width = 96, actual_height = 96; + const media_type_desc actual_outputs[] = { { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6563,9 +6564,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6577,9 +6578,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6591,9 +6592,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6605,9 +6606,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 12800, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 160, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6870,7 +6871,7 @@ static void test_h264_decoder(void) todo_wine ok(i == 2, "got %lu iterations\n", i); todo_wine - ok(h264_encoded_data_len == 44959, "got h264_encoded_data_len %lu\n", h264_encoded_data_len); + ok(h264_encoded_data_len == 48194, "got h264_encoded_data_len %lu\n", h264_encoded_data_len); todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#lx\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %lu\n", output.dwStreamID); @@ -6892,7 +6893,7 @@ static void test_h264_decoder(void) ok(hr == S_OK, "GetOutputStreamInfo returned %#lx\n", hr); ok(output_info.dwFlags == flags, "got dwFlags %#lx\n", output_info.dwFlags); todo_wine - ok(output_info.cbSize == 0x3200, "got cbSize %#lx\n", output_info.cbSize); + ok(output_info.cbSize == actual_width * actual_height * 2, "got cbSize %#lx\n", output_info.cbSize); ok(output_info.cbAlignment == 0, "got cbAlignment %#lx\n", output_info.cbAlignment); i = -1; @@ -6918,11 +6919,11 @@ static void test_h264_decoder(void) ok(resource != 0, "FindResourceW failed, error %lu\n", GetLastError()); nv12_frame_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); nv12_frame_len = SizeofResource(GetModuleHandleW(NULL), resource); - ok(nv12_frame_len == 9600, "got frame length %lu\n", nv12_frame_len); + ok(nv12_frame_len == actual_width * actual_height * 3 / 2, "got frame length %lu\n", nv12_frame_len); status = 0; memset(&output, 0, sizeof(output)); - output.pSample = create_sample(NULL, 0x3200); + output.pSample = create_sample(NULL, actual_width * actual_height * 2); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); todo_wine ok(hr == S_OK, "ProcessOutput returned %#lx\n", hr); @@ -6943,13 +6944,13 @@ static void test_h264_decoder(void) ok(length == nv12_frame_len, "got length %lu\n", length); if (length == nv12_frame_len) { - for (i = 0; i < 74; ++i) + for (i = 0; i < actual_aperture.Area.cy; ++i) { - memset(data + 80 * i + 78, 0xcd, 2); - memset(data + 80 * (80 + i) + 78, 0xcd, 2); + memset(data + actual_width * i + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); + memset(data + actual_width * (actual_height + i) + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); } - memset(data + 80 * 74, 0xcd, 6 * 80); - memset(data + 80 * 117, 0xcd, 3 * 80); + memset(data + actual_width * actual_aperture.Area.cy, 0xcd, (actual_height - actual_aperture.Area.cy) * actual_width); + memset(data + actual_width * (actual_height + actual_aperture.Area.cy / 2), 0xcd, (actual_height - actual_aperture.Area.cy) / 2 * actual_width); } hr = IMFMediaBuffer_Unlock(media_buffer); ok(hr == S_OK, "Unlock returned %#lx\n", hr); diff --git a/dlls/mf/tests/nv12frame.bin b/dlls/mf/tests/nv12frame.bin index 9ceceb8fedb..4267981efd4 100644 Binary files a/dlls/mf/tests/nv12frame.bin and b/dlls/mf/tests/nv12frame.bin differ

1 0

Ziqing Hui : include: Add defines for ID2D1ImageSourceFromWic.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: wine Branch: master Commit: bd25d7f324981423773cdd6f07f4bf54b5c51050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd25d7f324981423773cdd6f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Mar 30 11:57:45 2022 +0800 include: Add defines for ID2D1ImageSourceFromWic. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index a33292882df..643212e1a27 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -166,3 +166,21 @@ interface ID2D1ImageSource : ID2D1Image [out] BOOL *resources_discarded ); }; + +[ + object, + uuid(77395441-1c8f-4555-8683-f50dab0fe792), + local, +] +interface ID2D1ImageSourceFromWic : ID2D1ImageSource +{ + HRESULT EnsureCached( + [in, optional] const D2D1_RECT_U *rect_to_fill + ); + HRESULT TrimCache( + [in, optional] const D2D1_RECT_U *rect_to_preserve + ); + void GetSource( + [out] IWICBitmapSource **source + ); +};

1 0