crypt32(6/6): accept ERROR_INVALID_PARAMETER in addition to
ERROR_PATH_NOT_FOUND...
Juan Lang
juan.lang at gmail.com
Fri Jun 29 15:11:44 CDT 2007
(and remove no-longer-useful checkFileStoreFailure)
--Juan
-------------- next part --------------
From e6d78249529d77ff10cfda8e8217679a7e822c06 Mon Sep 17 00:00:00 2001
From: Juan Lang <juanlang at juan.corp.google.com>
Date: Fri, 29 Jun 2007 13:00:48 -0700
Subject: [PATCH] Accept ERROR_INVALID_PARAMETER in addition to ERROR_PATH_NOT_FOUND (and remove
the no-longer-useful checkFileStoreFailure)
---
dlls/crypt32/tests/store.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index 549c0c6..63ac3a6 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -1191,16 +1191,6 @@ static void testFileStore(void)
DeleteFileW(filename);
}
-static void checkFileStoreFailure(LPCWSTR filename, DWORD dwEncodingType,
- DWORD dwFlags, DWORD expectedError)
-{
- HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_FILENAME_W,
- dwEncodingType, 0, dwFlags, filename);
-
- ok(!store && GetLastError() == expectedError,
- "Expected %08x, got %08x\n", expectedError, GetLastError());
-}
-
static BOOL initFileFromData(LPCWSTR filename, const BYTE *pb, DWORD cb)
{
HANDLE file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL,
@@ -1225,17 +1215,23 @@ static void testFileNameStore(void)
WCHAR filename[MAX_PATH];
HCERTSTORE store;
BOOL ret;
+ DWORD GLE;
- checkFileStoreFailure(NULL, 0, 0, ERROR_PATH_NOT_FOUND);
+ store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, 0, NULL);
+ GLE = GetLastError();
+ ok(!store && (GLE == ERROR_PATH_NOT_FOUND || GLE == ERROR_INVALID_PARAMETER),
+ "Expected ERROR_PATH_NOT_FOUND or ERROR_INVALID_PARAMETER, got %08x\n",
+ GLE);
if (!GetTempFileNameW(szDot, szPrefix, 0, filename))
return;
DeleteFileW(filename);
/* The two flags are mutually exclusive */
- checkFileStoreFailure(filename, 0,
- CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG,
- E_INVALIDARG);
+ store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0,
+ CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG, filename);
+ ok(!store && GetLastError() == E_INVALIDARG,
+ "Expected E_INVALIDARG, got %08x\n", GetLastError());
/* In all of the following tests, the encoding type seems to be ignored */
if (initFileFromData(filename, bigCert, sizeof(bigCert)))
--
1.4.1
More information about the wine-patches
mailing list