[ros-diffs] [akhaldi] 61186: [SCHANNEL_WINETEST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sun Dec  1 16:23:36 2013
New Revision: 61186

URL: http://svn.reactos.org/svn/reactos?rev=61186&view=rev
Log:
[SCHANNEL_WINETEST]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/rostests/winetests/schannel/CMakeLists.txt
    trunk/rostests/winetests/schannel/main.c
    trunk/rostests/winetests/schannel/testlist.c

Modified: trunk/rostests/winetests/schannel/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/CMakeLi...
==============================================================================
--- trunk/rostests/winetests/schannel/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/schannel/CMakeLists.txt	[iso-8859-1] Sun Dec  1 16:23:36 2013
@@ -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)

Modified: trunk/rostests/winetests/schannel/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/main.c?...
==============================================================================
--- trunk/rostests/winetests/schannel/main.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/schannel/main.c	[iso-8859-1] Sun Dec  1 16:23:36 2013
@@ -216,8 +216,9 @@

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 ||

Modified: trunk/rostests/winetests/schannel/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/testlis...
==============================================================================
--- trunk/rostests/winetests/schannel/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/schannel/testlist.c	[iso-8859-1] Sun Dec  1 16:23:36 2013
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */

-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>

extern void func_main(void);