- Wine-Devel - list.winehq.org

[PATCH] winealsa.drv: fix error with missed uint64_t
by Vitaly Lipatov March 27, 2022

March 27, 2022

Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> --- dlls/winealsa.drv/alsamidi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 476ea383a25..60065240251 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <pthread.h> #include <time.h> +#include <stdint.h> #include <alsa/asoundlib.h> #include "ntstatus.h" -- 2.33.0

1 0

[PATCH 1/2] ncrypt/tests: Test for NCryptVerifySignature.
by Santino Mazza March 27, 2022

March 27, 2022

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/tests/ncrypt.c | 131 +++++++++++++++++++++++++++++++++++++ include/ncrypt.h | 6 ++ 2 files changed, 137 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index fc951fef80a..0967c5a1084 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -330,6 +330,136 @@ static void test_finalize_key(void) NCryptFreeObject(key); } +static UCHAR signature_pubkey_blob[] = { + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xb4, 0xdb, 0x15, 0x24, 0xd0, 0x9a, 0xf4, 0xa3, 0x22, + 0x04, 0xbe, 0xbd, 0xda, 0xb4, 0x3b, 0x1f, 0x9d, 0x5f, 0x2a, 0x3e, 0xe7, + 0x42, 0xd7, 0xfa, 0xbc, 0xeb, 0x4e, 0xba, 0xcf, 0x92, 0x5d, 0x42, 0x0e, + 0xc0, 0xb0, 0x0f, 0xcc, 0xc3, 0x03, 0x69, 0x23, 0xb9, 0xc2, 0x07, 0xf7, + 0xf5, 0x19, 0xef, 0x9f, 0xb6, 0xd4, 0x6d, 0x35, 0x0d, 0x4c, 0x3a, 0x2b, + 0x37, 0x9d, 0x4d, 0x61, 0xce, 0x30, 0x33, 0x27, 0xe4, 0x9a, 0xca, 0x23, + 0xd6, 0x8f, 0x90, 0x33, 0xba, 0x5b, 0x16, 0xab, 0xa6, 0xda, 0x7a, 0x16, + 0x8e, 0xae, 0xf9, 0x6f, 0x29, 0xe2, 0xf1, 0x3d, 0xf0, 0xb6, 0xb4, 0x70, + 0xc0, 0x6d, 0xfc, 0x73, 0xf1, 0x3e, 0xdf, 0x02, 0x2c, 0xab, 0x24, 0x7a, + 0xd8, 0x8b, 0xcf, 0x63, 0xd0, 0x1a, 0x76, 0xb3, 0x11, 0x22, 0x5d, 0xf6, + 0x72, 0xb5, 0xd1, 0x6b, 0x83, 0xcd, 0x63, 0x5d, 0x3d, 0x03, 0xa2, 0xe0, + 0x36, 0xe8, 0x54, 0xe9, 0x6f, 0x04, 0xb3, 0x1a, 0xdf, 0x35, 0xd7, 0x01, + 0x57, 0xc7, 0x8d, 0x81, 0x4b, 0x39, 0x0c, 0x92, 0x71, 0x0b, 0x7d, 0x05, + 0xb4, 0xa4, 0xb4, 0xd4, 0x73, 0x55, 0x85, 0x19, 0xd5, 0x37, 0x7f, 0xcd, + 0x81, 0xd3, 0xf2, 0x62, 0x60, 0xfb, 0x6a, 0x1a, 0xda, 0xb4, 0x83, 0xfa, + 0x87, 0xac, 0x51, 0x3a, 0xb4, 0xc2, 0x03, 0xd3, 0xc6, 0xf0, 0x20, 0xca, + 0x10, 0xfd, 0xeb, 0xd8, 0x85, 0xb9, 0x74, 0x29, 0x83, 0xda, 0xa2, 0xee, + 0xcc, 0xf4, 0xf6, 0x18, 0xbc, 0x84, 0x92, 0xf5, 0xdb, 0x71, 0x14, 0xb9, + 0x62, 0x54, 0x4b, 0x64, 0x58, 0x95, 0xbc, 0x69, 0xc1, 0xcd, 0xac, 0x4b, + 0x7c, 0x1d, 0xc4, 0xe7, 0x6c, 0x44, 0x80, 0x5e, 0x88, 0x3a, 0x9c, 0xbd, + 0xd5, 0xa5, 0x2f, 0xa6, 0x73, 0x65, 0x48, 0x00, 0x5e, 0xfd, 0xe9, 0x4e, + 0xd7, 0x6c, 0x59, 0x47, 0x9b, 0xd1, 0x9d}; + +static UCHAR signature_pkcs1_sha256[] = { + 0xad, 0x3d, 0x2f, 0x31, 0x87, 0xba, 0x5b, 0xdc, 0x84, 0x95, 0x77, 0x68, + 0xf9, 0x9c, 0xd2, 0x38, 0x5b, 0x9f, 0x09, 0xc3, 0x8e, 0x9e, 0x8e, 0x8d, + 0x49, 0x56, 0x31, 0x09, 0x55, 0xc6, 0xd2, 0x1a, 0xb3, 0x00, 0x71, 0x60, + 0x84, 0x38, 0xf7, 0x1b, 0xc0, 0x43, 0x87, 0x31, 0x2d, 0xcc, 0xf2, 0x49, + 0x5f, 0x21, 0x8e, 0x77, 0x16, 0x57, 0xd7, 0xe9, 0x37, 0x3a, 0xe9, 0x91, + 0x5b, 0xc5, 0xea, 0x34, 0xb5, 0xf7, 0x4d, 0xaa, 0x65, 0x06, 0xef, 0xc6, + 0x14, 0xfa, 0xa7, 0x1e, 0xe5, 0xc6, 0x18, 0xfe, 0x06, 0x64, 0xe7, 0x6e, + 0x11, 0x83, 0x03, 0x4c, 0x91, 0x47, 0x60, 0x88, 0x12, 0x0c, 0x5e, 0xcc, + 0x3a, 0x93, 0x2f, 0x5c, 0x57, 0x5b, 0x66, 0x55, 0xa3, 0xe5, 0xf4, 0x3c, + 0x6f, 0xe9, 0xd8, 0xfd, 0xcc, 0x19, 0xc8, 0xf8, 0x13, 0x21, 0x3d, 0x29, + 0xee, 0x3c, 0xb2, 0xb4, 0x3f, 0x36, 0xd8, 0x82, 0xb1, 0xa9, 0x34, 0x89, + 0x2a, 0x7a, 0x42, 0x4a, 0x13, 0x0a, 0x0b, 0x50, 0xbe, 0x43, 0xa8, 0x2c, + 0x5a, 0x86, 0x65, 0x9f, 0xab, 0x86, 0x25, 0x44, 0xbb, 0x6b, 0xca, 0x04, + 0xca, 0xa5, 0xe7, 0x8e, 0xe2, 0x1d, 0xa8, 0x31, 0x90, 0x85, 0x6a, 0xd9, + 0xaf, 0x67, 0x8c, 0x1a, 0x13, 0xea, 0xa8, 0xfd, 0x3d, 0xc0, 0xb0, 0x3f, + 0xde, 0x6a, 0xc9, 0x65, 0xeb, 0x0a, 0xa6, 0x9b, 0xfc, 0x97, 0x0a, 0x72, + 0xaf, 0x04, 0xde, 0x3f, 0xcb, 0xac, 0x97, 0x6e, 0xfa, 0xbb, 0xd8, 0x6e, + 0xad, 0x0d, 0x10, 0xc6, 0x34, 0x18, 0x50, 0xb9, 0x12, 0xd4, 0x6b, 0xd5, + 0x3d, 0x9d, 0xfb, 0x31, 0x8d, 0x96, 0x39, 0x4d, 0x20, 0x91, 0x40, 0x06, + 0xca, 0xe6, 0x33, 0x73, 0x76, 0x2a, 0xe3, 0xab, 0xaf, 0x9d, 0xe9, 0x4e, + 0xb7, 0xe0, 0x4b, 0x45, 0x23, 0x07, 0xe9, 0xe2, 0xab, 0xdc, 0x9f, 0x5a, + 0xed, 0xbe, 0x76, 0x27}; + +static UCHAR invalid_signature[] = { + 0x4f, 0x8f, 0x88, 0x43, 0xed, 0x9e, 0xe8, 0x75, 0x0f, 0xe7, 0x32, 0xab, + 0x07, 0xcc, 0x6c, 0x8d, 0x56, 0xaa, 0x78, 0xf8, 0x43, 0x62, 0x4c, 0x0c, + 0xd5, 0x45, 0x2c, 0x3d, 0x28, 0x6f, 0xbc, 0x8b, 0xc1, 0x9f, 0xfe, 0x33, + 0x50, 0x4e, 0xd0, 0x6a, 0x83, 0xf8, 0x0e, 0xc8, 0x19, 0x59, 0xde, 0x25, + 0xf0, 0x7b, 0x4e, 0x3d, 0x9d, 0xc7, 0xbf, 0x72, 0xc3, 0x26, 0x48, 0xb6, + 0x19, 0x08, 0x3f, 0x05, 0xe8, 0x76, 0x2c, 0x11, 0x49, 0xfb, 0xa1, 0xc0, + 0xae, 0x6e, 0x30, 0xf8, 0x10, 0x61, 0x9f, 0x53, 0xc6, 0xeb, 0x7c, 0x7c, + 0x94, 0x5f, 0xca, 0xe5, 0x41, 0x40, 0xd6, 0x83, 0xa8, 0x4a, 0x45, 0x5c, + 0x77, 0x69, 0xf2, 0x89, 0xe9, 0xf7, 0x81, 0xa1, 0xae, 0x77, 0xf5, 0xec, + 0x41, 0x4b, 0xfc, 0x82, 0x7f, 0xee, 0x4e, 0x5b, 0x43, 0xdd, 0xcc, 0xe8, + 0x90, 0x12, 0xf0, 0x9a, 0xd0, 0xbc, 0x56, 0xd8, 0xeb, 0xd6, 0xfc, 0x80, + 0x48, 0x26, 0x8c, 0x63, 0x5c, 0x55, 0xd9, 0x6c, 0xb5, 0x10, 0xc1, 0xab, + 0x98, 0x3c, 0xe1, 0x25, 0x13, 0x4e, 0xc2, 0xdc, 0xd5, 0x4a, 0x25, 0xe5, + 0xc7, 0x9f, 0xfc, 0xf8, 0x53, 0x53, 0x12, 0x4c, 0xc1, 0x6c, 0x67, 0xa9, + 0x9e, 0x6e, 0x88, 0x2e, 0x93, 0xa3, 0x3f, 0x2d, 0xd3, 0xc5, 0xf4, 0x25, + 0xe2, 0x0f, 0x8f, 0xc0, 0x2b, 0x30, 0x94, 0x9d, 0xc0, 0x09, 0x31, 0x6c, + 0x19, 0xf7, 0x2e, 0x72, 0x6b, 0xb3, 0xf6, 0x78, 0x91, 0xca, 0x95, 0x28, + 0x9f, 0xf6, 0xd0, 0x77, 0x1c, 0x73, 0xff, 0x30, 0xe7, 0x02, 0xc3, 0xc8, + 0x0e, 0x95, 0x4f, 0x02, 0x96, 0xc5, 0xa9, 0x02, 0xb8, 0xaa, 0x97, 0xac, + 0x37, 0x47, 0xa9, 0x6d, 0xcb, 0x25, 0xb3, 0x8d, 0x20, 0xc5, 0xb6, 0x49, + 0xd8, 0xaf, 0x1a, 0xad, 0x62, 0x8c, 0x79, 0x60, 0x73, 0x8d, 0x46, 0x1e, + 0xe5, 0x23, 0x39, 0x44}; + +static UCHAR sha256_hash[] = { + 0x27, 0x51, 0x8b, 0xa9, 0x68, 0x30, 0x11, 0xf6, 0xb3, 0x96, 0x07, 0x2c, + 0x05, 0xf6, 0x65, 0x6d, 0x04, 0xf5, 0xfb, 0xc3, 0x78, 0x7c, 0xf9, 0x24, + 0x90, 0xec, 0x60, 0x6e, 0x50, 0x92, 0xe3, 0x26}; + +static void test_verify_signature(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + BCRYPT_PKCS1_PADDING_INFO padinfo; + BCRYPT_PKCS1_PADDING_INFO invalid_padinfo; + SECURITY_STATUS ret; + padinfo.pszAlgId = BCRYPT_SHA256_ALGORITHM; + invalid_padinfo.pszAlgId = BCRYPT_MD5_ALGORITHM; + + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, signature_pubkey_blob, sizeof(signature_pubkey_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine + { + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), invalid_signature, sizeof(invalid_signature), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_BAD_SIGNATURE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, NULL, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), 0); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(0, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, NULL, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, 4, signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), NULL, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, 4, NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &invalid_padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + } + + NCryptFreeObject(key); + NCryptFreeObject(prov); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -338,4 +468,5 @@ START_TEST(ncrypt) test_set_property(); test_create_persisted_key(); test_finalize_key(); + test_verify_signature(); } diff --git a/include/ncrypt.h b/include/ncrypt.h index f7372b30621..c09a1ec8676 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -71,6 +71,11 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SILENT_FLAG 0x00000040 +#define NCRYPT_NO_PADDING_FLAG 0x00000001 +#define NCRYPT_PAD_PKCS1_FLAG 0x00000002 +#define NCRYPT_PAD_OAEP_FLAG 0x00000004 +#define NCRYPT_PAD_PSS_FLAG 0x00000008 + #define NCRYPT_NAME_PROPERTY L"Name" #define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" #define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name" @@ -116,6 +121,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, co SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE, void *, BYTE *, DWORD, BYTE *, DWORD, DWORD); #ifdef __cplusplus } -- 2.35.1

1 1

[PATCH] win32u: Return client menu name from NtUserUnregisterClass.
by Jacek Caban March 27, 2022

March 27, 2022

Spotted by Esme Povirk. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/class.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Gijs Vermeulen March 27, 2022

March 27, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52616 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 06d423373b8e..7578fb25c9c7 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -492,8 +492,8 @@ @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) @ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) -@ stub SetupQueryInfVersionInformationA -@ stub SetupQueryInfVersionInformationW +@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr) +@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr) @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4b1585c8df64..693030f4a21e 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -676,3 +676,21 @@ BOOL WINAPI SetupDiGetClassRegistryPropertyW(const GUID *class, DWORD prop, DWOR SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_a(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_w(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} -- 2.35.1

1 0

[PATCH] win32u: Return client menu name from NtUserUnregisterClass.
by Jacek Caban March 27, 2022

March 27, 2022

Spotted by Esme Povirk. --- dlls/win32u/class.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] oleacc/tests: Fix crash when current thread is not in foreground state.
by Piotr Caban March 27, 2022

March 27, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52079 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

2 1

[PATCH 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf March 27, 2022

March 27, 2022

IE8 runtime calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Kept the same naming convention as the other functions for consistency. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 17 +++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..18953cf381e 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,23 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(pvar) == VT_BSTR) + { + if (V_BSTR(pvar) == NULL) + return L""; + + return V_BSTR(pvar); + } + + return pszDefault; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..c8c9bae31e0 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *var) +{ + return (VariantToStringWithDefault(var, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

2 4

[PATCH 1/2] user32: Remove redundant #ifdef around #undef.
by Zebediah Figura March 27, 2022

March 27, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/class.c | 11 ----------- dlls/user32/win.c | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e2eb60d8bbf..cc342cf507b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -765,21 +765,10 @@ BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry ) /* 64bit versions */ -#ifdef GetClassLongPtrA #undef GetClassLongPtrA -#endif - -#ifdef GetClassLongPtrW #undef GetClassLongPtrW -#endif - -#ifdef SetClassLongPtrA #undef SetClassLongPtrA -#endif - -#ifdef SetClassLongPtrW #undef SetClassLongPtrW -#endif /*********************************************************************** * GetClassLongPtrA (USER32.@) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b49afec9bd1..619bbba1dfe 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1831,21 +1831,10 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) /* 64bit versions */ -#ifdef GetWindowLongPtrW #undef GetWindowLongPtrW -#endif - -#ifdef GetWindowLongPtrA #undef GetWindowLongPtrA -#endif - -#ifdef SetWindowLongPtrW #undef SetWindowLongPtrW -#endif - -#ifdef SetWindowLongPtrA #undef SetWindowLongPtrA -#endif /***************************************************************************** * GetWindowLongPtrW (USER32.@) -- 2.34.1

2 3

[PATCH] amstream: Use CRT memory allocators.
by Zebediah Figura March 27, 2022

March 27, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/amstream_private.h | 1 - dlls/amstream/audiodata.c | 22 +++++++++------------- dlls/amstream/audiostream.c | 24 +++++++++++------------- dlls/amstream/ddrawstream.c | 16 +++++++--------- dlls/amstream/filter.c | 24 ++++++++++++------------ dlls/amstream/main.c | 6 +++--- dlls/amstream/multimedia.c | 6 +++--- 7 files changed, 45 insertions(+), 54 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index e71563cb115..999081db754 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -32,7 +32,6 @@ #include "mmstream.h" #include "austream.h" #include "amstream.h" -#include "wine/heap.h" HRESULT multimedia_stream_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 1f8c0c44064..752651b1afe 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -71,19 +71,16 @@ static ULONG WINAPI IAudioDataImpl_AddRef(IAudioData* iface) static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) { - AMAudioDataImpl *This = impl_from_IAudioData(iface); - ULONG ref = InterlockedDecrement(&This->ref); + AMAudioDataImpl *audiodata = impl_from_IAudioData(iface); + ULONG ref = InterlockedDecrement(&audiodata->ref); - TRACE("(%p)->(): new ref = %lu\n", iface, This->ref); + TRACE("%p decreasing refcount to %lu.\n", audiodata, ref); if (!ref) { - if (This->data_owned) - { - CoTaskMemFree(This->data); - } - - HeapFree(GetProcessHeap(), 0, This); + if (audiodata->data_owned) + free(audiodata->data); + free(audiodata); } return ref; @@ -103,7 +100,7 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY if (This->data_owned) { - CoTaskMemFree(This->data); + free(This->data); This->data_owned = FALSE; } @@ -112,7 +109,7 @@ static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BY if (!This->data) { - This->data = CoTaskMemAlloc(This->size); + This->data = malloc(This->size); This->data_owned = TRUE; if (!This->data) { @@ -228,8 +225,7 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AMAudioDataImpl)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index a043390f5b1..d76156cb682 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -202,7 +202,7 @@ static ULONG WINAPI audio_sample_Release(IAudioStreamSample *iface) IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); IAudioData_Release(sample->audio_data); CloseHandle(sample->update_event); - HeapFree(GetProcessHeap(), 0, sample); + free(sample); } return refcount; } @@ -383,8 +383,7 @@ static HRESULT audiostreamsample_create(struct audio_stream *parent, IAudioData TRACE("(%p)\n", audio_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; @@ -456,15 +455,15 @@ static ULONG WINAPI audio_IAMMediaStream_AddRef(IAMMediaStream *iface) static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); + ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("(%p/%p)->(): new ref = %lu\n", iface, This, ref); + TRACE("%p decreasing refcount to %lu.\n", stream, ref); if (!ref) { - DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This); + DeleteCriticalSection(&stream->cs); + free(stream); } return ref; @@ -830,7 +829,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) - heap_free(enum_media_types); + free(enum_media_types); return refcount; } @@ -904,7 +903,7 @@ static HRESULT WINAPI enum_media_types_Clone(IEnumMediaTypes *iface, IEnumMediaT TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1121,7 +1120,7 @@ static HRESULT WINAPI audio_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **e if (!enum_media_types) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1394,8 +1393,7 @@ HRESULT audio_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMediaStream_iface.lpVtbl = &audio_IAMMediaStream_vtbl; diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 7b0c92c5f61..e31e0d106d3 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -229,7 +229,7 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) DeleteCriticalSection(&stream->cs); if (stream->ddraw) IDirectDraw_Release(stream->ddraw); - HeapFree(GetProcessHeap(), 0, stream); + free(stream); } return ref; @@ -815,7 +815,7 @@ static ULONG WINAPI enum_media_types_Release(IEnumMediaTypes *iface) ULONG refcount = InterlockedDecrement(&enum_media_types->refcount); TRACE("%p decreasing refcount to %lu.\n", enum_media_types, refcount); if (!refcount) - heap_free(enum_media_types); + free(enum_media_types); return refcount; } @@ -873,7 +873,7 @@ static HRESULT WINAPI enum_media_types_Clone(IEnumMediaTypes *iface, IEnumMediaT TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1148,7 +1148,7 @@ static HRESULT WINAPI ddraw_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **e if (!enum_media_types) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMediaTypes_iface.lpVtbl = &enum_media_types_vtbl; @@ -1460,8 +1460,7 @@ HRESULT ddraw_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMediaStream_iface.lpVtbl = &ddraw_IAMMediaStream_vtbl; @@ -1539,7 +1538,7 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) if (sample->surface) IDirectDrawSurface_Release(sample->surface); - HeapFree(GetProcessHeap(), 0, sample); + free(sample); } return ref; @@ -1736,8 +1735,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw TRACE("(%p)\n", ddraw_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index f5a855d6a96..c1c97630bb9 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -76,8 +76,8 @@ static ULONG WINAPI enum_pins_Release(IEnumPins *iface) { for (i = 0; i < enum_pins->count; ++i) IPin_Release(enum_pins->pins[i]); - heap_free(enum_pins->pins); - heap_free(enum_pins); + free(enum_pins->pins); + free(enum_pins); } return refcount; } @@ -131,16 +131,16 @@ static HRESULT WINAPI enum_pins_Clone(IEnumPins *iface, IEnumPins **out) TRACE("iface %p, out %p.\n", iface, out); - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = enum_pins->count; object->index = enum_pins->index; - if (!(object->pins = heap_alloc(enum_pins->count * sizeof(*object->pins)))) + if (!(object->pins = malloc(enum_pins->count * sizeof(*object->pins)))) { - heap_free(object); + free(object); return E_OUTOFMEMORY; } for (i = 0; i < enum_pins->count; ++i) @@ -251,11 +251,11 @@ static ULONG WINAPI filter_Release(IMediaStreamFilter *iface) IAMMediaStream_JoinFilter(filter->streams[i], NULL); IAMMediaStream_Release(filter->streams[i]); } - heap_free(filter->streams); + free(filter->streams); if (filter->clock) IReferenceClock_Release(filter->clock); DeleteCriticalSection(&filter->cs); - heap_free(filter); + free(filter); } return refcount; @@ -424,7 +424,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!enum_pins) return E_POINTER; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; EnterCriticalSection(&filter->cs); @@ -433,9 +433,9 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu object->refcount = 1; object->count = filter->nb_streams; object->index = 0; - if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) + if (!(object->pins = malloc(filter->nb_streams * sizeof(*object->pins)))) { - heap_free(object); + free(object); LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } @@ -543,7 +543,7 @@ static HRESULT WINAPI filter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaS TRACE("(%p)->(%p)\n", iface, pAMMediaStream); - streams = CoTaskMemRealloc(This->streams, (This->nb_streams + 1) * sizeof(IAMMediaStream*)); + streams = realloc(This->streams, (This->nb_streams + 1) * sizeof(*streams)); if (!streams) return E_OUTOFMEMORY; This->streams = streams; @@ -1092,7 +1092,7 @@ HRESULT filter_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMediaStreamFilter_iface.lpVtbl = &filter_vtbl; diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 3d091135257..a78377d0b7e 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -93,7 +93,7 @@ static ULONG WINAPI AMCF_Release(IClassFactory *iface) ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -173,8 +173,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; + if (!(factory = calloc(1, sizeof(*factory)))) + return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 70c0210840f..dc855901c77 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -100,7 +100,7 @@ static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) IMediaControl_Release(This->media_control); if (This->graph) IGraphBuilder_Release(This->graph); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -562,7 +562,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) if (outer) return CLASS_E_NOAGGREGATION; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IAMMultiMediaStream_iface.lpVtbl = &multimedia_stream_vtbl; @@ -572,7 +572,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void **)&object->filter))) { ERR("Failed to create stream filter, hr %#lx.\n", hr); - heap_free(object); + free(object); return hr; } -- 2.34.1

1 0

[PATCH] shell32: Use COM wrappers for IShellPropSheetExt and IShellExtInit.
by Zebediah Figura March 27, 2022

March 27, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shellord.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 55b02d4188f..66e5caf08da 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1674,7 +1674,7 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAdd /* Call the AddPage method of all registered IShellPropSheetExt interfaces */ for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1764,21 +1764,21 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ Then call IShellExtInit's Initialize method. */ if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(IShellPropSheetExt_QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) + if (SUCCEEDED(IShellExtInit_Initialize(psxi, NULL, pDataObj, hKey))) { /* Add the IShellPropSheetExt instance to the array */ psxa->pspsx[psxa->uiCount++] = pspsx; } else { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); + IShellExtInit_Release(psxi); + IShellPropSheetExt_Release(pspsx); } } else - pspsx->lpVtbl->Release(pspsx); + IShellPropSheetExt_Release(pspsx); } } @@ -1821,7 +1821,7 @@ UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPRO for (i = 0; i != psxa->uiCount; i++) { Call.bCalled = FALSE; - psxa->pspsx[i]->lpVtbl->ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1844,7 +1844,7 @@ void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa) { for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->Release(psxa->pspsx[i]); + IShellPropSheetExt_Release(psxa->pspsx[i]); } LocalFree(psxa); -- 2.34.1

1 0