- wine-devel - winehq.org

[PATCH 4/6] win32u: Move send_internal_message_timeout implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 43 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-)

2 1

[PATCH 3/6] user32: Avoid internal structs in post_dde_message.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-)

2 1

[PATCH 2/6] win32u: Move NtUserWaitForInputIdle implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 48 ++-------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 ++++++++++++++++++++++++++++++------ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ 8 files changed, 63 insertions(+), 58 deletions(-)

2 1

[PATCH 1/6] win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 66 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 ++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-)

2 1

[PATCH] crypt32/tests: Add more OCSP response decoding tests.
by Hans Leidekker 01 Apr '22

01 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/encode.c | 88 ++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f25c779a9ce..8b1959fbef8 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8860,7 +8860,7 @@ static const BYTE ocsp_basic_signed_response[] = { 0x05, 0x51, 0x49, 0xac, 0x2f, 0xe8, 0x67, 0xcf, 0xa7 }; -static const BYTE ocsp_to_be_signed[] = { +static const BYTE ocsp_basic_response[] = { 0x30, 0x81, 0x9e, 0xa2, 0x16, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x31, @@ -8877,6 +8877,24 @@ static const BYTE ocsp_to_be_signed[] = { 0x33, 0x36, 0x30, 0x31, 0x5a }; +static const BYTE ocsp_basic_response_revoked[] = { + 0x30, 0x81, 0xb1, 0xa2, 0x16, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, + 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, + 0xf5, 0x31, 0x7f, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, + 0x31, 0x30, 0x31, 0x32, 0x35, 0x30, 0x35, 0x5a, 0x30, 0x81, 0x85, 0x30, + 0x81, 0x82, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, + 0x1a, 0x05, 0x00, 0x04, 0x14, 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, + 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, 0xc2, 0x18, 0x76, + 0xeb, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, + 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, 0xf5, 0x31, 0x7f, 0x02, + 0x10, 0x0d, 0x2e, 0x67, 0xa2, 0x98, 0x85, 0x3b, 0x9a, 0x54, 0x52, 0xe3, + 0xa2, 0x85, 0xa4, 0x57, 0x2f, 0xa1, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x31, 0x31, 0x30, 0x32, 0x37, 0x32, 0x31, 0x33, 0x38, 0x34, 0x38, 0x5a, + 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, 0x31, 0x30, 0x31, + 0x30, 0x39, 0x30, 0x31, 0x5a, 0xa0, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x32, 0x30, 0x34, 0x30, 0x37, 0x30, 0x30, 0x32, 0x34, 0x30, 0x31, 0x5a +}; + static const BYTE ocsp_signature[] = { 0x6a, 0x4c, 0xfa, 0xe6, 0xe3, 0x48, 0xbb, 0xd6, 0x18, 0x33, 0x04, 0x9d, 0x6a, 0x92, 0x4d, 0x01, 0x74, 0x4f, 0x1a, 0x70, 0xfa, 0xf2, 0x8b, 0xba, @@ -8914,8 +8932,8 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding) ok(ret, "got %08lx\n", GetLastError()); if (sizeof(void *) == 4) todo_wine ok(size == 496, "got %lu\n", size); else ok(size == 536, "got %lu\n", size); - ok(info->ToBeSigned.cbData == sizeof(ocsp_to_be_signed), "got %lu\n", info->ToBeSigned.cbData); - ok(!memcmp(info->ToBeSigned.pbData, ocsp_to_be_signed, sizeof(ocsp_to_be_signed)), "wrong data\n"); + ok(info->ToBeSigned.cbData == sizeof(ocsp_basic_response), "got %lu\n", info->ToBeSigned.cbData); + ok(!memcmp(info->ToBeSigned.pbData, ocsp_basic_response, sizeof(ocsp_basic_response)), "wrong data\n"); ok(!strcmp(info->SignatureInfo.SignatureAlgorithm.pszObjId, szOID_RSA_SHA256RSA), "got %s\n", info->SignatureInfo.SignatureAlgorithm.pszObjId); @@ -8941,22 +8959,35 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) static const BYTE resp_id[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE resp_id2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE name_hash[] = { 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE name_hash2[] = { + 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, + 0xc2, 0x18, 0x76, 0xeb}; static const BYTE key_hash[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE key_hash2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE serial[] = { 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE serial2[] = { + 0x2f, 0x57, 0xa4, 0x85, 0xa2, 0xe3, 0x52, 0x54, 0x9a, 0x3b, 0x85, 0x98, 0xa2, 0x67, 0x2e, 0x0d}; OCSP_BASIC_RESPONSE_INFO *info; OCSP_BASIC_RESPONSE_ENTRY *entry; + OCSP_BASIC_REVOKED_INFO *revoked; DWORD size; BOOL ret; + /* good cert */ size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_to_be_signed, - sizeof(ocsp_to_be_signed), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response, + sizeof(ocsp_basic_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); ok(!info->dwVersion, "got %lu\n", info->dwVersion); @@ -8991,6 +9022,53 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) ok(!info->cExtension, "got %lu\n", info->cExtension); ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); LocalFree(info); + + /* revoked cert */ + size = 0; + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response_revoked, + sizeof(ocsp_basic_response_revoked), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine ok(ret, "got %08lx\n", GetLastError()); + + if (ret) { + ok(!info->dwVersion, "got %lu\n", info->dwVersion); + ok(info->dwResponderIdChoice == 2, "got %lu\n", info->dwResponderIdChoice); + ok(info->ByKeyResponderId.cbData == sizeof(resp_id), "got %lu\n", info->ByKeyResponderId.cbData); + ok(!memcmp(info->ByKeyResponderId.pbData, resp_id2, sizeof(resp_id2)), "wrong data\n"); + ok(info->ProducedAt.dwLowDateTime == 647048832, "got %lu\n", info->ProducedAt.dwLowDateTime); + ok(info->ProducedAt.dwHighDateTime == 30950558, "got %lu\n", info->ProducedAt.dwHighDateTime); + ok(info->cResponseEntry == 1, "got %lu\n", info->cResponseEntry); + ok(info->rgResponseEntry != NULL, "got %p\n", info->rgResponseEntry); + + entry = info->rgResponseEntry; + ok(!strcmp(entry->CertId.HashAlgorithm.pszObjId, szOID_OIWSEC_sha1), "got '%s'\n", entry->CertId.HashAlgorithm.pszObjId); + ok(entry->CertId.HashAlgorithm.Parameters.cbData == 2, "got %lu\n", entry->CertId.HashAlgorithm.Parameters.cbData); + ok(entry->CertId.HashAlgorithm.Parameters.pbData[0] == 5, "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[0]); + ok(!entry->CertId.HashAlgorithm.Parameters.pbData[1], "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[1]); + ok(entry->CertId.IssuerNameHash.cbData == 20, "got %lu\n", entry->CertId.IssuerNameHash.cbData); + ok(!memcmp(entry->CertId.IssuerNameHash.pbData, name_hash2, sizeof(name_hash2)), "wrong data\n"); + ok(entry->CertId.IssuerKeyHash.cbData == 20, "got %lu\n", entry->CertId.IssuerKeyHash.cbData); + ok(!memcmp(entry->CertId.IssuerKeyHash.pbData, key_hash2, sizeof(key_hash2)), "wrong data\n"); + ok(entry->CertId.SerialNumber.cbData == 16, "got %lu\n", entry->CertId.SerialNumber.cbData); + ok(!memcmp(entry->CertId.SerialNumber.pbData, serial2, sizeof(serial2)), "wrong data\n"); + ok(entry->dwCertStatus == 1, "got %lu\n", entry->dwCertStatus); + ok(entry->pRevokedInfo != NULL, "got NULL\n"); + + revoked = entry->pRevokedInfo; + ok(revoked->RevocationDate.dwLowDateTime == 107865088, "got %lu\n", revoked->RevocationDate.dwLowDateTime); + ok(revoked->RevocationDate.dwHighDateTime == 30919547, "got %lu\n", revoked->RevocationDate.dwHighDateTime); + ok(!revoked->dwCrlReasonCode, "got %lu\n", revoked->dwCrlReasonCode); + + ok(entry->ThisUpdate.dwLowDateTime == 3891950720, "got %lu\n", entry->ThisUpdate.dwLowDateTime); + ok(entry->ThisUpdate.dwHighDateTime == 30950555, "got %lu\n", entry->ThisUpdate.dwHighDateTime); + ok(entry->NextUpdate.dwLowDateTime == 3347801728, "got %lu\n", entry->NextUpdate.dwLowDateTime); + ok(entry->NextUpdate.dwHighDateTime == 30951957, "got %lu\n", entry->NextUpdate.dwHighDateTime); + ok(!entry->cExtension, "got %lu\n", entry->cExtension); + ok(entry->rgExtension == NULL, "got %p\n", entry->rgExtension); + + ok(!info->cExtension, "got %lu\n", info->cExtension); + ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); + } + LocalFree(info); } START_TEST(encode) -- 2.30.2

1 0

[PATCH] directmanipulation: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/directmanipulation/directmanipulation.c | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index b20c41331e5..e72ffec3ddb 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "oleidl.h" #include "rpcproxy.h" -#include "wine/heap.h" #include "wine/debug.h" #include "directmanipulation.h" @@ -89,7 +88,7 @@ ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -130,7 +129,7 @@ static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj) { struct directupdatemanager *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -201,7 +200,7 @@ static ULONG WINAPI primary_Release(IDirectManipulationPrimaryContent *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -433,7 +432,7 @@ static ULONG WINAPI viewport_Release(IDirectManipulationViewport2 *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -540,7 +539,7 @@ static HRESULT WINAPI viewport_GetPrimaryContent(IDirectManipulationViewport2 *i { struct primarycontext *primary; TRACE("IDirectManipulationPrimaryContent\n"); - primary = heap_alloc( sizeof(*primary)); + primary = malloc( sizeof(*primary)); if(!primary) return E_OUTOFMEMORY; @@ -719,7 +718,7 @@ static HRESULT create_viewport(IDirectManipulationViewport2 **obj) { struct directviewport *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -766,7 +765,7 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface) { if(This->updatemanager) IDirectManipulationUpdateManager_Release(This->updatemanager); - heap_free(This); + free(This); } return ref; } @@ -887,7 +886,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -962,7 +961,7 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor2 *iface) { if(This->manager) IDirectManipulationUpdateManager_Release(This->manager); - heap_free(This); + free(This); } return ref; } @@ -1065,7 +1064,7 @@ static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnk *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; -- 2.35.1

1 0

[PATCH] msxml3/tests: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 5 ++--- dlls/msxml3/tests/httpreq.c | 5 ++--- dlls/msxml3/tests/saxreader.c | 17 ++++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c6eeb012b68..0643ea5350f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -43,7 +43,6 @@ #include "asptlb.h" #include "shlwapi.h" -#include "wine/heap.h" #include "wine/test.h" #define XML_E_UNEXPECTED_ATTRIBUTE 0xC00CE56C @@ -193,7 +192,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - heap_free(This); + free(This); return ref; } @@ -253,7 +252,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = heap_alloc(sizeof(*event)); + dispevent *event = malloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index bf52e71a6e7..bccfbaf582a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -35,7 +35,6 @@ #include "objsafe.h" #include "mshtml.h" -#include "wine/heap.h" #include "wine/test.h" #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) @@ -1250,7 +1249,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - heap_free(This); + free(This); return ref; } @@ -1326,7 +1325,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = heap_alloc(sizeof(*event)); + dispevent *event = malloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d8101c4ce94..e123d4eba5a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -33,7 +33,6 @@ #include "ocidl.h" #include "dispex.h" -#include "wine/heap.h" #include "wine/test.h" #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -268,13 +267,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = heap_alloc(call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof (struct call_entry)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = heap_realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); } assert(call_seq->sequence); @@ -309,7 +308,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].attributes[j].qnameW); SysFreeString(call_seq->sequence[i].attributes[j].valueW); } - heap_free(call_seq->sequence[i].attributes); + free(call_seq->sequence[i].attributes); call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); @@ -317,7 +316,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].arg3W); } - heap_free(call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -544,7 +543,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct call_sequence)); + seq[i] = calloc(1, sizeof(**seq)); } static const WCHAR szSimpleXML[] = @@ -1235,7 +1234,7 @@ static HRESULT WINAPI contentHandler_startElement( int i; struct attribute_entry *attr; - attr = heap_alloc_zero(len * sizeof(*attr)); + attr = calloc(len, sizeof(*attr)); v = VARIANT_TRUE; hr = ISAXXMLReader_getFeature(g_reader, _bstr_("http://xml.org/sax/features/namespaces"), &v); @@ -3374,7 +3373,7 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = heap_alloc(len + 1); + buff = malloc(len + 1); memset(buff, 'A', len); buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); @@ -3457,7 +3456,7 @@ static void test_mxwriter_flush(void) ok(SysStringLen(V_BSTR(&dest)) == len, "got len=%d, expected %d\n", SysStringLen(V_BSTR(&dest)), len); VariantClear(&dest); - heap_free(buff); + free(buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer); -- 2.35.1

1 0

[PATCH] sxs/tests: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sxs/tests/sxs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 589d713e08b..0c367f7c6d5 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -26,7 +26,6 @@ #include "shlwapi.h" #include "wine/test.h" -#include "wine/heap.h" #include "initguid.h" #include "interfaces.h" @@ -108,7 +107,7 @@ static void run_test(void) ok(ret == FALSE, "Got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %ld\n", GetLastError()); - info = heap_alloc(buffer_size); + info = malloc(buffer_size); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, info, buffer_size, &buffer_size); ok(ret == TRUE, "Got %d\n", ret); @@ -121,14 +120,14 @@ static void run_test(void) ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.0"), "Unexpected runtime version %s.\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); - heap_free(info); + free(info); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %ld\n", GetLastError()); - info = heap_alloc(buffer_size); + info = malloc(buffer_size); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, info, buffer_size, &buffer_size); @@ -142,7 +141,7 @@ static void run_test(void) ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.1"), "Unexpected runtime version %s.\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); - heap_free(info); + free(info); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); -- 2.35.1

1 0

[PATCH] mfmediaengine/tests: Remove unused header include.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index ea2f570d721..008ee58849c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -32,7 +32,6 @@ #include "mmdeviceapi.h" #include "audiosessiontypes.h" -#include "wine/heap.h" #include "wine/test.h" static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); -- 2.35.1

1 0

[PATCH] dxva2: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index b262990e0f7..c5ca3439a68 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -30,7 +30,6 @@ #include "dxva2api.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dxva2); @@ -98,7 +97,7 @@ static BOOL dxva_array_reserve(void **elements, size_t *capacity, size_t count, if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; @@ -178,7 +177,7 @@ static ULONG WINAPI video_processor_Release(IDirectXVideoProcessor *iface) if (!refcount) { IDirectXVideoProcessorService_Release(processor->service); - heap_free(processor); + free(processor); } return refcount; @@ -613,7 +612,7 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir return E_INVALIDARG; } - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirectXVideoProcessor_iface.lpVtbl = &video_processor_vtbl; @@ -776,8 +775,8 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) if (manager->handles[i].state_block) IDirect3DStateBlock9_Release(manager->handles[i].state_block); } - heap_free(manager->handles); - heap_free(manager); + free(manager->handles); + free(manager); } return refcount; @@ -1051,7 +1050,7 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan *manager = NULL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; -- 2.35.1

1 0

[PATCH v5 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 01 Apr '22

01 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. v4: - Retrieve string as BSTR. v5: - Remove unnecessary variable. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 20 ++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 27 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..61b1b4313ef 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,26 @@ 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_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret; + ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + + if (!ret) return L""; + return ret; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 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 *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH v4 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 01 Apr '22

01 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. v4: - Retrieve string as BSTR. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 22 ++++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 29 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..046063dd183 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,28 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + VARIANT var = *pvar; + + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(&var) == (VT_BYREF | VT_VARIANT)) var = *V_VARIANTREF(pvar); + if (V_VT(&var) == (VT_BYREF | VT_BSTR) || V_VT(&var) == VT_BSTR) + { + BSTR ret; + ret = V_ISBYREF(&var) ? *V_BSTRREF(&var) : V_BSTR(&var); + + if (!ret) return L""; + return ret; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 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 *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH vkd3d v7 1/8] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Matteo Bruni 31 Mar '22

31 Mar '22

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v7: Catch another case. libs/vkd3d-shader/hlsl.y | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ab56fba..0fc8fa29 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3208,7 +3208,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3229,15 +3232,25 @@ initializer_expr_list: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } | initializer_expr_list ',' initializer_expr { + struct hlsl_ir_node **new_args; + $$ = $1; - if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } + $$.args = new_args; $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3); -- 2.34.1

4 17

[PATCH] comsvcs: Use CRT memory allocation functions.
by Nikolay Sivov 31 Mar '22

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comsvcs/main.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index b34c7d21309..43803f60632 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -19,7 +19,6 @@ */ #include "comsvcs_private.h" -#include "wine/heap.h" #include "wine/debug.h" #include "initguid.h" #include "comsvcs_classes.h" @@ -109,7 +108,7 @@ static ULONG WINAPI holder_Release(IHolder *iface) if (!ref) { - heap_free(This); + free(This); } return ref; @@ -221,7 +220,7 @@ static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) TRACE("(%p)\n", object); - hold = heap_alloc(sizeof(*hold)); + hold = malloc(sizeof(*hold)); if (!hold) { *object = NULL; @@ -277,7 +276,7 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface) { if (This->mta_cookie) CoDecrementMTAUsage(This->mta_cookie); - heap_free(This); + free(This); } return ref; @@ -330,7 +329,7 @@ static HRESULT WINAPI dispenser_manager_cf_CreateInstance(IClassFactory *iface, TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), object); - dismanager = heap_alloc_zero(sizeof(*dismanager)); + dismanager = calloc(1, sizeof(*dismanager)); if (!dismanager) { *object = NULL; @@ -443,8 +442,8 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) if (!refcount) { - heap_free(moniker->progid); - heap_free(moniker); + free(moniker->progid); + free(moniker); } return refcount; @@ -488,7 +487,7 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (SUCCEEDED(hr) && progid_len) { - if (!(progid = heap_alloc(progid_len))) + if (!(progid = malloc(progid_len))) return E_OUTOFMEMORY; hr = IStream_Read(stream, progid, progid_len, &len); } @@ -500,12 +499,12 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (SUCCEEDED(hr) && pad == 0) { moniker->clsid = clsid; - heap_free(moniker->progid); + free(moniker->progid); moniker->progid = progid; progid = NULL; } - heap_free(progid); + free(progid); return hr; } @@ -871,7 +870,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG progid = str; } - moniker = heap_alloc_zero(sizeof(*moniker)); + moniker = calloc(1, sizeof(*moniker)); if (!moniker) return E_OUTOFMEMORY; @@ -881,12 +880,11 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->clsid = guid; if (progid) { - if (!(moniker->progid = heap_alloc((lstrlenW(progid) + 1) * sizeof(WCHAR)))) + if (!(moniker->progid = wcsdup(progid))) { IMoniker_Release(&moniker->IMoniker_iface); return E_OUTOFMEMORY; } - lstrcpyW(moniker->progid, progid); } *ret = &moniker->IMoniker_iface; -- 2.35.1

1 0

[RFC PATCH] riched20: Draw OLE objects with IViewObject implementation.
by Jinoh Kang 31 Mar '22

31 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52752 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a23f4c82730..3cbd2ddf4af 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5652,6 +5652,7 @@ static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) { IDataObject* ido; + IViewObject* ivo; FORMATETC fmt; STGMEDIUM stgm; DIBSECTION dibsect; @@ -5677,6 +5678,29 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) + { + HRESULT hr; + SIZEL sizel; + + hr = IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sizel); + if (FAILED(hr)) + { + WARN("failed to get extent: %#08lx\n", hr); + sizel.cx = sizel.cy = 0; + } + + convert_sizel(c, &sizel, pSize); + if (c->editor->nZoomNumerator != 0) + { + pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + pSize->cy = MulDiv(pSize->cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + + IViewObject_Release(ivo); + return; + } + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Query Interface IID_IDataObject failed!\n"); @@ -5729,6 +5753,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) { IDataObject* ido; + IViewObject* ivo; FORMATETC fmt; STGMEDIUM stgm; DIBSECTION dibsect; @@ -5741,6 +5766,45 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); + + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) + { + HRESULT hr; + SIZEL sizel = run->reobj->obj.sizel; + + if (sizel.cx == 0 && sizel.cy == 0) + { + hr = IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sizel); + if (FAILED(hr)) + { + WARN("failed to get extent: %#08lx\n", hr); + IViewObject_Release(ivo); + return; + } + } + + convert_sizel(c, &sizel, &sz); + if (c->editor->nZoomNumerator != 0) + { + sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + + hr = IViewObject_Draw(ivo, DVASPECT_CONTENT, -1, 0, 0, 0, c->hDC, (RECTL*)&rc, NULL, NULL, 0); + if (FAILED(hr)) + { + WARN("failed to draw object: %#08lx\n", hr); + } + + IViewObject_Release(ivo); + return; + } + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Couldn't get interface\n"); -- 2.34.1

1 0

[PATCH v2] ntoskrnl.exe: Make USD pointers volatile to silent a warning.
by Rémi Bernon 31 Mar '22

31 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 8f1aa4d45a3..0aba2413ab1 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -496,9 +496,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define SIB_INDEX( sib, rex ) (((sib) >> 3) & 7) | (((rex) & REX_X) ? 8 : 0) #define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) -/* keep in sync with dlls/ntdll/thread.c:thread_init */ -static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000; -static const BYTE *user_shared_data = (BYTE *)0xfffff78000000000; +/* keep in sync with dlls/ntdll/thread.c:thread_init. + * + * Both the data and the pointers need to be volatile, as GCC 11 + * considers that a fixed value pointer is an empty array, and will + * emit warnings when dereferencing it otherwise. + */ +static const volatile BYTE *const volatile wine_user_shared_data = (BYTE *)0x7ffe0000; +static const volatile BYTE *const volatile user_shared_data = (BYTE *)0xfffff78000000000; static inline DWORD64 *get_int_reg( CONTEXT *context, int index ) { @@ -516,7 +521,7 @@ static inline int get_op_size( int long_op, int rex ) } /* store an operand into a register */ -static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex, +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const volatile BYTE *addr, int long_op, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); @@ -527,7 +532,7 @@ static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i switch (op) { case INSTR_OP_MOV: - memcpy( reg, addr, op_size ); + memcpy( reg, (BYTE *)addr, op_size ); break; case INSTR_OP_OR: for (i = 0; i < op_size; ++i) @@ -541,7 +546,7 @@ static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i } /* store an operand into a byte register */ -static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex, enum instr_op op ) +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const volatile BYTE *addr, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); BYTE *reg = (BYTE *)get_int_reg( context, index ); @@ -843,7 +848,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ULONGLONG temp = 0; TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &temp, wine_user_shared_data + offset, data_size ); + memcpy( &temp, (BYTE *)wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; @@ -902,7 +907,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); + memcpy( &context->Rax, (BYTE *)wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; } -- 2.35.1

2 1

[PATCH v3 6/6] win32u: Move NtUserGetMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 527 +---------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 103 ++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 7 files changed, 112 insertions(+), 529 deletions(-)

3 2

[PATCH v3 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

3 2

[tools 1/3] testbot/cgi: Add SimpleCollectionPage.
by Francois Gouget 31 Mar '22

31 Mar '22

SimpleCollectionPage embeds a single collection block. But unlike CollectionPage it is only a Page subclass instead of implementing both the Page and CollectionBlock interfaces. Customizing the collection block is done by creating a CollectionBlock subclass and passing the appropriate creator function to the page constructor. This better separates the page customization aspects (implement a SimpleCollectionPage subclass) from the collection block ones (implement a CollectionBlock subclass). Most of the time only the collection block needs to be customized and SimpleCollectionPage can be used as is. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 5 + .../ObjectModel/CGI/SimpleCollectionPage.pm | 138 ++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 9a52f11bc..200734a6a 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -91,6 +91,11 @@ sub _initialize($$$) #my ($self, $Collection, $EnclosingPage) = @_; } +sub Create($$@) +{ + return ObjectModel::CGI::CollectionBlock->new(@_); +} + sub CallGetDetailsPage($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm new file mode 100644 index 000000000..76e4d5195 --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm @@ -0,0 +1,138 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Base class for list pages +# +# Copyright 2009 Ge van Geldorp +# Copyright 2014, 2017-2018, 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::SimpleCollectionPage; + +=head1 NAME + +ObjectModel::CGI::SimpleCollectionPage - Base class for list pages + +A page containing a single collection block. + +The SimpleCollectionPage instances have the following properties: +=over +=item Collection +The collection containing the items to be shown in the CollectionBlock widget. + +=item CollectionBlock +The widget showing the items in the specified collection. + +=item ActionPerformed +Set to true if an action was specified and succeeded. +=back + +=cut + +use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + +# Use require to avoid overriding Page::new() +require ObjectModel::CGI::CollectionBlock; + + +=pod +=over 12 + +=item C<_initialize()> + +Sets up the new page object. + +Parameters: +=over + +=item Request +=item RequiredRole +See Page::new(). + +=item Collection +This is the collection of items that should be shown in the CollectionBlock +widget. + +=item BlockCreator +If undefined the page will create an instance of the CollectionBlock class. +Otherwise it will use this function to create the CollectionBlock widget, thus +enabling use of a CollectionBlock subclass. + +=back + +=back +=cut + +sub _initialize($$$$;$) +{ + my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; + + $self->{Collection} = $Collection; + $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; + $self->{CollectionBlock} = &$BlockCreator($Collection, $self); + $self->SUPER::_initialize($Request, $RequiredRole); +} + + +# +# HTML page generation +# + +sub GetTitle($) +{ + my ($self) = @_; + + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; +} + +sub GenerateTitle($) +{ + my ($self) = @_; + + my $Title = $self->GetTitle(); + if ($Title) + { + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; + } +} + +sub GenerateBody($) +{ + my ($self) = @_; + + print "<div class='CollectionPageBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + $self->{CollectionBlock}->GenerateList(); + print "</div>\n"; + print "</div>\n"; +} + +sub GeneratePage($) +{ + my ($self) = @_; + + if ($self->GetParam("Action")) + { + $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); + } + $self->SUPER::GeneratePage(); +} + +1; -- 2.30.2

1 2

[tools] testbot: Fix the spelling of a couple of Perl POD entries.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 58ece69f3..9a52f11bc 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -37,7 +37,7 @@ Also, because this is only one part of a web page, some methods, such as those dealing with errors, are delegated to the EnclosingPage object which must implement the ObjectModel::CGI::Page interface. -Other methods are designed so they can be overriden by the enclosing page as +Other methods are designed so they can be overridden by the enclosing page as a way to allow it to modify how the collection block looks or behaves. These methods can be identified by their CallXxx() trampoline. The override mechanism works as follows: diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a79155950..0879557ad 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -360,7 +360,7 @@ sub GetPageTitle($) =head1 C<GetTitle()> This returns the title for the current web page or email section. -Note that this may not be valid HTML and thus my need escaping. +Note that this may not be valid HTML and thus may need escaping. =back =cut -- 2.30.2

1 0

[PATCH v3 4/6] win32u: Move process_sent_messages implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Removed unused functions. dlls/user32/message.c | 11 +- dlls/user32/user_main.c | 3 + dlls/user32/user_private.h | 6 +- dlls/user32/winproc.c | 6 + dlls/win32u/message.c | 392 ++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 6 + dlls/win32u/sysparams.c | 10 + dlls/win32u/win32u_private.h | 2 + include/ntuser.h | 12 ++ 9 files changed, 440 insertions(+), 8 deletions(-)

3 2

[PATCH v3 3/6] user32: Move unpack_message call to User32CallWindowProc.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 412 +++-------------------------------- dlls/user32/winproc.c | 486 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 511 insertions(+), 390 deletions(-)

3 2

[tools] testbot/web: Standardize the page creation.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 5 ++--- testbot/web/Feedback.pl | 5 ++--- testbot/web/ForgotPassword.pl | 5 ++--- testbot/web/JobDetails.pl | 5 ++--- testbot/web/Login.pl | 5 ++--- testbot/web/Logout.pl | 5 ++--- testbot/web/Register.pl | 5 ++--- testbot/web/ResetPassword.pl | 5 ++--- testbot/web/Stats.pl | 5 ++--- testbot/web/Submit.pl | 5 ++--- testbot/web/admin/BranchDetails.pl | 5 ++--- testbot/web/admin/Log.pl | 5 ++--- testbot/web/admin/SpecialJobs.pl | 5 ++--- testbot/web/admin/UserDetails.pl | 5 ++--- testbot/web/admin/VMDetails.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 16 files changed, 32 insertions(+), 48 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 1771e7ca3..5a5a37505 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -318,6 +318,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $ActivityPage = ActivityPage->new($Request, "wine-devel"); -$ActivityPage->GeneratePage(); +my $Page = ActivityPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index ca1ee5ed7..6185d26d2 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -137,6 +137,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $FeedbackPage = FeedbackPage->new($Request, ""); -$FeedbackPage->GeneratePage(); +my $Page = FeedbackPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index cc0cd455d..190985264 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -131,6 +131,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ForgotPasswordPage = ForgotPasswordPage->new($Request, ""); -$ForgotPasswordPage->GeneratePage(); +my $Page = ForgotPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c4d6b1a1b..7e1df1ffa 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -741,6 +741,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $JobDetailsPage = JobDetailsPage->new($Request, ""); -$JobDetailsPage->GeneratePage(); +my $Page = JobDetailsPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index ac64fc28e..b1f82a94b 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -154,6 +154,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $LoginPage = LoginPage->new($Request, ""); -$LoginPage->GeneratePage(); +my $Page = LoginPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index b0fd5cdc1..35f5c487c 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -76,6 +76,5 @@ sub GeneratePage($) package main; my $Request = shift; - -my $LogoutPage = LogoutPage->new($Request, ""); -$LogoutPage->GeneratePage(); +my $Page = LogoutPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 4cfef79fc..bbea0eb12 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -183,6 +183,5 @@ EOF package main; my $Request = shift; - -my $RegisterPage = RegisterPage->new($Request, ""); -$RegisterPage->GeneratePage(); +my $Page = RegisterPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 81655e0c4..4f672ea94 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -184,6 +184,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ResetPasswordPage = ResetPasswordPage->new($Request, ""); -$ResetPasswordPage->GeneratePage(); +my $Page = ResetPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 39c28789c..7ef65b3bf 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -397,6 +397,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $StatsPage = StatsPage->new($Request, "wine-devel"); -$StatsPage->GeneratePage(); +my $Page = StatsPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index aba2b6dc5..8323b9ab7 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1376,6 +1376,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SubmitPage->new($Request, "wine-devel"); -$SubmitPage->GeneratePage(); +my $Page = SubmitPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/BranchDetails.pl b/testbot/web/admin/BranchDetails.pl index fe3ebd118..1373e20fe 100644 --- a/testbot/web/admin/BranchDetails.pl +++ b/testbot/web/admin/BranchDetails.pl @@ -38,6 +38,5 @@ sub _initialize($$$) package main; my $Request = shift; - -my $BranchDetailsPage = BranchDetailsPage->new($Request, "admin"); -$BranchDetailsPage->GeneratePage(); +my $Page = BranchDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 8d3a8ce8b..9c18c375e 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -97,6 +97,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $LogPage = LogPage->new($Request, "admin"); -$LogPage->GeneratePage(); +my $Page = LogPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 49f80a0f9..e267cc7d5 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -256,6 +256,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SpecialJobsPage->new($Request, "admin"); -$SubmitPage->GeneratePage(); +my $Page = SpecialJobsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 7f7c710e1..f11d127ad 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -126,6 +126,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $UserDetailsPage = UserDetailsPage->new($Request, "admin"); -$UserDetailsPage->GeneratePage(); +my $Page = UserDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index f39b0d674..35b26811a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -89,6 +89,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $VMDetailsPage = VMDetailsPage->new($Request, "admin"); -$VMDetailsPage->GeneratePage(); +my $Page = VMDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 94421536d..d2dd2b49d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -394,6 +394,5 @@ EOF package main; my $Request = shift; - -my $StatusPage = StatusPage->new($Request, ""); -$StatusPage->GeneratePage(); +my $Page = StatusPage->new($Request, ""); +$Page->GeneratePage(); -- 2.30.2

1 0

[PATCH v3 2/6] win32u: Move reply_message_result implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 181 +----------------------- dlls/win32u/message.c | 264 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 ++ dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 153 ++++++++++++++++++++ 6 files changed, 431 insertions(+), 179 deletions(-)

3 2

[tools] testbot: Remove an unneeded Fcntl import in VM::Run().
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f850daaf3..65f633354 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -446,7 +446,6 @@ sub Run($$$$$$) # So set ChildPid in the parent and synchronize with the child so it only # execs once this is done. - use Fcntl; my ($fd_read, $fd_write); pipe($fd_read, $fd_write); # For synchronization -- 2.30.2

1 0

[tools] testbot/cgi: ItemPage does not need URI::Escape.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 567a489fc..b88e27394 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -31,7 +31,6 @@ ObjectModel::CGI::ItemPage - Base class for bound web forms use ObjectModel::CGI::FormPage; our @ISA = qw(ObjectModel::CGI::FormPage); -use URI::Escape; sub _initialize($$$$) { -- 2.30.2

1 0

[tools] testbot/CheckForWinetestUpdate: HTTP::Response is not needed.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 94d975071..c7aecce1e 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -46,7 +46,6 @@ use File::Compare; use File::Copy; use LWP::UserAgent; use HTTP::Request; -use HTTP::Response; use HTTP::Status; use WineTestBot::Config; -- 2.30.2

1 0

[tools] testbot/web: Remove unneeded imports from the Submit page.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3d49aaeaa..aba2b6dc5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,9 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use Fcntl qw(O_RDONLY); -use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX -use File::Basename; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; -- 2.30.2

1 0

[PATCH v3 1/6] user32: Introduce reply_message_result helper.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)

3 2

[PATCH v2 4/6] win32u: Move process_sent_messages implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

3 3

[PATCH] explorerframe: Use CRT memory allocation functions.
by Nikolay Sivov 31 Mar '22

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/nstc.c | 15 +++++++-------- dlls/explorerframe/taskbarlist.c | 5 ++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 315316f7e7a..3b56d33367a 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,7 +33,6 @@ #include "wine/list.h" #include "wine/debug.h" -#include "wine/heap.h" #include "explorerframe_main.h" @@ -852,7 +851,7 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - heap_free(This); + free(This); EFRAME_UnlockModule(); } @@ -989,7 +988,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %lx, %lx, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = heap_alloc(sizeof(*new_root)); + new_root = malloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1013,7 +1012,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - heap_free(new_root); + free(new_root); return E_FAIL; } @@ -1081,7 +1080,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - heap_free(root); + free(root); return S_OK; } else @@ -1123,7 +1122,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = heap_alloc(sizeof(LPITEMIDLIST)*count); + array = malloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1137,7 +1136,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - heap_free(array); + free(array); return hr; } @@ -1598,7 +1597,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = heap_alloc_zero(sizeof(*nstc)); + nstc = calloc(1, sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY; diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index b4bc104cd6b..dd61cc62ae4 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,7 +21,6 @@ #include "explorerframe_main.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); @@ -81,7 +80,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface) if (!refcount) { - heap_free(This); + free(This); EFRAME_UnlockModule(); } @@ -309,7 +308,7 @@ HRESULT TaskbarList_Constructor(IUnknown *outer, REFIID riid, void **taskbar_lis return CLASS_E_NOAGGREGATION; } - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if (!object) { ERR("Failed to allocate taskbar list object memory\n"); -- 2.35.1

1 0

[PATCH] sxs: Use CRT memory allocation functions.
by Nikolay Sivov 31 Mar '22

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/appwiz.cpl/appwiz.c | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 593c8644b7e..012bc054129 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -106,19 +106,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, */ static void FreeAppInfo(APPINFO *info) { - HeapFree(GetProcessHeap(), 0, info->title); - HeapFree(GetProcessHeap(), 0, info->path); - HeapFree(GetProcessHeap(), 0, info->path_modify); - HeapFree(GetProcessHeap(), 0, info->icon); - HeapFree(GetProcessHeap(), 0, info->publisher); - HeapFree(GetProcessHeap(), 0, info->version); - HeapFree(GetProcessHeap(), 0, info->contact); - HeapFree(GetProcessHeap(), 0, info->helplink); - HeapFree(GetProcessHeap(), 0, info->helptelephone); - HeapFree(GetProcessHeap(), 0, info->readme); - HeapFree(GetProcessHeap(), 0, info->urlupdateinfo); - HeapFree(GetProcessHeap(), 0, info->comments); - HeapFree(GetProcessHeap(), 0, info); + free(info->title); + free(info->path); + free(info->path_modify); + free(info->icon); + free(info->publisher); + free(info->version); + free(info->contact); + free(info->helplink); + free(info->helptelephone); + free(info->readme); + free(info->urlupdateinfo); + free(info->comments); + free(info); } static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value) @@ -127,7 +127,7 @@ static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value) WCHAR *ret = NULL; if (!RegQueryValueExW(hkey, value, NULL, &type, NULL, &len) && type == REG_SZ) { - if (!(ret = HeapAlloc(GetProcessHeap(), 0, len))) return NULL; + if (!(ret = malloc(len))) return NULL; RegQueryValueExW(hkey, value, 0, 0, (BYTE *)ret, &len); } return ret; @@ -176,12 +176,12 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) { int len = lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName); - if (!(command = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + if (!(command = malloc(len * sizeof(WCHAR)))) goto err; wsprintfW(command, L"msiexec /x%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, NULL, &uninstlen)) { - if (!(command = HeapAlloc(GetProcessHeap(), 0, uninstlen))) goto err; + if (!(command = malloc(uninstlen))) goto err; RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, (BYTE *)command, &uninstlen); } else @@ -191,10 +191,10 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) continue; } - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct APPINFO)); + info = calloc(1, sizeof(*info)); if (!info) goto err; - info->title = HeapAlloc(GetProcessHeap(), 0, displen); + info->title = malloc(displen); if (!info->title) goto err; @@ -209,7 +209,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) info->icon = 0; else { - info->icon = HeapAlloc(GetProcessHeap(), 0, displen); + info->icon = malloc(displen); if (!info->icon) goto err; @@ -259,12 +259,12 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) { int len = lstrlenW(L"msiexec /i%s") + lstrlenW(subKeyName); - if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + if (!(info->path_modify = malloc(len * sizeof(WCHAR)))) goto err; wsprintfW(info->path_modify, L"msiexec /i%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, NULL, &displen)) { - if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, displen))) goto err; + if (!(info->path_modify = malloc(displen))) goto err; RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, (BYTE *)info->path_modify, &displen); } } @@ -286,7 +286,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) err: RegCloseKey(hkeyApp); if (info) FreeAppInfo(info); - HeapFree(GetProcessHeap(), 0, command); + free(command); return FALSE; } -- 2.35.1

1 0

[PATCH] atl: Use CRT allocation functions.
by Nikolay Sivov 31 Mar '22

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/atl/atl.c | 11 +++++------ dlls/atl/atl30.c | 2 +- dlls/atl/atl_ax.c | 24 +++++++++++------------ dlls/atl/registrar.c | 45 ++++++++++++++++++++++---------------------- 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index ed6afe4ea2e..87a24e33ed7 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -23,7 +23,6 @@ #include "atlcom.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -294,7 +293,7 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD TRACE("version %04x (%p %p %Id)\n", _ATL_VER, pM, pFunc, dw); if (_ATL_VER > _ATL_VER_30 || pM->cbSize > ATLVer1Size) { - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem = malloc(sizeof(*termfunc_elem)); termfunc_elem->pFunc = pFunc; termfunc_elem->dw = dw; termfunc_elem->pNext = pM->m_pTermFuncs; @@ -320,7 +319,7 @@ void WINAPI AtlCallTermFunc(_ATL_MODULE *pM) iter->pFunc(iter->dw); tmp = iter; iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); + free(tmp); } pM->m_pTermFuncs = NULL; @@ -342,13 +341,13 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, TRACE("(%p %s %p %p)\n", inst, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); index_len = lpszIndex ? lstrlenW(lpszIndex) : 0; - path = heap_alloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(L".tlb")); + path = malloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(L".tlb")); if(!path) return E_OUTOFMEMORY; path_len = GetModuleFileNameW(inst, path, MAX_PATH); if(!path_len) { - heap_free(path); + free(path); return HRESULT_FROM_WIN32(GetLastError()); } @@ -374,7 +373,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, } } - heap_free(path); + free(path); if(FAILED(hres)) return hres; diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index e84656998b8..d7d130c2a03 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -121,7 +121,7 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) iter->pFunc(iter->dw); tmp = iter; iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); + free(tmp); } } diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 04b0afdb759..4ff0a796d3b 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -63,12 +63,12 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L if ( wMsg == WM_CREATE ) { DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + WCHAR *ptr = malloc( len*sizeof(WCHAR) ); if (!ptr) return 1; GetWindowTextW( hWnd, ptr, len ); AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); + free( ptr ); return 0; } return DefWindowProcW( hWnd, wMsg, wParam, lParam ); @@ -225,7 +225,7 @@ static ULONG WINAPI OleClientSite_Release(IOleClientSite *iface) if (!ref) { IOCS_Detach( This ); - HeapFree( GetProcessHeap(), 0, This ); + free( This ); } return ref; @@ -945,7 +945,7 @@ static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IUnknown **contain return S_OK; *container = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(IOCS)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -969,7 +969,7 @@ static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IUnknown **contain else { IOCS_Detach( This ); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return hr; @@ -1160,7 +1160,7 @@ static inline BOOL advance_array(WORD **pptr, DWORD *palloc, DWORD *pfilled, con if ( (*pfilled + size) > *palloc ) { *palloc = ((*pfilled+size) + 0xFF) & ~0xFF; - *pptr = HeapReAlloc( GetProcessHeap(), 0, *pptr, *palloc * sizeof(WORD) ); + *pptr = realloc( *pptr, *palloc * sizeof(WORD) ); if (!*pptr) return FALSE; } @@ -1186,7 +1186,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) DWORD style; filled = 0; allocated = 256; - output = HeapAlloc( GetProcessHeap(), 0, allocated * sizeof(WORD) ); + output = malloc( allocated * sizeof(WORD) ); if (!output) return NULL; @@ -1307,12 +1307,12 @@ HWND WINAPI AtlAxCreateDialogA(HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC return AtlAxCreateDialogW( hInst, (LPCWSTR) name, owner, dlgProc, param ); length = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - nameW = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); + nameW = malloc( length * sizeof(WCHAR) ); if (nameW) { MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, length ); res = AtlAxCreateDialogW( hInst, nameW, owner, dlgProc, param ); - HeapFree( GetProcessHeap(), 0, nameW ); + free( nameW ); } return res; } @@ -1348,8 +1348,8 @@ HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO newptr = AX_ConvertDialogTemplate( ptr ); if ( newptr ) { - res = CreateDialogIndirectParamW( hInst, newptr, owner, dlgProc, param ); - HeapFree( GetProcessHeap(), 0, newptr ); + res = CreateDialogIndirectParamW( hInst, newptr, owner, dlgProc, param ); + free( newptr ); } else res = NULL; FreeResource ( hrsrc ); @@ -1425,7 +1425,7 @@ INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE instance, const WCHAR *name, return 0; ret = DialogBoxIndirectParamW(instance, template, owner, proc, param); - HeapFree(GetProcessHeap(), 0, template); + free(template); return ret; } diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 061483f6513..5a3eef7dd4f 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -74,7 +74,7 @@ static inline Registrar *impl_from_IRegistrar(IRegistrar *iface) static void strbuf_init(strbuf *buf) { - buf->str = HeapAlloc(GetProcessHeap(), 0, 128*sizeof(WCHAR)); + buf->str = malloc(128*sizeof(WCHAR)); buf->alloc = 128; buf->len = 0; } @@ -85,7 +85,7 @@ static void strbuf_write(LPCOLESTR str, strbuf *buf, int len) len = lstrlenW(str); if(buf->len+len+1 >= buf->alloc) { buf->alloc = (buf->len+len)<<1; - buf->str = HeapReAlloc(GetProcessHeap(), 0, buf->str, buf->alloc*sizeof(WCHAR)); + buf->str = realloc(buf->str, buf->alloc*sizeof(WCHAR)); } memcpy(buf->str+buf->len, str, len*sizeof(OLECHAR)); buf->len += len; @@ -292,7 +292,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO if(FAILED(hres)) break; count = (lstrlenW(buf->str) + 1) / 2; - bytes = HeapAlloc(GetProcessHeap(), 0, count); + bytes = malloc(count); if(bytes == NULL) { hres = E_OUTOFMEMORY; break; @@ -313,7 +313,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO hres = HRESULT_FROM_WIN32(lres); } } - HeapFree(GetProcessHeap(), 0, bytes); + free(bytes); break; } default: @@ -360,7 +360,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO break; } - HeapFree(GetProcessHeap(), 0, name.str); + free(name.str); if(hkey && key_type != IS_VAL) RegCloseKey(hkey); *pstr = iter; @@ -411,7 +411,7 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) if(FAILED(hres)) break; } - HeapFree(GetProcessHeap(), 0, buf.str); + free(buf.str); return hres; } @@ -426,7 +426,7 @@ static HRESULT string_register(Registrar *This, LPCOLESTR data, BOOL do_register hres = do_preprocess(This, data, &buf); if(FAILED(hres)) { WARN("preprocessing failed!\n"); - HeapFree(GetProcessHeap(), 0, buf.str); + free(buf.str); return hres; } @@ -434,7 +434,7 @@ static HRESULT string_register(Registrar *This, LPCOLESTR data, BOOL do_register if(FAILED(hres) && do_register) do_process_root_key(buf.str, FALSE); - HeapFree(GetProcessHeap(), 0, buf.str); + free(buf.str); return hres; } @@ -456,13 +456,13 @@ static HRESULT resource_register(Registrar *This, LPCOLESTR resFileName, reslen = SizeofResource(hins, src); if(regstra) { len = MultiByteToWideChar(CP_ACP, 0, regstra, reslen, NULL, 0)+1; - regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); + regstrw = calloc(len, sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, regstra, reslen, regstrw, len); regstrw[len-1] = '\0'; hres = string_register(This, regstrw, do_register); - HeapFree(GetProcessHeap(), 0, regstrw); + free(regstrw); }else { WARN("could not load resource\n"); hres = HRESULT_FROM_WIN32(GetLastError()); @@ -491,21 +491,21 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if(file != INVALID_HANDLE_VALUE) { filelen = GetFileSize(file, NULL); - regstra = HeapAlloc(GetProcessHeap(), 0, filelen); + regstra = malloc(filelen); if(ReadFile(file, regstra, filelen, NULL, NULL)) { len = MultiByteToWideChar(CP_ACP, 0, regstra, filelen, NULL, 0)+1; - regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); + regstrw = calloc(len, sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, regstra, filelen, regstrw, len); regstrw[len-1] = '\0'; hres = string_register(This, regstrw, do_register); - HeapFree(GetProcessHeap(), 0, regstrw); + free(regstrw); }else { WARN("Failed to read file %s\n", debugstr_w(fileName)); hres = HRESULT_FROM_WIN32(GetLastError()); } - HeapFree(GetProcessHeap(), 0, regstra); + free(regstra); CloseHandle(file); }else { WARN("Could not open file %s\n", debugstr_w(fileName)); @@ -545,7 +545,7 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface) TRACE("(%p) ->%ld\n", This, ref); if(!ref) { IRegistrar_ClearReplacements(iface); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; } @@ -558,14 +558,14 @@ static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key, TRACE("(%p)->(%s %s)\n", This, debugstr_w(Key), debugstr_w(item)); - new_rep = HeapAlloc(GetProcessHeap(), 0, sizeof(rep_list)); + new_rep = malloc(sizeof(*new_rep)); new_rep->key_len = lstrlenW(Key); - new_rep->key = HeapAlloc(GetProcessHeap(), 0, (new_rep->key_len + 1) * sizeof(OLECHAR)); + new_rep->key = malloc((new_rep->key_len + 1) * sizeof(OLECHAR)); memcpy(new_rep->key, Key, (new_rep->key_len+1)*sizeof(OLECHAR)); len = lstrlenW(item)+1; - new_rep->item = HeapAlloc(GetProcessHeap(), 0, len*sizeof(OLECHAR)); + new_rep->item = malloc(len*sizeof(OLECHAR)); memcpy(new_rep->item, item, len*sizeof(OLECHAR)); new_rep->next = This->rep; @@ -587,9 +587,9 @@ static HRESULT WINAPI Registrar_ClearReplacements(IRegistrar *iface) iter = This->rep; while(iter) { iter2 = iter->next; - HeapFree(GetProcessHeap(), 0, iter->key); - HeapFree(GetProcessHeap(), 0, iter->item); - HeapFree(GetProcessHeap(), 0, iter); + free(iter->key); + free(iter->item); + free(iter); iter = iter2; } @@ -680,13 +680,12 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar **ret) { Registrar *registrar; - registrar = HeapAlloc(GetProcessHeap(), 0, sizeof(*registrar)); + registrar = calloc(1, sizeof(*registrar)); if(!registrar) return E_OUTOFMEMORY; registrar->IRegistrar_iface.lpVtbl = &RegistrarVtbl; registrar->ref = 1; - registrar->rep = NULL; *ret = &registrar->IRegistrar_iface; return S_OK; -- 2.35.1

1 0

[PATCH] crypt32/tests: Use wide character string literals.
by Hans Leidekker 31 Mar '22

31 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/cert.c | 52 +++---- dlls/crypt32/tests/chain.c | 59 +++----- dlls/crypt32/tests/encode.c | 88 +++++------ dlls/crypt32/tests/main.c | 16 +- dlls/crypt32/tests/object.c | 54 ++----- dlls/crypt32/tests/oid.c | 65 ++++---- dlls/crypt32/tests/protectdata.c | 13 +- dlls/crypt32/tests/sip.c | 35 ++--- dlls/crypt32/tests/store.c | 222 ++++++++++----------------- dlls/crypt32/tests/str.c | 249 +++++++++---------------------- 10 files changed, 294 insertions(+), 559 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 608d2c8c1b7..e781045b2c4 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -348,7 +348,6 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, } static const CHAR cspNameA[] = "WineCryptTemp"; -static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 }; static const BYTE v1CertWithPubKey[] = { 0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, 0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, @@ -1135,9 +1134,6 @@ static void testFindCert(void) CRYPT_HASH_BLOB blob; BYTE otherSerialNumber[] = { 2 }; DWORD count; - static const WCHAR juan[] = { 'j','u','a','n',0 }; - static const WCHAR lang[] = { 'L','A','N','G',0 }; - static const WCHAR malcolm[] = { 'm','a','l','c','o','l','m',0 }; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1272,7 +1268,7 @@ static void testFindCert(void) context = NULL; do { context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_ISSUER_STR, juan, context); + CERT_FIND_ISSUER_STR, L"juan", context); if (context) count++; } while (context); @@ -1281,14 +1277,14 @@ static void testFindCert(void) context = NULL; do { context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_ISSUER_STR, lang, context); + CERT_FIND_ISSUER_STR, L"LANG", context); if (context) count++; } while (context); ok(count == 3, "expected 3 contexts\n"); SetLastError(0xdeadbeef); context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_ISSUER_STR, malcolm, NULL); + CERT_FIND_ISSUER_STR, L"malcolm", NULL); ok(!context, "expected no certs\n"); ok(GetLastError() == CRYPT_E_NOT_FOUND, "expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); @@ -1564,8 +1560,6 @@ static void testGetIssuerCert(void) DWORD flags = 0xffffffff, size; CERT_NAME_BLOB certsubject; BYTE *certencoded; - WCHAR rootW[] = {'R', 'O', 'O', 'T', '\0'}, - certname[] = {'C', 'N', '=', 'd', 'u', 'm', 'm', 'y', ',', ' ', 'T', '=', 'T', 'e', 's', 't', '\0'}; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1707,10 +1701,10 @@ static void testGetIssuerCert(void) /* Self-sign a certificate, add to the store and test getting the issuer */ size = 0; - ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), + ok(CertStrToNameW(X509_ASN_ENCODING, L"CN=dummy, T=Test", CERT_X500_NAME_STR, NULL, NULL, &size, NULL), "CertStrToName should have worked\n"); certencoded = HeapAlloc(GetProcessHeap(), 0, size); - ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), + ok(CertStrToNameW(X509_ASN_ENCODING, L"CN=dummy, T=Test", CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), "CertStrToName should have worked\n"); certsubject.pbData = certencoded; certsubject.cbData = size; @@ -1735,7 +1729,7 @@ static void testGetIssuerCert(void) HeapFree(GetProcessHeap(), 0, certencoded); /* Test root storage self-signed certificate */ - store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, rootW); + store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, L"ROOT"); ok(store != NULL, "CertOpenStore failed: %08lx\n", GetLastError()); flags = 0; cert1 = CertEnumCertificatesInStore(store, NULL); @@ -1796,10 +1790,6 @@ static void testCryptHashCert2(void) BOOL ret; BYTE hash[20]; DWORD hashLen; - const WCHAR SHA1[] = { 'S', 'H', 'A', '1', '\0' }; - const WCHAR invalidAlgorithm[] = { '_', 'S', 'H', 'O', 'U', 'L', 'D', - 'N', 'O', 'T', - 'E', 'X', 'I', 'S', 'T', '_', '\0' }; if (!pCryptHashCertificate2) { @@ -1809,21 +1799,21 @@ static void testCryptHashCert2(void) /* Test empty hash */ hashLen = sizeof(hash); - ret = pCryptHashCertificate2(SHA1, 0, NULL, NULL, 0, hash, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, NULL, 0, hash, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Got unexpected size of hash %ld\n", hashLen); ok(!memcmp(hash, emptyHash, sizeof(emptyHash)), "Unexpected hash of nothing\n"); /* Test known hash */ hashLen = sizeof(hash); - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Got unexpected size of hash %ld\n", hashLen); ok(!memcmp(hash, knownHash, sizeof(knownHash)), "Unexpected hash\n"); /* Test null hash size pointer just sets hash size */ hashLen = 0; - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), NULL, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Hash size not set correctly (%ld)\n", hashLen); @@ -1837,24 +1827,24 @@ static void testCryptHashCert2(void) /* Test invalid algorithm */ hashLen = sizeof(hash); SetLastError(0xdeadbeef); - ret = pCryptHashCertificate2(invalidAlgorithm, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = pCryptHashCertificate2(L"_SHOULDNOTEXIST_", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(!ret && GetLastError() == STATUS_NOT_FOUND, "Expected STATUS_NOT_FOUND (0x%08lx), got 0x%08lx\n", STATUS_NOT_FOUND, GetLastError()); /* Test hash buffer too small */ hashLen = sizeof(hash) / 2; SetLastError(0xdeadbeef); - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(!ret && GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA (%d), got %ld\n", ERROR_MORE_DATA, GetLastError()); /* Null hash length crashes Windows implementations */ if (0) { /* Test hashLen null with hash */ - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, NULL); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, NULL); /* Test hashLen null with no hash */ - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), NULL, NULL); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, NULL); } } @@ -2311,7 +2301,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -2346,7 +2336,7 @@ static void testCreateSelfSignCert(void) info.dwProvType = PROV_RSA_FULL; info.dwKeySpec = AT_KEYEXCHANGE; info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; - info.pwszContainerName = cspNameW; + info.pwszContainerName = (WCHAR *)L"WineCryptTemp"; /* This should fail because the CSP doesn't have the specified key. */ SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, @@ -2385,7 +2375,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -2432,7 +2422,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -2468,7 +2458,7 @@ static void testCreateSelfSignCert(void) info.dwProvType = PROV_RSA_FULL; info.dwKeySpec = AT_SIGNATURE; info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; - info.pwszContainerName = cspNameW; + info.pwszContainerName = (WCHAR *)L"WineCryptTemp"; /* This should fail because the CSP doesn't have the specified key. */ SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, @@ -2509,7 +2499,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -3112,7 +3102,7 @@ static void testIsRDNAttrsInCertificateName(void) static char juan_with_intermediate_space[] = "Juan Lang"; static char juan_with_trailing_space[] = "Juan Lang "; static char juan_lower_case[] = "juan lang"; - static WCHAR juanW[] = { 'J','u','a','n',' ','L','a','n','g',0 }; + static WCHAR juanW[] = L"Juan Lang"; static char the_wine_project[] = "The Wine Project"; BOOL ret; CERT_NAME_BLOB name; @@ -3852,7 +3842,7 @@ static void testAcquireCertPrivateKey(void) lstrcpyW(ms_def_prov_w, MS_DEF_PROV_W); - keyProvInfo.pwszContainerName = cspNameW; + keyProvInfo.pwszContainerName = (WCHAR *)L"WineCryptTemp"; keyProvInfo.pwszProvName = ms_def_prov_w; keyProvInfo.dwProvType = PROV_RSA_FULL; keyProvInfo.dwFlags = 0; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 9165e87249f..bcf51c6c811 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -5140,31 +5140,6 @@ static void check_ssl_policy(void) { CERT_CHAIN_POLICY_PARA policyPara = { 0 }; SSL_EXTRA_CERT_CHAIN_POLICY_PARA sslPolicyPara = { { 0 } }; - WCHAR winehq[] = { 'w','i','n','e','h','q','.','o','r','g',0 }; - WCHAR google_dot_com[] = { 'w','w','w','.','g','o','o','g','l','e','.', - 'c','o','m',0 }; - WCHAR battle_dot_net[] = { 'w','w','w','.','b','a','t','t','l','e','.', - 'n','e','t',0 }; - WCHAR a_dot_openssl_dot_org[] = { 'a','.','o','p','e','n','s','s','l','.', - 'o','r','g',0 }; - WCHAR openssl_dot_org[] = { 'o','p','e','n','s','s','l','.','o','r','g',0 }; - WCHAR fopenssl_dot_org[] = { 'f','o','p','e','n','s','s','l','.', - 'o','r','g',0 }; - WCHAR a_dot_b_dot_openssl_dot_org[] = { 'a','.','b','.', - 'o','p','e','n','s','s','l','.','o','r','g',0 }; - WCHAR cs_dot_stanford_dot_edu[] = { 'c','s','.', - 's','t','a','n','f','o','r','d','.','e','d','u',0 }; - WCHAR www_dot_cs_dot_stanford_dot_edu[] = { 'w','w','w','.','c','s','.', - 's','t','a','n','f','o','r','d','.','e','d','u',0 }; - WCHAR a_dot_cs_dot_stanford_dot_edu[] = { 'a','.','c','s','.', - 's','t','a','n','f','o','r','d','.','e','d','u',0 }; - WCHAR test_dot_winehq_dot_org[] = { 't','e','s','t','.', - 'w','i','n','e','h','q','.','o','r','g',0 }; - WCHAR a_dot_b_dot_winehq_dot_org[] = { 'a','.','b','.', - 'w','i','n','e','h','q','.','o','r','g',0 }; - WCHAR foo_dot_com[] = { 'f','o','o','.','c','o','m',0 }; - WCHAR afoo_dot_com[] = { 'a','f','o','o','.','c','o','m',0 }; - WCHAR a_dot_foo_dot_com[] = { 'a','.','f','o','o','.','c','o','m',0 }; HCERTSTORE testRoot; CERT_CHAIN_ENGINE_CONFIG engineConfig = { sizeof(engineConfig), 0 }; HCERTCHAINENGINE engine; @@ -5199,7 +5174,7 @@ static void check_ssl_policy(void) /* One more time authenticating a client, but specify winehq.org as the * server name. */ - sslPolicyPara.pwszServerName = winehq; + sslPolicyPara.pwszServerName = (WCHAR *)L"winehq.org"; CHECK_CHAIN_POLICY_STATUS_ARRAY(CERT_CHAIN_POLICY_SSL, NULL, sslPolicyCheck, &oct2007, &policyPara); /* And again authenticating a server, still specifying winehq.org as the @@ -5226,7 +5201,7 @@ static void check_ssl_policy(void) CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); /* And again, but checking the Google chain at a bad date */ - sslPolicyPara.pwszServerName = google_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.google.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingNameExpired, &oct2007, &policyPara); policyPara.dwFlags = 0; @@ -5239,7 +5214,7 @@ static void check_ssl_policy(void) googlePolicyCheckWithMatchingName, &oct2007, &policyPara); /* And again, but checking the Google chain at a good date */ sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_UNKNOWN_CA; - sslPolicyPara.pwszServerName = google_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.google.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingName, &nov2016, &policyPara); sslPolicyPara.fdwChecks = 0; @@ -5248,34 +5223,34 @@ static void check_ssl_policy(void) * with various combinations of matching and non-matching names. * With "a.openssl.org": match */ - sslPolicyPara.pwszServerName = a_dot_openssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.openssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithMatchingName, &oct2009, &policyPara); /* With "openssl.org": no match */ - sslPolicyPara.pwszServerName = openssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"openssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithoutMatchingName, &oct2009, &policyPara); /* With "fopenssl.org": no match */ - sslPolicyPara.pwszServerName = fopenssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"fopenssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithoutMatchingName, &oct2009, &policyPara); /* with "a.b.openssl.org": no match */ - sslPolicyPara.pwszServerName = a_dot_b_dot_openssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.b.openssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithoutMatchingName, &oct2009, &policyPara); /* Check again with the cs.stanford.edu, which has both cs.stanford.edu * and www.cs.stanford.edu in its subject alternative name. * With "cs.stanford.edu": match */ - sslPolicyPara.pwszServerName = cs_dot_stanford_dot_edu; + sslPolicyPara.pwszServerName = (WCHAR *)L"cs.stanford.edu"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, stanfordPolicyCheckWithMatchingName, &nov2016, &policyPara); /* With "www.cs.stanford.edu": match */ - sslPolicyPara.pwszServerName = www_dot_cs_dot_stanford_dot_edu; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.cs.stanford.edu"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, stanfordPolicyCheckWithMatchingName, &nov2016, &policyPara); /* With "a.cs.stanford.edu": no match */ - sslPolicyPara.pwszServerName = a_dot_cs_dot_stanford_dot_edu; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.cs.stanford.edu"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, stanfordPolicyCheckWithoutMatchingName, &nov2016, &policyPara); /* Check chain29, which has a wildcard in its subject alternative name, @@ -5293,15 +5268,15 @@ static void check_ssl_policy(void) return; } /* With "winehq.org": no match */ - sslPolicyPara.pwszServerName = winehq; + sslPolicyPara.pwszServerName = (WCHAR *)L"winehq.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* With "test.winehq.org": match */ - sslPolicyPara.pwszServerName = test_dot_winehq_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"test.winehq.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithMatchingName, &oct2007, &policyPara); /* With "a.b.winehq.org": no match */ - sslPolicyPara.pwszServerName = a_dot_b_dot_winehq_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.b.winehq.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* When specifying to ignore name mismatch: match */ @@ -5320,20 +5295,20 @@ static void check_ssl_policy(void) /* Test chain31, which has two CNs, "*.foo.com" and "foo.com", against * some names that match one of the CNs: */ - sslPolicyPara.pwszServerName = foo_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"foo.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithMatchingName, &oct2007, &policyPara); - sslPolicyPara.pwszServerName = a_dot_foo_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.foo.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithMatchingName, &oct2007, &policyPara); /* and against a name that doesn't match either CN: */ - sslPolicyPara.pwszServerName = afoo_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"afoo.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* The Battle.Net chain checks a certificate with a domain component * containing a terminating NULL. */ - sslPolicyPara.pwszServerName = battle_dot_net; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.battle.net"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, nullTerminatedDomainComponentPolicyCheck, &oct2010, &policyPara); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b6325efd518..f25c779a9ce 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -886,9 +886,6 @@ static void test_encodeName(DWORD dwEncoding) } } -static WCHAR commonNameW[] = { 'J','u','a','n',' ','L','a','n','g',0 }; -static WCHAR surNameW[] = { 'L','a','n','g',0 }; - static const BYTE twoRDNsNoNull[] = { 0x30,0x21,0x31,0x1f,0x30,0x0b,0x06,0x03,0x55,0x04,0x04,0x13,0x04,0x4c,0x61, 0x6e,0x67,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75,0x61,0x6e, @@ -935,8 +932,8 @@ static void test_encodeUnicodeName(DWORD dwEncoding) */ attrs[0].pszObjId = oid_common_name; attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; - attrs[0].Value.cbData = sizeof(commonNameW); - attrs[0].Value.pbData = (BYTE *)commonNameW; + attrs[0].Value.cbData = sizeof(L"Juan Lang"); + attrs[0].Value.pbData = (BYTE *)L"Juan Lang"; rdn.cRDNAttr = 1; rdn.rgRDNAttr = attrs; info.cRDN = 1; @@ -952,11 +949,11 @@ static void test_encodeUnicodeName(DWORD dwEncoding) attrs[0].pszObjId = oid_common_name; attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[0].Value.cbData = 0; - attrs[0].Value.pbData = (BYTE *)commonNameW; + attrs[0].Value.pbData = (BYTE *)L"Juan Lang"; attrs[1].pszObjId = oid_sur_name; attrs[1].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[1].Value.cbData = 0; - attrs[1].Value.pbData = (BYTE *)surNameW; + attrs[1].Value.pbData = (BYTE *)L"Lang"; rdn.cRDNAttr = 2; rdn.rgRDNAttr = attrs; info.cRDN = 1; @@ -1226,9 +1223,9 @@ static void test_decodeUnicodeName(DWORD dwEncoding) CERT_RDN_ATTR attrs[] = { { oid_sur_name, CERT_RDN_PRINTABLE_STRING, - { lstrlenW(surNameW) * sizeof(WCHAR), (BYTE *)surNameW } }, + { lstrlenW(L"Lang") * sizeof(WCHAR), (BYTE *)L"Lang" } }, { oid_common_name, CERT_RDN_PRINTABLE_STRING, - { lstrlenW(commonNameW) * sizeof(WCHAR), (BYTE *)commonNameW } }, + { lstrlenW(L"Juan Lang") * sizeof(WCHAR), (BYTE *)L"Juan Lang" } }, }; rdn.cRDNAttr = ARRAY_SIZE(attrs); @@ -1297,9 +1294,9 @@ static struct EncodedNameValue nameValues[] = { visibleCommonNameValue, sizeof(visibleCommonNameValue) }, { { CERT_RDN_GENERAL_STRING, { sizeof(commonName), (BYTE *)commonName } }, generalCommonNameValue, sizeof(generalCommonNameValue) }, - { { CERT_RDN_BMP_STRING, { sizeof(commonNameW), (BYTE *)commonNameW } }, + { { CERT_RDN_BMP_STRING, { sizeof(L"Juan Lang"), (BYTE *)L"Juan Lang" } }, bmpCommonNameValue, sizeof(bmpCommonNameValue) }, - { { CERT_RDN_UTF8_STRING, { sizeof(commonNameW), (BYTE *)commonNameW } }, + { { CERT_RDN_UTF8_STRING, { sizeof(L"Juan Lang"), (BYTE *)L"Juan Lang" } }, utf8CommonNameValue, sizeof(utf8CommonNameValue) }, /* The following tests succeed under Windows, but really should fail, * they contain characters that are illegal for the encoding. I'm @@ -1437,14 +1434,11 @@ static void test_decodeNameValue(DWORD dwEncoding) static const BYTE emptyURL[] = { 0x30, 0x02, 0x86, 0x00 }; static const BYTE emptyURLExtraBytes[] = { 0x30, 0x02, 0x86, 0x00, 0, 0, 0 }; -static const WCHAR url[] = { 'h','t','t','p',':','/','/','w','i','n','e', - 'h','q','.','o','r','g',0 }; +static const WCHAR url[] = L"http://winehq.org"; static const BYTE encodedURL[] = { 0x30, 0x13, 0x86, 0x11, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x69, 0x6e, 0x65, 0x68, 0x71, 0x2e, 0x6f, 0x72, 0x67 }; -static const WCHAR nihongoURL[] = { 'h','t','t','p',':','/','/',0x226f, - 0x575b, 0 }; -static const WCHAR dnsName[] = { 'w','i','n','e','h','q','.','o','r','g',0 }; +static const WCHAR dnsName[] = L"winehq.org"; static const BYTE encodedDnsName[] = { 0x30, 0x0c, 0x82, 0x0a, 0x77, 0x69, 0x6e, 0x65, 0x68, 0x71, 0x2e, 0x6f, 0x72, 0x67 }; static const BYTE localhost[] = { 127, 0, 0, 1 }; @@ -1503,7 +1497,7 @@ static void test_encodeAltName(DWORD dwEncoding) LocalFree(buf); } /* Now with the URL containing an invalid IA5 char */ - U(entry).pwszURL = (LPWSTR)nihongoURL; + U(entry).pwszURL = (WCHAR *)L"http://\x226f\x575b"; ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_IA5_STRING, @@ -1764,17 +1758,13 @@ struct UnicodeExpectedError DWORD error; }; -static const WCHAR oneW[] = { '1',0 }; -static const WCHAR aW[] = { 'a',0 }; -static const WCHAR quoteW[] = { '"', 0 }; - static struct UnicodeExpectedError unicodeErrors[] = { - { CERT_RDN_ANY_TYPE, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, - { CERT_RDN_ENCODED_BLOB, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, - { CERT_RDN_OCTET_STRING, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, - { CERT_RDN_NUMERIC_STRING, aW, 0, CRYPT_E_INVALID_NUMERIC_STRING }, - { CERT_RDN_PRINTABLE_STRING, quoteW, 0, CRYPT_E_INVALID_PRINTABLE_STRING }, - { CERT_RDN_IA5_STRING, nihongoURL, 7, CRYPT_E_INVALID_IA5_STRING }, + { CERT_RDN_ANY_TYPE, L"1", 0, CRYPT_E_NOT_CHAR_STRING }, + { CERT_RDN_ENCODED_BLOB, L"1", 0, CRYPT_E_NOT_CHAR_STRING }, + { CERT_RDN_OCTET_STRING, L"1", 0, CRYPT_E_NOT_CHAR_STRING }, + { CERT_RDN_NUMERIC_STRING, L"a", 0, CRYPT_E_INVALID_NUMERIC_STRING }, + { CERT_RDN_PRINTABLE_STRING, L"\"", 0, CRYPT_E_INVALID_PRINTABLE_STRING }, + { CERT_RDN_IA5_STRING, L"http://\x226f\x575b", 7, CRYPT_E_INVALID_IA5_STRING }, }; struct UnicodeExpectedResult @@ -1805,24 +1795,24 @@ static BYTE nihongoUTF8[] = { 0x0c,0x0d,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f, 0xe2,0x89,0xaf,0xe5,0x9d,0x9b }; static struct UnicodeExpectedResult unicodeResults[] = { - { CERT_RDN_NUMERIC_STRING, oneW, { sizeof(oneNumeric), oneNumeric } }, - { CERT_RDN_PRINTABLE_STRING, oneW, { sizeof(onePrintable), onePrintable } }, - { CERT_RDN_TELETEX_STRING, oneW, { sizeof(oneTeletex), oneTeletex } }, - { CERT_RDN_VIDEOTEX_STRING, oneW, { sizeof(oneVideotex), oneVideotex } }, - { CERT_RDN_IA5_STRING, oneW, { sizeof(oneIA5), oneIA5 } }, - { CERT_RDN_GRAPHIC_STRING, oneW, { sizeof(oneGraphic), oneGraphic } }, - { CERT_RDN_VISIBLE_STRING, oneW, { sizeof(oneVisible), oneVisible } }, - { CERT_RDN_UNIVERSAL_STRING, oneW, { sizeof(oneUniversal), oneUniversal } }, - { CERT_RDN_GENERAL_STRING, oneW, { sizeof(oneGeneral), oneGeneral } }, - { CERT_RDN_BMP_STRING, oneW, { sizeof(oneBMP), oneBMP } }, - { CERT_RDN_UTF8_STRING, oneW, { sizeof(oneUTF8), oneUTF8 } }, - { CERT_RDN_BMP_STRING, nihongoURL, { sizeof(nihongoBMP), nihongoBMP } }, - { CERT_RDN_UTF8_STRING, nihongoURL, { sizeof(nihongoUTF8), nihongoUTF8 } }, + { CERT_RDN_NUMERIC_STRING, L"1", { sizeof(oneNumeric), oneNumeric } }, + { CERT_RDN_PRINTABLE_STRING, L"1", { sizeof(onePrintable), onePrintable } }, + { CERT_RDN_TELETEX_STRING, L"1", { sizeof(oneTeletex), oneTeletex } }, + { CERT_RDN_VIDEOTEX_STRING, L"1", { sizeof(oneVideotex), oneVideotex } }, + { CERT_RDN_IA5_STRING, L"1", { sizeof(oneIA5), oneIA5 } }, + { CERT_RDN_GRAPHIC_STRING, L"1", { sizeof(oneGraphic), oneGraphic } }, + { CERT_RDN_VISIBLE_STRING, L"1", { sizeof(oneVisible), oneVisible } }, + { CERT_RDN_UNIVERSAL_STRING, L"1", { sizeof(oneUniversal), oneUniversal } }, + { CERT_RDN_GENERAL_STRING, L"1", { sizeof(oneGeneral), oneGeneral } }, + { CERT_RDN_BMP_STRING, L"1", { sizeof(oneBMP), oneBMP } }, + { CERT_RDN_UTF8_STRING, L"1", { sizeof(oneUTF8), oneUTF8 } }, + { CERT_RDN_BMP_STRING, L"http://\x226f\x575b", { sizeof(nihongoBMP), nihongoBMP } }, + { CERT_RDN_UTF8_STRING, L"http://\x226f\x575b", { sizeof(nihongoUTF8), nihongoUTF8 } }, }; static struct UnicodeExpectedResult unicodeWeirdness[] = { - { CERT_RDN_TELETEX_STRING, nihongoURL, { sizeof(nihongoT61), nihongoT61 } }, - { CERT_RDN_GENERAL_STRING, nihongoURL, { sizeof(nihongoGeneral), nihongoGeneral } }, + { CERT_RDN_TELETEX_STRING, L"http://\x226f\x575b", { sizeof(nihongoT61), nihongoT61 } }, + { CERT_RDN_GENERAL_STRING, L"http://\x226f\x575b", { sizeof(nihongoGeneral), nihongoGeneral } }, }; static void test_encodeUnicodeNameValue(DWORD dwEncoding) @@ -1854,12 +1844,12 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); value.dwValueType = CERT_RDN_ANY_TYPE; - value.Value.pbData = (LPBYTE)oneW; + value.Value.pbData = (LPBYTE)L"1"; ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); - value.Value.cbData = sizeof(oneW); + value.Value.cbData = sizeof(L"1"); ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, @@ -3699,7 +3689,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) /* A dist point with an invalid name */ point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; entry.dwAltNameChoice = CERT_ALT_NAME_URL; - U(entry).pwszURL = (LPWSTR)nihongoURL; + U(entry).pwszURL = (WCHAR *)L"http://\x226f\x575b"; U(point.DistPointName).FullName.cAltEntry = 1; U(point.DistPointName).FullName.rgAltEntry = &entry; ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, @@ -7567,8 +7557,6 @@ static void test_decodeNameConstraints(DWORD dwEncoding) } } -static WCHAR noticeText[] = { 'T','h','i','s',' ','i','s',' ','a',' ', - 'n','o','t','i','c','e',0 }; static const BYTE noticeWithDisplayText[] = { 0x30,0x22,0x1e,0x20,0x00,0x54,0x00,0x68,0x00,0x69,0x00,0x73,0x00,0x20,0x00, 0x69,0x00,0x73,0x00,0x20,0x00,0x61,0x00,0x20,0x00,0x6e,0x00,0x6f,0x00,0x74, @@ -7607,7 +7595,7 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); LocalFree(buf); } - notice.pszDisplayText = noticeText; + notice.pszDisplayText = (WCHAR *)L"This is a notice"; ret = pCryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); @@ -7663,7 +7651,7 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(!lstrcmpW(notice->pszDisplayText, noticeText), + ok(!lstrcmpW(notice->pszDisplayText, L"This is a notice"), "unexpected display text\n"); ok(notice->pNoticeReference == NULL, "unexpected notice reference\n"); LocalFree(notice); @@ -7675,7 +7663,7 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(!lstrcmpW(notice->pszDisplayText, noticeText), + ok(!lstrcmpW(notice->pszDisplayText, L"This is a notice"), "unexpected display text\n"); ok(notice->pNoticeReference != NULL, "expected a notice reference\n"); if (notice->pNoticeReference) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 640a50399e5..19dde3fb28f 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -272,31 +272,23 @@ static void test_readTrustedPublisherDWORD(void) pReadDWORD = (void *)GetProcAddress(hCrypt, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); if (pReadDWORD) { - static const WCHAR safer[] = { - 'S','o','f','t','w','a','r','e','\\', - 'P','o','l','i','c','i','e','s','\\', - 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m', - 'C','e','r','t','i','f','i','c','a','t','e','s','\\', - 'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r', - '\\','S','a','f','e','r',0 }; - static const WCHAR authenticodeFlags[] = { 'A','u','t','h','e','n', - 't','i','c','o','d','e','F','l','a','g','s',0 }; BOOL ret, exists = FALSE; DWORD size, readFlags = 0, returnedFlags; HKEY key; LONG rc; - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, safer, &key); + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"Software\\Policies\\Microsoft\\SystemCertificates\\TrustedPublisher\\Safer", &key); if (rc == ERROR_SUCCESS) { size = sizeof(readFlags); - rc = RegQueryValueExW(key, authenticodeFlags, NULL, NULL, + rc = RegQueryValueExW(key, L"AuthenticodeFlags", NULL, NULL, (LPBYTE)&readFlags, &size); if (rc == ERROR_SUCCESS) exists = TRUE; } returnedFlags = 0xdeadbeef; - ret = pReadDWORD(authenticodeFlags, &returnedFlags); + ret = pReadDWORD(L"AuthenticodeFlags", &returnedFlags); ok(ret == exists, "Unexpected return value\n"); ok(readFlags == returnedFlags, "Expected flags %08lx, got %08lx\n", readFlags, returnedFlags); diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 8e77709b970..8fbba2cd83c 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -45,18 +45,10 @@ static char bigCertBase64[] = "MHoCAQEwAgYAMBUxEzARBgNVBAMTCkp1YW4gTGFuZwAwIhgPMTYwMTAxMDEwMDAw\n" "MDBaGA8xNjAxMDEwMTAwMDAwMFowFTETMBEGA1UEAxMKSnVhbiBMYW5nADAHMAIG\n" "AAMBAKMWMBQwEgYDVR0TAQH/BAgwBgEB/wIBAQ==\n"; -static WCHAR bigCertBase64W[] = { -'M','H','o','C','A','Q','E','w','A','g','Y','A','M','B','U','x','E','z','A', -'R','B','g','N','V','B','A','M','T','C','k','p','1','Y','W','4','g','T','G', -'F','u','Z','w','A','w','I','h','g','P','M','T','Y','w','M','T','A','x','M', -'D','E','w',',','D','A','w','\n', -'M','D','B','a','G','A','8','x','N','j','A','x','M','D','E','w','M','T','A', -'w','M','D','A','w','M','F','o','w','F','T','E','T','M','B','E','G','A','1', -'U','E','A','x','M','K','S','n','V','h','b','i','B','M','Y','W','5','n','A', -'D','A','H','M','A','I','G','\n', -'A','A','M','B','A','K','M','W','M','B','Q','w','E','g','Y','D','V','R','0', -'T','A','Q','H','/','B','A','g','w','B','g','E','B','/','w','I','B','A','Q', -'=','=','\n',0 }; +static WCHAR bigCertBase64W[] = +L"MHoCAQEwAgYAMBUxEzARBgNVBAMTCkp1YW4gTGFuZwAwIhgPMTYwMTAxMDEw,DAw\n" +"MDBaGA8xNjAxMDEwMTAwMDAwMFowFTETMBEGA1UEAxMKSnVhbiBMYW5nADAHMAIG\n" +"AAMBAKMWMBQwEgYDVR0TAQH/BAgwBgEB/wIBAQ==\n"; static BYTE signedWithCertWithValidPubKeyContent[] = { 0x30,0x82,0x01,0x89,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, 0xa0,0x82,0x01,0x7a,0x30,0x82,0x01,0x76,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c, @@ -95,34 +87,16 @@ static char signedWithCertWithValidPubKeyContentBase64[] = "EzARBgNVBAMTCkp1YW4gTGFuZwACAQEwDAYIKoZIhvcNAgUFADAEBgAFAARAgaZw" "s+9Z0WbRm8CatppebW9tDVmpqm7pLKAe7sJgvFm+P2MGjckRHSNkku8u/FcppK/g" "7pMZOVHkRLgLKPSoDQ=="; -static WCHAR signedWithCertWithValidPubKeyContentBase64W[] = { -'M','I','I','B','i','Q','Y','J','K','o','Z','I','h','v','c','N','A','Q','c','C', -'o','I','I','B','e','j','C','C','A','X','Y','C','A','Q','E','x','D','j','A','M', -'B','g','g','q','h','k','i','G','9','w','0','C','B','Q','U','A','M','B','M','G', -'C','S','q','G','S','I','b','3','D','Q','E','H','A','a','A','G','B','A','Q','B', -'A','g','M','E','o','I','H','S','M','I','H','P','A','g','E','B','M','A','I','G', -'A','D','A','V','M','R','M','w','E','Q','Y','D','V','Q','Q','D','E','w','p','K', -'d','W','F','u','I','E','x','h','b','m','c','A','M','C','I','Y','D','z','E','2', -'M','D','E','w','M','T','A','x','M','D','A','w','M','D','A','w','W','h','g','P', -'M','T','Y','w','M','T','A','x','M','D','E','w','M','D','A','w','M','D','B','a', -'M','B','U','x','E','z','A','R','B','g','N','V','B','A','M','T','C','k','p','1', -'Y','W','4','g','T','G','F','u','Z','w','A','w','X','D','A','N','B','g','k','q', -'h','k','i','G','9','w','0','B','A','Q','E','F','A','A','N','L','A','D','B','I', -'A','k','E','A','4','l','Q','6','p','4','O','x','J','x','Q','+','W','b','u','0', -'U','+','Y','f','5','1','3','x','I','W','i','t','h','V','P','b','a','x','7','r', -'Z','Z','c','D','h','m','D','e','8','2','w','4','d','e','B','M','Y','b','u','8', -'Y','h','e','p','z','X','k','/','I','U','6','W','y','w','7','c','Y','Z','Q','w', -'G','B','B','r','0','B','w','Q','e','Q','I','D','A','Q','A','B','o','x','Y','w', -'F','D','A','S','B','g','N','V','H','R','M','B','A','f','8','E','C','D','A','G', -'A','Q','H','/','A','g','E','B','M','X','c','w','d','Q','I','B','A','T','A','a', -'M','B','U','x','E','z','A','R','B','g','N','V','B','A','M','T','C','k','p','1', -'Y','W','4','g','T','G','F','u','Z','w','A','C','A','Q','E','w','D','A','Y','I', -'K','o','Z','I','h','v','c','N','A','g','U','F','A','D','A','E','B','g','A','F', -'A','A','R','A','g','a','Z','w','s','+','9','Z','0','W','b','R','m','8','C','a', -'t','p','p','e','b','W','9','t','D','V','m','p','q','m','7','p','L','K','A','e', -'7','s','J','g','v','F','m','+','P','2','M','G','j','c','k','R','H','S','N','k', -'k','u','8','u','/','F','c','p','p','K','/','g','7','p','M','Z','O','V','H','k', -'R','L','g','L','K','P','S','o','D','Q','=','=',0 }; +static WCHAR signedWithCertWithValidPubKeyContentBase64W[] = +L"MIIBiQYJKoZIhvcNAQcCoIIBejCCAXYCAQExDjAMBggqhkiG9w0CBQUAMBMGCSqG" +"SIb3DQEHAaAGBAQBAgMEoIHSMIHPAgEBMAIGADAVMRMwEQYDVQQDEwpKdWFuIExh" +"bmcAMCIYDzE2MDEwMTAxMDAwMDAwWhgPMTYwMTAxMDEwMDAwMDBaMBUxEzARBgNV" +"BAMTCkp1YW4gTGFuZwAwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA4lQ6p4OxJxQ+" +"Wbu0U+Yf513xIWithVPbax7rZZcDhmDe82w4deBMYbu8YhepzXk/IU6Wyw7cYZQw" +"GBBr0BwQeQIDAQABoxYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMXcwdQIBATAaMBUx" +"EzARBgNVBAMTCkp1YW4gTGFuZwACAQEwDAYIKoZIhvcNAgUFADAEBgAFAARAgaZw" +"s+9Z0WbRm8CatppebW9tDVmpqm7pLKAe7sJgvFm+P2MGjckRHSNkku8u/FcppK/g" +"7pMZOVHkRLgLKPSoDQ=="; static void test_query_object(void) { diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 7ba68b6cceb..291636be388 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -95,9 +95,6 @@ static const struct OIDToAlgID algIDToOID[] = { { szOID_OIWSEC_sha1, NULL, CALG_SHA }, }; -static const WCHAR bogusDll[] = { 'b','o','g','u','s','.','d','l','l',0 }; -static const WCHAR bogus2Dll[] = { 'b','o','g','u','s','2','.','d','l','l',0 }; - static void testOIDToAlgID(void) { int i; @@ -298,12 +295,12 @@ static void test_registerOIDFunction(void) * omitted. This may be a side effect of the registry code, I don't know. * I don't check it because I doubt anyone would depend on it. ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, NULL, - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); */ /* On windows XP, GetLastError is incorrectly being set with an HRESULT, * E_INVALIDARG */ - ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "foo", NULL, bogusDll, + ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "foo", NULL, L"bogus.dll", NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG: %ld\n", GetLastError()); @@ -313,7 +310,7 @@ static void test_registerOIDFunction(void) ok(ret, "Expected pseudo-success, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { skip("Need admin rights\n"); @@ -324,7 +321,7 @@ static void test_registerOIDFunction(void) "1.2.3.4.5.6.7.8.9.10"); ok(ret, "CryptUnregisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "bogus", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(X509_ASN_ENCODING, "bogus", "1.2.3.4.5.6.7.8.9.10"); @@ -335,14 +332,14 @@ static void test_registerOIDFunction(void) "Could not delete bogus key\n"); /* Shouldn't have effect but registry keys are created */ ret = CryptRegisterOIDFunction(PKCS_7_ASN_ENCODING, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(PKCS_7_ASN_ENCODING, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); ok(ret, "CryptUnregisterOIDFunction failed: %ld\n", GetLastError()); /* Check with bogus encoding type. Registry keys are still created */ ret = CryptRegisterOIDFunction(0, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(0, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); @@ -357,7 +354,7 @@ static void test_registerOIDFunction(void) * (for now) treated as a mask. Registry keys are created. */ ret = CryptRegisterOIDFunction(3, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(3, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); @@ -387,12 +384,12 @@ static void test_registerDefaultOIDFunction(void) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* This succeeds on WinXP, although the bogus entry is unusable. - ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, bogusDll); + ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, L"bogus.dll"); */ /* Register one at index 0 */ SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, - bogusDll); + L"bogus.dll"); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { skip("Need admin rights\n"); @@ -401,66 +398,63 @@ static void test_registerDefaultOIDFunction(void) ok(ret, "CryptRegisterDefaultOIDFunction failed: %08lx\n", GetLastError()); /* Reregistering should fail */ ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, - bogusDll); + L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %08lx\n", GetLastError()); /* Registering the same one at index 1 should also fail */ ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 1, - bogusDll); + L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %08lx\n", GetLastError()); /* Registering a different one at index 1 succeeds */ ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 1, - bogus2Dll); + L"bogus2.dll"); ok(ret, "CryptRegisterDefaultOIDFunction failed: %08lx\n", GetLastError()); sprintf(buf, fmt, 0, func); rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key); ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %ld\n", rc); if (rc == 0) { - static const CHAR dllA[] = "Dll"; - static const CHAR bogusDll_A[] = "bogus.dll"; - static const CHAR bogus2Dll_A[] = "bogus2.dll"; CHAR dllBuf[MAX_PATH]; DWORD type, size; LPSTR ptr; size = ARRAY_SIZE(dllBuf); - rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size); + rc = RegQueryValueExA(key, "Dll", NULL, &type, (LPBYTE)dllBuf, &size); ok(rc == 0, "Expected Dll value to exist, RegQueryValueExA failed: %ld\n", rc); ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %ld\n", type); - /* bogusDll was registered first, so that should be first */ + /* bogus.dll was registered first, so that should be first */ ptr = dllBuf; - ok(!lstrcmpiA(ptr, bogusDll_A), "Unexpected dll\n"); + ok(!lstrcmpiA(ptr, "bogus.dll"), "Unexpected dll\n"); ptr += lstrlenA(ptr) + 1; - ok(!lstrcmpiA(ptr, bogus2Dll_A), "Unexpected dll\n"); + ok(!lstrcmpiA(ptr, "bogus2.dll"), "Unexpected dll\n"); RegCloseKey(key); } /* Unregister both of them */ ret = CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", - bogusDll); + L"bogus.dll"); ok(ret, "CryptUnregisterDefaultOIDFunction failed: %08lx\n", GetLastError()); ret = CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", - bogus2Dll); + L"bogus2.dll"); ok(ret, "CryptUnregisterDefaultOIDFunction failed: %08lx\n", GetLastError()); /* Now that they're both unregistered, unregistering should fail */ ret = CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", - bogusDll); + L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); /* Repeat a few tests on the normal encoding type */ ret = CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, - "CertDllOpenStoreProv", 0, bogusDll); + "CertDllOpenStoreProv", 0, L"bogus.dll"); ok(ret, "CryptRegisterDefaultOIDFunction failed\n"); ret = CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, - "CertDllOpenStoreProv", bogusDll); + "CertDllOpenStoreProv", L"bogus.dll"); ok(ret, "CryptUnregisterDefaultOIDFunction failed\n"); ret = CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, - "CertDllOpenStoreProv", bogusDll); + "CertDllOpenStoreProv", L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); } @@ -498,7 +492,7 @@ static void test_getDefaultOIDFunctionAddress(void) /* Even with a registered dll, this fails (since the dll doesn't exist) */ SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, - bogusDll); + L"bogus.dll"); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) skip("Need admin rights\n"); else @@ -507,7 +501,7 @@ static void test_getDefaultOIDFunctionAddress(void) &hFuncAddr); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); - CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", bogusDll); + CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", L"bogus.dll"); } static BOOL WINAPI countOidInfo(PCCRYPT_OID_INFO pInfo, void *pvArg) @@ -545,8 +539,6 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { - static WCHAR sha256ECDSA[] = { 's','h','a','2','5','6','E','C','D','S','A',0 }; - static WCHAR sha1[] = { 's','h','a','1',0 }; static CHAR oid_rsa_md5[] = szOID_RSA_MD5, oid_sha256[] = szOID_NIST_sha256; static CHAR oid_ecdsa_sha256[] = szOID_ECDSA_SHA256; ALG_ID alg = CALG_SHA1; @@ -561,7 +553,7 @@ static void test_findOIDInfo(void) } oid_test_info [] = { { CRYPT_OID_INFO_OID_KEY, oid_rsa_md5, szOID_RSA_MD5, CALG_MD5 }, - { CRYPT_OID_INFO_NAME_KEY, sha1, szOID_OIWSEC_sha1, CALG_SHA1 }, + { CRYPT_OID_INFO_NAME_KEY, (void *)L"sha1", szOID_OIWSEC_sha1, CALG_SHA1 }, { CRYPT_OID_INFO_ALGID_KEY, &alg, szOID_OIWSEC_sha1, CALG_SHA1 }, { CRYPT_OID_INFO_SIGN_KEY, algs, szOID_RSA_MD5RSA, CALG_MD5 }, { CRYPT_OID_INFO_OID_KEY, oid_sha256, szOID_NIST_sha256, CALG_SHA_256, -1 }, @@ -593,8 +585,8 @@ static void test_findOIDInfo(void) ok(info->cbSize == sizeof(*info), "Unexpected structure size %ld.\n", info->cbSize); ok(!strcmp(info->pszOID, oid_ecdsa_sha256), "Expected %s, got %s\n", oid_ecdsa_sha256, info->pszOID); - ok(!lstrcmpW(info->pwszName, sha256ECDSA), "Expected %s, got %s\n", - wine_dbgstr_w(sha256ECDSA), wine_dbgstr_w(info->pwszName)); + ok(!lstrcmpW(info->pwszName, L"sha256ECDSA"), "Expected %s, got %s\n", + wine_dbgstr_w(L"sha256ECDSA"), wine_dbgstr_w(info->pwszName)); ok(info->dwGroupId == CRYPT_SIGN_ALG_OID_GROUP_ID, "Expected CRYPT_SIGN_ALG_OID_GROUP_ID, got %lu\n", info->dwGroupId); ok(U(*info).Algid == CALG_OID_INFO_CNG_ONLY, @@ -617,7 +609,6 @@ static void test_findOIDInfo(void) static void test_registerOIDInfo(void) { - static const WCHAR winetestW[] = { 'w','i','n','e','t','e','s','t',0 }; static char test_oid[] = "1.2.3.4.5.6.7.8.9.10"; CRYPT_OID_INFO info1; const CRYPT_OID_INFO *info2; @@ -665,7 +656,7 @@ static void test_registerOIDInfo(void) info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); ok(!info2, "should fail\n"); - info1.pwszName = winetestW; + info1.pwszName = L"winetest"; info1.dwGroupId = CRYPT_HASH_ALG_OID_GROUP_ID; SetLastError(0xdeadbeef); ret = CryptRegisterOIDInfo(&info1, CRYPT_INSTALL_OID_INFO_BEFORE_FLAG); diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index c4dfcd19a39..162dab090e2 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -33,7 +33,6 @@ static BOOL (WINAPI *pCryptUnprotectData)(DATA_BLOB*,LPWSTR*,DATA_BLOB*,PVOID,CR static char secret[] = "I am a super secret string that no one can see!"; static char secret2[] = "I am a super secret string indescribable string"; static char key[] = "Wibble wibble wibble"; -static const WCHAR desc[] = {'U','l','t','r','a',' ','s','e','c','r','e','t',' ','t','e','s','t',' ','m','e','s','s','a','g','e',0}; static BOOL protected = FALSE; /* if true, the unprotect tests can run */ static DATA_BLOB cipher; static DATA_BLOB cipher_entropy; @@ -52,13 +51,13 @@ static void test_cryptprotectdata(void) entropy.cbData=strlen(key)+1; SetLastError(0xDEADBEEF); - protected = pCryptProtectData(NULL,desc,NULL,NULL,NULL,0,&cipher); + protected = pCryptProtectData(NULL, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); ok(!protected, "Encrypting without plain data source.\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain,desc,NULL,NULL,NULL,0,NULL); + protected = pCryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, NULL); ok(!protected, "Encrypting without cipher destination.\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); @@ -68,7 +67,7 @@ static void test_cryptprotectdata(void) /* without entropy */ SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain,desc,NULL,NULL,NULL,0,&cipher); + protected = pCryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); ok(protected || broken(!protected), /* Win9x/NT4 */ "Encrypting without entropy.\n"); @@ -85,7 +84,7 @@ static void test_cryptprotectdata(void) /* with entropy */ SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain,desc,&entropy,NULL,NULL,0,&cipher_entropy); + protected = pCryptProtectData(&plain, L"Ultra secret test message", &entropy, NULL, NULL, 0, &cipher_entropy); ok(protected || broken(!protected), /* Win9x/NT4 */ "Encrypting with entropy.\n"); @@ -161,7 +160,7 @@ static void test_cryptunprotectdata(void) ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); ok(!strcmp((const char*)plain.pbData,secret),"Plain does not match secret\n"); ok(data_desc!=NULL,"Description not allocated\n"); - ok(!lstrcmpW(data_desc,desc),"Description does not match\n"); + ok(!lstrcmpW(data_desc, L"Ultra secret test message"),"Description does not match\n"); LocalFree(plain.pbData); LocalFree(data_desc); @@ -186,7 +185,7 @@ static void test_cryptunprotectdata(void) ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); ok(!strcmp((const char*)plain.pbData,secret),"Plain does not match secret\n"); ok(data_desc!=NULL,"Description not allocated\n"); - ok(!lstrcmpW(data_desc,desc),"Description does not match\n"); + ok(!lstrcmpW(data_desc, L"Ultra secret test message"),"Description does not match\n"); LocalFree(plain.pbData); LocalFree(data_desc); diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 5728065127b..4a89393484e 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -41,8 +41,6 @@ static void test_AddRemoveProvider(void) BOOL ret; SIP_ADD_NEWPROVIDER newprov; GUID actionid = { 0xdeadbe, 0xefde, 0xadbe, { 0xef,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe }}; - static WCHAR dummydll[] = {'d','e','a','d','b','e','e','f','.','d','l','l',0 }; - static WCHAR dummyfunction[] = {'d','u','m','m','y','f','u','n','c','t','i','o','n',0 }; /* NULL check */ SetLastError(0xdeadbeef); @@ -77,12 +75,12 @@ static void test_AddRemoveProvider(void) memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER)); newprov.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); newprov.pgSubject = &actionid; - newprov.pwszDLLFileName = dummydll; - newprov.pwszGetFuncName = dummyfunction; - newprov.pwszPutFuncName = dummyfunction; - newprov.pwszCreateFuncName = dummyfunction; - newprov.pwszVerifyFuncName = dummyfunction; - newprov.pwszRemoveFuncName = dummyfunction; + newprov.pwszDLLFileName = (WCHAR *)L"deadbeef.dll"; + newprov.pwszGetFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszPutFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszCreateFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszVerifyFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszRemoveFuncName = (WCHAR *)L"dummyfunction"; SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) @@ -111,16 +109,16 @@ static void test_AddRemoveProvider(void) memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER)); newprov.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); newprov.pgSubject = &actionid; - newprov.pwszDLLFileName = dummydll; - newprov.pwszGetFuncName = dummyfunction; - newprov.pwszPutFuncName = dummyfunction; - newprov.pwszCreateFuncName = dummyfunction; - newprov.pwszVerifyFuncName = dummyfunction; - newprov.pwszRemoveFuncName = dummyfunction; - newprov.pwszIsFunctionNameFmt2 = dummyfunction; - newprov.pwszIsFunctionName = dummyfunction; + newprov.pwszDLLFileName = (WCHAR *)L"deadbeef.dll"; + newprov.pwszGetFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszPutFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszCreateFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszVerifyFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszRemoveFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszIsFunctionNameFmt2 = (WCHAR *)L"dummyfunction"; + newprov.pwszIsFunctionName = (WCHAR *)L"dummyfunction"; /* If GetCapFuncName set to NULL, then CryptSIPRemoveProvider fails on win 8 */ - newprov.pwszGetCapFuncName = dummyfunction; + newprov.pwszGetCapFuncName = (WCHAR *)L"dummyfunction"; SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); @@ -148,7 +146,6 @@ static void test_SIPRetrieveSubjectGUID(void) static const CHAR windir[] = "windir"; static const CHAR regeditExe[] = "regedit.exe"; static const GUID nullSubject = { 0x0, 0x0, 0x0, { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 }}; - static const WCHAR deadbeef[] = { 'c',':','\\','d','e','a','d','b','e','e','f','.','d','b','f',0 }; /* Couldn't find a name for this GUID, it's the one used for 95% of the files */ static const GUID unknownGUID = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; static const GUID cabGUID = { 0xc689aaba, 0x8e78, 0x11d0, {0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; @@ -170,7 +167,7 @@ static void test_SIPRetrieveSubjectGUID(void) SetLastError(0xdeadbeef); /* Set subject to something other than zeros */ memset(&subject, 1, sizeof(GUID)); - ret = CryptSIPRetrieveSubjectGuid(deadbeef, NULL, &subject); + ret = CryptSIPRetrieveSubjectGuid(L"c:\\deadbeef.dbf", NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok (GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND, diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index d8669995d68..f1124459d6a 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -366,16 +366,6 @@ static const struct */ static void testRegStoreSavedCerts(void) { - static const WCHAR fmt[] = - { '%','s','\\','%','s','\\','%','s','\\','%','s',0}, - ms_certs[] = - { 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0}, - certs[] = - {'C','e','r','t','i','f','i','c','a','t','e','s',0}, - bigCert_hash[] = { - '6','E','3','0','9','0','7','1','5','F','D','9','2','3', - '5','6','E','B','A','E','2','5','4','0','E','6','2','2', - 'D','A','1','9','2','6','0','2','A','6','0','8',0}; PCCERT_CONTEXT cert1, cert2; HCERTSTORE store; HANDLE cert_file; @@ -415,8 +405,8 @@ static void testRegStoreSavedCerts(void) CertFreeCertificateContext(cert1); CertCloseStore(store, 0); - wsprintfW(key_name, fmt, reg_store_saved_certs[i].base_reg_path, - reg_store_saved_certs[i].store_name, certs, bigCert_hash); + wsprintfW(key_name, L"%s\\%s\\%s\\%s", reg_store_saved_certs[i].base_reg_path, + reg_store_saved_certs[i].store_name, L"Certificates", L"6E3090715FD92356EBAE2540E622DA192602A608"); if (!reg_store_saved_certs[i].appdata_file) { @@ -430,10 +420,10 @@ static void testRegStoreSavedCerts(void) "Failed to get app data path at %ld (%lx)\n", pathres, GetLastError()); if (pathres == S_OK) { - PathAppendW(appdata_path, ms_certs); + PathAppendW(appdata_path, L"Microsoft\\SystemCertificates"); PathAppendW(appdata_path, reg_store_saved_certs[i].store_name); - PathAppendW(appdata_path, certs); - PathAppendW(appdata_path, bigCert_hash); + PathAppendW(appdata_path, L"Certificates"); + PathAppendW(appdata_path, L"6E3090715FD92356EBAE2540E622DA192602A608"); cert_file = CreateFileW(appdata_path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -486,9 +476,6 @@ static void testStoresInCollection(void) { PCCERT_CONTEXT cert1, cert2, tcert1; HCERTSTORE collection, ro_store, rw_store, rw_store_2, tstore; - static const WCHAR WineTestRO_W[] = { 'W','i','n','e','T','e','s','t','_','R','O',0 }, - WineTestRW_W[] = { 'W','i','n','e','T','e','s','t','_','R','W',0 }, - WineTestRW2_W[]= { 'W','i','n','e','T','e','s','t','_','R','W','2',0 }; BOOL ret; collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, @@ -496,7 +483,7 @@ static void testStoresInCollection(void) ok(collection != NULL, "Failed to init collection store, last error %lx\n", GetLastError()); /* Add read-only store to collection with very high priority*/ ro_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRO_W); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RO"); ok(ro_store != NULL, "Failed to init ro store %lx\n", GetLastError()); ret = CertAddStoreToCollection(collection, ro_store, 0, 1000); @@ -509,7 +496,7 @@ static void testStoresInCollection(void) /* Add read-write store to collection with the lowest priority*/ rw_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW_W); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW"); ok (rw_store != NULL, "Failed to open rw store %lx\n", GetLastError()); ret = CertAddStoreToCollection(collection, rw_store, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok (ret, "Failed to add rw store to collection %lx\n", GetLastError()); @@ -533,7 +520,7 @@ static void testStoresInCollection(void) /** adding one more rw store with higher priority*/ rw_store_2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW2_W); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW2"); ok (rw_store_2 != NULL, "Failed to init second rw store %lx\n", GetLastError()); ret = CertAddStoreToCollection(collection, rw_store_2, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 50); ok (ret, "Failed to add rw_store_2 to collection %lx\n",GetLastError()); @@ -568,8 +555,8 @@ static void testStoresInCollection(void) ok (tcert1==NULL,"Unexpected cert in the collection %p %lx\n",tcert1, GetLastError()); /* checking whether certs had been saved */ - tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, WineTestRW_W); + tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"WineTest_RW"); ok (tstore!=NULL, "Failed to open existing rw store\n"); tcert1 = CertEnumCertificatesInStore(tstore, NULL); todo_wine @@ -577,8 +564,8 @@ static void testStoresInCollection(void) CertFreeCertificateContext(tcert1); CertCloseStore(tstore,0); - tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, WineTestRW2_W); + tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"WineTest_RW2"); ok (tstore!=NULL, "Failed to open existing rw2 store\n"); tcert1 = CertEnumCertificatesInStore(tstore, NULL); todo_wine @@ -592,16 +579,16 @@ static void testStoresInCollection(void) CertCloseStore(rw_store_2,0); /* reopening registry stores to check whether certs had been saved */ - rw_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW_W); + rw_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW"); tcert1 = CertEnumCertificatesInStore(rw_store, NULL); ok (tcert1 && tcert1->cbCertEncoded == cert1->cbCertEncoded, "Unexpected cert in store %p\n", tcert1); CertFreeCertificateContext(tcert1); CertCloseStore(rw_store,0); - rw_store_2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW2_W); + rw_store_2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW2"); tcert1 = CertEnumCertificatesInStore(rw_store_2, NULL); ok (tcert1 && tcert1->cbCertEncoded == cert2->cbCertEncoded, "Unexpected cert in store %p\n", tcert1); @@ -610,12 +597,12 @@ static void testStoresInCollection(void) CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); - CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER,WineTestRO_W); - CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER,WineTestRW_W); - CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER,WineTestRW2_W); + CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RO"); + CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW"); + CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW2"); } @@ -624,8 +611,6 @@ static void testCollectionStore(void) HCERTSTORE store1, store2, collection, collection2; PCCERT_CONTEXT context; BOOL ret; - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; HANDLE file; @@ -949,7 +934,7 @@ static void testCollectionStore(void) /* Test adding a cert to a collection with a file store, committing the * change to the collection, and comparing the resulting file. */ - if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"cer", 0, filename)) return; DeleteFileW(filename); @@ -1281,20 +1266,13 @@ static void testRegStore(void) } } -static const char MyA[] = { 'M','y',0,0 }; -static const WCHAR MyW[] = { 'M','y',0 }; -static const WCHAR BogusW[] = { 'B','o','g','u','s',0 }; -static const WCHAR BogusPathW[] = { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r', - 't','i','f','i','c','a','t','e','s','\\','B','o','g','u','s',0 }; - static void testSystemRegStore(void) { HCERTSTORE store, memStore; /* Check with a UNICODE name */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"My"); /* Not all OSes support CERT_STORE_PROV_SYSTEM_REGISTRY, so don't continue * testing if they don't. */ @@ -1314,41 +1292,40 @@ static void testSystemRegStore(void) /* Check opening a bogus store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"Bogus"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER, L"Bogus"); ok(store != 0, "CertOpenStore failed: %08lx\n", GetLastError()); if (store) CertCloseStore(store, 0); /* Now check whether deleting is allowed */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, L"Bogus"); ok(!store, "CertOpenStore failed: %08lx\n", GetLastError()); - RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); + RegDeleteKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates\\Bogus"); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, 0, NULL); ok(!store && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyA); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, "My"); ok(!store && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyW); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, L"My"); ok(!store && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* The name is expected to be UNICODE, check with an ASCII name */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyA); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, "My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); } static void testSystemStore(void) { - static const WCHAR baskslashW[] = { '\\',0 }; HCERTSTORE store; WCHAR keyName[MAX_PATH]; HKEY key; @@ -1358,22 +1335,21 @@ static void testSystemStore(void) ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyA); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, "My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyW); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, L"My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); /* The name is expected to be UNICODE, first check with an ASCII name */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyA); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, "My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); /* Create the expected key */ lstrcpyW(keyName, CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH); - lstrcatW(keyName, baskslashW); - lstrcatW(keyName, MyW); + lstrcatW(keyName, L"\\My"); rc = RegCreateKeyExW(HKEY_CURRENT_USER, keyName, 0, NULL, 0, KEY_READ, NULL, &key, NULL); ok(!rc, "RegCreateKeyEx failed: %ld\n", rc); @@ -1381,12 +1357,12 @@ static void testSystemStore(void) RegCloseKey(key); /* Check opening with a UNICODE name, specifying the create new flag */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_CREATE_NEW_FLAG, MyW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_CREATE_NEW_FLAG, L"My"); ok(!store && GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %08lx\n", GetLastError()); /* Now check opening with a UNICODE name, this time opening existing */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"My"); ok(store != 0, "CertOpenStore failed: %08lx\n", GetLastError()); if (store) { @@ -1405,18 +1381,18 @@ static void testSystemStore(void) /* Check opening a bogus store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"Bogus"); ok(!store, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER, L"Bogus"); ok(store != 0, "CertOpenStore failed: %08lx\n", GetLastError()); if (store) CertCloseStore(store, 0); /* Now check whether deleting is allowed */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, L"Bogus"); ok(!store, "Didn't expect a store to be returned when deleting\n"); - RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); + RegDeleteKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates\\Bogus"); } static const BYTE serializedStoreWithCertAndCRL[] = { @@ -1439,8 +1415,6 @@ static const BYTE serializedStoreWithCertAndCRL[] = { static void testFileStore(void) { - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; HCERTSTORE store; BOOL ret; @@ -1451,7 +1425,7 @@ static void testFileStore(void) ok(!store && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %08lx\n", GetLastError()); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"cer", 0, filename)) return; DeleteFileW(filename); @@ -1597,57 +1571,22 @@ static const BYTE base64SPC[] = "G6U1ipFe/q8byWD/9JpiBKMGPi9YlUTgXHfS9d4S/QWO1h9Z7KeipBYhoslQpHXu" "y9bUr8Adqi6SzgHpCnMu53dxgxUD1r4xAA=="; /* Same as base64SPC, but as a wide-char string */ -static const WCHAR utf16Base64SPC[] = { -'M','I','I','C','J','Q','Y','J','K','o','Z','I','h','v','c','N','A', -'Q','c','C','o','I','I','C','F','j','C','C','A','h','I','C','A','Q', -'E','x','A','D','A','L','B','g','k','q','h','k','i','G','9','w','0', -'B','B','w','G','g','g','g','H','6','M','I','I','B','9','j','C','C', -'A','V','+','g','A','w','I','B','A','g','I','Q','n','P','8','+','E', -'F','4','o','p','r','9','O','x','H','7','h','4','u','B','P','W','T', -'A','N','B','g','k','q','h','k','i','G','9','w','0','B','A','Q','Q', -'F','A','D','A','U','M','R','I','w','E','A','Y','D','V','Q','Q','D', -'E','w','l','K','d','W','F','u','I','E','x','h','b','m','c','w','H', -'h','c','N','M','D','g','x','M','j','E','y','M','T','c','x','M','D', -'E','0','W','h','c','N','M','z','k','x','M','j','M','x','M','j','M', -'1','O','T','U','5','W','j','A','U','M','R','I','w','E','A','Y','D', -'V','Q','Q','D','E','w','l','K','d','W','F','u','I','E','x','h','b', -'m','c','w','g','Z','8','w','D','Q','Y','J','K','o','Z','I','h','v', -'c','N','A','Q','E','B','B','Q','A','D','g','Y','0','A','M','I','G', -'J','A','o','G','B','A','L','C','g','N','j','y','N','v','O','i','c', -'0','F','O','f','j','x','v','i','4','3','H','b','M','+','D','5','j', -'o','D','k','h','i','G','S','X','e','+','g','b','Z','l','f','8','f', -'1','6','k','0','7','k','k','O','b','F','E','u','n','z','m','d','B', -'5','c','o','s','c','m','A','7','g','y','q','i','W','N','N','4','Z', -'U','y','r','2','c','A','3','l','C','b','n','p','G','P','A','/','0', -'I','b','l','y','y','O','c','u','G','I','F','m','m','C','z','e','Z', -'a','V','a','5','Z','G','6','x','Z','P','K','7','L','7','o','+','7', -'3','Q','o','6','j','X','V','b','G','h','B','G','n','M','Z','7','Q', -'9','s','A','n','6','s','2','9','3','3','o','l','n','S','t','n','e', -'j','n','q','w','V','0','N','A','g','M','B','A','A','G','j','S','T', -'B','H','M','E','U','G','A','1','U','d','A','Q','Q','+','M','D','y', -'A','E','F','K','b','K','E','d','X','Y','y','x','+','C','W','K','c', -'V','6','v','x','M','6','S','h','F','j','A','U','M','R','I','w','E', -'A','Y','D','V','Q','Q','D','E','w','l','K','d','W','F','u','I','E', -'x','h','b','m','e','C','E','J','z','/','P','h','B','e','K','K','a', -'/','T','s','R','+','4','e','L','g','T','1','k','w','D','Q','Y','J', -'K','o','Z','I','h','v','c','N','A','Q','E','E','B','Q','A','D','g', -'Y','E','A','L','p','k','g','L','g','W','3','m','E','a','K','i','d', -'P','Q','3','i','P','J','Y','L','G','0','U','b','1','w','r','a','q', -'E','l','9','b','d','4','2','h','r','h','z','I','d','c','D','z','l', -'Q','g','x','n','m','8','/','5','c','H','Y','V','x','I','F','/','C', -'2','0','x','/','H','J','p','l','b','1','R','G','6','U','1','i','p', -'F','e','/','q','8','b','y','W','D','/','9','J','p','i','B','K','M', -'G','P','i','9','Y','l','U','T','g','X','H','f','S','9','d','4','S', -'/','Q','W','O','1','h','9','Z','7','K','e','i','p','B','Y','h','o', -'s','l','Q','p','H','X','u','y','9','b','U','r','8','A','d','q','i', -'6','S','z','g','H','p','C','n','M','u','5','3','d','x','g','x','U', -'D','1','r','4','x','A','A','=','=',0 }; +static const WCHAR utf16Base64SPC[] = +L"MIICJQYJKoZIhvcNAQcCoIICFjCCAhICAQExADALBgkqhkiG9w0BBwGgggH6MIIB" +"9jCCAV+gAwIBAgIQnP8+EF4opr9OxH7h4uBPWTANBgkqhkiG9w0BAQQFADAUMRIw" +"EAYDVQQDEwlKdWFuIExhbmcwHhcNMDgxMjEyMTcxMDE0WhcNMzkxMjMxMjM1OTU5" +"WjAUMRIwEAYDVQQDEwlKdWFuIExhbmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ" +"AoGBALCgNjyNvOic0FOfjxvi43HbM+D5joDkhiGSXe+gbZlf8f16k07kkObFEunz" +"mdB5coscmA7gyqiWNN4ZUyr2cA3lCbnpGPA/0IblyyOcuGIFmmCzeZaVa5ZG6xZP" +"K7L7o+73Qo6jXVbGhBGnMZ7Q9sAn6s2933olnStnejnqwV0NAgMBAAGjSTBHMEUG" +"A1UdAQQ+MDyAEFKbKEdXYyx+CWKcV6vxM6ShFjAUMRIwEAYDVQQDEwlKdWFuIExh" +"bmeCEJz/PhBeKKa/TsR+4eLgT1kwDQYJKoZIhvcNAQEEBQADgYEALpkgLgW3mEaK" +"idPQ3iPJYLG0Ub1wraqEl9bd42hrhzIdcDzlQgxnm8/5cHYVxIF/C20x/HJplb1R" +"G6U1ipFe/q8byWD/9JpiBKMGPi9YlUTgXHfS9d4S/QWO1h9Z7KeipBYhoslQpHXu" +"y9bUr8Adqi6SzgHpCnMu53dxgxUD1r4xAA=="; static void testFileNameStore(void) { - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR spcPrefix[] = { 's','p','c',0 }; - static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; HCERTSTORE store; BOOL ret; @@ -1659,7 +1598,7 @@ static void testFileNameStore(void) "Expected ERROR_PATH_NOT_FOUND or ERROR_INVALID_PARAMETER, got %08lx\n", GLE); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"cer", 0, filename)) return; DeleteFileW(filename); @@ -1769,7 +1708,7 @@ static void testFileNameStore(void) } DeleteFileW(filename); - if (!GetTempFileNameW(szDot, spcPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"spc", 0, filename)) return; DeleteFileW(filename); @@ -2047,14 +1986,14 @@ static void testCertOpenSystemStore(void) /* This succeeds, and on WinXP at least, the Bogus key is created under * HKCU (but not under HKLM, even when run as an administrator.) */ - store = CertOpenSystemStoreW(0, BogusW); + store = CertOpenSystemStoreW(0, L"Bogus"); ok(store != 0, "CertOpenSystemStore failed: %08lx\n", GetLastError()); if (store) CertCloseStore(store, 0); /* Delete it so other tests succeed next time around */ CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); - RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, L"Bogus"); + RegDeleteKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates\\Bogus"); } static const struct @@ -2077,13 +2016,12 @@ static void testCertRegisterSystemStore(void) BOOL ret, cur_flag; DWORD err = 0; HCERTSTORE hstore; - static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0}; const CERT_CONTEXT *cert, *cert2; unsigned int i; for (i = 0; i < ARRAY_SIZE(reg_system_store_test_data); i++) { cur_flag = reg_system_store_test_data[i].cert_store; - ret = CertRegisterSystemStore(WineTestW, cur_flag, NULL, NULL); + ret = CertRegisterSystemStore(L"WineTest", cur_flag, NULL, NULL); if (!ret) { err = GetLastError(); @@ -2102,7 +2040,7 @@ static void testCertRegisterSystemStore(void) continue; } - hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_STORE_OPEN_EXISTING_FLAG | cur_flag, WineTestW); + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_STORE_OPEN_EXISTING_FLAG | cur_flag, L"WineTest"); ok (hstore != NULL, "Opening just registered store at %08x failed, last error %lx\n", cur_flag, GetLastError()); cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); @@ -2125,7 +2063,7 @@ static void testCertRegisterSystemStore(void) ret = CertCloseStore(hstore, 0); ok (ret, "CertCloseStore failed at %08x, last error %lx\n", cur_flag, GetLastError()); - ret = CertUnregisterSystemStore(WineTestW, cur_flag ); + ret = CertUnregisterSystemStore(L"WineTest", cur_flag ); todo_wine_if (reg_system_store_test_data[i].todo) ok( ret == reg_system_store_test_data[i].expected, "Unregistering failed at %08x, last error %ld\n", cur_flag, GetLastError()); @@ -2238,7 +2176,7 @@ static void testStoreProperty(void) CertCloseStore(store, 0); /* Recheck on the My store.. */ - store = CertOpenSystemStoreW(0, MyW); + store = CertOpenSystemStoreW(0, L"My"); size = sizeof(state); ret = CertGetStoreProperty(store, CERT_ACCESS_STATE_PROP_ID, &state, &size); ok(ret, "CertGetStoreProperty failed for CERT_ACCESS_STATE_PROP_ID: %08lx\n", @@ -2452,16 +2390,13 @@ static const BYTE serializedStoreWithCertAndHash[] = { static void delete_test_key(void) { HKEY root_key, test_key; - static const WCHAR SysCertW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0}; - static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0}; WCHAR subkey_name[32]; DWORD num_subkeys, subkey_name_len; int idx; - if (RegOpenKeyExW(HKEY_CURRENT_USER, SysCertW, 0, KEY_READ, &root_key)) + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates", 0, KEY_READ, &root_key)) return; - if (RegOpenKeyExW(root_key, WineTestW, 0, KEY_READ, &test_key)) + if (RegOpenKeyExW(root_key, L"WineTest", 0, KEY_READ, &test_key)) { RegCloseKey(root_key); return; @@ -2474,7 +2409,7 @@ static void delete_test_key(void) RegDeleteKeyW(test_key, subkey_name); } RegCloseKey(test_key); - RegDeleteKeyW(root_key, WineTestW); + RegDeleteKeyW(root_key, L"WineTest"); RegCloseKey(root_key); } @@ -2486,9 +2421,6 @@ static void testAddCertificateLink(void) DWORD size; LPBYTE buf; CERT_NAME_BLOB blob; - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR szDot[] = { '.',0 }; - static const WCHAR WineTestW[] = { 'W','i','n','e','T','e','s','t',0 }; WCHAR filename1[MAX_PATH], filename2[MAX_PATH]; HANDLE file; @@ -2550,8 +2482,8 @@ static void testAddCertificateLink(void) HeapFree(GetProcessHeap(), 0, buf); } /* Set a friendly name on the source certificate... */ - blob.pbData = (LPBYTE)WineTestW; - blob.cbData = sizeof(WineTestW); + blob.pbData = (LPBYTE)L"WineTest"; + blob.cbData = sizeof(L"WineTest"); ret = CertSetCertificateContextProperty(source, CERT_FRIENDLY_NAME_PROP_ID, 0, &blob); ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", @@ -2568,7 +2500,7 @@ static void testAddCertificateLink(void) CERT_FRIENDLY_NAME_PROP_ID, buf, &size); ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); - ok(!lstrcmpW((LPCWSTR)buf, WineTestW), + ok(!lstrcmpW((LPCWSTR)buf, L"WineTest"), "unexpected friendly name\n"); HeapFree(GetProcessHeap(), 0, buf); } @@ -2580,7 +2512,7 @@ static void testAddCertificateLink(void) /* Test adding a cert to a file store, committing the change to the store, * and creating a link to the resulting cert. */ - if (!GetTempFileNameW(szDot, szPrefix, 0, filename1)) + if (!GetTempFileNameW(L".", L"cer", 0, filename1)) return; DeleteFileW(filename1); @@ -2625,8 +2557,8 @@ static void testAddCertificateLink(void) HeapFree(GetProcessHeap(), 0, buf); } /* Set a friendly name on the source certificate... */ - blob.pbData = (LPBYTE)WineTestW; - blob.cbData = sizeof(WineTestW); + blob.pbData = (LPBYTE)L"WineTest"; + blob.cbData = sizeof(L"WineTest"); ret = CertSetCertificateContextProperty(source, CERT_FRIENDLY_NAME_PROP_ID, 0, &blob); ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", @@ -2642,7 +2574,7 @@ static void testAddCertificateLink(void) ret = CertGetCertificateContextProperty(linked, CERT_FRIENDLY_NAME_PROP_ID, buf, &size); ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); - ok(!lstrcmpW((LPCWSTR)buf, WineTestW), + ok(!lstrcmpW((LPCWSTR)buf, L"WineTest"), "unexpected friendly name\n"); HeapFree(GetProcessHeap(), 0, buf); } @@ -2650,7 +2582,7 @@ static void testAddCertificateLink(void) } CertCloseStore(store2, 0); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename2)) + if (!GetTempFileNameW(L".", L"cer", 0, filename2)) return; DeleteFileW(filename2); @@ -2719,7 +2651,7 @@ static void testAddCertificateLink(void) bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &source); ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename1)) + if (!GetTempFileNameW(L".", L"cer", 0, filename1)) return; DeleteFileW(filename1); @@ -2754,7 +2686,7 @@ static void testAddCertificateLink(void) * in a system store. */ store2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestW); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest"); ok(store2 != NULL, "CertOpenStore failed: %08lx\n", GetLastError()); ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index c99b5e35a91..6a19d264c14 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -129,61 +129,6 @@ static char subjectStrCRLF[] = "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com"; static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=Wine Development, CN=localhost, E=aric(a)codeweavers.com"; static char x500SubjectStrSemicolonReverse[] = "E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; -static WCHAR issuerStrW[] = { - 'U','S',',',' ','M','i','n','n','e','s','o','t','a',',',' ','M','i','n','n', - 'e','a','p','o','l','i','s',',',' ','C','o','d','e','W','e','a','v','e','r', - 's',',',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ',',' ','l','o','c','a','l','h','o','s','t',',',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; -static WCHAR issuerStrSemicolonW[] = { - 'U','S',';',' ','M','i','n','n','e','s','o','t','a',';',' ','M','i','n','n', - 'e','a','p','o','l','i','s',';',' ','C','o','d','e','W','e','a','v','e','r', - 's',';',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ';',' ','l','o','c','a','l','h','o','s','t',';',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; -static WCHAR issuerStrCRLFW[] = { - 'U','S','\r','\n','M','i','n','n','e','s','o','t','a','\r','\n','M','i','n', - 'n','e','a','p','o','l','i','s','\r','\n','C','o','d','e','W','e','a','v','e', - 'r','s','\r','\n','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n', - 't','\r','\n','l','o','c','a','l','h','o','s','t','\r','\n','a','r','i','c', - '@','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; -static WCHAR subjectStrW[] = { - '2','.','5','.','4','.','6','=','U','S',',',' ','2','.','5','.','4','.','8', - '=','M','i','n','n','e','s','o','t','a',',',' ','2','.','5','.','4','.','7', - '=','M','i','n','n','e','a','p','o','l','i','s',',',' ','2','.','5','.','4', - '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',',',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',',',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', - 'h','o','s','t',',',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; -static WCHAR subjectStrSemicolonW[] = { - '2','.','5','.','4','.','6','=','U','S',';',' ','2','.','5','.','4','.','8', - '=','M','i','n','n','e','s','o','t','a',';',' ','2','.','5','.','4','.','7', - '=','M','i','n','n','e','a','p','o','l','i','s',';',' ','2','.','5','.','4', - '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',';',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',';',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', - 'h','o','s','t',';',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; -static WCHAR subjectStrCRLFW[] = { - '2','.','5','.','4','.','6','=','U','S','\r','\n','2','.','5','.','4','.','8', - '=','M','i','n','n','e','s','o','t','a','\r','\n','2','.','5','.','4','.','7', - '=','M','i','n','n','e','a','p','o','l','i','s','\r','\n','2','.','5','.','4', - '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s','\r','\n','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t','\r','\n','2','.','5','.','4','.','3','=','l','o','c','a','l', - 'h','o','s','t','\r','\n','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; -static WCHAR x500SubjectStrSemicolonReverseW[] = { - 'E','=','a','r','i','c','@','c','o','d','e','w','e','a','v','e','r','s','.','c', - 'o','m',';',' ','C','N','=','l','o','c','a','l','h','o','s','t',';',' ','O','U', - '=','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t',';',' ','O', - '=','C','o','d','e','W','e','a','v','e','r','s',';',' ','L','=','M','i','n','n', - 'e','a','p','o','l','i','s',';',' ','S','=','M','i','n','n','e','s','o','t','a', - ';',' ','C','=','U','S',0 }; static HMODULE dll; static DWORD (WINAPI *pCertNameToStrA)(DWORD,LPVOID,DWORD,LPSTR,DWORD); @@ -274,55 +219,34 @@ static void test_CertRDNValueToStrA(void) static void test_CertRDNValueToStrW(void) { - static const WCHAR usW[] = { 'U','S',0 }; - static const WCHAR minnesotaW[] = { 'M','i','n','n','e','s','o','t','a',0 }; - static const WCHAR minneapolisW[] = { 'M','i','n','n','e','a','p','o','l', - 'i','s',0 }; - static const WCHAR codeweaversW[] = { 'C','o','d','e','W','e','a','v','e', - 'r','s',0 }; - static const WCHAR wineDevW[] = { 'W','i','n','e',' ','D','e','v','e','l', - 'o','p','m','e','n','t',0 }; - static const WCHAR localhostW[] = { 'l','o','c','a','l','h','o','s','t',0 }; - static const WCHAR aricW[] = { 'a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; - static const WCHAR ePKIW[] = { 'e','P','K','I',' ','R','o','o','t',' ', - 'C','e','r','t','i','f','i','c','a','t','i','o','n',' ','A','u','t','h', - 'o','r','i','t','y',0 }; - static const WCHAR embeddedDoubleQuoteW[] = { 'a','b','c','"','d','e','f', - 0 }; - static const WCHAR embeddedSingleQuoteW[] = { 'a','b','c','\'','d','e','f', - 0 }; - static const WCHAR embeddedCommaW[] = { 'a','b','c',',',' ','d','e','f',0 }; - static const WCHAR trailingAndEndingSpaceW[] = { ' ','a','b','c',' ',0 }; - static const WCHAR enclosingQuotesW[] = { '"','d','e','f','"',0 }; - static const WCHAR embeddedSemiW[] = { '1',';','3',0 }; + static const WCHAR ePKIW[] = L"ePKI Root Certification Authority"; CertRDNAttrEncodingW attrs[] = { { "2.5.4.6", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin1), bin1 }, usW, FALSE }, + { sizeof(bin1), bin1 }, L"US", FALSE }, { "2.5.4.8", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin2), bin2 }, minnesotaW, FALSE }, + { sizeof(bin2), bin2 }, L"Minnesota", FALSE }, { "2.5.4.7", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin3), bin3 }, minneapolisW, FALSE }, + { sizeof(bin3), bin3 }, L"Minneapolis", FALSE }, { "2.5.4.10", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin4), bin4 }, codeweaversW, FALSE }, + { sizeof(bin4), bin4 }, L"CodeWeavers", FALSE }, { "2.5.4.11", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin5), bin5 }, wineDevW, FALSE }, + { sizeof(bin5), bin5 }, L"Wine Development", FALSE }, { "2.5.4.3", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin6), bin6 }, localhostW, FALSE }, + { sizeof(bin6), bin6 }, L"localhost", FALSE }, { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, - { sizeof(bin7), bin7 }, aricW, FALSE }, + { sizeof(bin7), bin7 }, L"aric(a)codeweavers.com", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin9), bin9 }, embeddedDoubleQuoteW, FALSE }, + { sizeof(bin9), bin9 }, L"abc\"def", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin10), bin10 }, embeddedSingleQuoteW, FALSE }, + { sizeof(bin10), bin10 }, L"abc'def", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin11), bin11 }, embeddedCommaW, FALSE }, + { sizeof(bin11), bin11 }, L"abc, def", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin12), bin12 }, trailingAndEndingSpaceW, FALSE }, + { sizeof(bin12), bin12 }, L" abc ", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin13), bin13 }, enclosingQuotesW, FALSE }, + { sizeof(bin13), bin13 }, L"\"def\"", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin14), bin14 }, embeddedSemiW, FALSE }, + { sizeof(bin14), bin14 }, L"1;3", FALSE }, }; DWORD i, ret; WCHAR buffer[2000]; @@ -557,30 +481,6 @@ static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); } -static const WCHAR simpleCN_W[] = { 'C','N','=','1',0 }; -static const WCHAR singledQuotedCN_W[] = { 'C','N','=','\'','1','\'',0 }; -static const WCHAR simpleSingleQuotedCN_W[] = { '\'','1','\'',0 }; -static const WCHAR spacedCN_W[] = { 'C','N','=','"',' ','1',' ','"',0 }; -static const WCHAR simpleSpacedCN_W[] = { '"',' ','1',' ','"',0 }; -static const WCHAR quotedCN_W[] = { 'C','N','=','"','"','"','1','"','"','"',0 }; -static const WCHAR simpleQuotedCN_W[] = { '"','"','"','1','"','"','"',0 }; -static const WCHAR multipleAttrCN_W[] = { 'C','N','=','"','1','+','2','"',0 }; -static const WCHAR simpleMultipleAttrCN_W[] = { '"','1','+','2','"',0 }; -static const WCHAR commaCN_W[] = { 'C','N','=','"','a',',','b','"',0 }; -static const WCHAR simpleCommaCN_W[] = { '"','a',',','b','"',0 }; -static const WCHAR equalCN_W[] = { 'C','N','=','"','a','=','b','"',0 }; -static const WCHAR simpleEqualCN_W[] = { '"','a','=','b','"',0 }; -static const WCHAR lessThanCN_W[] = { 'C','N','=','"','<','"',0 }; -static const WCHAR simpleLessThanCN_W[] = { '"','<','"',0 }; -static const WCHAR greaterThanCN_W[] = { 'C','N','=','"','>','"',0 }; -static const WCHAR simpleGreaterThanCN_W[] = { '"','>','"',0 }; -static const WCHAR hashCN_W[] = { 'C','N','=','"','#','"',0 }; -static const WCHAR simpleHashCN_W[] = { '"','#','"',0 }; -static const WCHAR semiCN_W[] = { 'C','N','=','"',';','"',0 }; -static const WCHAR simpleSemiCN_W[] = { '"',';','"',0 }; -static const WCHAR newlineCN_W[] = { 'C','N','=','"','a','\n','b','"',0 }; -static const WCHAR simpleNewlineCN_W[] = { '"','a','\n','b','"',0 }; - static void test_CertNameToStrW(void) { PCCERT_CONTEXT context; @@ -617,88 +517,95 @@ static void test_CertNameToStrW(void) ret, GetLastError()); test_NameToStrConversionW(&context->pCertInfo->Issuer, - CERT_SIMPLE_NAME_STR, issuerStrW, FALSE); + CERT_SIMPLE_NAME_STR, + L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - issuerStrSemicolonW, FALSE); + L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - issuerStrCRLFW, FALSE); + L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com", + FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, - CERT_OID_NAME_STR, subjectStrW, FALSE); + CERT_OID_NAME_STR, + L"2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=Wine Development," + " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - subjectStrSemicolonW, FALSE); + L"2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development;" + " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - subjectStrCRLFW, FALSE); + L"2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine " + "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, - x500SubjectStrSemicolonReverseW, FALSE); + L"E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; " + "C=US", FALSE); CertFreeCertificateContext(context); } blob.pbData = encodedSimpleCN; blob.cbData = sizeof(encodedSimpleCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, simpleCN_W, FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1", FALSE); blob.pbData = encodedSingleQuotedCN; blob.cbData = sizeof(encodedSingleQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, singledQuotedCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'", FALSE); test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - simpleSingleQuotedCN_W, FALSE); + L"'1'", FALSE); blob.pbData = encodedSpacedCN; blob.cbData = sizeof(encodedSpacedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, spacedCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleSpacedCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \"", FALSE); blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, quotedCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleQuotedCN_W, + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\"", FALSE); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, multipleAttrCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\"", FALSE); test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - simpleMultipleAttrCN_W, FALSE); + L"\"1+2\"", FALSE); blob.pbData = encodedCommaCN; blob.cbData = sizeof(encodedCommaCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, commaCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleCommaCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\"", FALSE); blob.pbData = encodedEqualCN; blob.cbData = sizeof(encodedEqualCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, equalCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleEqualCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\"", FALSE); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, lessThanCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleLessThanCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\"", FALSE); blob.pbData = encodedGreaterThanCN; blob.cbData = sizeof(encodedGreaterThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, greaterThanCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\"", FALSE); test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - simpleGreaterThanCN_W, FALSE); + L"\">\"", FALSE); blob.pbData = encodedHashCN; blob.cbData = sizeof(encodedHashCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, hashCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleHashCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\"", FALSE); blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, semiCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleSemiCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\"", FALSE); blob.pbData = encodedNewlineCN; blob.cbData = sizeof(encodedNewlineCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, newlineCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleNewlineCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\"", FALSE); } @@ -814,40 +721,30 @@ struct StrToNameW const BYTE *encoded; }; -static const WCHAR badlyQuotedCN_W[] = { 'C','N','=','"','"','1','"','"',0 }; -static const WCHAR simpleCN2_W[] = { 'C','N','=','"','1','"',0 }; -static const WCHAR simpleCN3_W[] = { 'C','N',' ','=',' ','"','1','"',0 }; -static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; -static const WCHAR dummyCN_W[] = { 'C','N','=','d','u','m','m','y',',','T','=','t','e','s','t',0 }; -static const WCHAR encodedFields_W[] = { ' ','C','N',' ','=',' ',' ',' ','W','i','n','e',' ','T', - 'e','s','t',',','T',' ','=',' ','1','2','3',',',' ','C', - ' ','=',' ','B','R',0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; static const struct StrToNameW namesW[] = { - { simpleCN_W, sizeof(encodedSimpleCN), encodedSimpleCN }, - { simpleCN2_W, sizeof(encodedSimpleCN), encodedSimpleCN }, - { simpleCN3_W, sizeof(encodedSimpleCN), encodedSimpleCN }, - { singledQuotedCN_W, sizeof(encodedSingleQuotedCN), encodedSingleQuotedCN }, - { spacedCN_W, sizeof(encodedSpacedCN), encodedSpacedCN }, - { quotedCN_W, sizeof(encodedQuotedCN), encodedQuotedCN }, - { multipleAttrCN_W, sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, - { japaneseCN_W, sizeof(encodedJapaneseCN), encodedJapaneseCN }, - { commaCN_W, sizeof(encodedCommaCN), encodedCommaCN }, - { equalCN_W, sizeof(encodedEqualCN), encodedEqualCN }, - { lessThanCN_W, sizeof(encodedLessThanCN), encodedLessThanCN }, - { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, - { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, - { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, - { dummyCN_W, sizeof(encodedDummyCN), encodedDummyCN }, - { encodedFields_W, sizeof(encodedFields), encodedFields }, + { L"CN=1", sizeof(encodedSimpleCN), encodedSimpleCN }, + { L"CN=\"1\"", sizeof(encodedSimpleCN), encodedSimpleCN }, + { L"CN = \"1\"", sizeof(encodedSimpleCN), encodedSimpleCN }, + { L"CN='1'", sizeof(encodedSingleQuotedCN), encodedSingleQuotedCN }, + { L"CN=\" 1 \"", sizeof(encodedSpacedCN), encodedSpacedCN }, + { L"CN=\"\"\"1\"\"\"", sizeof(encodedQuotedCN), encodedQuotedCN }, + { L"CN=\"1+2\"", sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, + { L"CN=\x226f\x575b", sizeof(encodedJapaneseCN), encodedJapaneseCN }, + { L"CN=\"a,b\"", sizeof(encodedCommaCN), encodedCommaCN }, + { L"CN=\"a=b\"", sizeof(encodedEqualCN), encodedEqualCN }, + { L"CN=\"<\"", sizeof(encodedLessThanCN), encodedLessThanCN }, + { L"CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, + { L"CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, + { L"CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, + { L"CN=dummy,T=test", sizeof(encodedDummyCN), encodedDummyCN }, + { L" CN = Wine Test,T = 123, C = BR", sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameW(void) { - static const WCHAR bogusW[] = { 'b','o','g','u','s',0 }; - static const WCHAR fooW[] = { 'f','o','o','=','1',0 }; BOOL ret; DWORD size, i; LPCWSTR errorPtr; @@ -864,24 +761,24 @@ static void test_CertStrToNameW(void) */ ret = pCertStrToNameW(0, NULL, 0, NULL, NULL, &size, NULL); ok(!ret, "Expected failure\n"); - ret = pCertStrToNameW(0, bogusW, 0, NULL, NULL, &size, NULL); + ret = pCertStrToNameW(0, L"bogus", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(0, fooW, 0, NULL, NULL, &size, NULL); + ret = pCertStrToNameW(0, L"foo=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(0, simpleCN_W, 0, NULL, NULL, &size, NULL); + ret = pCertStrToNameW(0, L"CN=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(X509_ASN_ENCODING, simpleCN_W, 0, NULL, NULL, &size, + ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=1", 0, NULL, NULL, &size, NULL); ok(ret, "CertStrToNameW failed: %08lx\n", GetLastError()); size = sizeof(buf); - ret = pCertStrToNameW(X509_ASN_ENCODING, badlyQuotedCN_W, 0, NULL, buf, + ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(X509_ASN_ENCODING, badlyQuotedCN_W, 0, NULL, buf, + ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, &size, &errorPtr); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); -- 2.30.2

2 1

[PATCH 1/2] winemenubuilder: Search for an executable file when no file extension is provided.
by Sven Baars 31 Mar '22

31 Mar '22

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- This fixes icon extraction for the Scrivener programs menu item which uses C:\\Program Files\\Scrivener\\Scrivener as executable path. programs/winemenubuilder/winemenubuilder.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ab8798a88b5..a2aa5eef0e4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -802,16 +802,25 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre GRPICONDIR *pIconDir; ENUMRESSTRUCT sEnumRes; HRESULT hr = E_FAIL; + WCHAR fullPathW[MAX_PATH]; + DWORD len; + + len = SearchPathW(NULL, szFileName, L".exe", MAX_PATH, fullPathW, NULL); + if (len == 0 || len > MAX_PATH) + { + WINE_WARN("SearchPath failed\n"); + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + } - hModule = LoadLibraryExW(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE); + hModule = LoadLibraryExW(fullPathW, 0, LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { if (GetLastError() == ERROR_BAD_EXE_FORMAT) - return open_module16_icon(szFileName, nIndex, ppStream); + return open_module16_icon(fullPathW, nIndex, ppStream); else { WINE_WARN("LoadLibraryExW (%s) failed, error %ld\n", - wine_dbgstr_w(szFileName), GetLastError()); + wine_dbgstr_w(fullPathW), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } } @@ -820,7 +829,7 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre { hResInfo = FindResourceW(hModule, MAKEINTRESOURCEW(-nIndex), (LPCWSTR)RT_GROUP_ICON); WINE_TRACE("FindResourceW (%s) called, return %p, error %ld\n", - wine_dbgstr_w(szFileName), hResInfo, GetLastError()); + wine_dbgstr_w(fullPathW), hResInfo, GetLastError()); } else { -- 2.30.0.335.ge6362826a0

1 1

[PATCH v2 6/6] win32u: Move NtUserGetMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 527 +---------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 103 ++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 7 files changed, 112 insertions(+), 529 deletions(-)

2 1

[PATCH v2 1/5] kernelbase: Check handle validity in unsafe_mem_from_HLOCAL.
by Rémi Bernon 31 Mar '22

31 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 3cb596e5814..655778fe79f 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -598,9 +598,12 @@ struct mem_entry * the output jpeg's > 1 MB if not */ #define HLOCAL_STORAGE (sizeof(HLOCAL) * 2) -static inline struct mem_entry *mem_from_HLOCAL( HLOCAL handle ) +static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { - return (struct mem_entry *)((char *)handle - 2); + struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); + if (!((ULONG_PTR)handle & 2)) return NULL; + if (mem->magic != MAGIC_LOCAL_USED) return NULL; + return mem; } static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) @@ -709,8 +712,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle ) } else /* HANDLE */ { - mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { mem->magic = 0xdead; if (mem->ptr) @@ -745,6 +747,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle ) */ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) { + struct mem_entry *mem; void *ret = NULL; TRACE_(globalmem)( "handle %p\n", handle ); @@ -767,8 +770,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) RtlLockHeap( GetProcessHeap() ); __TRY { - struct mem_entry *mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { ret = mem->ptr; if (!mem->ptr) SetLastError( ERROR_DISCARDED ); @@ -826,10 +828,9 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f LocalFree( handle ); } } - else if (!is_pointer( handle ) && (flags & LMEM_DISCARDABLE)) + else if ((mem = unsafe_mem_from_HLOCAL( handle )) && (flags & LMEM_DISCARDABLE)) { /* change the flags to make our block "discardable" */ - mem = mem_from_HLOCAL( handle ); mem->flags |= LMEM_DISCARDABLE >> 8; ret = handle; } @@ -843,10 +844,9 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; ret = HeapReAlloc( GetProcessHeap(), heap_flags, handle, size ); } - else + else if ((mem = unsafe_mem_from_HLOCAL( handle ))) { /* reallocate a moveable block */ - mem = mem_from_HLOCAL( handle ); if (size != 0) { if (size <= INT_MAX - HLOCAL_STORAGE) @@ -886,6 +886,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f else WARN_(globalmem)( "not freeing memory associated with locked handle\n" ); } } + else SetLastError( ERROR_INVALID_HANDLE ); } RtlUnlockHeap( GetProcessHeap() ); return ret; @@ -897,6 +898,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f */ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) { + struct mem_entry *mem; BOOL ret = FALSE; TRACE_(globalmem)( "handle %p\n", handle ); @@ -910,8 +912,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) RtlLockHeap( GetProcessHeap() ); __TRY { - struct mem_entry *mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { if (mem->lock) { -- 2.35.1

2 5

[PATCH v2 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

2 1

[PATCH v2 3/6] user32: Move unpack_message call to User32CallWindowProc.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Move even more logic to winproc.c. While this requires exposing more details to PE side (all those packed_* structs), it should make 32on64 easier later. It also fixes WM_COPYDATA (unrelated to above). dlls/user32/message.c | 412 +++-------------------------------- dlls/user32/winproc.c | 486 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 511 insertions(+), 390 deletions(-)

2 1

[PATCH v2 2/6] win32u: Move reply_message_result implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 181 +----------------------- dlls/win32u/message.c | 264 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 ++ dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 153 ++++++++++++++++++++ 6 files changed, 431 insertions(+), 179 deletions(-)

2 1

[PATCH v2 1/6] user32: Introduce reply_message_result helper.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)

2 1

[PATCH 5/5] wineoss: Move get_endpoint_ids to the unixlib.
by Huw Davies 31 Mar '22

31 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 251 ++++++++++-------------------------- dlls/wineoss.drv/oss.c | 206 +++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 19 +++ 3 files changed, 293 insertions(+), 183 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e5206627528..fd35a439c5a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -147,11 +148,10 @@ typedef struct _SessionMgr { } SessionMgr; typedef struct _OSSDevice { + struct list entry; EDataFlow flow; - char devnode[OSS_DEVNODE_SIZE]; GUID guid; - - struct list entry; + char devnode[0]; } OSSDevice; static struct list g_devices = LIST_INIT(g_devices); @@ -346,25 +346,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -/* dst must be large enough to hold devnode */ -static void oss_clean_devnode(char *dest, const char *devnode) -{ - const char *dot, *slash; - size_t len; - - strcpy(dest, devnode); - dot = strrchr(dest, '.'); - if(!dot) - return; - - slash = strrchr(dest, '/'); - if(slash && dot < slash) - return; - - len = dot - dest; - dest[len] = '\0'; -} - static int open_device(const char *device, EDataFlow flow) { int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; @@ -372,44 +353,6 @@ static int open_device(const char *device, EDataFlow flow) return open(device, flags, 0); } -static UINT get_default_index(EDataFlow flow) -{ - int fd = -1, err; - UINT i; - oss_audioinfo ai; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - - fd = open_device("/dev/dsp", flow); - if(fd < 0){ - WARN("Couldn't open default device!\n"); - return 0; - } - - ai.dev = -1; - if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ - WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); - close(fd); - return 0; - } - - close(fd); - - TRACE("Default devnode: %s\n", ai.devnode); - oss_clean_devnode(devnode, ai.devnode); - i = 0; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow){ - if(!strcmp(devnode, dev_item->devnode)) - return i; - ++i; - } - } - - WARN("Couldn't find default device! Choosing first.\n"); - return 0; -} - static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item; @@ -419,138 +362,80 @@ static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) return NULL; } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, - UINT *num, UINT *def_index) +static void device_add(OSSDevice *oss_dev) { - int i, mixer_fd; - oss_sysinfo sysinfo; - static int print_once = 0; + if(get_ossdevice_from_guid(&oss_dev->guid)) /* already in list */ + HeapFree(GetProcessHeap(), 0, oss_dev); + else + list_add_tail(&g_devices, &oss_dev->entry); +} - static const WCHAR outW[] = {'O','u','t',':',' ',0}; - static const WCHAR inW[] = {'I','n',':',' ',0}; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i; TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - mixer_fd = open("/dev/mixer", O_RDONLY, 0); - if(mixer_fd < 0){ - ERR("OSS /dev/mixer doesn't seem to exist\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ - close(mixer_fd); - - if(errno == EINVAL){ - ERR("OSS version too old, need at least OSSv4\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - if(!print_once){ - TRACE("OSS sysinfo:\n"); - TRACE("product: %s\n", sysinfo.product); - TRACE("version: %s\n", sysinfo.version); - TRACE("versionnum: %x\n", sysinfo.versionnum); - TRACE("numaudios: %d\n", sysinfo.numaudios); - TRACE("nummixers: %d\n", sysinfo.nummixers); - TRACE("numcards: %d\n", sysinfo.numcards); - TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); - print_once = 1; - } - - if(sysinfo.numaudios <= 0){ - WARN("No audio devices!\n"); - close(mixer_fd); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - *ids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(GUID)); - - *num = 0; - for(i = 0; i < sysinfo.numaudios; ++i){ - oss_audioinfo ai = {0}; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - int fd; - - ai.dev = i; - if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ - WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, - strerror(errno)); - continue; - } - - oss_clean_devnode(devnode, ai.devnode); - - /* check for duplicates */ - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow && !strcmp(devnode, dev_item->devnode)) - break; + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + OSS_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; + } + + for(i = 0; i < params.num; i++){ + unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int dev_size = strlen(params.endpoints[i].device) + 1; + OSSDevice *oss_dev; + + ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); + oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); + if(!ids[i] || !oss_dev){ + HeapFree(GetProcessHeap, 0, oss_dev); + params.result = E_OUTOFMEMORY; + goto end; } - if(&dev_item->entry != &g_devices) - continue; - - fd = open_device(devnode, flow); - if(fd < 0){ - WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", - devnode, errno, strerror(errno)); - continue; - } - close(fd); - - if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || - (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ - size_t len, prefix_len; - const WCHAR *prefix; - - dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item)); - - dev_item->flow = flow; - get_device_guid(flow, devnode, &dev_item->guid); - strcpy(dev_item->devnode, devnode); - - (*guids)[*num] = dev_item->guid; - - len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); - if(flow == eRender){ - prefix = outW; - prefix_len = ARRAY_SIZE(outW) - 1; - len += prefix_len; - }else{ - prefix = inW; - prefix_len = ARRAY_SIZE(inW) - 1; - len += prefix_len; - } - (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); - if(!(*ids)[*num]){ - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - HeapFree(GetProcessHeap(), 0, dev_item); - close(mixer_fd); - return E_OUTOFMEMORY; - } - memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR)); - MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, - (*ids)[*num] + prefix_len, len - prefix_len); - - list_add_tail(&g_devices, &dev_item->entry); - - (*num)++; + memcpy(ids[i], params.endpoints[i].name, name_size); + get_device_guid(flow, params.endpoints[i].device, guids + i); + + oss_dev->flow = flow; + oss_dev->guid = guids[i]; + memcpy(oss_dev->devnode, params.endpoints[i].device, dev_size); + device_add(oss_dev); + } + *def_index = params.default_idx; + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if(FAILED(params.result)){ + HeapFree(GetProcessHeap(), 0, guids); + if(ids){ + for(i = 0; i < params.num; i++) + HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); } + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - close(mixer_fd); - - *def_index = get_default_index(flow); - - return S_OK; + return params.result; } HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9c1de25acb5..ae4e4981d2d 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -29,11 +29,13 @@ #include <sys/ioctl.h> #include <fcntl.h> #include <unistd.h> +#include <errno.h> #include <sys/soundcard.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "audioclient.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -88,7 +90,211 @@ static NTSTATUS test_connect(void *args) return STATUS_SUCCESS; } +/* dst must be large enough to hold devnode */ +static void oss_clean_devnode(char *dest, const char *devnode) +{ + const char *dot, *slash; + size_t len; + + strcpy(dest, devnode); + dot = strrchr(dest, '.'); + if(!dot) + return; + + slash = strrchr(dest, '/'); + if(slash && dot < slash) + return; + + len = dot - dest; + dest[len] = '\0'; +} + +static int open_device(const char *device, EDataFlow flow) +{ + int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; + + return open(device, flags, 0); +} + +static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE]) +{ + int fd, err; + oss_audioinfo ai; + + device[0] = '\0'; + fd = open_device("/dev/dsp", flow); + if(fd < 0){ + WARN("Couldn't open default device!\n"); + return; + } + + ai.dev = -1; + if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ + WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); + close(fd); + return; + } + close(fd); + + TRACE("Default devnode: %s\n", ai.devnode); + oss_clean_devnode(device, ai.devnode); + return; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + oss_sysinfo sysinfo; + static int print_once = 0; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + struct endpoint_info + { + WCHAR name[OSS_DEVNAME_SIZE + ARRAY_SIZE(outW)]; + char device[OSS_DEVNODE_SIZE]; + } *info; + unsigned int i, j, num, needed, name_len, device_len, default_idx = 0; + char default_device[OSS_DEVNODE_SIZE]; + struct endpoint *endpoint; + int mixer_fd; + char *ptr; + + mixer_fd = open("/dev/mixer", O_RDONLY, 0); + if(mixer_fd < 0){ + ERR("OSS /dev/mixer doesn't seem to exist\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ + close(mixer_fd); + if(errno == EINVAL){ + ERR("OSS version too old, need at least OSSv4\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + + if(!print_once){ + TRACE("OSS sysinfo:\n"); + TRACE("product: %s\n", sysinfo.product); + TRACE("version: %s\n", sysinfo.version); + TRACE("versionnum: %x\n", sysinfo.versionnum); + TRACE("numaudios: %d\n", sysinfo.numaudios); + TRACE("nummixers: %d\n", sysinfo.nummixers); + TRACE("numcards: %d\n", sysinfo.numcards); + TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); + print_once = 1; + } + + if(sysinfo.numaudios <= 0){ + WARN("No audio devices!\n"); + close(mixer_fd); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + info = malloc(sysinfo.numaudios * sizeof(*info)); + if(!info){ + close(mixer_fd); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + get_default_device(params->flow, default_device); + + num = 0; + for(i = 0; i < sysinfo.numaudios; ++i){ + oss_audioinfo ai = {0}; + char devnode[OSS_DEVNODE_SIZE]; + int fd, prefix_len; + const WCHAR *prefix; + + ai.dev = i; + if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ + WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, + strerror(errno)); + continue; + } + + oss_clean_devnode(devnode, ai.devnode); + + /* check for duplicates */ + for(j = 0; j < num; j++) + if(!strcmp(devnode, info[j].device)) + break; + if(j < num) + continue; + + fd = open_device(devnode, params->flow); + if(fd < 0){ + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", + devnode, errno, strerror(errno)); + continue; + } + close(fd); + + if((params->flow == eCapture && !(ai.caps & PCM_CAP_INPUT)) || + (params->flow == eRender && !(ai.caps & PCM_CAP_OUTPUT))) + continue; + + strcpy(info[num].device, devnode); + + if(params->flow == eRender){ + prefix = outW; + prefix_len = ARRAY_SIZE(outW) - 1; + }else{ + prefix = inW; + prefix_len = ARRAY_SIZE(inW) - 1; + } + memcpy(info[num].name, prefix, prefix_len * sizeof(WCHAR)); + ntdll_umbstowcs(ai.name, strlen(ai.name) + 1, info[num].name + prefix_len, + ARRAY_SIZE(info[num].name) - prefix_len); + if(!strcmp(default_device, info[num].device)) + default_idx = num; + num++; + } + close(mixer_fd); + + needed = num * sizeof(*params->endpoints); + endpoint = params->endpoints; + ptr = (char *)(endpoint + num); + + for(i = 0; i < num; i++){ + name_len = wcslen(info[i].name) + 1; + device_len = strlen(info[i].device) + 1; + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); + + if(needed <= params->size){ + endpoint->name = (WCHAR *)ptr; + memcpy(endpoint->name, info[i].name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->device = ptr; + memcpy(endpoint->device, info[i].device, device_len); + ptr += (device_len + 1) & ~1; + endpoint++; + } + } + free(info); + + params->num = num; + params->default_idx = default_idx; + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, + get_endpoint_ids, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index d4fb5db3102..1a80794f150 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mmdeviceapi.h" + /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority { @@ -30,9 +32,26 @@ struct test_connect_params enum DriverPriority priority; }; +struct endpoint +{ + WCHAR *name; + char *device; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + enum oss_funcs { oss_test_connect, + oss_get_endpoint_ids, }; extern unixlib_handle_t oss_handle; -- 2.25.1

1 1

[PATCH v9 1/7] include: Add wdscore.h file.
by Mohamad Al-Jaf 31 Mar '22

31 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- The functions CurrentIP and ConstructPartialMsgV[A/W] are used by other Windows libraries including kernelbase. --- include/Makefile.in | 1 + include/wdscore.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 include/wdscore.h diff --git a/include/Makefile.in b/include/Makefile.in index 189b4676091..5b77d5b47c5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -755,6 +755,7 @@ SOURCES = \ wbemdisp.idl \ wbemprov.idl \ wct.h \ + wdscore.h \ weakreference.idl \ webservices.h \ werapi.h \ diff --git a/include/wdscore.h b/include/wdscore.h new file mode 100644 index 00000000000..8888247e347 --- /dev/null +++ b/include/wdscore.h @@ -0,0 +1,32 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WDSCORE__ +#define __WDSCORE__ + +#ifdef __cplusplus +extern "C" { +#endif + +LPVOID CurrentIP(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WDSCORE__ */ -- 2.35.1

1 7

[PATCH v3] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). v3: implement X11DRV_FindXIC(..) for getting exists XIC. --- dlls/winex11.drv/ime.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xim.c | 31 +++++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..2fe78234671 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -753,6 +753,8 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); + bRet = TRUE; } break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..de882a532f3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,6 +827,7 @@ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; +XIC X11DRV_FindXIC(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..7a4ec432bbf 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -249,9 +249,36 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, TRACE("Finished\n"); } +/** + * X11DRV_FindXIC + * + * This function finds the already created XIC in itself and parents. + * If only the specified handle is get via X11DRV_get_ic, the XIC can be exists + * in the parents and cannot be get. + */ +XIC X11DRV_FindXIC(HWND hwnd) +{ + HWND hwndParent = hwnd; + XIC ic; + if (!hwndParent) + return NULL; + for (;;) + { + ic = get_win_data( hwndParent )->xic; + if (ic) + break; + else + hwndParent = GetParent(hwnd); + + if (!hwndParent) + return NULL; + } + return ic; +} + void X11DRV_ForceXIMReset(HWND hwnd) { - XIC ic = X11DRV_get_ic(hwnd); + XIC ic = X11DRV_FindXIC(hwnd); if (ic) { char* leftover; @@ -267,7 +294,7 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) XIMPreeditState state; XVaNestedList attr; - ic = X11DRV_get_ic(hwnd); + ic = X11DRV_FindXIC(hwnd); if (!ic) return; -- 2.32.0

1 0

[PATCH v2] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). --- dlls/winex11.drv/ime.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..f44b50550ec 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -704,6 +704,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { case CPS_COMPLETE: { + HWND hwnd; HIMCC newCompStr; DWORD cplen = 0; LPWSTR cpstr; @@ -753,6 +754,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + hwnd = GetActiveWindow(); + if (hwnd) + { + X11DRV_ForceXIMReset(hwnd); + } + bRet = TRUE; } break; -- 2.32.0

1 0

[PATCH v2] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 31 Mar '22

31 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: Initialize imeStartIndex with -1 on ME_MakeEditor. --- dlls/riched20/editor.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..ff6edfc145f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3045,6 +3046,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->back_style = TXTBACK_OPAQUE; ITextHost_TxGetBackStyle( ed->texthost, &ed->back_style ); + ed->imeStartIndex = -1; + list_init( &ed->reobj_list ); OleInitialize(NULL); @@ -3888,6 +3891,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3922,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4554,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

1 0

[PATCH] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. When XmbResetIC is performed in the composition state, a KeyEvent is generated to empty the existing buffer. However, Wine directly manages the Composition state, so the following strings are unnecessary. so, ignore it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/winex11.drv/ime.c | 1 + dlls/winex11.drv/xim.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..69ab2e4e850 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -752,6 +752,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); bRet = TRUE; } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..098a520e629 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -44,6 +44,7 @@ BOOL ximInComposeMode=FALSE; static DWORD dwCompStringLength = 0; static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; +static BOOL ignoreNextLookupChars = FALSE; #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) @@ -106,6 +107,12 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) TRACE("%p %u\n", str, count); + if (ignoreNextLookupChars) + { + ignoreNextLookupChars = FALSE; + return; + } + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, NULL, 0); wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * dwOutput); if (wcOutput == NULL) @@ -255,8 +262,20 @@ void X11DRV_ForceXIMReset(HWND hwnd) if (ic) { char* leftover; + BOOL bInCompose = ximInComposeMode; + TRACE("Forcing Reset %p\n",ic); leftover = XmbResetIC(ic); + + /* + * When Reset is performed in the composition state, a KeyEvent is + * generated to empty the existing buffer. + * + * However, Wine directly manages the Composition state, so the + * following strings are unnecessary. + */ + ignoreNextLookupChars = bInCompose && leftover; + XFree(leftover); } } -- 2.32.0

1 0

[PATCH] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 31 Mar '22

31 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/riched20/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..f8b28bfaef0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3888,6 +3889,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3920,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4552,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

2 1

[PATCH] include: Add more URL_* flags.
by Zebediah Figura 30 Mar '22

30 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/shlwapi.h | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index a282ae6d993..6149c7081a3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -648,28 +648,34 @@ typedef enum { /* The following are used by UrlEscape..., UrlUnEscape..., * UrlCanonicalize..., and UrlCombine... routines */ -#define URL_WININET_COMPATIBILITY 0x80000000 -#define URL_PLUGGABLE_PROTOCOL 0x40000000 -#define URL_ESCAPE_UNSAFE 0x20000000 -#define URL_UNESCAPE 0x10000000 +#define URL_WININET_COMPATIBILITY 0x80000000 +#define URL_PLUGGABLE_PROTOCOL 0x40000000 +#define URL_ESCAPE_UNSAFE 0x20000000 +#define URL_UNESCAPE 0x10000000 -#define URL_DONT_SIMPLIFY 0x08000000 -#define URL_NO_META URL_DONT_SIMPLIFY -#define URL_ESCAPE_SPACES_ONLY 0x04000000 -#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO -#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_SIMPLIFY 0x08000000 +#define URL_ESCAPE_SPACES_ONLY 0x04000000 +#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_INTERNAL_PATH 0x00800000 /* Will escape #'s in paths */ -#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 -#define URL_CONVERT_IF_DOSPATH 0x00200000 -#define URL_UNESCAPE_INPLACE 0x00100000 +#define URL_INTERNAL_PATH 0x00800000 +#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 +#define URL_CONVERT_IF_DOSPATH 0x00200000 +#define URL_UNESCAPE_INPLACE 0x00100000 -#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_ESCAPE_ASCII_URI_COMPONENT 0x00080000 +#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_DONT_UNESCAPE 0x00020000 +#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 -#define URL_ESCAPE_PERCENT 0x00001000 +#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 +#define URL_ESCAPE_PERCENT 0x00001000 + +#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO +#define URL_ESCAPE_URI_COMPONENT (URL_ESCAPE_ASCII_URI_COMPONENT | URL_ESCAPE_AS_UTF8) +#define URL_NO_META URL_DONT_SIMPLIFY +#define URL_UNESCAPE_AS_UTF8 URL_ESCAPE_AS_UTF8 +#define URL_UNESCAPE_URI_COMPONENT URL_UNESCAPE_AS_UTF8 HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); -- 2.34.1

1 0

[PATCH v2 1/5] windows.media.speech: Add IVector<Inspectable*>.
by Bernhard Kölbl 30 Mar '22

30 Mar '22

And use it in recognizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Add C asserts for flexible arrays. --- dlls/windows.media.speech/private.h | 6 + dlls/windows.media.speech/recognizer.c | 21 +- dlls/windows.media.speech/vector.c | 279 +++++++++++++++++++++++++ 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3c8371ccdbe..348c060c1c6 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -61,6 +61,11 @@ extern IActivationFactory *synthesizer_factory; +struct vector_iids +{ + const GUID *vector; +}; + HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); @@ -68,6 +73,7 @@ HRESULT typed_event_handlers_clear( struct list* list ); HRESULT vector_hstring_create( IVector_HSTRING **out ); HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ); +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index da219d6bd0a..e552779937b 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -233,6 +233,7 @@ struct recognizer LONG ref; ISpeechContinuousRecognitionSession *session; + IVector_ISpeechRecognitionConstraint *constraints; }; /* @@ -296,6 +297,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) if (!ref) { ISpeechContinuousRecognitionSession_Release(impl->session); + IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -637,13 +639,22 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface { struct recognizer *impl; struct session *session; + struct vector_iids constraints_iids = + { + .vector = &IID_IVector_ISpeechRecognitionConstraint, + }; + HRESULT hr; TRACE("iface %p, language %p, speechrecognizer %p.\n", iface, language, speechrecognizer); *speechrecognizer = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (!(session = calloc(1, sizeof(*session)))) return E_OUTOFMEMORY; + if (!(session = calloc(1, sizeof(*session)))) + { + hr = E_OUTOFMEMORY; + goto error; + } if (language) FIXME("language parameter unused. Stub!\n"); @@ -658,11 +669,19 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->session = &session->ISpeechContinuousRecognitionSession_iface; impl->ref = 1; + if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&impl->constraints))) + goto error; TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; + +error: + free(session); + free(impl); + + return hr; } static const struct ISpeechRecognizerFactoryVtbl speech_recognizer_factory_vtbl = diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index fcb7f483e03..e3a802fc020 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -771,3 +771,282 @@ error: IVector_HSTRING_Release(*out); return hr; } + +/* + * + * IVector<Inspectable*> + * + */ + +struct vector_inspectable +{ + IVector_IInspectable IVector_IInspectable_iface; + struct vector_iids iids; + LONG ref; + + UINT32 size; + UINT32 capacity; + IInspectable **elements; +}; + +static inline struct vector_inspectable *impl_from_IVector_IInspectable( IVector_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_inspectable, IVector_IInspectable_iface); +} + +static HRESULT WINAPI vector_inspectable_QueryInterface( IVector_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, impl->iids.vector)) + { + IInspectable_AddRef((*out = &impl->IVector_IInspectable_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_inspectable_AddRef( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_inspectable_Release( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVector_IInspectable_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_inspectable_GetIids( IVector_IInspectable *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetRuntimeClassName( IVector_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetTrustLevel( IVector_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetAt( IVector_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef((*value = impl->elements[index])); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_get_Size( IVector_IInspectable *iface, UINT32 *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_IndexOf( IVector_IInspectable *iface, + IInspectable *element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_SetAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_InsertAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + IInspectable **tmp = impl->elements; + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_RemoveAt( IVector_IInspectable *iface, UINT32 index ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Append( IVector_IInspectable *iface, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_IInspectable_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_inspectable_RemoveAtEnd( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) IInspectable_Release(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Clear( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_IInspectable_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetMany( IVector_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef((items[i - start_index] = impl->elements[i])); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_ReplaceAll( IVector_IInspectable *iface, UINT32 count, IInspectable **items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_IInspectable_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_IInspectable_Append(iface, items[i]); + return hr; +} + +static const struct IVector_IInspectableVtbl vector_inspectable_vtbl = +{ + /* IUnknown methods */ + vector_inspectable_QueryInterface, + vector_inspectable_AddRef, + vector_inspectable_Release, + /* IInspectable methods */ + vector_inspectable_GetIids, + vector_inspectable_GetRuntimeClassName, + vector_inspectable_GetTrustLevel, + /* IVector<IInspectable*> methods */ + vector_inspectable_GetAt, + vector_inspectable_get_Size, + vector_inspectable_GetView, + vector_inspectable_IndexOf, + vector_inspectable_SetAt, + vector_inspectable_InsertAt, + vector_inspectable_RemoveAt, + vector_inspectable_Append, + vector_inspectable_RemoveAtEnd, + vector_inspectable_Clear, + vector_inspectable_GetMany, + vector_inspectable_ReplaceAll +}; + +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ) +{ + struct vector_inspectable *impl; + + TRACE("iid %s, out %p.\n", debugstr_guid(iids->vector), out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_IInspectable_iface.lpVtbl = &vector_inspectable_vtbl; + impl->iids = *iids; + impl->ref = 1; + + *out = &impl->IVector_IInspectable_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 9

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel