July 2007 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Implement getting some parameters from a decoded signed message.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 115edc67e60308d35c34dd9adeb46ae2f54db39c URL: http://source.winehq.org/git/wine.git/?a=commit;h=115edc67e60308d35c34dd9ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:57:50 2007 -0700 crypt32: Implement getting some parameters from a decoded signed message. --- dlls/crypt32/msg.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 12 ------ 2 files changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 042b1ef..bca4040 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1559,6 +1559,90 @@ static BOOL CDecodeHashMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } +static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + BOOL ret = FALSE; + + switch (dwParamType) + { + case CMSG_TYPE_PARAM: + ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); + break; + case CMSG_SIGNER_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cSignerInfo, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CERT_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cCertEncoded, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CERT_PARAM: + if (msg->u.signedInfo) + { + if (dwIndex >= msg->u.signedInfo->cCertEncoded) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.signedInfo->rgCertEncoded[dwIndex].pbData, + msg->u.signedInfo->rgCertEncoded[dwIndex].cbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CRL_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cCrlEncoded, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_CRL_PARAM: + if (msg->u.signedInfo) + { + if (dwIndex >= msg->u.signedInfo->cCrlEncoded) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.signedInfo->rgCrlEncoded[dwIndex].pbData, + msg->u.signedInfo->rgCrlEncoded[dwIndex].cbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_ATTR_CERT_COUNT_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + &msg->u.signedInfo->cAttrCertEncoded, sizeof(DWORD)); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + case CMSG_ATTR_CERT_PARAM: + if (msg->u.signedInfo) + { + if (dwIndex >= msg->u.signedInfo->cAttrCertEncoded) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.signedInfo->rgAttrCertEncoded[dwIndex].pbData, + msg->u.signedInfo->rgAttrCertEncoded[dwIndex].cbData); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; + default: + FIXME("unimplemented for %d\n", dwParamType); + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + return ret; +} + static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { @@ -1571,6 +1655,10 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CDecodeHashMsg_GetParam(msg, dwParamType, dwIndex, pvData, pcbData); break; + case CMSG_SIGNED: + ret = CDecodeSignedMsg_GetParam(msg, dwParamType, dwIndex, pvData, + pcbData); + break; default: switch (dwParamType) { diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b7f9393..85a9d62 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1961,26 +1961,18 @@ static void test_decode_msg_get_param(void) size = sizeof(value); value = 2112; ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 signer, got %d\n", value); - } /* index is ignored when getting signer count */ ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 1, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 signer, got %d\n", value); - } ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 0, "Expected 0 certs, got %d\n", value); - } ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 0, "Expected 0 CRLs, got %d\n", value); - } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, NULL); @@ -1988,17 +1980,13 @@ static void test_decode_msg_get_param(void) sizeof(signedWithCertAndCrlBareContent), TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 cert, got %d\n", value); check_param("cert", msg, CMSG_CERT_PARAM, cert, sizeof(cert)); - } ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 1, "Expected 1 CRL, got %d\n", value); check_param("crl", msg, CMSG_CRL_PARAM, crl, sizeof(crl)); - } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Change type to avoid unnecessary casting.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 9c7c9e545e2518701e045ff9c47397c7a2ba50fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7c9e545e2518701e045ff9c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:57:17 2007 -0700 crypt32: Change type to avoid unnecessary casting. --- dlls/crypt32/msg.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d1b2ec6..042b1ef 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -241,7 +241,7 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, return ret; } -static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const BYTE *src, +static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const void *src, DWORD len) { BOOL ret = TRUE; @@ -444,8 +444,7 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, /* Since the data are always encoded as octets, the version is * always 0 (see rfc3852, section 7) */ - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&version, - sizeof(version)); + ret = CRYPT_CopyParam(pvData, pcbData, &version, sizeof(version)); } break; default: @@ -887,7 +886,7 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, pvData, pcbData); break; case CMSG_VERSION_PARAM: - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->info.version, + ret = CRYPT_CopyParam(pvData, pcbData, &msg->info.version, sizeof(msg->info.version)); break; default: @@ -1495,8 +1494,7 @@ static BOOL CDecodeHashMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, switch (dwParamType) { case CMSG_TYPE_PARAM: - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, - sizeof(msg->type)); + ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); break; case CMSG_HASH_ALGORITHM_PARAM: { @@ -1577,7 +1575,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, switch (dwParamType) { case CMSG_TYPE_PARAM: - ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, + ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); break; default:

1 0

Juan Lang : crypt32: Test getting parameters from decoded signed messages.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: d187fcd172bb0b5583a93fef7b579cf5b1ce1210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d187fcd172bb0b5583a93fef7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:56:48 2007 -0700 crypt32: Test getting parameters from decoded signed messages. --- dlls/crypt32/tests/msg.c | 54 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8cfb72c..b7f9393 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1907,7 +1907,7 @@ static void test_decode_msg_get_param(void) { HCRYPTMSG msg; BOOL ret; - DWORD size = 0, version; + DWORD size = 0, value; LPBYTE buf; msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); @@ -1950,9 +1950,55 @@ static void test_decode_msg_get_param(void) } check_param("hash inner OID", msg, CMSG_INNER_CONTENT_TYPE_PARAM, (const BYTE *)szOID_RSA_data, strlen(szOID_RSA_data) + 1); - version = CMSG_HASHED_DATA_V0; - check_param("hash version", msg, CMSG_VERSION_PARAM, (const BYTE *)&version, - sizeof(version)); + value = CMSG_HASHED_DATA_V0; + check_param("hash version", msg, CMSG_VERSION_PARAM, (const BYTE *)&value, + sizeof(value)); + CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + size = sizeof(value); + value = 2112; + ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 signer, got %d\n", value); + } + /* index is ignored when getting signer count */ + ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 1, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 signer, got %d\n", value); + } + ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 0, "Expected 0 certs, got %d\n", value); + } + ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 0, "Expected 0 CRLs, got %d\n", value); + } + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, + NULL); + ret = CryptMsgUpdate(msg, signedWithCertAndCrlBareContent, + sizeof(signedWithCertAndCrlBareContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgGetParam(msg, CMSG_CERT_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 cert, got %d\n", value); + check_param("cert", msg, CMSG_CERT_PARAM, cert, sizeof(cert)); + } + ret = CryptMsgGetParam(msg, CMSG_CRL_COUNT_PARAM, 0, &value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 CRL, got %d\n", value); + check_param("crl", msg, CMSG_CRL_PARAM, crl, sizeof(crl)); + } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Store decoded signed content in message.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 299612378a9120340ffc8058ddba105bae192a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=299612378a9120340ffc8058d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:56:20 2007 -0700 crypt32: Store decoded signed content in message. --- dlls/crypt32/msg.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ee116bd..d1b2ec6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1241,6 +1241,7 @@ typedef struct _CDecodeMsg HCRYPTPROV crypt_prov; union { HCRYPTHASH hash; + CRYPT_SIGNED_INFO *signedInfo; } u; CRYPT_DATA_BLOB msg_data; PCONTEXT_PROPERTY_LIST properties; @@ -1257,6 +1258,9 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) case CMSG_HASHED: CryptDestroyHash(msg->u.hash); break; + case CMSG_SIGNED: + LocalFree(msg->u.signedInfo); + break; } CryptMemFree(msg->msg_data.pbData); ContextPropertyList_Free(msg->properties); @@ -1390,10 +1394,7 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_SIGNED_INFO *)&signedInfo, &size); if (ret) - { - FIXME("store properties in message\n"); - LocalFree(signedInfo); - } + msg->u.signedInfo = signedInfo; return ret; } /* Decodes the content in blob as the type given, and updates the value

1 0

Juan Lang : crypt32: Correct type of a decoded signed message.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 211a8d324f0cdf4e2be1678c5bf8e603be45a2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211a8d324f0cdf4e2be1678c5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:55:44 2007 -0700 crypt32: Correct type of a decoded signed message. --- dlls/crypt32/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f6cddbb..ee116bd 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1422,7 +1422,7 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, break; case CMSG_SIGNED: if ((ret = CDecodeMsg_DecodeSignedContent(msg, blob))) - msg->type = CMSG_HASHED; + msg->type = CMSG_SIGNED; break; default: {

1 0

Juan Lang : crypt32: A decoded message' s parameters are dependent on its type.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: fd1e88ae61aa347e45f32e0770536f46f5e93369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1e88ae61aa347e45f32e077… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 27 10:55:15 2007 -0700 crypt32: A decoded message's parameters are dependent on its type. --- dlls/crypt32/msg.c | 61 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d932815..f6cddbb 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1239,7 +1239,9 @@ typedef struct _CDecodeMsg CryptMsgBase base; DWORD type; HCRYPTPROV crypt_prov; - HCRYPTHASH hash; + union { + HCRYPTHASH hash; + } u; CRYPT_DATA_BLOB msg_data; PCONTEXT_PROPERTY_LIST properties; } CDecodeMsg; @@ -1250,7 +1252,12 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); - CryptDestroyHash(msg->hash); + switch (msg->type) + { + case CMSG_HASHED: + CryptDestroyHash(msg->u.hash); + break; + } CryptMemFree(msg->msg_data.pbData); ContextPropertyList_Free(msg->properties); } @@ -1479,10 +1486,9 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, return ret; } -static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, +static BOOL CDecodeHashMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { - CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; BOOL ret = FALSE; switch (dwParamType) @@ -1508,7 +1514,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, break; } case CMSG_COMPUTED_HASH_PARAM: - if (!msg->hash) + if (!msg->u.hash) { CRYPT_ALGORITHM_IDENTIFIER *hashAlgoID = NULL; DWORD size = 0; @@ -1520,7 +1526,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, hashAlgoID, &size); if (ret) algID = CertOIDToAlgId(hashAlgoID->pszObjId); - ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->hash); + ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->u.hash); if (ret) { CRYPT_DATA_BLOB content; @@ -1528,7 +1534,7 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = ContextPropertyList_FindProperty(msg->properties, CMSG_CONTENT_PARAM, &content); if (ret) - ret = CryptHashData(msg->hash, content.pbData, + ret = CryptHashData(msg->u.hash, content.pbData, content.cbData, 0); } CryptMemFree(hashAlgoID); @@ -1536,7 +1542,8 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, else ret = TRUE; if (ret) - ret = CryptGetHashParam(msg->hash, HP_HASHVAL, pvData, pcbData, 0); + ret = CryptGetHashParam(msg->u.hash, HP_HASHVAL, pvData, pcbData, + 0); break; default: { @@ -1553,6 +1560,42 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, return ret; } +static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + switch (msg->type) + { + case CMSG_HASHED: + ret = CDecodeHashMsg_GetParam(msg, dwParamType, dwIndex, pvData, + pcbData); + break; + default: + switch (dwParamType) + { + case CMSG_TYPE_PARAM: + ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, + sizeof(msg->type)); + break; + default: + { + CRYPT_DATA_BLOB blob; + + ret = ContextPropertyList_FindProperty(msg->properties, dwParamType, + &blob); + if (ret) + ret = CRYPT_CopyParam(pvData, pcbData, blob.pbData, + blob.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + } + } + return ret; +} + HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, HCRYPTPROV hCryptProv, PCERT_INFO pRecipientInfo, PCMSG_STREAM_INFO pStreamInfo) @@ -1580,7 +1623,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, msg->crypt_prov = CRYPT_GetDefaultProvider(); msg->base.open_flags &= ~CMSG_CRYPT_RELEASE_CONTEXT_FLAG; } - msg->hash = 0; + memset(&msg->u, 0, sizeof(msg->u)); msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; msg->properties = ContextPropertyList_Create();

1 0

Paul Vriens : localspl/tests: Use skip if localspl can't be loaded.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: b893575cb9df15871dd847d3b8ea5b78a879c0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b893575cb9df15871dd847d3b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jul 27 21:41:32 2007 +0200 localspl/tests: Use skip if localspl can't be loaded. --- dlls/localspl/tests/localmon.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index ff358ca..535a76b 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -1086,7 +1086,10 @@ START_TEST(localmon) /* This DLL does not exist on Win9x */ hdll = LoadLibraryA("localspl.dll"); - if (!hdll) return; + if (!hdll) { + skip("localspl.dll cannot be loaded, most likely running on Win9x\n"); + return; + } tempdirW[0] = '\0'; tempfileW[0] = '\0';

1 0

Stefan Dösinger : d3d8: Only test pixel shaders for refcounting if they are supported.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 630d602631b07a2e4942b27d6f7a55ca6e1f31b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630d602631b07a2e4942b27d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:33:37 2007 +0200 d3d8: Only test pixel shaders for refcounting if they are supported. --- dlls/d3d8/tests/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 84b5f29..bc9c804 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -292,6 +292,7 @@ static void test_refcount(void) IDirect3DSurface8 *pBackBuffer = NULL; DWORD dStateBlock = -1; IDirect3DSwapChain8 *pSwapChain = NULL; + D3DCAPS8 caps; D3DPRESENT_PARAMETERS d3dpp; D3DDISPLAYMODE d3ddm; @@ -326,6 +327,7 @@ static void test_refcount(void) trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } + IDirect3DDevice8_GetDeviceCaps(pDevice, &caps); refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); @@ -435,8 +437,11 @@ static void test_refcount(void) /* Shaders */ hr = IDirect3DDevice8_CreateVertexShader( pDevice, decl, simple_vs, &dVertexShader, 0 ); CHECK_CALL( hr, "CreateVertexShader", pDevice, refcount ); - hr = IDirect3DDevice8_CreatePixelShader( pDevice, simple_ps, &dPixelShader ); - CHECK_CALL( hr, "CreatePixelShader", pDevice, refcount ); + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 0)) + { + hr = IDirect3DDevice8_CreatePixelShader( pDevice, simple_ps, &dPixelShader ); + CHECK_CALL( hr, "CreatePixelShader", pDevice, refcount ); + } /* Textures */ hr = IDirect3DDevice8_CreateTexture( pDevice, 32, 32, 3, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pTexture ); CHECK_CALL( hr, "CreateTexture", pDevice, ++refcount );

1 0

Roderick Colenbrander : wgl: Fix another BadMatch error by giving a pbuffer its own GLXContext.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: ae9119f8d02745ccecebf538150e0973e11d6875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9119f8d02745ccecebf5381… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 15:19:46 2007 +0200 wgl: Fix another BadMatch error by giving a pbuffer its own GLXContext. --- dlls/winex11.drv/opengl.c | 47 +++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 05f322e..db9eb44 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -81,26 +81,6 @@ typedef struct wine_glcontext { struct wine_glcontext *prev; } Wine_GLContext; -typedef struct wine_glpbuffer { - Drawable drawable; - Display* display; - int pixelFormat; - int width; - int height; - int* attribList; - HDC hdc; - - int use_render_texture; - GLuint texture_target; - GLuint texture_bind_target; - GLuint texture; - int texture_level; - HDC prev_hdc; - HGLRC prev_ctx; - HDC render_hdc; - HGLRC render_ctx; -} Wine_GLPBuffer; - typedef struct wine_glextension { const char *extName; struct { @@ -134,6 +114,22 @@ typedef struct wine_glpixelformat { BOOL offscreenOnly; } WineGLPixelFormat; +typedef struct wine_glpbuffer { + Drawable drawable; + Display* display; + WineGLPixelFormat* fmt; + int width; + int height; + int* attribList; + HDC hdc; + + int use_render_texture; + GLuint texture_target; + GLuint texture_bind_target; + GLuint texture; + int texture_level; +} Wine_GLPBuffer; + static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; @@ -1984,7 +1980,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->display = gdi_display; object->width = iWidth; object->height = iHeight; - object->pixelFormat = iPixelFormat; + object->fmt = fmt; nAttribs = ConvertAttribWGLtoGLX(piAttribList, attribs, object); if (-1 == nAttribs) { @@ -2163,7 +2159,7 @@ HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *physDev, HPBUFFERARB hPbuffer) /* The function wglGetPbufferDCARB returns a DC to which the pbuffer can be connected. * All formats in our pixelformat list are compatible with each other and the main drawable. */ - physDev->current_pf = object->pixelFormat; + physDev->current_pf = object->fmt->iPixelFormat; physDev->drawable = object->drawable; SetRect( &physDev->drawable_rect, 0, 0, object->width, object->height ); physDev->dc_rect = physDev->drawable_rect; @@ -2648,6 +2644,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf static int init = 0; GLXContext prev_context = pglXGetCurrentContext(); Drawable prev_drawable = pglXGetCurrentDrawable(); + GLXContext tmp_context; /* Our render_texture emulation is basic and lacks some features (1D/Cube support). This is mostly due to lack of demos/games using them. Further the use of glReadPixels @@ -2664,14 +2661,18 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf return GL_FALSE; } + TRACE("drawable=%p, context=%p\n", (void*)object->drawable, prev_context); + tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, GLX_RGBA_TYPE, NULL, True); + /* Switch to our pbuffer and readback its contents */ - pglXMakeCurrent(gdi_display, object->drawable, prev_context); + pglXMakeCurrent(gdi_display, object->drawable, tmp_context); pglReadPixels(0, 0, object->width, object->height, GL_RGBA, GL_UNSIGNED_BYTE, buf); /* Switch back to the original drawable and upload the pbuffer-texture */ pglXMakeCurrent(object->display, prev_drawable, prev_context); pglTexImage2D(object->texture_target, 0, GL_RGBA8, object->width, object->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf); + pglXDestroyContext(gdi_display, tmp_context); HeapFree(GetProcessHeap(), 0, buf); }

1 0

James Hawkins : msi: Use a more unique property separator.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 9089835c3552d70b1f54901d7e500814a209a9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9089835c3552d70b1f54901d7… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 27 11:13:01 2007 -0700 msi: Use a more unique property separator. --- dlls/msi/custom.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 54efc85..390113e 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -137,7 +137,7 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti /* stores the following properties before the action: * - * [CustomActionData][UserSID][ProductCode]Action + * [CustomActionData<=>UserSID<=>ProductCode]Action */ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, LPCWSTR usersid, LPCWSTR prodcode) @@ -145,7 +145,9 @@ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, LPWSTR deferred; DWORD len; - static const WCHAR format[] = {'[','%','s',']','[','%','s',']','[','%','s',']','%','s',0}; + static const WCHAR format[] = { + '[','%','s','<','=','>','%','s','<','=','>','%','s',']','%','s',0 + }; if (!actiondata) return strdupW(action); @@ -162,15 +164,17 @@ static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data) { LPWSTR end, beg = deferred_data + 1; - end = strchrW(beg, ']'); + static const WCHAR sep[] = {'<','=','>',0}; + + end = strstrW(beg, sep); *end = '\0'; MSI_SetPropertyW(package, szActionData, beg); - beg = end + 2; + beg = end + 3; - end = strchrW(beg, ']'); + end = strstrW(beg, sep); *end = '\0'; MSI_SetPropertyW(package, UserSID, beg); - beg = end + 2; + beg = end + 3; end = strchrW(beg, ']'); *end = '\0';

1 0