Skip to content

W
wine-cw
Commit 7cd6a6d9 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

schannel/tests: Get rid of workarounds for old Windows versions.

parent 08d0bc64
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 15 deletions
dlls/schannel/tests/main.c
View file @ 7cd6a6d9
...@@ -78,26 +78,20 @@ static void testInitialize(void) ...@@ -78,26 +78,20 @@ static void testInitialize(void)
/* SpLsaModeInitialize does not care about the LSA version. */ /* SpLsaModeInitialize does not care about the LSA version. */
status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables);
ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status);
ok(cTables == 2 || ok(cTables == 2, "cTables: %ld\n", cTables);
broken(cTables == 1), /* Win2k */
"cTables: %ld\n", cTables);
ok(pTables2 != NULL,"pTables: %p\n", pTables2); ok(pTables2 != NULL,"pTables: %p\n", pTables2);
/* We can call it as many times we want. */ /* We can call it as many times we want. */
status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables);
ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status);
ok(cTables == 2 || ok(cTables == 2, "cTables: %ld\n", cTables);
broken(cTables == 1), /* Win2k */
"cTables: %ld\n", cTables);
ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables != NULL, "pTables: %p\n", pTables);
/* It will always return the same pointer. */ /* It will always return the same pointer. */
ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2);
status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables);
ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status);
ok(cTables == 2 || ok(cTables == 2, "cTables: %ld\n", cTables);
broken(cTables == 1), /* Win2k */
"cTables: %ld\n", cTables);
ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables != NULL, "pTables: %p\n", pTables);
ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2);
...@@ -124,9 +118,7 @@ static void testInitialize(void) ...@@ -124,9 +118,7 @@ static void testInitialize(void)
ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status);
ok(Version == SECPKG_INTERFACE_VERSION || Version == SECPKG_INTERFACE_VERSION_2 /* win11 */, ok(Version == SECPKG_INTERFACE_VERSION || Version == SECPKG_INTERFACE_VERSION_2 /* win11 */,
"Version: 0x%lx\n", Version); "Version: 0x%lx\n", Version);
ok(cUserTables == 2 || ok(cUserTables == 2, "cUserTables: %ld\n", cUserTables);
broken(cUserTables == 4), /* Win2k */
"cUserTables: %ld\n", cUserTables);
ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables);
/* Initializing user again */ /* Initializing user again */
...@@ -250,9 +242,7 @@ static void testGetInfo(void) ...@@ -250,9 +242,7 @@ static void testGetInfo(void)
return; return;
} }
status = pTables->GetInfo(&PackageInfo); status = pTables->GetInfo(&PackageInfo);
ok(SUCCEEDED(status) || ok(SUCCEEDED(status), "status: 0x%lx\n", status);
status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */
"status: 0x%lx\n", status);
if (SUCCEEDED(status)) if (SUCCEEDED(status))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment