From 8e493634959ecce562581ff1632a2b3ff047bc42 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 1 Dec 2013 16:23:36 +0000 Subject: [PATCH] [SCHANNEL_WINETEST] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=61186 --- rostests/winetests/schannel/CMakeLists.txt | 4 +--- rostests/winetests/schannel/main.c | 5 +++-- rostests/winetests/schannel/testlist.c | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rostests/winetests/schannel/CMakeLists.txt b/rostests/winetests/schannel/CMakeLists.txt index 969fee9dbe8..cccd12cb399 100644 --- a/rostests/winetests/schannel/CMakeLists.txt +++ b/rostests/winetests/schannel/CMakeLists.txt @@ -1,7 +1,5 @@ -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) -add_importlibs(schannel_winetest msvcrt kernel32 ntdll) +add_importlibs(schannel_winetest msvcrt kernel32) add_cd_file(TARGET schannel_winetest DESTINATION reactos/bin FOR all) diff --git a/rostests/winetests/schannel/main.c b/rostests/winetests/schannel/main.c index 83c107a953d..d8ade9a8dc0 100644 --- a/rostests/winetests/schannel/main.c +++ b/rostests/winetests/schannel/main.c @@ -216,8 +216,9 @@ static void testGetInfo(void) if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "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 || diff --git a/rostests/winetests/schannel/testlist.c b/rostests/winetests/schannel/testlist.c index 6f0c3974819..d3d739a538c 100644 --- a/rostests/winetests/schannel/testlist.c +++ b/rostests/winetests/schannel/testlist.c @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include - #define STANDALONE -#include "wine/test.h" +#include extern void func_main(void);