From 7cd6a6d960fb7f60f5ac493932325bebcb9c68aa Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Fri, 7 Oct 2022 17:21:49 +0200 Subject: [PATCH] schannel/tests: Get rid of workarounds for old Windows versions. --- dlls/schannel/tests/main.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 6eeecc7c2c2..b3875636b0c 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -78,26 +78,20 @@ static void testInitialize(void) /* SpLsaModeInitialize does not care about the LSA version. */ status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); - ok(cTables == 2 || - broken(cTables == 1), /* Win2k */ - "cTables: %ld\n", cTables); + ok(cTables == 2, "cTables: %ld\n", cTables); ok(pTables2 != NULL,"pTables: %p\n", pTables2); /* We can call it as many times we want. */ status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); - ok(cTables == 2 || - broken(cTables == 1), /* Win2k */ - "cTables: %ld\n", cTables); + ok(cTables == 2, "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); /* It will always return the same pointer. */ ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); - ok(cTables == 2 || - broken(cTables == 1), /* Win2k */ - "cTables: %ld\n", cTables); + ok(cTables == 2, "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); @@ -124,9 +118,7 @@ static void testInitialize(void) ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(Version == SECPKG_INTERFACE_VERSION || Version == SECPKG_INTERFACE_VERSION_2 /* win11 */, "Version: 0x%lx\n", Version); - ok(cUserTables == 2 || - broken(cUserTables == 4), /* Win2k */ - "cUserTables: %ld\n", cUserTables); + ok(cUserTables == 2, "cUserTables: %ld\n", cUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); /* Initializing user again */ @@ -250,9 +242,7 @@ static void testGetInfo(void) return; } status = pTables->GetInfo(&PackageInfo); - ok(SUCCEEDED(status) || - status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ - "status: 0x%lx\n", status); + ok(SUCCEEDED(status), "status: 0x%lx\n", status); if (SUCCEEDED(status)) {