[ros-diffs] [akhaldi] 73242: [WLANAPI_APITEST] Bring these tests back home.

Author: akhaldi
Date: Thu Nov 17 13:46:36 2016
New Revision: 73242

URL: http://svn.reactos.org/svn/reactos?rev=73242&view=rev
Log:
[WLANAPI_APITEST] Bring these tests back home.

Added:
    trunk/rostests/apitests/wlanapi/
      - copied from r73241, trunk/rostests/winetests/wlanapi/
Removed:
    trunk/rostests/winetests/wlanapi/
Modified:
    trunk/rostests/apitests/CMakeLists.txt
    trunk/rostests/apitests/wlanapi/CMakeLists.txt
    trunk/rostests/apitests/wlanapi/testlist.c
    trunk/rostests/apitests/wlanapi/wlanapi.c
    trunk/rostests/winetests/CMakeLists.txt

Modified: trunk/rostests/apitests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r…
==============================================================================
--- trunk/rostests/apitests/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/CMakeLists.txt	[iso-8859-1] Thu Nov 17 13:46:36 2016
@@ -37,4 +37,5 @@
 add_subdirectory(wininet)
 add_subdirectory(winprint)
 add_subdirectory(winspool)
+add_subdirectory(wlanapi)
 add_subdirectory(ws2_32)

Modified: trunk/rostests/apitests/wlanapi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/CMakeLis…
==============================================================================
--- trunk/rostests/apitests/wlanapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/wlanapi/CMakeLists.txt	[iso-8859-1] Thu Nov 17 13:46:36 2016
@@ -1,5 +1,5 @@
 
-add_executable(wlanapi_winetest wlanapi.c testlist.c)
-set_module_type(wlanapi_winetest win32cui)
-add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32)
-add_cd_file(TARGET wlanapi_winetest DESTINATION reactos/bin FOR all)
+add_executable(wlanapi_apitest wlanapi.c testlist.c)
+set_module_type(wlanapi_apitest win32cui)
+add_importlibs(wlanapi_apitest wlanapi msvcrt kernel32)
+add_cd_file(TARGET wlanapi_apitest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/apitests/wlanapi/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/testlist…
==============================================================================
--- trunk/rostests/apitests/wlanapi/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/wlanapi/testlist.c	[iso-8859-1] Thu Nov 17 13:46:36 2016
@@ -1,10 +1,7 @@
-/* Automatically generated file; DO NOT EDIT!! */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#define __ROS_LONG64__
 
 #define STANDALONE
-#include "wine/test.h"
+#include <apitest.h>
 
 extern void func_wlanapi(void);
 

Modified: trunk/rostests/apitests/wlanapi/wlanapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/wlanapi.…
==============================================================================
--- trunk/rostests/apitests/wlanapi/wlanapi.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/wlanapi/wlanapi.c	[iso-8859-1] Thu Nov 17 13:46:36 2016
@@ -18,15 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wlanapi.h"
-
-#include "wine/test.h"
+#include <apitest.h>
+
+#include <wlanapi.h>
 
 static const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a,
0xf0, 0xc6, 0x8d, 0x43}};
 
@@ -43,20 +37,20 @@
         skip("Skipping wlanapi tests, WlanSvc is not running\n");
         return;
     }
-    ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %d\n", ret);
+    ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %ld\n", ret);
     WlanCloseHandle(hClientHandle, NULL);
 
     /* invalid pdwNegotiatedVersion */
     ret = WlanOpenHandle(1, NULL, NULL, &hClientHandle);
-    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got
%d\n", GetLastError());
+    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got
%ld\n", GetLastError());
 
     /* invalid hClientHandle */
     ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, NULL);
-    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got
%d\n", GetLastError());
+    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got
%ld\n", GetLastError());
 
     /* invalid pReserved */
     ret = WlanOpenHandle(1, (PVOID) 1, &dwNegotiatedVersion, &hClientHandle);
-    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got
%d\n", GetLastError());
+    ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got
%ld\n", GetLastError());
 }
 
 static void WlanCloseHandle_test(void)

Modified: trunk/rostests/winetests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?…
==============================================================================
--- trunk/rostests/winetests/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/CMakeLists.txt	[iso-8859-1] Thu Nov 17 13:46:36 2016
@@ -114,7 +114,6 @@
 add_subdirectory(winmm)
 #add_subdirectory(winspool)
 add_subdirectory(wintrust)
-add_subdirectory(wlanapi)
 add_subdirectory(wldap32)
 add_subdirectory(wmiutils)
 add_subdirectory(ws2_32)