ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Accept ERROR_INVALID_PARAMETER in addition to ERROR_PATH_NOT_FOUND (and remove no-longer-useful checkFileStoreFailure).

This commit is contained in:
Juan Lang 2007-06-29 13:00:48 -07:00 committed by Alexandre Julliard
parent 11e6717e66
commit ef134dc703
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/crypt32/tests/store.c
View File

@ -1191,16 +1191,6 @@ static void testFileStore(void)
DeleteFileW(filename); 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) static BOOL initFileFromData(LPCWSTR filename, const BYTE *pb, DWORD cb)
{ {
HANDLE file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, HANDLE file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL,
@ -1225,17 +1215,23 @@ static void testFileNameStore(void)
WCHAR filename[MAX_PATH]; WCHAR filename[MAX_PATH];
HCERTSTORE store; HCERTSTORE store;
BOOL ret; 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)) if (!GetTempFileNameW(szDot, szPrefix, 0, filename))
return; return;
DeleteFileW(filename); DeleteFileW(filename);
/* The two flags are mutually exclusive */ /* The two flags are mutually exclusive */
checkFileStoreFailure(filename, 0, store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0,
CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG, CERT_FILE_STORE_COMMIT_ENABLE_FLAG | CERT_STORE_READONLY_FLAG, filename);
E_INVALIDARG); 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 */ /* In all of the following tests, the encoding type seems to be ignored */
if (initFileFromData(filename, bigCert, sizeof(bigCert))) if (initFileFromData(filename, bigCert, sizeof(bigCert)))