Module: wine Branch: master Commit: 53087dbe12ea5997c554755107e69c128443fe73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53087dbe12ea5997c554755107... Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 7 09:19:17 2007 -0700 crypt32: Introduce cryptasn debug channel to quiet down crypt traces. --- dlls/crypt32/decode.c | 9 +++++---- dlls/crypt32/encode.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 495febd..5601862 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -53,7 +53,8 @@ #define ASN_FLAGS_MASK 0xe0 #define ASN_TYPE_MASK 0x1f -WINE_DEFAULT_DEBUG_CHANNEL(crypt); +WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); +WINE_DECLARE_DEBUG_CHANNEL(crypt); struct GenericArray { @@ -132,7 +133,7 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, CryptDecodeObjectFunc pCryptDecodeObject; HCRYPTOIDFUNCADDR hFunc; - TRACE("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, + TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); @@ -3988,7 +3989,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, CryptDecodeObjectExFunc decodeFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(0x%08x, %s, %p, %d, 0x%08x, %p, %p, %p)\n", + TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo); @@ -4154,7 +4155,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; else - TRACE("OID %s not found or unimplemented, looking for DLL\n", + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!decodeFunc) { diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index e361e77..591a1e0 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -47,7 +47,8 @@ #include "wine/unicode.h" #include "crypt32_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(crypt); +WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); +WINE_DECLARE_DEBUG_CHANNEL(crypt); typedef BOOL (WINAPI *CryptEncodeObjectFunc)(DWORD, LPCSTR, const void *, BYTE *, DWORD *); @@ -99,7 +100,7 @@ BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, HCRYPTOIDFUNCADDR hFunc; CryptEncodeObjectFunc pCryptEncodeObject; - TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, + TRACE_(crypt)("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); @@ -3343,7 +3344,7 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, CryptEncodeObjectExFunc encodeFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, + TRACE_(crypt)("(0x%08x, %s, %p, 0x%08x, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, dwFlags, pEncodePara, pvEncoded, pcbEncoded); @@ -3499,7 +3500,7 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) encodeFunc = CRYPT_AsnEncodeIssuingDistPoint; else - TRACE("OID %s not found or unimplemented, looking for DLL\n", + TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", debugstr_a(lpszStructType)); if (!encodeFunc) { @@ -3613,9 +3614,9 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro ExportPublicKeyInfoExFunc exportFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, dwKeySpec, - dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, - pInfo, pcbInfo); + TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, + dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, + pvAuxInfo, pInfo, pcbInfo); if (!hCryptProv) { @@ -3692,7 +3693,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, ImportPublicKeyInfoExFunc importFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, + TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); if (!set)