crypt32: Decode cleanups.

- implement a helper to decode sequences of like types - use helper functions wherever applicable when decoding - correct "expected" vs. "got" usage in tests - fix a few other small bugs

crypt32: Decode cleanups.
07dfb1ae · Juan Lang · Alexandre Julliard · 6077c63f · 07dfb1ae · 07dfb1ae
Commit 07dfb1ae authored Dec 13, 2005 by Juan Lang Committed by Alexandre Julliard Dec 13, 2005
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

encode.c dlls/crypt32/encode.c +0 -0

encode.c dlls/crypt32/tests/encode.c +8 -6

No files found.
--- a/dlls/crypt32/encode.c
+++ b/dlls/crypt32/encode.c
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -777,12 +777,12 @@ static void compareNames(const CERT_NAME_INFO *expected,
 {
    ok(got->cRDN == expected->cRDN, "Expected %ld RDNs, got %ld\n",
     expected->cRDN, got->cRDN);
-    if (expected->cRDN)
+    if (got->cRDN)
    {
        ok(got->rgRDN[0].cRDNAttr == expected->rgRDN[0].cRDNAttr,
         "Expected %ld RDN attrs, got %ld\n", expected->rgRDN[0].cRDNAttr,
         got->rgRDN[0].cRDNAttr);
-        if (expected->rgRDN[0].cRDNAttr)
+        if (got->rgRDN[0].cRDNAttr)
        {
            if (expected->rgRDN[0].rgRDNAttr[0].pszObjId &&
             strlen(expected->rgRDN[0].rgRDNAttr[0].pszObjId))
@@ -802,10 +802,12 @@ static void compareNames(const CERT_NAME_INFO *expected,
             "Unexpected data size, got %ld, expected %ld\n",
             got->rgRDN[0].rgRDNAttr[0].Value.cbData,
             expected->rgRDN[0].rgRDNAttr[0].Value.cbData);
-            if (expected->rgRDN[0].rgRDNAttr[0].Value.pbData)
+            if (got->rgRDN[0].rgRDNAttr[0].Value.cbData &&
+             got->rgRDN[0].rgRDNAttr[0].Value.pbData)
                ok(!memcmp(got->rgRDN[0].rgRDNAttr[0].Value.pbData,
                 expected->rgRDN[0].rgRDNAttr[0].Value.pbData,
-                 expected->rgRDN[0].rgRDNAttr[0].Value.cbData),
+                 min(got->rgRDN[0].rgRDNAttr[0].Value.cbData,
+                 expected->rgRDN[0].rgRDNAttr[0].Value.cbData)),
                 "Unexpected value\n");
        }
    }
@@ -837,7 +839,7 @@ static void test_decodeName(DWORD dwEncoding)
        rdn.rgRDNAttr = (CERT_RDN_ATTR *)&names[i].attr;
        if (buf)
        {
-            compareNames((CERT_NAME_INFO *)buf, &info);
+            compareNames(&info, (CERT_NAME_INFO *)buf);
            LocalFree(buf);
        }
    }
@@ -894,7 +896,7 @@ static void test_decodeName(DWORD dwEncoding)

        rdn.cRDNAttr = sizeof(attrs) / sizeof(attrs[0]);
        rdn.rgRDNAttr = attrs;
-        compareNames((CERT_NAME_INFO *)buf, &info);
+        compareNames(&info, (CERT_NAME_INFO *)buf);
        LocalFree(buf);
    }
 }