[CRYPT32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

svn path=/trunk/; revision=69930
This commit is contained in:
Amine Khaldi 2015-11-17 21:13:47 +00:00
parent f976f07653
commit e42f2b76ee
2 changed files with 33 additions and 2 deletions

View file

@ -7262,7 +7262,7 @@ static void test_decodeNameConstraints(DWORD dwEncoding)
if (constraints->cPermittedSubtree !=
encodedNameConstraints[i].constraints.cPermittedSubtree)
fprintf(stderr, "%d: expected %d permitted, got %d\n", i,
fprintf(stderr, "%d: expected %u permitted, got %u\n", i,
encodedNameConstraints[i].constraints.cPermittedSubtree,
constraints->cPermittedSubtree);
if (constraints->cPermittedSubtree ==
@ -7276,7 +7276,7 @@ static void test_decodeNameConstraints(DWORD dwEncoding)
}
if (constraints->cExcludedSubtree !=
encodedNameConstraints[i].constraints.cExcludedSubtree)
fprintf(stderr, "%d: expected %d excluded, got %d\n", i,
fprintf(stderr, "%d: expected %u excluded, got %u\n", i,
encodedNameConstraints[i].constraints.cExcludedSubtree,
constraints->cExcludedSubtree);
if (constraints->cExcludedSubtree ==

View file

@ -2203,6 +2203,35 @@ static const BYTE serializedStoreWithCertAndHash[] = {
0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
static void delete_test_key(void)
{
HKEY root_key, test_key;
static const WCHAR SysCertW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0};
static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0};
WCHAR subkey_name[32];
DWORD num_subkeys, subkey_name_len;
int idx;
if (RegOpenKeyExW(HKEY_CURRENT_USER, SysCertW, 0, KEY_READ, &root_key))
return;
if (RegOpenKeyExW(root_key, WineTestW, 0, KEY_READ, &test_key))
{
RegCloseKey(root_key);
return;
}
RegQueryInfoKeyW(test_key, NULL, NULL, NULL, &num_subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
for (idx = num_subkeys; idx-- > 0;)
{
subkey_name_len = sizeof(subkey_name)/sizeof(WCHAR);
RegEnumKeyExW(test_key, idx, subkey_name, &subkey_name_len, NULL, NULL, NULL, NULL);
RegDeleteKeyW(test_key, subkey_name);
}
RegCloseKey(test_key);
RegDeleteKeyW(root_key, WineTestW);
RegCloseKey(root_key);
}
static void testAddCertificateLink(void)
{
BOOL ret;
@ -2499,6 +2528,8 @@ static void testAddCertificateLink(void)
CertFreeCertificateContext(source);
CertCloseStore(store1, 0);
delete_test_key();
}
static DWORD countCertsInStore(HCERTSTORE store)