[USBSTOR]

[reactos.git] / rostests / apitests / ws2_32 / WSAStartup.c

diff --git a/rostests/apitests/ws2_32/WSAStartup.c b/rostests/apitests/ws2_32/WSAStartup.c
index 86d5f42..92edb42 100644 (file)
--- a/rostests/apitests/ws2_32/WSAStartup.c
+++ b/rostests/apitests/ws2_32/WSAStartup.c
@@ -2,19 +2,19 @@
  * PROJECT:         ReactOS api tests
  * LICENSE:         GPLv2+ - See COPYING in the top level directory
  * PURPOSE:         Test for WSAStartup
- * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
+ * PROGRAMMER:      Thomas Faber <thomas.faber@reactos.org>
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <windef.h>
 #include <winsock2.h>
-#include <wine/test.h>
-#include <pseh/pseh2.h>
 #include <ndk/rtlfuncs.h>
 #include <ndk/mmfuncs.h>
 
-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
 static
 PVOID
 AllocateGuarded(
@@ -78,7 +78,7 @@ CheckStringBuffer(
     EqualLength = RtlCompareMemory(Buffer, Expected, Length);
     if (EqualLength != Length)
     {
-        ok(0, "String is '%S', expected '%S'\n", Buffer, Expected);
+        ok(0, "String is '%.*s', expected '%s'\n", (int)MaximumLength, Buffer, Expected);
         Result = FALSE;
     }
 
@@ -133,7 +133,6 @@ AreLegacyFunctionsSupported(VOID)
 
 START_TEST(WSAStartup)
 {
-    NTSTATUS ExceptionStatus;
     BOOLEAN Okay;
     LPWSADATA WsaData;
     int Error;