Juan Lang : crypt32: Fix indenting for szOID_CRL_DIST_POINTS.

Alexandre Julliard julliard at winehq.org
Thu Nov 13 08:51:33 CST 2008


Module: wine
Branch: master
Commit: 5922150e2f728fead96ee05f9c3f2401f98aa5f7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5922150e2f728fead96ee05f9c3f2401f98aa5f7

Author: Juan Lang <juan.lang at gmail.com>
Date:   Wed Nov 12 20:41:23 2008 -0800

crypt32: Fix indenting for szOID_CRL_DIST_POINTS.

---

 dlls/crypt32/object.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c
index b31576c..6e79038 100644
--- a/dlls/crypt32/object.c
+++ b/dlls/crypt32/object.c
@@ -1539,13 +1539,15 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType,
              CRL_DIST_POINT_NO_NAME)
             {
                 bytesNeeded += strlenW(distPointName) * sizeof(WCHAR);
-                bytesNeeded += strlenW(colon) * sizeof(WCHAR);
+                bytesNeeded += strlenW(nameSep) * sizeof(WCHAR);
                 if (distPoint->DistPointName.dwDistPointNameChoice ==
                  CRL_DIST_POINT_FULL_NAME)
                     bytesNeeded += strlenW(fullName) * sizeof(WCHAR);
                 else
                     bytesNeeded += strlenW(rdnName) * sizeof(WCHAR);
                 bytesNeeded += strlenW(nameSep) * sizeof(WCHAR);
+                if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
+                    bytesNeeded += 2 * strlenW(indent) * sizeof(WCHAR);
                 /* The indent level (3) is higher than when used as the issuer,
                  * because the name is subordinate to the name type (full vs.
                  * RDN.)
@@ -1648,8 +1650,15 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType,
 
                         strcpyW(str, distPointName);
                         str += strlenW(distPointName);
-                        strcpyW(str, colon);
-                        str += strlenW(colon);
+                        strcpyW(str, nameSep);
+                        str += strlenW(nameSep);
+                        if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE)
+                        {
+                            strcpyW(str, indent);
+                            str += strlenW(indent);
+                            strcpyW(str, indent);
+                            str += strlenW(indent);
+                        }
                         if (distPoint->DistPointName.dwDistPointNameChoice ==
                          CRL_DIST_POINT_FULL_NAME)
                         {




More information about the wine-cvs mailing list