Juan Lang : crypt32: Remove wrong test and parameter check.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue May 29 08:05:22 CDT 2007
Module: wine
Branch: master
Commit: fa10a299308605a0256c6d590beb1b440ec632f9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa10a299308605a0256c6d590beb1b440ec632f9
Author: Juan Lang <juan.lang at gmail.com>
Date: Thu May 24 16:43:49 2007 -0700
crypt32: Remove wrong test and parameter check.
---
dlls/crypt32/store.c | 6 ------
dlls/crypt32/tests/store.c | 28 ----------------------------
2 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index 13ac320..30143fe 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -1920,12 +1920,6 @@ static PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv,
SetLastError(ERROR_PATH_NOT_FOUND);
return NULL;
}
- if (!(dwFlags & (CERT_FILE_STORE_COMMIT_ENABLE_FLAG |
- CERT_STORE_READONLY_FLAG)))
- {
- SetLastError(ERROR_FILE_NOT_FOUND);
- return NULL;
- }
access = GENERIC_READ;
if (dwFlags & CERT_FILE_STORE_COMMIT_ENABLE_FLAG)
diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index d00adb4..52cf965 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -1230,34 +1230,6 @@ static void testFileNameStore(void)
checkFileStoreFailure(filename, 0,
CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG,
E_INVALIDARG);
- /* Without an encoding type, these all fail */
- checkFileStoreFailure(filename, 0, 0, ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, 0, CERT_STORE_OPEN_EXISTING_FLAG,
- ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, 0, CERT_STORE_CREATE_NEW_FLAG,
- ERROR_FILE_NOT_FOUND);
- /* Without a message encoding type, these still fail */
- checkFileStoreFailure(filename, X509_ASN_ENCODING, 0, ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, X509_ASN_ENCODING,
- CERT_STORE_OPEN_EXISTING_FLAG, ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, X509_ASN_ENCODING,
- CERT_STORE_CREATE_NEW_FLAG, ERROR_FILE_NOT_FOUND);
- /* Without a cert encoding type, they still fail */
- checkFileStoreFailure(filename, PKCS_7_ASN_ENCODING, 0,
- ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, PKCS_7_ASN_ENCODING,
- CERT_STORE_OPEN_EXISTING_FLAG, ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, PKCS_7_ASN_ENCODING,
- CERT_STORE_CREATE_NEW_FLAG, ERROR_FILE_NOT_FOUND);
- /* With both a message and cert encoding type, but without commit enabled,
- * they still fail
- */
- checkFileStoreFailure(filename, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0,
- ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
- CERT_STORE_OPEN_EXISTING_FLAG, ERROR_FILE_NOT_FOUND);
- checkFileStoreFailure(filename, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
- CERT_STORE_CREATE_NEW_FLAG, ERROR_FILE_NOT_FOUND);
/* In all of the following tests, the encoding type seems to be ignored */
if (initFileFromData(filename, bigCert, sizeof(bigCert)))
More information about the wine-cvs
mailing list