Juan Lang : crypt32: Allow either NULL or empty strings where one or the other is expected.

Alexandre Julliard julliard at winehq.org
Fri Oct 12 05:22:58 CDT 2007


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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Wed Oct 10 16:05:49 2007 -0700

crypt32: Allow either NULL or empty strings where one or the other is expected.

---

 dlls/crypt32/tests/encode.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index 47b40e0..29590fc 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -3395,7 +3395,10 @@ static void compareAltNameEntry(const CERT_ALT_NAME_ENTRY *expected,
         case CERT_ALT_NAME_URL:
         case CERT_ALT_NAME_REGISTERED_ID:
             ok((!U(*expected).pwszURL && !U(*got).pwszURL) ||
-               !lstrcmpW(U(*expected).pwszURL, U(*got).pwszURL), "Unexpected name\n");
+             (!U(*expected).pwszURL && !lstrlenW(U(*got).pwszURL)) ||
+             (!U(*got).pwszURL && !lstrlenW(U(*expected).pwszURL)) ||
+             !lstrcmpW(U(*expected).pwszURL, U(*got).pwszURL),
+             "Unexpected name\n");
             break;
         case CERT_ALT_NAME_X400_ADDRESS:
         case CERT_ALT_NAME_DIRECTORY_NAME:




More information about the wine-cvs mailing list