Fixes a crypt32 str test. (try 2)

Christian Inci chris.pcguy.inci at gmail.com
Fri Apr 1 22:13:07 CDT 2011


Try 2: Add handling for CERT_NAME_STR_NO_PLUS_FLAG.
---
 dlls/crypt32/str.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c
index 36e4a3a..501a537 100644
--- a/dlls/crypt32/str.c
+++ b/dlls/crypt32/str.c
@@ -1075,6 +1075,7 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500,
                     static const WCHAR semiSep[] = { ';',0 };
                     static const WCHAR crlfSep[] = { '\r','\n',0 };
                     static const WCHAR allSeps[] = { '+',',',';','\r','\n',0 };
+                    static const WCHAR allSepsWithoutPlus[] = { ',',';','\r','\n',0 };
                     LPCWSTR sep;
 
                     str++;
@@ -1084,6 +1085,8 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500,
                         sep = semiSep;
                     else if (dwStrType & CERT_NAME_STR_CRLF_FLAG)
                         sep = crlfSep;
+                    else if (dwStrType & CERT_NAME_STR_NO_PLUS_FLAG)
+                        sep = allSepsWithoutPlus;
                     else
                         sep = allSeps;
                     ret = CRYPT_GetNextValueW(str, dwStrType, sep, &token,
-- 
1.7.1


--------------060604010608050907030806--



More information about the wine-patches mailing list