Andrew Talbot : crypt32/tests: Write-strings warnings fix.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jul 28 07:15:09 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 2c23192704f48df7227e278964804a0d46a0dc61
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2c23192704f48df7227e278964804a0d46a0dc61

Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date:   Thu Jul 27 19:45:58 2006 +0100

crypt32/tests: Write-strings warnings fix.

---

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

diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index 712c1b2..1372934 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -806,6 +806,8 @@ static void test_encodeUnicodeName(DWORD
     CERT_RDN_ATTR attrs[2];
     CERT_RDN rdn;
     CERT_NAME_INFO info;
+    static CHAR oid_common_name[] = szOID_COMMON_NAME,
+                oid_sur_name[]    = szOID_SUR_NAME;
     BYTE *buf = NULL;
     DWORD size = 0;
     BOOL ret;
@@ -830,7 +832,7 @@ static void test_encodeUnicodeName(DWORD
     /* Check with one CERT_RDN_ATTR, that has an invalid character for the
      * encoding (the NULL).
      */
-    attrs[0].pszObjId = szOID_COMMON_NAME;
+    attrs[0].pszObjId = oid_common_name;
     attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING;
     attrs[0].Value.cbData = sizeof(commonNameW);
     attrs[0].Value.pbData = (BYTE *)commonNameW;
@@ -846,11 +848,11 @@ static void test_encodeUnicodeName(DWORD
     /* Check with two NULL-terminated CERT_RDN_ATTRs.  Note DER encoding
      * forces the order of the encoded attributes to be swapped.
      */
-    attrs[0].pszObjId = szOID_COMMON_NAME;
+    attrs[0].pszObjId = oid_common_name;
     attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING;
     attrs[0].Value.cbData = 0;
     attrs[0].Value.pbData = (BYTE *)commonNameW;
-    attrs[1].pszObjId = szOID_SUR_NAME;
+    attrs[1].pszObjId = oid_sur_name;
     attrs[1].dwValueType = CERT_RDN_PRINTABLE_STRING;
     attrs[1].Value.cbData = 0;
     attrs[1].Value.pbData = (BYTE *)surNameW;




More information about the wine-cvs mailing list