advapi32/tests: Removed sign comparison warnings.

Marko Nikolic grkoma at gmail.com
Tue Aug 17 08:10:43 CDT 2010


---
 dlls/advapi32/tests/crypt.c |  178 ++++++++++++++++++++++++-------------------
 1 files changed, 98 insertions(+), 80 deletions(-)

diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c
index 6cfbbbf..b1f8285 100644
--- a/dlls/advapi32/tests/crypt.c
+++ b/dlls/advapi32/tests/crypt.c
@@ -152,34 +152,39 @@ static void test_acquire_context(void)
 {
 	BOOL result;
 	HCRYPTPROV hProv;
-	DWORD GLE;
+	INT GLE;
 
 	/* Provoke all kinds of error conditions (which are easy to provoke). 
 	 * The order of the error tests seems to match Windows XP's rsaenh.dll CSP,
 	 * but since this is likely to change between CSP versions, we don't check
 	 * this. Please don't change the order of tests. */
 	result = pCryptAcquireContextA(&hProv, NULL, NULL, 0, 0);
-	ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%d\n", GetLastError());
-	
+        GLE = GetLastError();
+	ok(!result && GLE==NTE_BAD_PROV_TYPE, "%d\n", GLE);
+
 	result = pCryptAcquireContextA(&hProv, NULL, NULL, 1000, 0);
-	ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%d\n", GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE==NTE_BAD_PROV_TYPE, "%d\n", GLE);
 
 	result = pCryptAcquireContextA(&hProv, NULL, NULL, NON_DEF_PROV_TYPE, 0);
-	ok(!result && GetLastError()==NTE_PROV_TYPE_NOT_DEF, "%d\n", GetLastError());
-	
+        GLE = GetLastError();
+	ok(!result && GLE==NTE_PROV_TYPE_NOT_DEF, "%d\n", GLE);
+
 	result = pCryptAcquireContextA(&hProv, szKeySet, szNonExistentProv, PROV_RSA_FULL, 0);
-	ok(!result && GetLastError()==NTE_KEYSET_NOT_DEF, "%d\n", GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE==NTE_KEYSET_NOT_DEF, "%d\n", GLE);
 
 	result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, NON_DEF_PROV_TYPE, 0);
-	ok(!result && GetLastError()==NTE_PROV_TYPE_NO_MATCH, "%d\n", GetLastError());
-	
+        GLE = GetLastError();
+	ok(!result && GLE==NTE_PROV_TYPE_NO_MATCH, "%d\n", GLE);
+
 	/* This test fails under Win2k SP4:
 	   result = TRUE, GetLastError() == ERROR_INVALID_PARAMETER
 	SetLastError(0xdeadbeef);
 	result = pCryptAcquireContextA(NULL, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0);
 	ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%d/%d\n", result, GetLastError());
 	*/
-	
+
 	/* Last not least, try to really acquire a context. */
 	hProv = 0;
 	SetLastError(0xdeadbeef);
@@ -203,7 +208,7 @@ static void test_acquire_context(void)
 		      GLE == ERROR_SUCCESS            || 
 		      GLE == ERROR_RING2_STACK_IN_USE || 
 		      GLE == NTE_FAIL                 ||
-		      GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GetLastError());
+		      GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GLE);
 
 	if (hProv) 
 		pCryptReleaseContext(hProv, 0);
@@ -390,6 +395,7 @@ static const BYTE privKey[] = {
 static void test_verify_sig(void)
 {
 	BOOL ret;
+        INT GLE;
 	HCRYPTPROV prov;
 	HCRYPTKEY key;
 	HCRYPTHASH hash;
@@ -403,16 +409,16 @@ static void test_verify_sig(void)
 
 	SetLastError(0xdeadbeef);
 	ret = pCryptVerifySignatureW(0, NULL, 0, 0, NULL, 0);
-	if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+        GLE = GetLastError();
+	if (!ret && GLE == ERROR_CALL_NOT_IMPLEMENTED)
 	{
 		win_skip("CryptVerifySignatureW is not implemented\n");
 		return;
 	}
-	ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
-	 "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError());
-	ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL,
-	 CRYPT_NEWKEYSET);
-	if (!ret && GetLastError() == NTE_EXISTS)
+	ok(!ret && GLE == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GLE);
+	ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET);
+        GLE = GetLastError();
+	if (!ret && GLE == NTE_EXISTS)
 		ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL, 0);
 	ret = pCryptImportKey(prov, (LPBYTE)privKey, sizeof(privKey), 0, 0, &key);
 	ok(ret, "CryptImportKey failed: %08x\n", GetLastError());
@@ -420,32 +426,34 @@ static void test_verify_sig(void)
 	ok(ret, "CryptCreateHash failed: %08x\n", GetLastError());
 	SetLastError(0xdeadbeef);
 	ret = pCryptVerifySignatureW(hash, NULL, 0, 0, NULL, 0);
-	ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
-	 "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError());
+        GLE = GetLastError();
+	ok(!ret && GLE == ERROR_INVALID_PARAMETER,
+	 "Expected ERROR_INVALID_PARAMETER, got %08x\n", GLE);
 	SetLastError(0xdeadbeef);
 	ret = pCryptVerifySignatureW(0, NULL, 0, key, NULL, 0);
-	ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
-	 "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError());
+        GLE = GetLastError();
+	ok(!ret && GLE == ERROR_INVALID_PARAMETER,
+	 "Expected ERROR_INVALID_PARAMETER, got %08x\n", GLE);
 	SetLastError(0xdeadbeef);
 	ret = pCryptVerifySignatureW(hash, NULL, 0, key, NULL, 0);
-	ok(!ret && (GetLastError() == NTE_BAD_SIGNATURE ||
-	 GetLastError() == ERROR_INVALID_PARAMETER),
-	 "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n",
-	 GetLastError());
+        GLE = GetLastError();
+	ok(!ret && (GLE == NTE_BAD_SIGNATURE || GLE == ERROR_INVALID_PARAMETER),
+	 "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n", GLE);
 	SetLastError(0xdeadbeef);
 	ret = pCryptVerifySignatureW(hash, NULL, sizeof(bogus), key, NULL, 0);
-	ok(!ret && (GetLastError() == NTE_BAD_SIGNATURE ||
-	 GetLastError() == ERROR_INVALID_PARAMETER),
-	 "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n",
-	 GetLastError());
+        GLE = GetLastError();
+	ok(!ret && (GLE == NTE_BAD_SIGNATURE || GLE == ERROR_INVALID_PARAMETER),
+	 "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n", GLE);
 	SetLastError(0xdeadbeef);
 	ret = pCryptVerifySignatureW(hash, bogus, 0, key, NULL, 0);
-	ok(!ret && GetLastError() == NTE_BAD_SIGNATURE,
-	 "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError());
+        GLE = GetLastError();
+	ok(!ret && GLE == NTE_BAD_SIGNATURE,
+	 "Expected NTE_BAD_SIGNATURE, got %08x\n", GLE);
 	SetLastError(0xdeadbeef);
 	ret = pCryptVerifySignatureW(hash, bogus, sizeof(bogus), key, NULL, 0);
-	ok(!ret && GetLastError() == NTE_BAD_SIGNATURE,
-	 "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError());
+        GLE = GetLastError();
+	ok(!ret && GLE == NTE_BAD_SIGNATURE,
+	 "Expected NTE_BAD_SIGNATURE, got %08x\n", GLE);
 	pCryptDestroyKey(key);
 	pCryptDestroyHash(hash);
 	pCryptReleaseContext(prov, 0);
@@ -497,7 +505,9 @@ static void test_enum_providers(void)
 	DWORD result;
 	DWORD notNull = 5;
 	DWORD notZeroFlags = 5;
-	
+
+        INT GLE;
+
 	if(!pCryptEnumProvidersA)
 	{
 	    win_skip("CryptEnumProvidersA is not available\n");
@@ -512,11 +522,13 @@ static void test_enum_providers(void)
 	
 	/* check pdwReserved flag for NULL */
 	result = pCryptEnumProvidersA(dwIndex, &notNull, 0, &type, NULL, &providerLen);
-	ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%d\n", GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE == ERROR_INVALID_PARAMETER, "%d\n", GLE);
 	
 	/* check dwFlags == 0 */
 	result = pCryptEnumProvidersA(dwIndex, NULL, notZeroFlags, &type, NULL, &providerLen);
-	ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d\n", GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE == NTE_BAD_FLAGS, "%d\n", GLE);
 	
 	/* alloc provider to half the size required
 	 * cbName holds the size required */
@@ -525,8 +537,9 @@ static void test_enum_providers(void)
 		return;
 
 	result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen);
-	ok(!result && GetLastError()==ERROR_MORE_DATA, "expected %i, got %d\n",
-		ERROR_MORE_DATA, GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE == ERROR_MORE_DATA, "expected %i, got %d\n",
+		ERROR_MORE_DATA, GLE);
 
 	LocalFree(provider);
 
@@ -543,8 +556,9 @@ static void test_enum_providers(void)
 	 * ERROR_NO_MORE_ITEMS */
 	for (count = 0; count < provCount + 1; count++)
 		result = pCryptEnumProvidersA(count, NULL, 0, &type, NULL, &providerLen);
-	ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected %i, got %d\n", 
-			ERROR_NO_MORE_ITEMS, GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE == ERROR_NO_MORE_ITEMS, "expected %i, got %d\n", 
+			ERROR_NO_MORE_ITEMS, GLE);
 	
 	/* check expected versus actual values returned */
 	result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, NULL, &providerLen);
@@ -645,6 +659,8 @@ static void test_enum_provider_types(void)
 	DWORD notNull = 5;
 	DWORD notZeroFlags = 5;
 
+        INT GLE;
+
 	if(!pCryptEnumProviderTypesA)
 	{
 		win_skip("CryptEnumProviderTypesA is not available\n");
@@ -659,13 +675,13 @@ static void test_enum_provider_types(void)
 
 	/* check pdwReserved for NULL */
 	result = pCryptEnumProviderTypesA(index, &notNull, 0, &provType, typeName, &typeNameSize);
-	ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n",
-		GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GLE);
 
 	/* check dwFlags == zero */
 	result = pCryptEnumProviderTypesA(index, NULL, notZeroFlags, &provType, typeName, &typeNameSize);
-	ok(!result && GetLastError()==NTE_BAD_FLAGS, "expected ERROR_INVALID_PARAMETER, got %d\n",
-		GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE==NTE_BAD_FLAGS, "expected ERROR_INVALID_PARAMETER, got %d\n", GLE);
 
 	/* This test fails under Win2k SP4:
 	 * result = TRUE, GetLastError() == 0xdeadbeef */
@@ -679,8 +695,8 @@ static void test_enum_provider_types(void)
 
 		SetLastError(0xdeadbeef);
 		result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, typeName, &typeNameSize);
-		ok(!result && GetLastError()==ERROR_MORE_DATA, "expected 0/ERROR_MORE_DATA, got %d/%d\n",
-			result, GetLastError());
+                GLE = GetLastError();
+		ok(!result && GLE==ERROR_MORE_DATA, "expected 0/ERROR_MORE_DATA, got %d/%d\n", result, GLE);
 
 		LocalFree(typeName);
 	}
@@ -698,8 +714,8 @@ static void test_enum_provider_types(void)
 	 * ERROR_NO_MORE_ITEMS */
 	for (typeCount = 0; typeCount < dwTypeCount + 1; typeCount++)
 		result = pCryptEnumProviderTypesA(typeCount, NULL, 0, &provType, NULL, &typeNameSize);
-	ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n",
-		GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE==ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", GLE);
 
 	/* check expected versus actual values returned */
 	result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, NULL, &typeNameSize);
@@ -785,7 +801,9 @@ static void test_get_default_provider(void)
 	DWORD provNameSize;
 	DWORD result;
 	DWORD notNull = 5;
-	
+
+        INT GLE;
+
 	if(!pCryptGetDefaultProviderA)
 	{
 	    win_skip("CryptGetDefaultProviderA is not available\n");
@@ -800,23 +818,24 @@ static void test_get_default_provider(void)
 	
 	/* check pdwReserved for NULL */
 	result = pCryptGetDefaultProviderA(provType, &notNull, flags, provName, &provNameSize);
-	ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %d\n",
-		ERROR_INVALID_PARAMETER, GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE==ERROR_INVALID_PARAMETER, "expected %i, got %d\n", ERROR_INVALID_PARAMETER, GLE);
 	
 	/* check for invalid flag */
 	flags = 0xdeadbeef;
 	result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize);
-	ok(!result && GetLastError()==NTE_BAD_FLAGS, "expected %d, got %d\n",
-		NTE_BAD_FLAGS, GetLastError());
+        GLE = GetLastError();
+	ok(!result && GLE==NTE_BAD_FLAGS, "expected %d, got %d\n", NTE_BAD_FLAGS, GLE);
 	flags = CRYPT_MACHINE_DEFAULT;
 	
 	/* check for invalid prov type */
 	provType = 0xdeadbeef;
 	result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize);
-	ok(!result && (GetLastError() == NTE_BAD_PROV_TYPE ||
-	               GetLastError() == ERROR_INVALID_PARAMETER),
+        GLE = GetLastError();
+	ok(!result && (GLE == NTE_BAD_PROV_TYPE ||
+	               GLE == ERROR_INVALID_PARAMETER),
 		"expected NTE_BAD_PROV_TYPE or ERROR_INVALID_PARAMETER, got %d/%d\n",
-		result, GetLastError());
+		result, GLE);
 	provType = PROV_RSA_FULL;
 	
 	SetLastError(0);
@@ -828,9 +847,9 @@ static void test_get_default_provider(void)
 		return;
 	
 	result = pCryptGetDefaultProviderA(provType, NULL, flags, provName, &provNameSize);
-	ok(!result && GetLastError()==ERROR_MORE_DATA, "expected %i, got %d\n",
-		ERROR_MORE_DATA, GetLastError());
-		
+        GLE = GetLastError();
+	ok(!result && GLE==ERROR_MORE_DATA, "expected %i, got %d\n", ERROR_MORE_DATA, GLE);
+
 	LocalFree(provName);
 	
 	/* check expected versus actual values returned */
@@ -972,6 +991,7 @@ static void test_rc2_keylen(void)
     HCRYPTPROV provider;
     HCRYPTKEY hkey = 0;
     BOOL ret;
+    INT GLE;
 
     SetLastError(0xdeadbeef);
     ret = pCryptAcquireContextA(&provider, NULL, NULL,
@@ -991,14 +1011,13 @@ static void test_rc2_keylen(void)
         ret = pCryptImportKey(provider, (BYTE*)&key_blob,
                           sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
                           0, CRYPT_IPSEC_HMAC_KEY, &hkey);
+        GLE = GetLastError();
         /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */
         todo_wine
-        ok(ret ||
-           broken(!ret && GetLastError() == NTE_BAD_FLAGS),
-           "CryptImportKey error %08x\n", GetLastError());
-
+        ok(ret || broken(!ret && GLE == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GLE);
         if (ret)
             pCryptDestroyKey(hkey);
+
         pCryptReleaseContext(provider, 0);
     }
 
@@ -1014,21 +1033,23 @@ static void test_rc2_keylen(void)
         ret = pCryptImportKey(provider, (BYTE*)&key_blob,
                               sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
                               0, 0, &hkey);
-        ok(!ret && (GetLastError() == NTE_BAD_DATA ||
-                    GetLastError() == NTE_BAD_LEN || /* Win7 */
-                    GetLastError() == NTE_BAD_TYPE || /* W2K */
-                    GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */
-           "unexpected error %08x\n", GetLastError());
+        GLE = GetLastError();
+        ok(!ret && (GLE == NTE_BAD_DATA ||
+                    GLE == NTE_BAD_LEN || /* Win7 */
+                    GLE == NTE_BAD_TYPE || /* W2K */
+                    GLE == NTE_PERM), /* Win9x, WinMe and NT4 */
+           "unexpected error %08x\n", GLE);
         /* but importing an 56-bit (7-byte) key does.. */
         key_blob.key_size = 7;
         SetLastError(0xdeadbeef);
         ret = pCryptImportKey(provider, (BYTE*)&key_blob,
                               sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
                               0, 0, &hkey);
+        GLE = GetLastError();
         ok(ret ||
-           broken(!ret && GetLastError() == NTE_BAD_TYPE) || /* W2K */
-           broken(!ret && GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */
-           "CryptAcquireContext error %08x\n", GetLastError());
+           broken(!ret && GLE == NTE_BAD_TYPE) || /* W2K */
+           broken(!ret && GLE == NTE_PERM), /* Win9x, WinMe and NT4 */
+           "CryptAcquireContext error %08x\n", GLE);
         if (ret)
             pCryptDestroyKey(hkey);
         /* as does importing a 16-byte key with the base provider when
@@ -1039,11 +1060,10 @@ static void test_rc2_keylen(void)
         ret = pCryptImportKey(provider, (BYTE*)&key_blob,
                               sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
                               0, CRYPT_IPSEC_HMAC_KEY, &hkey);
+        GLE = GetLastError();
         /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */
         todo_wine
-        ok(ret ||
-           broken(!ret && GetLastError() == NTE_BAD_FLAGS),
-           "CryptImportKey error %08x\n", GetLastError());
+        ok(ret || broken(!ret && GLE == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GLE);
         if (ret)
             pCryptDestroyKey(hkey);
 
@@ -1065,10 +1085,9 @@ static void test_rc2_keylen(void)
         ret = pCryptImportKey(provider, (BYTE*)&key_blob,
                               sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
                               0, CRYPT_IPSEC_HMAC_KEY, &hkey);
+        GLE = GetLastError();
         todo_wine
-        ok(ret ||
-           broken(!ret && GetLastError() == NTE_BAD_FLAGS),
-           "CryptImportKey error %08x\n", GetLastError());
+        ok(ret || broken(!ret && GLE == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GLE);
         if (ret)
             pCryptDestroyKey(hkey);
 
@@ -1080,10 +1099,9 @@ static void test_rc2_keylen(void)
         ret = pCryptImportKey(provider, (BYTE*)&key_blob,
                               sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
                               0, CRYPT_IPSEC_HMAC_KEY, &hkey);
+        GLE = GetLastError();
         todo_wine
-        ok(ret ||
-           broken(!ret && GetLastError() == NTE_BAD_FLAGS),
-           "CryptImportKey error %08x\n", GetLastError());
+        ok(ret || broken(!ret && GLE == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GLE);
         if (ret)
             pCryptDestroyKey(hkey);
 
-- 
1.7.0.4




More information about the wine-patches mailing list