[SCHANNEL_WINETEST]: Sync with Wine 1.5.19.

svn path=/trunk/; revision=57879

diff --git a/rostests/winetests/schannel/CMakeLists.txt b/rostests/winetests/schannel/CMakeLists.txt
index 60474f6..969fee9 100644 (file)
--- a/rostests/winetests/schannel/CMakeLists.txt
+++ b/rostests/winetests/schannel/CMakeLists.txt
@@ -1,8 +1,5 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__ROS_LONG64__)
 add_executable(schannel_winetest main.c testlist.c)
 target_link_libraries(schannel_winetest wine)
 set_module_type(schannel_winetest win32cui)

diff --git a/rostests/winetests/schannel/main.c b/rostests/winetests/schannel/main.c
index b576848..83c107a 100644 (file)
--- a/rostests/winetests/schannel/main.c
+++ b/rostests/winetests/schannel/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);