[1/2] schannel/tests: Fix test on win8 (try 2)
André Hentschel
nerv at dawncrow.de
Thu Dec 6 12:28:08 CST 2012
As suggested by Hans
---
dlls/schannel/tests/main.c | 18 +++++++++++++++---
include/sspi.h | 4 ++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c
index b576848..83c107a 100644
--- a/dlls/schannel/tests/main.c
+++ b/dlls/schannel/tests/main.c
@@ -45,6 +45,17 @@
ValidateTargetInfo)
#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE)
+#define LSA_BASE_CAPS ( \
+ SECPKG_FLAG_INTEGRITY | \
+ SECPKG_FLAG_PRIVACY | \
+ SECPKG_FLAG_CONNECTION | \
+ SECPKG_FLAG_MULTI_REQUIRED | \
+ SECPKG_FLAG_EXTENDED_ERROR | \
+ SECPKG_FLAG_IMPERSONATION | \
+ SECPKG_FLAG_ACCEPT_WIN32_NAME | \
+ SECPKG_FLAG_STREAM | \
+ SECPKG_FLAG_MUTUAL_AUTH )
+
static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG,
PSECPKG_FUNCTION_TABLE*, PULONG);
static NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG,
@@ -179,8 +190,9 @@ static void testGetInfo(void)
/* First package: Unified */
status = pTables->GetInfo(&PackageInfo);
ok(status == STATUS_SUCCESS, "status: 0x%x\n", status);
- ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n",
- PackageInfo.fCapabilities);
+ ok(PackageInfo.fCapabilities == LSA_BASE_CAPS ||
+ PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH),
+ "fCapabilities: 0x%x\n", PackageInfo.fCapabilities);
ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion);
ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID);
ok(PackageInfo.cbMaxToken == 0x4000 ||
@@ -204,7 +216,7 @@ static void testGetInfo(void)
if (status == STATUS_SUCCESS)
{
- ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n",
+ ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n",
PackageInfo.fCapabilities);
ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion);
ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID);
diff --git a/include/sspi.h b/include/sspi.h
index bd2241c..74bfd2f 100644
--- a/include/sspi.h
+++ b/include/sspi.h
@@ -131,6 +131,10 @@ typedef struct _SecPkgInfoW
#define SECPKG_FLAG_DELEGATION 0x00020000
#define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000
#define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000
+#define SECPKG_FLAG_NEGO_EXTENDER 0x00100000
+#define SECPKG_FLAG_NEGOTIABLE2 0x00200000
+#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000
+#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000
#define SECPKG_ID_NONE 0xffff
--
1.8.0
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list