December 2008 - Wine-Commits

Henri Verbeet : wined3d: Don' t reparse the entire shader just to update the sampler types.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: fb475c7c29f8d23ecdd3c3c633c04be347013a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb475c7c29f8d23ecdd3c3c63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 12 09:33:51 2008 +0100 wined3d: Don't reparse the entire shader just to update the sampler types. --- dlls/wined3d/baseshader.c | 32 ++--------------- dlls/wined3d/device.c | 3 +- dlls/wined3d/pixelshader.c | 76 +++++++++++++++++++++++++--------------- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_private.h | 12 ++---- include/wine/wined3d.idl | 2 - 6 files changed, 58 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb475c7c29f8d23ecdd3c…

1 0

Juan Lang : crypt32: Support base64-encoded PKCS messages in CryptQueryObject.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 909a81839b74bac9c1fad49272f0b956195ede2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=909a81839b74bac9c1fad4927… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 16:36:46 2008 -0800 crypt32: Support base64-encoded PKCS messages in CryptQueryObject. --- dlls/crypt32/object.c | 81 ++++++++++++++++++++++++++++++++++++------- dlls/crypt32/tests/object.c | 1 - 2 files changed, 68 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 97f71b7..b55b441 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -428,14 +428,21 @@ static BOOL CRYPT_QueryUnsignedMessage(const CRYPT_DATA_BLOB *blob, /* Used to decode non-embedded messages */ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject, - DWORD dwExpectedContentTypeFlags, DWORD *pdwMsgAndCertEncodingType, - DWORD *pdwContentType, HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, DWORD *pdwFormatType, + HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) { CERT_BLOB fileBlob; const CERT_BLOB *blob; BOOL ret; HCRYPTMSG msg = NULL; DWORD encodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + DWORD formatType = 0; + + TRACE("(%d, %p, %08x, %08x, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, + phMsg); switch (dwObjectType) { @@ -458,17 +465,63 @@ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject, return FALSE; ret = FALSE; - /* Try it first as a signed message */ - if (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) - ret = CRYPT_QuerySignedMessage(blob, pdwMsgAndCertEncodingType, - pdwContentType, &msg); - /* Failing that, try as an unsigned message */ + if (dwExpectedFormatTypeFlags & CERT_QUERY_FORMAT_FLAG_BINARY) + { + /* Try it first as a signed message */ + if (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) + ret = CRYPT_QuerySignedMessage(blob, pdwMsgAndCertEncodingType, + pdwContentType, &msg); + /* Failing that, try as an unsigned message */ + if (!ret && + (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) + ret = CRYPT_QueryUnsignedMessage(blob, pdwMsgAndCertEncodingType, + pdwContentType, &msg); + if (ret) + formatType = CERT_QUERY_FORMAT_BINARY; + } if (!ret && - (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) - ret = CRYPT_QueryUnsignedMessage(blob, pdwMsgAndCertEncodingType, - pdwContentType, &msg); + (dwExpectedFormatTypeFlags & CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED)) + { + CRYPT_DATA_BLOB trimmed = { blob->cbData, blob->pbData }; + CRYPT_DATA_BLOB decoded; + + while (trimmed.cbData && !trimmed.pbData[trimmed.cbData - 1]) + trimmed.cbData--; + ret = CryptStringToBinaryA((LPSTR)trimmed.pbData, trimmed.cbData, + CRYPT_STRING_BASE64_ANY, NULL, &decoded.cbData, NULL, NULL); + if (ret) + { + decoded.pbData = CryptMemAlloc(decoded.cbData); + if (decoded.pbData) + { + ret = CryptStringToBinaryA((LPSTR)trimmed.pbData, + trimmed.cbData, CRYPT_STRING_BASE64_ANY, decoded.pbData, + &decoded.cbData, NULL, NULL); + if (ret) + { + /* Try it first as a signed message */ + if (dwExpectedContentTypeFlags & + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) + ret = CRYPT_QuerySignedMessage(&decoded, + pdwMsgAndCertEncodingType, pdwContentType, &msg); + /* Failing that, try as an unsigned message */ + if (!ret && (dwExpectedContentTypeFlags & + CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) + ret = CRYPT_QueryUnsignedMessage(&decoded, + pdwMsgAndCertEncodingType, pdwContentType, &msg); + if (ret) + formatType = CERT_QUERY_FORMAT_BASE64_ENCODED; + } + CryptMemFree(decoded.pbData); + } + else + ret = FALSE; + } + } if (ret) { + if (pdwFormatType) + *pdwFormatType = formatType; if (phMsg) *phMsg = msg; if (phCertStore) @@ -536,8 +589,9 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, ret = CRYPT_QueryMessageObject( CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, - pdwMsgAndCertEncodingType, NULL, phCertStore, - phMsg); + CERT_QUERY_FORMAT_FLAG_BINARY, + pdwMsgAndCertEncodingType, NULL, NULL, + phCertStore, phMsg); if (ret && pdwContentType) *pdwContentType = CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED; @@ -630,7 +684,8 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED))) { ret = CRYPT_QueryMessageObject(dwObjectType, pvObject, - dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, phMsg); } if (!ret && diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index b0b95a6..e658dd6 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -192,7 +192,6 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); /* A valid signed message, encoded as a wide character base64 string, can * be queried successfully.

1 0

Juan Lang : crypt32: Support base64-encoded context objects in CryptQueryObject.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 626a6fe15dbf9c314370f9fea4a87168b07ed0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=626a6fe15dbf9c314370f9fea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 15:42:06 2008 -0800 crypt32: Support base64-encoded context objects in CryptQueryObject. --- dlls/crypt32/object.c | 104 ++++++++++++++++++++++++++++++------------ dlls/crypt32/tests/object.c | 2 - 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index fcb1440..97f35f7 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -61,15 +61,46 @@ static BOOL CRYPT_ReadBlobFromFile(LPCWSTR fileName, PCERT_BLOB blob) return ret; } +static BOOL CRYPT_QueryContextBlob(const CERT_BLOB *blob, + DWORD dwExpectedContentTypeFlags, HCERTSTORE store, + DWORD *contentType, const void **ppvContext) +{ + BOOL ret = FALSE; + + if (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_CERT) + { + ret = pCertInterface->addEncodedToStore(store, X509_ASN_ENCODING, + blob->pbData, blob->cbData, CERT_STORE_ADD_ALWAYS, ppvContext); + if (ret && contentType) + *contentType = CERT_QUERY_CONTENT_CERT; + } + if (!ret && (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_CRL)) + { + ret = pCRLInterface->addEncodedToStore(store, X509_ASN_ENCODING, + blob->pbData, blob->cbData, CERT_STORE_ADD_ALWAYS, ppvContext); + if (ret && contentType) + *contentType = CERT_QUERY_CONTENT_CRL; + } + if (!ret && (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_CTL)) + { + ret = pCTLInterface->addEncodedToStore(store, X509_ASN_ENCODING, + blob->pbData, blob->cbData, CERT_STORE_ADD_ALWAYS, ppvContext); + if (ret && contentType) + *contentType = CERT_QUERY_CONTENT_CTL; + } + return ret; +} + static BOOL CRYPT_QueryContextObject(DWORD dwObjectType, const void *pvObject, - DWORD dwExpectedContentTypeFlags, DWORD *pdwMsgAndCertEncodingType, - DWORD *pdwContentType, HCERTSTORE *phCertStore, const void **ppvContext) + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, DWORD *pdwFormatType, + HCERTSTORE *phCertStore, const void **ppvContext) { CERT_BLOB fileBlob; const CERT_BLOB *blob; HCERTSTORE store; - DWORD contentType; BOOL ret; + DWORD formatType = 0; switch (dwObjectType) { @@ -91,36 +122,54 @@ static BOOL CRYPT_QueryContextObject(DWORD dwObjectType, const void *pvObject, if (!ret) return FALSE; + ret = FALSE; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - ret = FALSE; - if (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_CERT) + if (dwExpectedFormatTypeFlags & CERT_QUERY_FORMAT_FLAG_BINARY) { - ret = pCertInterface->addEncodedToStore(store, X509_ASN_ENCODING, - blob->pbData, blob->cbData, CERT_STORE_ADD_ALWAYS, ppvContext); + ret = CRYPT_QueryContextBlob(blob, dwExpectedContentTypeFlags, store, + pdwContentType, ppvContext); if (ret) - contentType = CERT_QUERY_CONTENT_CERT; + formatType = CERT_QUERY_FORMAT_BINARY; } - if (!ret && (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_CRL)) - { - ret = pCRLInterface->addEncodedToStore(store, X509_ASN_ENCODING, - blob->pbData, blob->cbData, CERT_STORE_ADD_ALWAYS, ppvContext); - if (ret) - contentType = CERT_QUERY_CONTENT_CRL; - } - if (!ret && (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_CTL)) + if (!ret && + (dwExpectedFormatTypeFlags & CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED)) { - ret = pCTLInterface->addEncodedToStore(store, X509_ASN_ENCODING, - blob->pbData, blob->cbData, CERT_STORE_ADD_ALWAYS, ppvContext); + CRYPT_DATA_BLOB trimmed = { blob->cbData, blob->pbData }; + CRYPT_DATA_BLOB decoded; + + while (trimmed.cbData && !trimmed.pbData[trimmed.cbData - 1]) + trimmed.cbData--; + ret = CryptStringToBinaryA((LPSTR)trimmed.pbData, trimmed.cbData, + CRYPT_STRING_BASE64_ANY, NULL, &decoded.cbData, NULL, NULL); if (ret) - contentType = CERT_QUERY_CONTENT_CTL; + { + decoded.pbData = CryptMemAlloc(decoded.cbData); + if (decoded.pbData) + { + ret = CryptStringToBinaryA((LPSTR)trimmed.pbData, + trimmed.cbData, CRYPT_STRING_BASE64_ANY, decoded.pbData, + &decoded.cbData, NULL, NULL); + if (ret) + { + ret = CRYPT_QueryContextBlob(&decoded, + dwExpectedContentTypeFlags, store, pdwContentType, + ppvContext); + if (ret) + formatType = CERT_QUERY_FORMAT_BASE64_ENCODED; + } + CryptMemFree(decoded.pbData); + } + else + ret = FALSE; + } } if (ret) { if (pdwMsgAndCertEncodingType) *pdwMsgAndCertEncodingType = X509_ASN_ENCODING; - if (pdwContentType) - *pdwContentType = contentType; + if (pdwFormatType) + *pdwFormatType = formatType; if (phCertStore) *phCertStore = CertDuplicateStore(store); } @@ -509,15 +558,9 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, if (dwExpectedContentTypeFlags & unimplementedTypes) WARN("unimplemented for types %08x\n", dwExpectedContentTypeFlags & unimplementedTypes); - if (!(dwExpectedFormatTypeFlags & CERT_QUERY_FORMAT_FLAG_BINARY)) - { - FIXME("unimplemented for anything but binary\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } + if (pdwFormatType) *pdwFormatType = CERT_QUERY_FORMAT_BINARY; - if (phCertStore) *phCertStore = NULL; if (phMsg) @@ -531,8 +574,9 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_CTL)) { ret = CRYPT_QueryContextObject(dwObjectType, pvObject, - dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, - phCertStore, ppvContext); + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, + ppvContext); } if (!ret && (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE)) diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 6e440c6..b0b95a6 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -152,7 +152,6 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); /* The same base64-encoded cert, restricting the format types */ SetLastError(0xdeadbeef); @@ -165,7 +164,6 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); /* The same cert, base64-encoded but as a wide character string */ blob.pbData = (BYTE *)bigCertBase64W;

1 0

Juan Lang : crypt32: Don' t claim to have queried an object as a serialized context when reading it has failed .
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 86e2f94e68ca198cae7bb0037f0d8f5c166b6385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e2f94e68ca198cae7bb0037… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 15:23:31 2008 -0800 crypt32: Don't claim to have queried an object as a serialized context when reading it has failed. --- dlls/crypt32/object.c | 3 +++ dlls/crypt32/tests/object.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index f6e0c84..0674c79 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -163,6 +163,7 @@ static BOOL CRYPT_QuerySerializedContextObject(DWORD dwObjectType, if (!ret) return FALSE; + ret = FALSE; context = CRYPT_ReadSerializedElement(blob->pbData, blob->cbData, CERT_STORE_ALL_CONTEXT_FLAG, &contextType); if (context) @@ -563,6 +564,8 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); } + if (!ret) + SetLastError(CRYPT_E_NO_MATCH); TRACE("returning %d\n", ret); return ret; } diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 23f3597..6e440c6 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -152,13 +152,13 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); /* The same base64-encoded cert, restricting the format types */ SetLastError(0xdeadbeef); ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -174,7 +174,6 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); /* For brevity, not tested here, but tested on Windows: same failure @@ -195,6 +194,7 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); /* A valid signed message, encoded as a wide character base64 string, can * be queried successfully. @@ -205,12 +205,12 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Juan Lang : crypt32: Downgrade a fixme to a warn.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 33f0655e2a0e689105573dfd331533802eee026f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f0655e2a0e689105573dfd3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 15:24:05 2008 -0800 crypt32: Downgrade a fixme to a warn. --- dlls/crypt32/object.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 0674c79..fcb1440 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -413,7 +413,7 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, if (dwObjectType != CERT_QUERY_OBJECT_FILE) { - FIXME("don't know what to do for type %d embedded signed messages\n", + WARN("don't know what to do for type %d embedded signed messages\n", dwObjectType); SetLastError(E_INVALIDARG); return FALSE;

1 0

Juan Lang : crypt32: Split querying PKCS messages into helper functions.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 62cbf426895e2ea07c517782eb493268cb66f4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cbf426895e2ea07c517782e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 16:18:47 2008 -0800 crypt32: Split querying PKCS messages into helper functions. --- dlls/crypt32/object.c | 192 ++++++++++++++++++++++++++++-------------------- 1 files changed, 112 insertions(+), 80 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 97f35f7..97f71b7 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -322,6 +322,110 @@ static BOOL CRYPT_QuerySerializedStoreObject(DWORD dwObjectType, return ret; } +static BOOL CRYPT_QuerySignedMessage(const CRYPT_DATA_BLOB *blob, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, HCRYPTMSG *phMsg) +{ + DWORD encodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + BOOL ret = FALSE; + HCRYPTMSG msg; + + if ((msg = CryptMsgOpenToDecode(encodingType, 0, 0, 0, NULL, NULL))) + { + ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); + if (ret) + { + DWORD type, len = sizeof(type); + + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &type, &len); + if (ret) + { + if (type != CMSG_SIGNED) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + } + } + if (!ret) + { + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(encodingType, 0, CMSG_SIGNED, 0, NULL, + NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); + if (!ret) + { + CryptMsgClose(msg); + msg = NULL; + } + } + } + } + if (ret) + { + if (pdwMsgAndCertEncodingType) + *pdwMsgAndCertEncodingType = encodingType; + if (pdwContentType) + *pdwContentType = CERT_QUERY_CONTENT_PKCS7_SIGNED; + if (phMsg) + *phMsg = msg; + } + return ret; +} + +static BOOL CRYPT_QueryUnsignedMessage(const CRYPT_DATA_BLOB *blob, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, HCRYPTMSG *phMsg) +{ + DWORD encodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + BOOL ret = FALSE; + HCRYPTMSG msg; + + if ((msg = CryptMsgOpenToDecode(encodingType, 0, 0, 0, NULL, NULL))) + { + ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); + if (ret) + { + DWORD type, len = sizeof(type); + + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &type, &len); + if (ret) + { + if (type != CMSG_DATA) + { + SetLastError(ERROR_INVALID_DATA); + ret = FALSE; + } + } + } + if (!ret) + { + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(encodingType, 0, CMSG_DATA, 0, + NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); + if (!ret) + { + CryptMsgClose(msg); + msg = NULL; + } + } + } + } + if (ret) + { + if (pdwMsgAndCertEncodingType) + *pdwMsgAndCertEncodingType = encodingType; + if (pdwContentType) + *pdwContentType = CERT_QUERY_CONTENT_PKCS7_SIGNED; + if (phMsg) + *phMsg = msg; + } + return ret; +} + /* Used to decode non-embedded messages */ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject, DWORD dwExpectedContentTypeFlags, DWORD *pdwMsgAndCertEncodingType, @@ -354,88 +458,16 @@ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject, return FALSE; ret = FALSE; - /* Try it first as a PKCS content info */ - if ((dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) || - (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) - { - msg = CryptMsgOpenToDecode(encodingType, 0, 0, 0, NULL, NULL); - if (msg) - { - ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); - if (ret) - { - DWORD type, len = sizeof(type); - - ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &type, &len); - if (ret) - { - if ((dwExpectedContentTypeFlags & - CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED)) - { - if (type != CMSG_SIGNED) - { - SetLastError(ERROR_INVALID_DATA); - ret = FALSE; - } - else if (pdwContentType) - *pdwContentType = CERT_QUERY_CONTENT_PKCS7_SIGNED; - } - else if ((dwExpectedContentTypeFlags & - CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) - { - if (type != CMSG_DATA) - { - SetLastError(ERROR_INVALID_DATA); - ret = FALSE; - } - else if (pdwContentType) - *pdwContentType = CERT_QUERY_CONTENT_PKCS7_UNSIGNED; - } - } - } - if (!ret) - { - CryptMsgClose(msg); - msg = NULL; - } - } - } - /* Failing that, try explicitly typed messages */ - if (!ret && - (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED)) - { - msg = CryptMsgOpenToDecode(encodingType, 0, CMSG_SIGNED, 0, NULL, NULL); - if (msg) - { - ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); - if (!ret) - { - CryptMsgClose(msg); - msg = NULL; - } - } - if (msg && pdwContentType) - *pdwContentType = CERT_QUERY_CONTENT_PKCS7_SIGNED; - } + /* Try it first as a signed message */ + if (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) + ret = CRYPT_QuerySignedMessage(blob, pdwMsgAndCertEncodingType, + pdwContentType, &msg); + /* Failing that, try as an unsigned message */ if (!ret && (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) - { - msg = CryptMsgOpenToDecode(encodingType, 0, CMSG_DATA, 0, NULL, NULL); - if (msg) - { - ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE); - if (!ret) - { - CryptMsgClose(msg); - msg = NULL; - } - } - if (msg && pdwContentType) - *pdwContentType = CERT_QUERY_CONTENT_PKCS7_UNSIGNED; - } - if (pdwMsgAndCertEncodingType) - *pdwMsgAndCertEncodingType = encodingType; - if (msg) + ret = CRYPT_QueryUnsignedMessage(blob, pdwMsgAndCertEncodingType, + pdwContentType, &msg); + if (ret) { if (phMsg) *phMsg = msg;

1 0

Juan Lang : crypt32: Support wide character base64-encoded PKCS messages in CryptQueryObject.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 8777a83467db7f9d269123ad25e5b2783dcbcb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8777a83467db7f9d269123ad2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 17:02:13 2008 -0800 crypt32: Support wide character base64-encoded PKCS messages in CryptQueryObject. --- dlls/crypt32/object.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/object.c | 2 -- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index b55b441..202f458 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -517,6 +517,46 @@ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject, else ret = FALSE; } + if (!ret && !(blob->cbData % sizeof(WCHAR))) + { + CRYPT_DATA_BLOB decoded; + LPWSTR str = (LPWSTR)blob->pbData; + DWORD strLen = blob->cbData / sizeof(WCHAR); + + /* Try again, assuming the input string is UTF-16 base64 */ + while (strLen && !str[strLen - 1]) + strLen--; + ret = CryptStringToBinaryW(str, strLen, CRYPT_STRING_BASE64_ANY, + NULL, &decoded.cbData, NULL, NULL); + if (ret) + { + decoded.pbData = CryptMemAlloc(decoded.cbData); + if (decoded.pbData) + { + ret = CryptStringToBinaryW(str, strLen, + CRYPT_STRING_BASE64_ANY, decoded.pbData, &decoded.cbData, + NULL, NULL); + if (ret) + { + /* Try it first as a signed message */ + if (dwExpectedContentTypeFlags & + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) + ret = CRYPT_QuerySignedMessage(&decoded, + pdwMsgAndCertEncodingType, pdwContentType, &msg); + /* Failing that, try as an unsigned message */ + if (!ret && (dwExpectedContentTypeFlags & + CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED)) + ret = CRYPT_QueryUnsignedMessage(&decoded, + pdwMsgAndCertEncodingType, pdwContentType, &msg); + if (ret) + formatType = CERT_QUERY_FORMAT_BASE64_ENCODED; + } + CryptMemFree(decoded.pbData); + } + else + ret = FALSE; + } + } } if (ret) { diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index e658dd6..911fc9f 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -202,7 +202,6 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, @@ -214,7 +213,6 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); }

1 0

Juan Lang : crypt32: Implement CryptStringToBinaryW.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: a104479da1757fb225662676f6c4df221e17b9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a104479da1757fb225662676f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 16:49:16 2008 -0800 crypt32: Implement CryptStringToBinaryW. --- dlls/crypt32/base64.c | 324 ++++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 323 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a104479da1757fb225662…

1 0

Juan Lang : crypt32: Add tests for CryptQueryObject.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 351ebcae25bffaa519a5c0eea9a7c94ebefae5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=351ebcae25bffaa519a5c0eea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 11 15:21:13 2008 -0800 crypt32: Add tests for CryptQueryObject. --- dlls/crypt32/tests/Makefile.in | 1 + dlls/crypt32/tests/object.c | 229 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=351ebcae25bffaa519a5c…

1 0

Paul Vriens : gdi32/tests: Fix some test failures on Win9x.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: ed4444dae595df8819db8f40e7f410a88bcf7e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4444dae595df8819db8f40e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 11 17:36:46 2008 +0100 gdi32/tests: Fix some test failures on Win9x. --- dlls/gdi32/tests/bitmap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7094f85..76547d3 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -339,7 +339,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER /* test various buffer sizes for GetObject */ ret = GetObject(hbm, 0, NULL); - ok(ret == sizeof(bm), "wrong size %d\n", ret); + ok(ret == sizeof(bm) || broken(ret == sizeof(DIBSECTION) /* Win9x */), "wrong size %d\n", ret); ret = GetObject(hbm, sizeof(*dsa) * 2, dsa); ok(ret == sizeof(*dsa) || broken(ret == sizeof(*dsa) * 2 /* Win9x */), "wrong size %d\n", ret); @@ -367,7 +367,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER memset(&ds, 0xAA, sizeof(ds)); ret = GetObject(hbm, sizeof(ds) - 4, &ds); - ok(ret == sizeof(ds.dsBm), "wrong size %d\n", ret); + ok(ret == sizeof(ds.dsBm) || broken(ret == (sizeof(ds) - 4) /* Win9x */), "wrong size %d\n", ret); ok(ds.dsBm.bmWidth == bmih->biWidth, "%u != %u\n", ds.dsBmih.biWidth, bmih->biWidth); ok(ds.dsBm.bmHeight == bmih->biHeight, "%u != %u\n", ds.dsBmih.biHeight, bmih->biHeight); ok(ds.dsBm.bmBits == bits, "%p != %p\n", ds.dsBm.bmBits, bits); @@ -376,7 +376,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ret == 0, "%d != 0\n", ret); ret = GetObject(hbm, 1, &ds); - ok(ret == 0, "%d != 0\n", ret); + ok(ret == 0 || broken(ret == 1 /* Win9x */), "%d != 0\n", ret); } #define test_color_todo(got, exp, txt, todo) \ @@ -2150,7 +2150,7 @@ void test_GdiAlphaBlend() if (!pGdiAlphaBlend) { - skip("GdiAlphaBlend() is not implemented\n"); + win_skip("GdiAlphaBlend() is not implemented\n"); return; }

1 0