Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-17 16:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync crypt32_winetest with wine 1.1.24

Browse source 
svn path=/trunk/; revision=41581
This commit is contained in:
Christoph von Wittich 2009-06-23 11:47:46 +00:00
parent 2d5297edef
commit aa2eef5de1
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rostests/winetests/crypt32/encode.c
View file

@ -5843,7 +5843,8 @@ static void test_decodePKCSAttribute(DWORD dwEncoding)
* I doubt an app depends on that.
*/
ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD ||
GetLastError() == CRYPT_E_ASN1_CORRUPT || OSS_MORE_INPUT /* Win9x */),
GetLastError() == CRYPT_E_ASN1_CORRUPT ||
GetLastError() == OSS_MORE_INPUT /* Win9x */),
"Expected CRYPT_E_ASN1_EOD, CRYPT_E_ASN1_CORRUPT, or OSS_MORE_INPUT, got %x\n",
GetLastError());
ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE,

6
rostests/winetests/crypt32/oid.c
View file

@ -384,7 +384,7 @@ static void test_registerDefaultOIDFunction(void)
static const char func[] = "CertDllOpenStoreProv";
char buf[MAX_PATH];
BOOL ret;
long rc;
LSTATUS rc;
HKEY key;
ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, NULL);
@ -419,7 +419,7 @@ static void test_registerDefaultOIDFunction(void)
ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError());
sprintf(buf, fmt, 0, func);
rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key);
ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %ld\n", rc);
ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %d\n", rc);
if (rc == 0)
{
static const CHAR dllA[] = "Dll";
@ -432,7 +432,7 @@ static void test_registerDefaultOIDFunction(void)
size = sizeof(dllBuf) / sizeof(dllBuf[0]);
rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size);
ok(rc == 0,
"Expected Dll value to exist, RegQueryValueExA failed: %ld\n", rc);
"Expected Dll value to exist, RegQueryValueExA failed: %d\n", rc);
ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %d\n", type);
/* bogusDll was registered first, so that should be first */
ptr = dllBuf;