From 8f270f22bd8b98283521566397885471a7b1171a Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang@gmail.com>
Date: Thu, 27 Sep 2007 11:08:36 -0700
Subject: [PATCH] Add/improve some traces
---
 dlls/crypt32/cert.c   |    2 +-
 dlls/crypt32/encode.c |   12 ++++++------
 dlls/crypt32/msg.c    |    6 ++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 4e5fcfd..024625c 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -1091,7 +1091,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificat
     PCCERT_CONTEXT ret;
     CertCompareFunc compare;
 
-    TRACE("(%p, %d, %d, %d, %p, %p)\n", hCertStore, dwCertEncodingType,
+    TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType,
 	 dwFlags, dwType, pvPara, pPrevCertContext);
 
     switch (dwType >> CERT_COMPARE_SHIFT)
diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c
index 1963eb7..dd71898 100644
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
@@ -3626,9 +3626,9 @@ static BOOL WINAPI CRYPT_ExportRsaPublic
     HCRYPTKEY key;
     static CHAR oid[] = szOID_RSA_RSA;
 
-    TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv,
+    TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv,
      dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags,
-     pvAuxInfo, pInfo, pcbInfo);
+     pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0);
 
     if (!pszPublicKeyObjId)
         pszPublicKeyObjId = oid;
@@ -3706,9 +3706,9 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(H
     ExportPublicKeyInfoExFunc exportFunc = NULL;
     HCRYPTOIDFUNCADDR hFunc = NULL;
 
-    TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv,
+    TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv,
      dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags,
-     pvAuxInfo, pInfo, pcbInfo);
+     pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0);
 
     if (!hCryptProv)
     {
@@ -3747,7 +3747,7 @@ static BOOL WINAPI CRYPT_ImportRsaPublic
     BOOL ret;
     DWORD pubKeySize = 0;
 
-    TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv,
+    TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv,
      dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey);
 
     ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB,
@@ -3785,7 +3785,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(H
     ImportPublicKeyInfoExFunc importFunc = NULL;
     HCRYPTOIDFUNCADDR hFunc = NULL;
 
-    TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv,
+    TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv,
      dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey);
 
     if (!set)
diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c
index 14dbb50..df93c79 100644
--- a/dlls/crypt32/msg.c
+++ b/dlls/crypt32/msg.c
@@ -1808,6 +1808,8 @@ static BOOL CRYPT_CopySignerInfo(void *p
     DWORD size = sizeof(CMSG_SIGNER_INFO);
     BOOL ret;
 
+    TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
+
     size += in->Issuer.cbData;
     size += in->SerialNumber.cbData;
     if (in->HashAlgorithm.pszObjId)
@@ -1853,6 +1855,7 @@ static BOOL CRYPT_CopySignerInfo(void *p
         CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData);
         ret = TRUE;
     }
+    TRACE("returning %d\n", ret);
     return ret;
 }
 
@@ -1862,6 +1865,8 @@ static BOOL CRYPT_CopySignerCertInfo(voi
     DWORD size = sizeof(CERT_INFO);
     BOOL ret;
 
+    TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in);
+
     size += in->Issuer.cbData;
     size += in->SerialNumber.cbData;
     if (!pvData)
@@ -1885,6 +1890,7 @@ static BOOL CRYPT_CopySignerCertInfo(voi
         CRYPT_CopyBlob(&out->SerialNumber, &in->SerialNumber, &nextData);
         ret = TRUE;
     }
+    TRACE("returning %d\n", ret);
     return ret;
 }
 
-- 
1.4.1