Skip to content

Commit

Permalink
[WINTRUST_WINETEST]
Browse files Browse the repository at this point in the history
* Sync with Wine 1.7.27.
CORE-8540

git-svn-id: svn://svn.reactos.org/reactos/trunk@64623 97493ccd-5924-5043-b1f5-66cb403b36ce
  • Loading branch information
AmineKhaldi committed Oct 8, 2014
1 parent 5a1071b commit 261ee73
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions rostests/winetests/wintrust/crypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static void test_context(void)
* FIXME:
* We don't want to mess too much with these for now so we should delete only the ones
* that shouldn't be there like the deadbeef ones. We first have to figure out if it's
* save to remove files and directories from CatRoot/CatRoot2.
* safe to remove files and directories from CatRoot/CatRoot2.
*/

ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0);
Expand Down Expand Up @@ -550,7 +550,9 @@ static void test_CryptCATAdminAddRemoveCatalog(void)
hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1);
error = GetLastError();
ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n");
ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError());
ok(error == ERROR_INVALID_PARAMETER ||
error == ERROR_BAD_FORMAT, /* win 8 */
"got %u\n", GetLastError());

SetLastError(0xdeadbeef);
hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0);
Expand Down
1 change: 1 addition & 0 deletions rostests/winetests/wintrust/softpub.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs)
}
else
skip("CertCreateCertificateContext failed: %08x\n", GetLastError());
funcs->pfnFree(data.pasSigners);
}
}

Expand Down

0 comments on commit 261ee73

Please sign in to comment.