Jeremy White : crypt32: More gcc 2.95 adjustments.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Mar 2 05:17:33 CST 2006


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

Author: Jeremy White <jwhite at codeweavers.com>
Date:   Wed Mar  1 09:52:22 2006 -0600

crypt32: More gcc 2.95 adjustments.

---

 dlls/crypt32/tests/oid.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c
index cfda412..fc1fdfc 100644
--- a/dlls/crypt32/tests/oid.c
+++ b/dlls/crypt32/tests/oid.c
@@ -356,8 +356,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_RSA_MD5), "Expected %s, got %s\n",
          szOID_RSA_MD5, info->pszOID);
-        ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
-         info->Algid);
+        ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
+           U(*info).Algid);
     }
     info = CryptFindOIDInfo(CRYPT_OID_INFO_NAME_KEY, (void *)sha1, 0);
     ok(info != NULL, "Expected to find sha1\n");
@@ -365,8 +365,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n",
          szOID_OIWSEC_sha1, info->pszOID);
-        ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
-         info->Algid);
+        ok(U(*info).Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
+           U(*info).Algid);
     }
     info = CryptFindOIDInfo(CRYPT_OID_INFO_ALGID_KEY, &alg, 0);
     ok(info != NULL, "Expected to find sha1\n");
@@ -374,8 +374,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n",
          szOID_OIWSEC_sha1, info->pszOID);
-        ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
-         info->Algid);
+        ok(U(*info).Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n",
+           U(*info).Algid);
     }
     info = CryptFindOIDInfo(CRYPT_OID_INFO_SIGN_KEY, algs, 0);
     ok(info != NULL, "Expected to find md5RSA\n");
@@ -383,8 +383,8 @@ static void test_findOIDInfo(void)
     {
         ok(!strcmp(info->pszOID, szOID_RSA_MD5RSA), "Expected %s, got %s\n",
          szOID_RSA_MD5RSA, info->pszOID);
-        ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
-         info->Algid);
+        ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n",
+           U(*info).Algid);
     }
 }
 




More information about the wine-cvs mailing list