[hbelusca] 60319: [APITESTS] - No need now to declare a NTSTATUS ExceptionStatus; variable to be able to use StartSeh() / EndSeh() macros; this is done automagically. - Use explicitely unicode macr...
Author: hbelusca Date: Sun Sep 22 19:07:35 2013 New Revision: 60319
URL: http://svn.reactos.org/svn/reactos?rev=60319&view=rev Log: [APITESTS] - No need now to declare a NTSTATUS ExceptionStatus; variable to be able to use StartSeh() / EndSeh() macros; this is done automagically. - Use explicitely unicode macros where it's needed.
Modified: trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c trunk/rostests/apitests/crt/_vsnprintf.c trunk/rostests/apitests/crt/_vsnwprintf.c trunk/rostests/apitests/crt/sprintf.c trunk/rostests/apitests/gdi32/AddFontResourceEx.c trunk/rostests/apitests/gdi32/CreateDIBitmap.c trunk/rostests/apitests/gdi32/GetObject.c trunk/rostests/apitests/gdi32/SelectObject.c trunk/rostests/apitests/gdi32/SetBrushOrgEx.c trunk/rostests/apitests/include/apitest.h trunk/rostests/apitests/ntdll/LdrEnumResources.c trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c trunk/rostests/apitests/ntdll/NtMapViewOfSection.c trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c trunk/rostests/apitests/ntdll/RtlBitmap.c trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c trunk/rostests/apitests/ntdll/RtlDoesFileExists.c trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c trunk/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c trunk/rostests/apitests/ntdll/SystemInfo.c trunk/rostests/apitests/ntdll/Timer.c trunk/rostests/apitests/ntdll/ZwContinue.c trunk/rostests/apitests/ntdll/sprintf.c trunk/rostests/apitests/ntdll/testlist.c trunk/rostests/apitests/powrprof/CMakeLists.txt trunk/rostests/apitests/powrprof/power.c trunk/rostests/apitests/powrprof/testlist.c trunk/rostests/apitests/ws2_32/WSAStartup.c trunk/rostests/apitests/ws2_32/getaddrinfo.c trunk/rostests/apitests/ws2_32/helpers.c trunk/rostests/apitests/ws2_32/ioctlsocket.c trunk/rostests/apitests/ws2_32/recv.c trunk/rostests/apitests/ws2_32/testlist.c
Modified: trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/SaferIde... ============================================================================== --- trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -16,7 +16,6 @@
START_TEST(SaferIdentifyLevel) { - NTSTATUS ExceptionStatus; BOOL ret; DWORD error; SAFER_LEVEL_HANDLE handle;
Modified: trunk/rostests/apitests/crt/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnprintf.c?... ============================================================================== --- trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -26,7 +26,7 @@ START_TEST(_vsnprintf) { char buffer[255]; - NTSTATUS ExceptionStatus; + /* Here you can mix wide and ANSI strings */ call_varargs(buffer, 255, 12, "%S world!", L"hello"); call_varargs(buffer, 255, 12, "%s world!", "hello");
Modified: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.c... ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -26,7 +26,7 @@ START_TEST(_vsnwprintf) { wchar_t buffer[255]; - NTSTATUS ExceptionStatus; + /* Test basic functionality */ call_varargs(buffer, 255, 19, L"%s world!", "hello"); call_varargs(buffer, 255, 12, L"%s world!", L"hello");
Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?rev... ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -71,7 +71,6 @@ * user32's wsprintf. Make sure to test them all */ START_TEST(sprintf) { - NTSTATUS ExceptionStatus; int Length; CHAR Buffer[128]; PCHAR String;
Modified: trunk/rostests/apitests/gdi32/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontReso... ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -8,7 +8,6 @@ #include <apitest.h>
#include <wingdi.h> -#include <libs/pseh/pseh2.h>
void Test_AddFontResourceExW() {
Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBit... ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -9,7 +9,6 @@
#include <wingdi.h> #include <winuser.h> -#include <pseh/pseh2.h>
#include "init.h"
Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.c... ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -10,7 +10,6 @@ #include <wingdi.h> #include <winddi.h> #include <winuser.h> -#include <pseh/pseh2.h> #include <include/ntgdityp.h> #include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObjec... ============================================================================== --- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -11,7 +11,6 @@ #include <wingdi.h> #include <winddi.h> #include <winuser.h> -#include <pseh/pseh2.h> #include <include/ntgdityp.h> #include <include/ntgdihdl.h>
Modified: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOrg... ============================================================================== --- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -8,7 +8,6 @@ #include <apitest.h>
#include <wingdi.h> -#include <pseh/pseh2.h>
void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp) {
Modified: trunk/rostests/apitests/include/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/apitest.h... ============================================================================== --- trunk/rostests/apitests/include/apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/include/apitest.h [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -3,19 +3,23 @@
// #define __ROS_LONG64__
+/* The user must #define STANDALONE if it uses this header in testlist.c */ #define WIN32_NO_STATUS +#include <wine/test.h> +#undef WIN32_NO_STATUS
-/* The user must #define STANDALONE if it uses this header in testlist.c */ -#include <wine/test.h> #include <pseh/pseh2.h>
/* See kmtests/include/kmt_test.h */ #define InvalidPointer ((PVOID)0x5555555555555555ULL) +// #define InvalidPointer ((PVOID)0x0123456789ABCDEFULL)
#define StartSeh() \ - ExceptionStatus = STATUS_SUCCESS; \ +{ \ + NTSTATUS ExceptionStatus = STATUS_SUCCESS; \ _SEH2_TRY \ { + #define EndSeh(ExpectedStatus) \ } \ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) \ @@ -23,6 +27,9 @@ ExceptionStatus = _SEH2_GetExceptionCode(); \ } \ _SEH2_END; \ - ok(ExceptionStatus == ExpectedStatus, "Exception 0x%08lx, expected 0x%08lx\n", ExceptionStatus, ExpectedStatus) + ok(ExceptionStatus == ExpectedStatus, \ + "Exception 0x%08lx, expected 0x%08lx\n", \ + ExceptionStatus, ExpectedStatus); \ +}
#endif /* _APITEST_H */
Modified: trunk/rostests/apitests/ntdll/LdrEnumResources.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/LdrEnumReso... ============================================================================== --- trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,10 +5,9 @@ * PROGRAMMER: Timo Kreuzer */
+#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/ldrfuncs.h>
typedef struct _TEST_RESOURCES
Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocateV... ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,11 +5,11 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/rtlfuncs.h> #include <ndk/mmfuncs.h> -#include <pseh/pseh2.h>
static PVOID Allocations[4096] = { NULL }; static ULONG CurrentAllocation = 0;
Modified: trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtFreeVirtu... ============================================================================== --- trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtFreeVirtualMemory.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -1,5 +1,7 @@ + +#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/pstypes.h> #include <ndk/mmfuncs.h>
Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewOf... ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -1,8 +1,8 @@ + +#include <apitest.h>
#define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/ntndk.h> -#include <pseh/pseh2.h>
NTSYSAPI NTSTATUS
Modified: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtProtectVi... ============================================================================== --- trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -4,14 +4,11 @@ * PURPOSE: Test for the NtProtectVirtualMemory API */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/rtlfuncs.h> #include <ndk/mmfuncs.h> -#include <pseh/pseh2.h> - -#define StartSeh status = STATUS_SUCCESS; _SEH2_TRY -#define EndSeh(ExpectedStatus) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { status = _SEH2_GetExceptionCode(); } _SEH2_END; ok(status == ExpectedStatus, "Exception %lx, expected %lx\n", status, ExpectedStatus)
START_TEST(NtProtectVirtualMemory) { @@ -40,13 +37,13 @@ ok(NT_SUCCESS(status), "Commiting memory failed\n");
/* Try writing it */ - StartSeh + StartSeh() { *allocationStart = 0xFF; } EndSeh(STATUS_SUCCESS);
/* Try reading it */ - StartSeh + StartSeh() { ok(*allocationStart == 0xFF, "Memory was not written\n"); } EndSeh(STATUS_SUCCESS); @@ -61,13 +58,13 @@ ok(oldProtection == PAGE_READWRITE, "Expected PAGE_READWRITE, got %08x.\n", oldProtection);
/* Try writing it */ - StartSeh + StartSeh() { *allocationStart = 0xAA; } EndSeh(STATUS_ACCESS_VIOLATION);
/* Try reading it */ - StartSeh + StartSeh() { ok(*allocationStart == 0xFF, "read-only memory were changed.\n"); } EndSeh(STATUS_SUCCESS); @@ -82,13 +79,13 @@ ok(oldProtection == PAGE_READONLY, "Expected PAGE_READONLY, got %08x.\n", oldProtection);
/* Try writing it */ - StartSeh + StartSeh() { *allocationStart = 0xAA; } EndSeh(STATUS_ACCESS_VIOLATION);
/* Try reading it */ - StartSeh + StartSeh() { ok(*allocationStart == 0, "Test should not go as far as this.\n"); } EndSeh(STATUS_ACCESS_VIOLATION);
Modified: trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQuerySyst... ============================================================================== --- trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,8 +5,9 @@ * PROGRAMMER: Hermès BÃLUSCA - MAÃTO hermes.belusca@sfr.fr */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/setypes.h> #include <ndk/rtlfuncs.h> #include <ndk/exfuncs.h>
Modified: trunk/rostests/apitests/ntdll/RtlBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlBitmap.c... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -1,8 +1,8 @@ + +#include <apitest.h>
#define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/rtlfuncs.h> -#include <pseh/pseh2.h>
void Test_RtlFindMostSignificantBit(void)
Modified: trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDetermin... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,10 +5,9 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/mmfuncs.h> #include <ndk/rtlfuncs.h>
@@ -104,12 +103,8 @@ ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); }
-#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) - START_TEST(RtlDetermineDosPathNameType) { - NTSTATUS ExceptionStatus; RTL_PATH_TYPE PathType; struct { @@ -189,7 +184,7 @@
if (!RtlDetermineDosPathNameType_Ustr) { - RtlDetermineDosPathNameType_Ustr = (PVOID)GetProcAddress(GetModuleHandle(L"ntdll"), "RtlDetermineDosPathNameType_Ustr"); + RtlDetermineDosPathNameType_Ustr = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll"), "RtlDetermineDosPathNameType_Ustr"); if (!RtlDetermineDosPathNameType_Ustr) skip("RtlDetermineDosPathNameType_Ustr unavailable\n"); }
Modified: trunk/rostests/apitests/ntdll/RtlDoesFileExists.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDoesFile... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDoesFileExists.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDoesFileExists.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,15 +5,11 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE #include <stdio.h> -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/rtlfuncs.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)
#define ok_bool_file(value, expected, file) do { \ if (expected) \ @@ -90,7 +86,6 @@
START_TEST(RtlDoesFileExists) { - NTSTATUS ExceptionStatus; BOOLEAN Ret; struct { @@ -168,21 +163,21 @@
if (!RtlDoesFileExists_UEx) { - RtlDoesFileExists_UEx = (PVOID)GetProcAddress(GetModuleHandle(L"ntdll"), "RtlDoesFileExists_UEx"); + RtlDoesFileExists_UEx = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll"), "RtlDoesFileExists_UEx"); if (!RtlDoesFileExists_UEx) skip("RtlDoesFileExists_UEx unavailable\n"); }
if (!RtlDoesFileExists_UStr) { - RtlDoesFileExists_UStr = (PVOID)GetProcAddress(GetModuleHandle(L"ntdll"), "RtlDoesFileExists_UStr"); + RtlDoesFileExists_UStr = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll"), "RtlDoesFileExists_UStr"); if (!RtlDoesFileExists_UStr) skip("RtlDoesFileExists_UStr unavailable\n"); }
if (!RtlDoesFileExists_UstrEx) { - RtlDoesFileExists_UstrEx = (PVOID)GetProcAddress(GetModuleHandle(L"ntdll"), "RtlDoesFileExists_UstrEx"); + RtlDoesFileExists_UstrEx = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll"), "RtlDoesFileExists_UstrEx"); if (!RtlDoesFileExists_UstrEx) skip("RtlDoesFileExists_UstrEx unavailable\n"); } @@ -215,18 +210,18 @@
swprintf(FileName, L"C:\%ls", CustomPath); /* Make sure this directory doesn't exist */ - while (GetFileAttributes(FileName) != INVALID_FILE_ATTRIBUTES) + while (GetFileAttributesW(FileName) != INVALID_FILE_ATTRIBUTES) { wcscat(CustomPath, L"X"); swprintf(FileName, L"C:\%ls", CustomPath); } - Success = CreateDirectory(FileName, NULL); + Success = CreateDirectoryW(FileName, NULL); ok(Success, "CreateDirectory failed, results might not be accurate\n"); swprintf(FileName, L"C:\%ls\ThisFolderExists", CustomPath); - Success = CreateDirectory(FileName, NULL); + Success = CreateDirectoryW(FileName, NULL); ok(Success, "CreateDirectory failed, results might not be accurate\n"); swprintf(FileName, L"C:\%ls\ThisFolderExists\ThisFileExists", CustomPath); - Handle = CreateFile(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); + Handle = CreateFileW(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); ok(Handle != INVALID_HANDLE_VALUE, "CreateFile failed, results might not be accurate\n"); if (Handle != INVALID_HANDLE_VALUE) { @@ -307,12 +302,12 @@ }
swprintf(FileName, L"C:\%ls\ThisFolderExists\ThisFileExists", CustomPath); - Success = DeleteFile(FileName); + Success = DeleteFileW(FileName); ok(Success, "DeleteFile failed, test might leave stale file\n"); swprintf(FileName, L"C:\%ls\ThisFolderExists", CustomPath); - Success = RemoveDirectory(FileName); + Success = RemoveDirectoryW(FileName); ok(Success, "RemoveDirectory failed, test might leave stale directory\n"); swprintf(FileName, L"C:\%ls", CustomPath); - Success = RemoveDirectory(FileName); + Success = RemoveDirectoryW(FileName); ok(Success, "RemoveDirectory failed, test might leave stale directory\n"); }
Modified: trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosPathN... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -39,10 +39,9 @@ # include <stdio.h> # include <stddef.h> #else /* Compile for ReactOS or wine */ +# include <apitest.h> # define WIN32_NO_STATUS # include <stdio.h> -# include <wine/test.h> -# include <pseh/pseh2.h> # include <ndk/rtlfuncs.h> #endif
Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSearc... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,11 +5,10 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE #include <stdio.h> -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/rtlfuncs.h>
/* @@ -25,9 +24,6 @@ ); */
-#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 BOOLEAN CheckStringBuffer( @@ -96,11 +92,8 @@ return TRUE; }
-#define InvalidPointer ((PVOID)0x0123456789ABCDEFULL) - START_TEST(RtlDosSearchPath_U) { - NTSTATUS ExceptionStatus; ULONG Length = 0; WCHAR Buffer[MAX_PATH]; PWSTR PartName; @@ -112,18 +105,18 @@
swprintf(FileName, L"C:\%ls", CustomPath); /* Make sure this directory doesn't exist */ - while (GetFileAttributes(FileName) != INVALID_FILE_ATTRIBUTES) + while (GetFileAttributesW(FileName) != INVALID_FILE_ATTRIBUTES) { wcscat(CustomPath, L"X"); swprintf(FileName, L"C:\%ls", CustomPath); } - Success = CreateDirectory(FileName, NULL); + Success = CreateDirectoryW(FileName, NULL); ok(Success, "CreateDirectory failed, results might not be accurate\n"); swprintf(FileName, L"C:\%ls\ThisFolderExists", CustomPath); - Success = CreateDirectory(FileName, NULL); + Success = CreateDirectoryW(FileName, NULL); ok(Success, "CreateDirectory failed, results might not be accurate\n"); swprintf(FileName, L"C:\%ls\ThisFolderExists\ThisFileExists", CustomPath); - Handle = CreateFile(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); + Handle = CreateFileW(FileName, 0, 0, NULL, CREATE_NEW, 0, NULL); ok(Handle != INVALID_HANDLE_VALUE, "CreateFile failed, results might not be accurate\n"); if (Handle != INVALID_HANDLE_VALUE) CloseHandle(Handle); @@ -170,7 +163,7 @@
/* Empty path string searches in current directory */ swprintf(FileName, L"C:\%ls\ThisFolderExists", CustomPath); - Success = SetCurrentDirectory(FileName); + Success = SetCurrentDirectoryW(FileName); ok(Success, "SetCurrentDirectory failed\n"); PartName = InvalidPointer; RtlFillMemory(Buffer, sizeof(Buffer), 0x55); @@ -206,14 +199,14 @@ ok(Okay, "CheckStringBuffer failed\n");
/* Clean up test folder */ - SetCurrentDirectory(L"C:\"); + SetCurrentDirectoryW(L"C:\"); swprintf(FileName, L"C:\%ls\ThisFolderExists\ThisFileExists", CustomPath); - Success = DeleteFile(FileName); + Success = DeleteFileW(FileName); ok(Success, "DeleteFile failed, test might leave stale file\n"); swprintf(FileName, L"C:\%ls\ThisFolderExists", CustomPath); - Success = RemoveDirectory(FileName); + Success = RemoveDirectoryW(FileName); ok(Success, "RemoveDirectory failed %(lu), test might leave stale directory\n", GetLastError()); swprintf(FileName, L"C:\%ls", CustomPath); - Success = RemoveDirectory(FileName); + Success = RemoveDirectoryW(FileName); ok(Success, "RemoveDirectory failed (%lu), test might leave stale directory\n", GetLastError()); }
Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSearc... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,9 +5,9 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/rtlfuncs.h>
/* @@ -26,9 +26,6 @@ ); */
-#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) - #define ok_eq_ulong(value, expected) ok((value) == (expected), #value " = %lu, expected %lu\n", value, expected) #define ok_eq_hex(value, expected) ok((value) == (expected), #value " = 0x%lx, expected 0x%lx\n", value, expected) #define ok_eq_pointer(value, expected) ok((value) == (expected), #value " = %p, expected %p\n", value, expected) @@ -39,11 +36,8 @@ ok((str1)->MaximumLength == (str2)->MaximumLength, "MaximumLength modified\n"); \ } while (0)
-#define InvalidPointer ((PVOID)0x0123456789ABCDEFULL) - START_TEST(RtlDosSearchPath_Ustr) { - NTSTATUS ExceptionStatus; NTSTATUS Status; UNICODE_STRING PathString; UNICODE_STRING FileNameString;
Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFullP... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_U.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,9 +5,9 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/rtlfuncs.h>
/* @@ -21,9 +21,6 @@ ); */
-#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 BOOLEAN CheckStringBuffer( @@ -73,8 +70,6 @@ return Result; }
-#define InvalidPointer ((PVOID)0x0123456789ABCDEFULL) - /* winetest_platform is "windows" for us, so broken() doesn't do what it should :( */ #undef broken #define broken(x) 0 @@ -132,7 +127,6 @@ { L"\\??\C:\test", PrefixNone, L"\\??\C:\test", PrefixNone, sizeof(L"\\??\C:\") }, { L"\\??\C:\test\", PrefixNone, L"\\??\C:\test\" }, }; - NTSTATUS ExceptionStatus; WCHAR FullPathNameBuffer[MAX_PATH]; PWSTR ShortName; SIZE_T Length; @@ -226,7 +220,6 @@
START_TEST(RtlGetFullPathName_U) { - NTSTATUS ExceptionStatus; PCWSTR FileName; PWSTR ShortName; ULONG Length;
Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFullP... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_Ustr.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,10 +5,9 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/rtlfuncs.h>
/* @@ -47,9 +46,6 @@ //= (PVOID)0x7769a3dd // win7 sp1 wow64 ;
-#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) - #define ok_eq_ustr(str1, str2) do { \ ok((str1)->Buffer == (str2)->Buffer, "Buffer modified\n"); \ ok((str1)->Length == (str2)->Length, "Length modified\n"); \ @@ -125,7 +121,6 @@ }
#define RtlPathTypeNotSet 123 -#define InvalidPointer ((PVOID)0x0123456789ABCDEFULL)
/* winetest_platform is "windows" for us, so broken() doesn't do what it should :( */ #undef broken @@ -185,7 +180,6 @@ { L"\\??\C:\test", PrefixNone, L"\\??\C:\test", RtlPathTypeUncAbsolute, PrefixNone, sizeof(L"\\??\C:\") }, { L"\\??\C:\test\", PrefixNone, L"\\??\C:\test\", RtlPathTypeUncAbsolute }, }; - NTSTATUS ExceptionStatus; ULONG Length; UNICODE_STRING FileName; WCHAR FullPathNameBuffer[MAX_PATH]; @@ -300,7 +294,6 @@
START_TEST(RtlGetFullPathName_Ustr) { - NTSTATUS ExceptionStatus; ULONG Length; UNICODE_STRING FileName; UNICODE_STRING TempString; @@ -312,7 +305,7 @@
if (!RtlGetFullPathName_Ustr) { - RtlGetFullPathName_Ustr = (PVOID)GetProcAddress(GetModuleHandle(L"ntdll"), "RtlGetFullPathName_Ustr"); + RtlGetFullPathName_Ustr = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll"), "RtlGetFullPathName_Ustr"); if (!RtlGetFullPathName_Ustr) { skip("RtlGetFullPathName_Ustr unavailable\n");
Modified: trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetFullP... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetFullPathName_UstrEx.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,10 +5,9 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/rtlfuncs.h>
/* @@ -39,9 +38,6 @@ OUT PSIZE_T LengthNeeded OPTIONAL );
-#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) - #define ok_eq_ustr(str1, str2) do { \ ok((str1)->Buffer == (str2)->Buffer, "Buffer modified\n"); \ ok((str1)->Length == (str2)->Length, "Length modified\n"); \ @@ -115,7 +111,6 @@ }
#define RtlPathTypeNotSet 123 -#define InvalidPointer ((PVOID)0x0123456789ABCDEFULL)
/* winetest_platform is "windows" for us, so broken() doesn't do what it should :( */ #undef broken @@ -175,7 +170,7 @@ { L"\\??\C:\test", PrefixNone, L"\\??\C:\test", RtlPathTypeUncAbsolute, PrefixNone, sizeof(L"\\??\C:\") }, { L"\\??\C:\test\", PrefixNone, L"\\??\C:\test\", RtlPathTypeUncAbsolute }, }; - NTSTATUS Status, ExceptionStatus; + NTSTATUS Status; UNICODE_STRING FileName; UNICODE_STRING FullPathName; WCHAR FullPathNameBuffer[MAX_PATH]; @@ -289,7 +284,7 @@
START_TEST(RtlGetFullPathName_UstrEx) { - NTSTATUS Status, ExceptionStatus; + NTSTATUS Status; UNICODE_STRING FileName; UNICODE_STRING TempString; UNICODE_STRING StaticString; @@ -301,7 +296,7 @@ SIZE_T LengthNeeded; BOOLEAN Okay;
- pRtlGetFullPathName_UstrEx = (PVOID)GetProcAddress(GetModuleHandle(L"ntdll"), "RtlGetFullPathName_UstrEx"); + pRtlGetFullPathName_UstrEx = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll"), "RtlGetFullPathName_UstrEx"); if (!pRtlGetFullPathName_UstrEx) { skip("RtlGetFullPathName_UstrEx unavailable\n");
Modified: trunk/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGetLonge... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGetLongestNtPathLength.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,8 +5,9 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/rtlfuncs.h>
/*
Modified: trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlInitiali... ============================================================================== --- trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlInitializeBitMap.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/rtlfuncs.h>
void Test_RtlInitializeBitmap()
Modified: trunk/rostests/apitests/ntdll/SystemInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo.... ============================================================================== --- trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/exfuncs.h>
void
Modified: trunk/rostests/apitests/ntdll/Timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/Timer.c?rev... ============================================================================== --- trunk/rostests/apitests/ntdll/Timer.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/Timer.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,8 +5,9 @@ * PROGRAMMER: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */
+#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <ndk/ketypes.h> #include <ndk/kefuncs.h>
Modified: trunk/rostests/apitests/ntdll/ZwContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ZwContinue.... ============================================================================== --- trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: */
+#include <apitest.h> + #include <setjmp.h> #include <time.h> -#include <wine/test.h>
#ifdef _M_IX86 #define ZWC_SEGMENT_BITS (0xFFFF)
Modified: trunk/rostests/apitests/ntdll/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/sprintf.c?r... ============================================================================== --- trunk/rostests/apitests/ntdll/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/sprintf.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,12 +5,13 @@ * PROGRAMMER: Timo Kreuzer */
+#include <apitest.h> + #include <stdio.h> #include <stdlib.h> #include <strings.h> #include <math.h> #include <stdarg.h> -#include <wine/test.h> #include <windows.h>
Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c?... ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__
#define STANDALONE -#include <wine/test.h> +#include <apitest.h>
extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void);
Modified: trunk/rostests/apitests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/CMakeLis... ============================================================================== --- trunk/rostests/apitests/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/CMakeLists.txt [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_UNICODE -DUNICODE)
add_executable(powrprof_apitest power.c testlist.c) set_module_type(powrprof_apitest win32cui)
Modified: trunk/rostests/apitests/powrprof/power.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c?... ============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -7,11 +7,11 @@ * Martin Rottensteiner */
+#include <apitest.h> + #include <stdarg.h> #include <ntstatus.h> #define WIN32_NO_STATUS -#define STANDALONE -#include <wine/test.h> #include <winreg.h> #include <powrprof.h>
Modified: trunk/rostests/apitests/powrprof/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/testlist... ============================================================================== --- trunk/rostests/apitests/powrprof/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/testlist.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -1,25 +1,12 @@ -/* Automatically generated file; DO NOT EDIT!! */ +#define __ROS_LONG64__
-/* stdarg.h is needed for Winelib */ -//#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include "windef.h" -//#include "winbase.h" - -struct test -{ - const char *name; - void (*func)(void); -}; +#define STANDALONE +#include <apitest.h>
extern void func_power(void);
const struct test winetest_testlist[] = { - { "power", func_power }, - { 0, 0 } + { "power", func_power }, + { 0, 0 } }; - -#define WINETEST_WANT_MAIN -#include <wine/test.h>
Modified: trunk/rostests/apitests/ws2_32/WSAStartup.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAStartup... ============================================================================== --- trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,18 +5,15 @@ * PROGRAMMER: Thomas Faber thfabba@gmx.de */
+#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 @@ -136,7 +133,6 @@
START_TEST(WSAStartup) { - NTSTATUS ExceptionStatus; BOOLEAN Okay; LPWSADATA WsaData; int Error;
Modified: trunk/rostests/apitests/ws2_32/getaddrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getaddrinf... ============================================================================== --- trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -4,6 +4,8 @@ * PURPOSE: Test for getaddrinfo * PROGRAMMER: Thomas Faber thfabba@gmx.de */ + +#include <apitest.h>
#define WIN32_NO_STATUS #define _INC_WINDOWS @@ -12,12 +14,7 @@ #include <windef.h> #include <winbase.h> #include <ws2tcpip.h> -#include <wine/test.h> -#include <pseh/pseh2.h> #include <ndk/umtypes.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)
#define ok_addrinfo(ai, flags, family, socktype, protocol, addrlen) do \ { \ @@ -39,8 +36,6 @@ ok_dec(((SOCKADDR_IN *)(sockaddr))->sin_zero[_i], 0); \ } while (0)
-#define InvalidPointer ((PVOID)0x5555555555555555ULL) - CHAR LocalAddress[sizeof("255.255.255.255")];
static @@ -50,7 +45,6 @@ int Error; PADDRINFOA AddrInfo; ADDRINFOA Hints; - NTSTATUS ExceptionStatus; struct { PCSTR NodeName; @@ -124,7 +118,6 @@ int Error; PADDRINFOA AddrInfo; ADDRINFOA Hints; - NTSTATUS ExceptionStatus; struct { PCSTR ServiceName; @@ -216,7 +209,6 @@ int Error; PADDRINFOA AddrInfo; ADDRINFOA Hints; - NTSTATUS ExceptionStatus; CHAR LocalHostName[128]; struct hostent *Hostent;
Modified: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c?... ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -6,9 +6,9 @@ * COPYRIGHT: Copyright 2008 Colin Finck mail@colinfinck.de */
+#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> - #include "ws2_32.h"
int CreateSocket(SOCKET* psck)
Modified: trunk/rostests/apitests/ws2_32/ioctlsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ioctlsocke... ============================================================================== --- trunk/rostests/apitests/ws2_32/ioctlsocket.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/ioctlsocket.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,9 +5,9 @@ * PROGRAMMERS: Colin Finck */
+#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> - #include "ws2_32.h"
int Test_ioctlsocket()
Modified: trunk/rostests/apitests/ws2_32/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/recv.c?rev... ============================================================================== --- trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -5,8 +5,10 @@ * PROGRAMMERS: Colin Finck */
+#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> +#include <ntstatus.h> #include <winternl.h> #include "ws2_32.h"
Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.c... ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Sun Sep 22 19:07:35 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__
#define STANDALONE -#include <wine/test.h> +#include <apitest.h>
extern void func_getaddrinfo(void); extern void func_ioctlsocket(void);
-
hbelusca＠svn.reactos.org