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

Juan Lang : crypt32: Improve tracing when builtin function isn't available.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 3a50b1fea64299f57cfb442a11bdbca398cbe840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a50b1fea64299f57cfb442a1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:21:37 2007 -0700 crypt32: Improve tracing when builtin function isn't available. --- dlls/crypt32/decode.c | 11 ++++++----- dlls/crypt32/encode.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7c50b27..f1915d4 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4050,8 +4050,6 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case (WORD)PKCS7_SIGNER_INFO: decodeFunc = CRYPT_AsnDecodePKCSSignerInfo; break; - default: - FIXME("%d: unimplemented\n", LOWORD(lpszStructType)); } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -4088,9 +4086,6 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; - else - TRACE_(crypt)("OID %s not found or unimplemented\n", - debugstr_a(lpszStructType)); return decodeFunc; } @@ -4152,6 +4147,8 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, if (!(pCryptDecodeObjectEx = CRYPT_GetBuiltinDecoder(dwCertEncodingType, lpszStructType))) { + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", + debugstr_a(lpszStructType)); pCryptDecodeObject = CRYPT_LoadDecoderFunc(dwCertEncodingType, lpszStructType, &hFunc); if (!pCryptDecodeObject) @@ -4204,8 +4201,12 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, *(BYTE **)pvStructInfo = NULL; decodeFunc = CRYPT_GetBuiltinDecoder(dwCertEncodingType, lpszStructType); if (!decodeFunc) + { + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", + debugstr_a(lpszStructType)); decodeFunc = CRYPT_LoadDecoderExFunc(dwCertEncodingType, lpszStructType, &hFunc); + } if (decodeFunc) ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 4dd8c99..be724d0 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3493,6 +3493,8 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, if (!(pCryptEncodeObjectEx = CRYPT_GetBuiltinEncoder(dwCertEncodingType, lpszStructType))) { + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", + debugstr_a(lpszStructType)); pCryptEncodeObject = CRYPT_LoadEncoderFunc(dwCertEncodingType, lpszStructType, &hFunc); if (!pCryptEncodeObject) @@ -3500,10 +3502,8 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, lpszStructType, &hFunc); } if (pCryptEncodeObject) - { ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, pvStructInfo, pbEncoded, pcbEncoded); - } else if (pCryptEncodeObjectEx) ret = pCryptEncodeObjectEx(dwCertEncodingType, lpszStructType, pvStructInfo, 0, NULL, pbEncoded, pcbEncoded);

1 0

Juan Lang : crypt32: Use helper functions to simplify CryptEncodeObject and CryptEncodeObjectEx .
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: f848055151c4e9c3db6f8e4cd067f820de4799e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f848055151c4e9c3db6f8e4cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:21:03 2007 -0700 crypt32: Use helper functions to simplify CryptEncodeObject and CryptEncodeObjectEx. --- dlls/crypt32/encode.c | 180 ++++++++++++++++++++++++++++--------------------- 1 files changed, 102 insertions(+), 78 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index aa650bd..4dd8c99 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -92,44 +92,6 @@ static BOOL WINAPI CRYPT_AsnEncodeChoiceOfTime(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded); -BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, - const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) -{ - static HCRYPTOIDFUNCSET set = NULL; - BOOL ret = FALSE; - HCRYPTOIDFUNCADDR hFunc; - CryptEncodeObjectFunc pCryptEncodeObject; - - TRACE_(crypt)("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, - debugstr_a(lpszStructType), pvStructInfo, pbEncoded, - pcbEncoded); - - if (!pbEncoded && !pcbEncoded) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Try registered DLL first.. */ - if (!set) - set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); - CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, - (void **)&pCryptEncodeObject, &hFunc); - if (pCryptEncodeObject) - { - ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, - pvStructInfo, pbEncoded, pcbEncoded); - CryptFreeOIDFunctionAddress(hFunc, 0); - } - else - { - /* If not, use CryptEncodeObjectEx */ - ret = CryptEncodeObjectEx(dwCertEncodingType, lpszStructType, - pvStructInfo, 0, NULL, pbEncoded, pcbEncoded); - } - return ret; -} - BOOL CRYPT_EncodeEnsureSpace(DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded, DWORD bytesNeeded) { @@ -3335,34 +3297,18 @@ BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, return ret; } -BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, - const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, - void *pvEncoded, DWORD *pcbEncoded) +static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, + LPCSTR lpszStructType) { - static HCRYPTOIDFUNCSET set = NULL; - BOOL ret = FALSE; CryptEncodeObjectExFunc encodeFunc = NULL; - HCRYPTOIDFUNCADDR hFunc = NULL; - - TRACE_(crypt)("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, - debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, - pvEncoded, pcbEncoded); - if (!pvEncoded && !pcbEncoded) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING && (dwCertEncodingType & CMSG_ENCODING_TYPE_MASK) != PKCS_7_ASN_ENCODING) { SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; + return NULL; } - SetLastError(NOERROR); - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG && pvEncoded) - *(BYTE **)pvEncoded = NULL; if (!HIWORD(lpszStructType)) { switch (LOWORD(lpszStructType)) @@ -3461,8 +3407,6 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, case (WORD)PKCS7_SIGNER_INFO: encodeFunc = CRYPT_AsnEncodePKCSSignerInfo; break; - default: - FIXME("%d: unimplemented\n", LOWORD(lpszStructType)); } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -3499,32 +3443,113 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) encodeFunc = CRYPT_AsnEncodeIssuingDistPoint; - else - TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", - debugstr_a(lpszStructType)); + return encodeFunc; +} + +static CryptEncodeObjectFunc CRYPT_LoadEncoderFunc(DWORD dwCertEncodingType, + LPCSTR lpszStructType, HCRYPTOIDFUNCADDR *hFunc) +{ + static HCRYPTOIDFUNCSET set = NULL; + CryptEncodeObjectFunc encodeFunc = NULL; + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&encodeFunc, hFunc); + return encodeFunc; +} + +static CryptEncodeObjectExFunc CRYPT_LoadEncoderExFunc(DWORD dwCertEncodingType, + LPCSTR lpszStructType, HCRYPTOIDFUNCADDR *hFunc) +{ + static HCRYPTOIDFUNCSET set = NULL; + CryptEncodeObjectExFunc encodeFunc = NULL; + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_EX_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&encodeFunc, hFunc); + return encodeFunc; +} + +BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, + const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + HCRYPTOIDFUNCADDR hFunc = NULL; + CryptEncodeObjectFunc pCryptEncodeObject = NULL; + CryptEncodeObjectExFunc pCryptEncodeObjectEx = NULL; + + TRACE_(crypt)("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, + pcbEncoded); + + if (!pbEncoded && !pcbEncoded) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(pCryptEncodeObjectEx = CRYPT_GetBuiltinEncoder(dwCertEncodingType, + lpszStructType))) + { + pCryptEncodeObject = CRYPT_LoadEncoderFunc(dwCertEncodingType, + lpszStructType, &hFunc); + if (!pCryptEncodeObject) + pCryptEncodeObjectEx = CRYPT_LoadEncoderExFunc(dwCertEncodingType, + lpszStructType, &hFunc); + } + if (pCryptEncodeObject) + { + ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, + pvStructInfo, pbEncoded, pcbEncoded); + } + else if (pCryptEncodeObjectEx) + ret = pCryptEncodeObjectEx(dwCertEncodingType, lpszStructType, + pvStructInfo, 0, NULL, pbEncoded, pcbEncoded); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); + TRACE_(crypt)("returning %d\n", ret); + return ret; +} + +BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, + const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, + void *pvEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + HCRYPTOIDFUNCADDR hFunc = NULL; + CryptEncodeObjectExFunc encodeFunc = NULL; + + TRACE_(crypt)("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, + pvEncoded, pcbEncoded); + + if (!pvEncoded && !pcbEncoded) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SetLastError(NOERROR); + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG && pvEncoded) + *(BYTE **)pvEncoded = NULL; + encodeFunc = CRYPT_GetBuiltinEncoder(dwCertEncodingType, lpszStructType); if (!encodeFunc) { - if (!set) - set = CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_EX_FUNC, 0); - CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, - (void **)&encodeFunc, &hFunc); + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", + debugstr_a(lpszStructType)); + encodeFunc = CRYPT_LoadEncoderExFunc(dwCertEncodingType, lpszStructType, + &hFunc); } if (encodeFunc) ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo, dwFlags, pEncodePara, pvEncoded, pcbEncoded); else { - static HCRYPTOIDFUNCSET encodeObjectSet = NULL; - CryptEncodeObjectFunc pCryptEncodeObject; + CryptEncodeObjectFunc pCryptEncodeObject = + CRYPT_LoadEncoderFunc(dwCertEncodingType, lpszStructType, &hFunc); - /* Try CryptEncodeObject function. Don't call CryptEncodeObject - * directly, as that could cause an infinite loop. - */ - if (!encodeObjectSet) - encodeObjectSet = - CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); - CryptGetOIDFunctionAddress(encodeObjectSet, dwCertEncodingType, - lpszStructType, 0, (void **)&pCryptEncodeObject, &hFunc); if (pCryptEncodeObject) { if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) @@ -3541,11 +3566,10 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, pvStructInfo, pvEncoded, pcbEncoded); } - else - SetLastError(ERROR_FILE_NOT_FOUND); } if (hFunc) CryptFreeOIDFunctionAddress(hFunc, 0); + TRACE_(crypt)("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Use helper functions to simplify CryptDecodeObject and CryptDecodeObjectEx .
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 4c58c4bc2fdb7ad3c7819da55cef005dc63d7e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c58c4bc2fdb7ad3c7819da55… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:19:42 2007 -0700 crypt32: Use helper functions to simplify CryptDecodeObject and CryptDecodeObjectEx. --- dlls/crypt32/decode.c | 200 ++++++++++++++++++++++++++++--------------------- 1 files changed, 113 insertions(+), 87 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 669b125..c6f7305 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -124,45 +124,6 @@ static BOOL WINAPI CRYPT_AsnDecodeUnsignedIntegerInternal( DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo); -BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, - const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, - DWORD *pcbStructInfo) -{ - static HCRYPTOIDFUNCSET set = NULL; - BOOL ret = FALSE; - CryptDecodeObjectFunc pCryptDecodeObject; - HCRYPTOIDFUNCADDR hFunc; - - TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, - debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo); - - if (!pvStructInfo && !pcbStructInfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Try registered DLL first.. */ - if (!set) - set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_FUNC, 0); - CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, - (void **)&pCryptDecodeObject, &hFunc); - if (pCryptDecodeObject) - { - ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, - pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); - CryptFreeOIDFunctionAddress(hFunc, 0); - } - else - { - /* If not, use CryptDecodeObjectEx */ - ret = CryptDecodeObjectEx(dwCertEncodingType, lpszStructType, pbEncoded, - cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo); - } - return ret; -} - /* Gets the number of length bytes from the given (leading) length byte */ #define GET_LEN_BYTES(b) ((b) <= 0x7f ? 1 : 1 + ((b) & 0x7f)) @@ -3980,44 +3941,17 @@ BOOL CRYPT_AsnDecodePKCSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } -BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, - const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, - PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, + LPCSTR lpszStructType) { - static HCRYPTOIDFUNCSET set = NULL; - BOOL ret = FALSE; CryptDecodeObjectExFunc decodeFunc = NULL; - HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p, %p)\n", - dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, - cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); - - if (!pvStructInfo && !pcbStructInfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING && (dwCertEncodingType & CMSG_ENCODING_TYPE_MASK) != PKCS_7_ASN_ENCODING) { SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - if (!cbEncoded) - { - SetLastError(CRYPT_E_ASN1_EOD); - return FALSE; + return NULL; } - if (cbEncoded > MAX_ENCODED_LEN) - { - SetLastError(CRYPT_E_ASN1_LARGE); - return FALSE; - } - - SetLastError(NOERROR); - if (dwFlags & CRYPT_DECODE_ALLOC_FLAG && pvStructInfo) - *(BYTE **)pvStructInfo = NULL; if (!HIWORD(lpszStructType)) { switch (LOWORD(lpszStructType)) @@ -4155,31 +4089,124 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; else - TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", + TRACE_(crypt)("OID %s not found or unimplemented\n", debugstr_a(lpszStructType)); - if (!decodeFunc) + return decodeFunc; +} + +static CryptDecodeObjectFunc CRYPT_LoadDecoderFunc(DWORD dwCertEncodingType, + LPCSTR lpszStructType, HCRYPTOIDFUNCADDR *hFunc) +{ + static HCRYPTOIDFUNCSET set = NULL; + CryptDecodeObjectFunc decodeFunc = NULL; + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&decodeFunc, hFunc); + return decodeFunc; +} + +static CryptDecodeObjectExFunc CRYPT_LoadDecoderExFunc(DWORD dwCertEncodingType, + LPCSTR lpszStructType, HCRYPTOIDFUNCADDR *hFunc) +{ + static HCRYPTOIDFUNCSET set = NULL; + CryptDecodeObjectExFunc decodeFunc = NULL; + + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_EX_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, + (void **)&decodeFunc, hFunc); + return decodeFunc; +} + +BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, + const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, + DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + CryptDecodeObjectFunc pCryptDecodeObject = NULL; + CryptDecodeObjectExFunc pCryptDecodeObjectEx = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; + + TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, + debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo); + + if (!pvStructInfo && !pcbStructInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(pCryptDecodeObjectEx = CRYPT_GetBuiltinDecoder(dwCertEncodingType, + lpszStructType))) + { + pCryptDecodeObject = CRYPT_LoadDecoderFunc(dwCertEncodingType, + lpszStructType, &hFunc); + if (!pCryptDecodeObject) + pCryptDecodeObjectEx = CRYPT_LoadDecoderExFunc(dwCertEncodingType, + lpszStructType, &hFunc); + } + if (pCryptDecodeObject) + ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); + else if (pCryptDecodeObjectEx) + ret = pCryptDecodeObjectEx(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, + pvStructInfo, pcbStructInfo); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); + TRACE_(crypt)("returning %d\n", ret); + return ret; +} + +BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, + const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + CryptDecodeObjectExFunc decodeFunc; + HCRYPTOIDFUNCADDR hFunc = NULL; + + TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p, %p)\n", + dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, + cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); + + if (!pvStructInfo && !pcbStructInfo) { - if (!set) - set = CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_EX_FUNC, 0); - CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, - (void **)&decodeFunc, &hFunc); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (cbEncoded > MAX_ENCODED_LEN) + { + SetLastError(CRYPT_E_ASN1_LARGE); + return FALSE; + } + + SetLastError(NOERROR); + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG && pvStructInfo) + *(BYTE **)pvStructInfo = NULL; + decodeFunc = CRYPT_GetBuiltinDecoder(dwCertEncodingType, lpszStructType); + if (!decodeFunc) + decodeFunc = CRYPT_LoadDecoderExFunc(dwCertEncodingType, lpszStructType, + &hFunc); if (decodeFunc) ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); else { - static HCRYPTOIDFUNCSET decodeObjectSet = NULL; - CryptDecodeObjectFunc pCryptDecodeObject; + CryptDecodeObjectFunc pCryptDecodeObject = + CRYPT_LoadDecoderFunc(dwCertEncodingType, lpszStructType, &hFunc); /* Try CryptDecodeObject function. Don't call CryptDecodeObject * directly, as that could cause an infinite loop. */ - if (!decodeObjectSet) - decodeObjectSet = - CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_FUNC, 0); - CryptGetOIDFunctionAddress(decodeObjectSet, dwCertEncodingType, - lpszStructType, 0, (void **)&pCryptDecodeObject, &hFunc); if (pCryptDecodeObject) { if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) @@ -4188,18 +4215,17 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, pbEncoded, cbEncoded, dwFlags, NULL, pcbStructInfo); if (ret && (ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, *pcbStructInfo))) - ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, - pbEncoded, cbEncoded, dwFlags, *(BYTE **)pvStructInfo, - pcbStructInfo); + ret = pCryptDecodeObject(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, dwFlags, + *(BYTE **)pvStructInfo, pcbStructInfo); } else ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); } - else - SetLastError(ERROR_FILE_NOT_FOUND); } if (hFunc) CryptFreeOIDFunctionAddress(hFunc, 0); + TRACE_(crypt)("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Ex encode/ decode functions should call non-Ex versions if no Ex version is available.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 038b53c301364c1775c823b8ad561c494be91413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038b53c301364c1775c823b8a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:18:33 2007 -0700 crypt32: Ex encode/decode functions should call non-Ex versions if no Ex version is available. --- dlls/crypt32/decode.c | 32 +++++++++++++++++++++++++++++++- dlls/crypt32/encode.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 5601862..669b125 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4168,7 +4168,37 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); else - SetLastError(ERROR_FILE_NOT_FOUND); + { + static HCRYPTOIDFUNCSET decodeObjectSet = NULL; + CryptDecodeObjectFunc pCryptDecodeObject; + + /* Try CryptDecodeObject function. Don't call CryptDecodeObject + * directly, as that could cause an infinite loop. + */ + if (!decodeObjectSet) + decodeObjectSet = + CryptInitOIDFunctionSet(CRYPT_OID_DECODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(decodeObjectSet, dwCertEncodingType, + lpszStructType, 0, (void **)&pCryptDecodeObject, &hFunc); + if (pCryptDecodeObject) + { + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + { + ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags, NULL, pcbStructInfo); + if (ret && (ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, *pcbStructInfo))) + ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags, *(BYTE **)pvStructInfo, + pcbStructInfo); + } + else + ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); + } + else + SetLastError(ERROR_FILE_NOT_FOUND); + } if (hFunc) CryptFreeOIDFunctionAddress(hFunc, 0); return ret; diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 591a1e0..aa650bd 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3513,7 +3513,37 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, ret = encodeFunc(dwCertEncodingType, lpszStructType, pvStructInfo, dwFlags, pEncodePara, pvEncoded, pcbEncoded); else - SetLastError(ERROR_FILE_NOT_FOUND); + { + static HCRYPTOIDFUNCSET encodeObjectSet = NULL; + CryptEncodeObjectFunc pCryptEncodeObject; + + /* Try CryptEncodeObject function. Don't call CryptEncodeObject + * directly, as that could cause an infinite loop. + */ + if (!encodeObjectSet) + encodeObjectSet = + CryptInitOIDFunctionSet(CRYPT_OID_ENCODE_OBJECT_FUNC, 0); + CryptGetOIDFunctionAddress(encodeObjectSet, dwCertEncodingType, + lpszStructType, 0, (void **)&pCryptEncodeObject, &hFunc); + if (pCryptEncodeObject) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + { + ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, + pvStructInfo, NULL, pcbEncoded); + if (ret && (ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pvEncoded, pcbEncoded, *pcbEncoded))) + ret = pCryptEncodeObject(dwCertEncodingType, + lpszStructType, pvStructInfo, *(BYTE **)pvEncoded, + pcbEncoded); + } + else + ret = pCryptEncodeObject(dwCertEncodingType, lpszStructType, + pvStructInfo, pvEncoded, pcbEncoded); + } + else + SetLastError(ERROR_FILE_NOT_FOUND); + } if (hFunc) CryptFreeOIDFunctionAddress(hFunc, 0); return ret;

1 0

Juan Lang : crypt32: Validate parameters better in CryptDecodeObject.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 5d8d9e7d08836698d9f55153cece7c006f7c1751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8d9e7d08836698d9f55153c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 10 11:20:24 2007 -0700 crypt32: Validate parameters better in CryptDecodeObject. --- dlls/crypt32/decode.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index c6f7305..7c50b27 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4138,6 +4138,16 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (cbEncoded > MAX_ENCODED_LEN) + { + SetLastError(CRYPT_E_ASN1_LARGE); + return FALSE; + } if (!(pCryptDecodeObjectEx = CRYPT_GetBuiltinDecoder(dwCertEncodingType, lpszStructType)))

1 0

Hernan Rajchert : wined3d: Fixed error message when glDrawElement fails.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 6aead911fbb8aa7a34129c5fa7403f4962a943c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aead911fbb8aa7a34129c5fa… Author: Hernan Rajchert <hrajchert(a)gmail.com> Date: Fri Aug 10 11:01:12 2007 -0300 wined3d: Fixed error message when glDrawElement fails. --- dlls/wined3d/drawprim.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c35ce69..e6766a2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -244,13 +244,14 @@ static void drawStridedFast(IWineD3DDevice *iface,UINT numberOfVertices, GLenum #if 1 glDrawElements(glPrimitiveType, numberOfVertices, idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (const char *)idxData+(idxSize * startIdx)); + checkGLcall("glDrawElements"); #else /* using drawRangeElements may be faster */ glDrawRangeElements(glPrimitiveType, minIndex, minIndex + numberOfVertices - 1, numberOfVertices, idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, (const char *)idxData+(idxSize * startIdx)); -#endif checkGLcall("glDrawRangeElements"); +#endif } else {

1 0

Alexandre Julliard : Convert .cvsignore files to a single .gitignore.
by Alexandre Julliard Aug. 11, 2007

Aug. 11, 2007

Module: bugzilla Branch: master Commit: 09ca8e7c1427f222f0635878600b4ad304fdbea9 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=09ca8e7c1427f222f0635… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 11 11:51:02 2007 +0200 Convert .cvsignore files to a single .gitignore. --- .cvsignore | 7 ------- .gitignore | 6 ++++++ Bugzilla/.cvsignore | 1 - docs/.cvsignore | 2 -- docs/html/.cvsignore | 1 - docs/html/api/.cvsignore | 3 --- docs/xml/.cvsignore | 1 - skins/.cvsignore | 2 -- template/.cvsignore | 3 --- template/en/.cvsignore | 2 -- 10 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 1d378db..0000000 --- a/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.htaccess -graphs -data -localconfig -index.html -old-params.txt -extensions diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a54ff87 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.htaccess +/data +/extensions +/graphs +/localconfig +/old-params.txt diff --git a/Bugzilla/.cvsignore b/Bugzilla/.cvsignore deleted file mode 100644 index 03c88fd..0000000 --- a/Bugzilla/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -.htaccess diff --git a/docs/.cvsignore b/docs/.cvsignore deleted file mode 100644 index 8453d5c..0000000 --- a/docs/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -txt -pdf diff --git a/docs/html/.cvsignore b/docs/html/.cvsignore deleted file mode 100644 index 2d19fc7..0000000 --- a/docs/html/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.html diff --git a/docs/html/api/.cvsignore b/docs/html/api/.cvsignore deleted file mode 100644 index 10d63bf..0000000 --- a/docs/html/api/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -*.html -Bugzilla -contrib diff --git a/docs/xml/.cvsignore b/docs/xml/.cvsignore deleted file mode 100644 index ef6b304..0000000 --- a/docs/xml/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bugzilla.ent diff --git a/skins/.cvsignore b/skins/.cvsignore deleted file mode 100644 index b98d8c9..0000000 --- a/skins/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -custom -contrib diff --git a/template/.cvsignore b/template/.cvsignore deleted file mode 100644 index 2e42e12..0000000 --- a/template/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -.htaccess -de -es diff --git a/template/en/.cvsignore b/template/en/.cvsignore deleted file mode 100644 index 73b2352..0000000 --- a/template/en/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.htaccess -custom

1 0

appdb/include util.php
by WineHQ Aug. 11, 2007

Aug. 11, 2007

ChangeSet ID: 31327 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/10 21:20:51 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Bugzilla now has an id column that we can order by. Fix wine version ordering and remove order processing code. Patch: http://cvs.winehq.org/patch.py?id=31327 Old revision New revision Changes Path 1.102 1.103 +2 -26 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.102 appdb/include/util.php:1.103 --- appdb/include/util.php:1.102 11 Aug 2007 2:20:51 -0000 +++ appdb/include/util.php 11 Aug 2007 2:20:51 -0000 @@ -159,42 +159,18 @@ function make_bugzilla_version_list($sVa $sTable = BUGZILLA_DB.".versions"; $sWhere = "WHERE product_id=".BUGZILLA_PRODUCT_ID; - $sQuery = "SELECT value FROM $sTable $sWhere"; + $sQuery = "SELECT value FROM $sTable $sWhere ORDER BY id desc limit 6"; $hResult = query_bugzilladb($sQuery); if(!$hResult) return; - // NOTE: perform some version list pruning - // - Reverse the order, we want the newest entries first - // and we can't use 'order by' since we have no column - // to order by, but the entries should come out in the - // order they were added - // - Trim the list, we don't want every version of wine ever released and - // we don't want the "CVS" version included since we can never figure out - // what version of Wine any given "CVS" version is - // - // TODO: if we ever get a reasonable way to order the list replace this code - // with that + // build the list of versions $aVersions = array(); while(list($sValue) = query_fetch_row($hResult)) { - // exclude unspecified versions and the "CVS" version - if(($sValue != "unspecified") && ($sValue != "CVS")) $aVersions[] = $sValue; } - // now reverse the array order since the oldest - // versions were added first - $aVersions = array_reverse($aVersions); - - // now trim off all but the last X versions - $iVersionsToKeep = 6; - $aVersions = array_slice($aVersions, 0, $iVersionsToKeep); - - // DONE TRIMMING VERSIONS - ///////////////////////// - - // build the selection array $sStr.= "<select name='$sVarname'>\n"; $sStr.= "<option value=\"\">Choose ...</option>\n";

1 0

lostwages/templates/en git.template cvs.template
by Alexandre Julliard Aug. 10, 2007

Aug. 10, 2007

ChangeSet ID: 31326 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/08/10 15:14:10 Modified files: templates/en : git.template cvs.template Log message: Update the information about the bugzilla repository. Patch: http://cvs.winehq.org/patch.py?id=31326 Old revision New revision Changes Path 1.5 1.6 +11 -4 lostwages/templates/en/git.template 1.28 1.29 +1 -2 lostwages/templates/en/cvs.template Index: lostwages/templates/en/git.template diff -u -p lostwages/templates/en/git.template:1.5 lostwages/templates/en/git.template:1.6 --- lostwages/templates/en/git.template:1.5 10 Aug 2007 20:14:10 -0000 +++ lostwages/templates/en/git.template 10 Aug 2007 20:14:10 -0000 @@ -81,7 +81,7 @@ git rebase origin Direct access from the web to the complete Git tree is also possible, using <a href="http://www.kernel.org/pub/software/scm/gitweb/">gitweb</a> package: <ul> - <li><a href="http://source.winehq.org/git">source.winehq.org/git</a>, + <li><a href="http://source.winehq.org/git/wine.git">source.winehq.org/git/wine.git</a>, on the primary Git repository</li> </ul> @@ -89,13 +89,20 @@ git rebase origin <h1 id="modules">Other modules available from WineHQ</h1> -The WineHQ CVS server makes a couple of other things available. +In addition to the main source tree, the WineHQ Git server also +exports the following modules: + +<ul> + <li><a href="http://source.winehq.org/git/bugzilla.git">bugzilla.git</a> -- source for the bugzilla version used on the WineHQ site</li> + <li><a href="http://source.winehq.org/git/tools.git">tools.git</a> -- tools used on the WineHQ site</li> +</ul> + +The WineHQ CVS server exports the following modules: <ul> <li><tt>lostwages</tt> -- source for the WineHQ web site</li> <li><tt>tools</tt> -- tools used on the WineHQ site</li> <li><tt>appdb</tt> -- source for the application database web site</li> - <li><tt>bugzilla</tt> -- source for the bugzilla version used on the WineHQ site</li> </ul> To login to the CVS server, run in a terminal: @@ -122,4 +129,4 @@ in a terminal run in that directory: <code>git cvsimport -v -k -d :pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine docs</code> -But be aware that this can take quite some time. \ No newline at end of file +But be aware that this can take quite some time. Index: lostwages/templates/en/cvs.template diff -u -p lostwages/templates/en/cvs.template:1.28 lostwages/templates/en/cvs.template:1.29 --- lostwages/templates/en/cvs.template:1.28 10 Aug 2007 20:14:10 -0000 +++ lostwages/templates/en/cvs.template 10 Aug 2007 20:14:10 -0000 @@ -45,7 +45,6 @@ cvs login <li><tt>lostwages</tt> -- source for the WineHQ web site</li> <li><tt>tools</tt> -- tools used on the WineHQ site</li> <li><tt>appdb</tt> -- source for the application database web site</li> - <li><tt>bugzilla</tt> -- source for the bugzilla version used on the WineHQ site</li> </ul> <hr /> @@ -74,4 +73,4 @@ cvs login <ul> <li><a href="http://cvs.winehq.org/cvsweb">cvs.winehq.org/cvsweb</a>, on the primary CVS repository.</li> -</ul> \ No newline at end of file +</ul>

1 0

tools/winetest summary.js
by Jeremy Newman Aug. 10, 2007

Aug. 10, 2007

ChangeSet ID: 31325 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/08/10 13:44:21 Modified files: winetest : summary.js Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Make the resultform html a bit bigger Patch: http://cvs.winehq.org/patch.py?id=31325 Old revision New revision Changes Path 1.3 1.4 +1 -1 tools/winetest/summary.js Index: tools/winetest/summary.js diff -u -p tools/winetest/summary.js:1.3 tools/winetest/summary.js:1.4 --- tools/winetest/summary.js:1.3 10 Aug 2007 18:44:21 -0000 +++ tools/winetest/summary.js 10 Aug 2007 18:44:21 -0000 @@ -2,7 +2,7 @@ result_window = null; document.writeln ('<a href="#" onClick="open_popup(); return false;">Open popup</a>'); function open_popup () { - result_window = window.open("../../resultform.html","results","width=240,height=200,resizable,scrollbars=no"); + result_window = window.open("../../resultform.html","results","width=240,height=240,resizable,scrollbars=no"); } function isopen () {

1 0