Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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...
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

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/SaferId… ============================================================================== --- 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.… ============================================================================== --- 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?re… ============================================================================== --- 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/AddFontRes… ============================================================================== --- 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/CreateDIBi… ============================================================================== --- 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.… ============================================================================== --- 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/SelectObje… ============================================================================== --- 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/SetBrushOr… ============================================================================== --- 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.… ============================================================================== --- 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/LdrEnumRes… ============================================================================== --- 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/NtAllocate… ============================================================================== --- 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(a)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/NtFreeVirt… ============================================================================== --- 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/NtMapViewO… ============================================================================== --- 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/NtProtectV… ============================================================================== --- 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/NtQuerySys… ============================================================================== --- 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(a)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.… ============================================================================== --- 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/RtlDetermi… ============================================================================== --- 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(a)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/RtlDoesFil… ============================================================================== --- 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(a)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/RtlDosPath… ============================================================================== --- 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/RtlDosSear… ============================================================================== --- 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(a)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/RtlDosSear… ============================================================================== --- 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(a)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/RtlGetFull… ============================================================================== --- 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(a)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/RtlGetFull… ============================================================================== --- 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(a)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/RtlGetFull… ============================================================================== --- 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(a)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/RtlGetLong… ============================================================================== --- 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(a)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/RtlInitial… ============================================================================== --- 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?re… ============================================================================== --- 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?… ============================================================================== --- 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/CMakeLi… ============================================================================== --- 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/testlis… ============================================================================== --- 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/WSAStartu… ============================================================================== --- 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(a)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/getaddrin… ============================================================================== --- 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(a)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(a)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/ioctlsock… ============================================================================== --- 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?re… ============================================================================== --- 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.… ============================================================================== --- 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);

1 0

[ion] 60318: - Implement and export PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion.
by ion＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: ion Date: Sun Sep 22 18:54:58 2013 New Revision: 60318 URL: http://svn.reactos.org/svn/reactos?rev=60318&view=rev Log: - Implement and export PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion. Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sun Sep 22 18:54:58 2013 @@ -969,7 +969,7 @@ @ stdcall PsGetCurrentThreadStackLimit() @ stdcall PsGetCurrentThreadTeb() @ stdcall PsGetCurrentThreadWin32Thread() -;PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion +@ stdcall PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion() @ stdcall PsGetJobLock(ptr) @ stdcall PsGetJobSessionId(ptr) @ stdcall PsGetJobUIRestrictionsClass(ptr) Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Sun Sep 22 18:54:58 2013 @@ -799,6 +799,17 @@ /* * @implemented */ +PVOID +NTAPI +PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion(VOID) +{ + KeEnterCriticalRegion(); + return PsGetCurrentThread()->Tcb.Win32Thread; +} + +/* + * @implemented + */ KPROCESSOR_MODE NTAPI PsGetCurrentThreadPreviousMode(VOID)

1 0

[ion] 60317: [NTOSKRNL]: Implement and export PsGetProcessSessionIdEx, and MmGetSessionIdEx. Dedicated to hbelusca. If you look at the diff (please don't), yes, this is seriously how it works in Wi...
by ion＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: ion Date: Sun Sep 22 18:47:36 2013 New Revision: 60317 URL: http://svn.reactos.org/svn/reactos?rev=60317&view=rev Log: [NTOSKRNL]: Implement and export PsGetProcessSessionIdEx, and MmGetSessionIdEx. Dedicated to hbelusca. If you look at the diff (please don't), yes, this is seriously how it works in Windows. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Sep 22 18:47:36 2013 @@ -493,6 +493,12 @@ IN PEPROCESS Process ); +ULONG +NTAPI +MmGetSessionIdEx( + IN PEPROCESS Process +); + /* marea.c *******************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Sep 22 18:47:36 2013 @@ -1561,6 +1561,21 @@ return SessionGlobal->SessionId; } +ULONG +NTAPI +MmGetSessionIdEx(IN PEPROCESS Process) +{ + PMM_SESSION_SPACE SessionGlobal; + + /* The session leader is always session zero */ + if (Process->Vm.Flags.SessionLeader == 1) return 0; + + /* Otherwise, get the session global, and read the session ID from it */ + SessionGlobal = (PMM_SESSION_SPACE)Process->Session; + if (!SessionGlobal) return -1; + return SessionGlobal->SessionId; +} + VOID NTAPI MiReleaseProcessReferenceToSessionDataPage(IN PMM_SESSION_SPACE SessionGlobal) Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sun Sep 22 18:47:36 2013 @@ -987,7 +987,7 @@ @ stdcall PsGetProcessSectionBaseAddress(ptr) @ stdcall PsGetProcessSecurityPort(ptr) @ stdcall PsGetProcessSessionId(ptr) -;PsGetProcessSessionIdEx +@ stdcall PsGetProcessSessionIdEx(ptr) @ stdcall PsGetProcessWin32Process(ptr) @ stdcall PsGetProcessWin32WindowStation(ptr) ;@ cdecl -arch=x86_64 PsGetProcessWow64Process() Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sun Sep 22 18:47:36 2013 @@ -1149,9 +1149,19 @@ */ ULONG NTAPI -PsGetProcessSessionId(PEPROCESS Process) +PsGetProcessSessionId(IN PEPROCESS Process) { return MmGetSessionId(Process); +} + +/* + * @implemented + */ +ULONG +NTAPI +PsGetProcessSessionIdEx(IN PEPROCESS Process) +{ + return MmGetSessionIdEx(Process); } /*

1 0

[hbelusca] 60316: [APITEST:WININET] Make it use apitest.h
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 18:19:56 2013 New Revision: 60316 URL: http://svn.reactos.org/svn/reactos?rev=60316&view=rev Log: [APITEST:WININET] Make it use apitest.h Modified: trunk/rostests/apitests/wininet/InternetOpen.c trunk/rostests/apitests/wininet/testlist.c Modified: trunk/rostests/apitests/wininet/InternetOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/Internet… ============================================================================== --- trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] Sun Sep 22 18:19:56 2013 @@ -5,14 +5,13 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE +#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 <wininet.h> struct hostent *(WINAPI *pgethostbyname)(const char *); @@ -29,7 +28,7 @@ { HMODULE ModuleHandle; - ModuleHandle = GetModuleHandle(L"ws2_32"); + ModuleHandle = GetModuleHandleW(L"ws2_32"); if (!ModuleHandle) return NULL; return GetProcAddress(ModuleHandle, FunctionName); @@ -41,7 +40,7 @@ BOOLEAN IsWinsockLoaded(VOID) { - return GetModuleHandle(L"ws2_32") != NULL; + return GetModuleHandleW(L"ws2_32") != NULL; } static @@ -85,9 +84,9 @@ ok(!IsWinsockLoaded(), "Winsock loaded on startup\n"); ok(!IsWinsockInitialized(), "Winsock initialized on startup\n"); - ModuleHandle = GetModuleHandle(L"wininet"); + ModuleHandle = GetModuleHandleW(L"wininet"); ok_ptr(ModuleHandle, NULL); - ModuleHandle = LoadLibrary(L"wininet"); + ModuleHandle = LoadLibraryW(L"wininet"); ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n", GetLastError()); pInternetOpen = (PVOID)GetProcAddress(ModuleHandle, "InternetOpenW"); Modified: trunk/rostests/apitests/wininet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/testlist… ============================================================================== --- trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] Sun Sep 22 18:19:56 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_InternetOpen(void);

1 0

[hbelusca] 60315: [WINHTTP:USER32] Make it use apitest.h
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 18:19:16 2013 New Revision: 60315 URL: http://svn.reactos.org/svn/reactos?rev=60315&view=rev Log: [WINHTTP:USER32] Make it use apitest.h Modified: trunk/rostests/apitests/winhttp/WinHttpOpen.c trunk/rostests/apitests/winhttp/testlist.c Modified: trunk/rostests/apitests/winhttp/WinHttpOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/WinHttpO… ============================================================================== --- trunk/rostests/apitests/winhttp/WinHttpOpen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winhttp/WinHttpOpen.c [iso-8859-1] Sun Sep 22 18:19:16 2013 @@ -5,14 +5,13 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE +#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 <winhttp.h> struct hostent *(WINAPI *pgethostbyname)(const char *); @@ -29,7 +28,7 @@ { HMODULE ModuleHandle; - ModuleHandle = GetModuleHandle(L"ws2_32"); + ModuleHandle = GetModuleHandleW(L"ws2_32"); if (!ModuleHandle) return NULL; return GetProcAddress(ModuleHandle, FunctionName); @@ -41,14 +40,14 @@ BOOLEAN IsWinsockLoaded(VOID) { - return GetModuleHandle(L"ws2_32") != NULL; + return GetModuleHandleW(L"ws2_32") != NULL; } static BOOLEAN IsWininetLoaded(VOID) { - return GetModuleHandle(L"wininet") != NULL; + return GetModuleHandleW(L"wininet") != NULL; } static @@ -93,9 +92,9 @@ ok(!IsWinsockInitialized(), "Winsock initialized on startup\n"); ok(!IsWininetLoaded(), "Wininet loaded on startup\n"); - ModuleHandle = GetModuleHandle(L"winhttp"); + ModuleHandle = GetModuleHandleW(L"winhttp"); ok_ptr(ModuleHandle, NULL); - ModuleHandle = LoadLibrary(L"winhttp"); + ModuleHandle = LoadLibraryW(L"winhttp"); ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n", GetLastError()); pWinHttpOpen = (PVOID)GetProcAddress(ModuleHandle, "WinHttpOpen"); Modified: trunk/rostests/apitests/winhttp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/testlist… ============================================================================== --- trunk/rostests/apitests/winhttp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winhttp/testlist.c [iso-8859-1] Sun Sep 22 18:19:16 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_WinHttpOpen(void);

1 0

[hbelusca] 60314: [APITESTS:USER32] Make it use apitest.h
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 18:17:54 2013 New Revision: 60314 URL: http://svn.reactos.org/svn/reactos?rev=60314&view=rev Log: [APITESTS:USER32] Make it use apitest.h Modified: trunk/rostests/apitests/user32/AttachThreadInput.c trunk/rostests/apitests/user32/CreateIconFromResourceEx.c trunk/rostests/apitests/user32/DeferWindowPos.c trunk/rostests/apitests/user32/DestroyCursorIcon.c trunk/rostests/apitests/user32/DrawIconEx.c trunk/rostests/apitests/user32/GetIconInfo.c trunk/rostests/apitests/user32/GetKeyState.c trunk/rostests/apitests/user32/GetPeekMessage.c trunk/rostests/apitests/user32/GetSystemMetrics.c trunk/rostests/apitests/user32/InitializeLpkHooks.c trunk/rostests/apitests/user32/LoadImage.c trunk/rostests/apitests/user32/RealGetWindowClass.c trunk/rostests/apitests/user32/ScrollDC.c trunk/rostests/apitests/user32/ScrollWindowEx.c trunk/rostests/apitests/user32/SetActiveWindow.c trunk/rostests/apitests/user32/SetCursorPos.c trunk/rostests/apitests/user32/SystemParametersInfo.c trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/WndProc.c trunk/rostests/apitests/user32/desktop.c trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/resource.h trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/CreateIconFromResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateIco… ============================================================================== --- trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <winuser.h> START_TEST(CreateIconFromResourceEx) Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Thomas Faber */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> #include "helper.h" #include <undocuser.h> Modified: trunk/rostests/apitests/user32/DestroyCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DestroyCu… ============================================================================== --- trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/DrawIconEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DrawIconE… ============================================================================== --- trunk/rostests/apitests/user32/DrawIconEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DrawIconEx.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/GetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetIconIn… ============================================================================== --- trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/GetKeyState.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetKeySta… ============================================================================== --- trunk/rostests/apitests/user32/GetKeyState.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetKeyState.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> #include <assert.h> Modified: trunk/rostests/apitests/user32/GetPeekMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetPeekMe… ============================================================================== --- trunk/rostests/apitests/user32/GetPeekMessage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetPeekMessage.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Thomas Faber */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> void Test_GetMessage(HWND hWnd) Modified: trunk/rostests/apitests/user32/GetSystemMetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetSystem… ============================================================================== --- trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/InitializeLpkHooks.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/Initializ… ============================================================================== --- trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> typedef struct _LPK_LPEDITCONTROL_LIST Modified: trunk/rostests/apitests/user32/LoadImage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage… ============================================================================== --- trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,5 +1,7 @@ + +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/RealGetWindowClass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RealGetWi… ============================================================================== --- trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Gregor Gullwi */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <winuser.h> #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) Modified: trunk/rostests/apitests/user32/ScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollDC.… ============================================================================== --- trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/ScrollWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollWin… ============================================================================== --- trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/SetCursorPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor… ============================================================================== --- trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include <assert.h> Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/WndProc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/WndProc.c… ============================================================================== --- trunk/rostests/apitests/user32/WndProc.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/WndProc.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c… ============================================================================== --- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <winuser.h> #include "helper.h" #include <undocuser.h> Modified: trunk/rostests/apitests/user32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/resource.… ============================================================================== --- trunk/rostests/apitests/user32/resource.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/resource.h [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,3 +1,2 @@ - #define IDI_TEST 1000 Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_AttachThreadInput(void); extern void func_CreateIconFromResourceEx(void);

1 0

[hbelusca] 60313: [ROSTESTS:APITESTS] Introduce a "apitest.h" header gathering special things for apitests (SEH macros, wine/test.h inclusion, and so on...).
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 17:52:42 2013 New Revision: 60313 URL: http://svn.reactos.org/svn/reactos?rev=60313&view=rev Log: [ROSTESTS:APITESTS] Introduce a "apitest.h" header gathering special things for apitests (SEH macros, wine/test.h inclusion, and so on...). Added: trunk/rostests/apitests/include/ trunk/rostests/apitests/include/apitest.h (with props) Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/advapi32/CreateService.c trunk/rostests/apitests/advapi32/LockDatabase.c trunk/rostests/apitests/advapi32/QueryServiceConfig2.c trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c trunk/rostests/apitests/advapi32/testlist.c trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c trunk/rostests/apitests/browseui/testlist.c trunk/rostests/apitests/com/testlist.c trunk/rostests/apitests/crt/_vscprintf.c trunk/rostests/apitests/crt/_vscwprintf.c trunk/rostests/apitests/crt/_vsnprintf.c trunk/rostests/apitests/crt/_vsnwprintf.c trunk/rostests/apitests/crt/mbstowcs_s.c trunk/rostests/apitests/crt/sprintf.c trunk/rostests/apitests/crt/strcpy.c trunk/rostests/apitests/crt/testlist.c trunk/rostests/apitests/crt/wcstombs_s.c trunk/rostests/apitests/dciman32/DCICreatePrimary.c trunk/rostests/apitests/dciman32/testlist.c trunk/rostests/apitests/gdi32/AddFontResource.c trunk/rostests/apitests/gdi32/AddFontResourceEx.c trunk/rostests/apitests/gdi32/BeginPath.c trunk/rostests/apitests/gdi32/CombineRgn.c trunk/rostests/apitests/gdi32/CombineTransform.c trunk/rostests/apitests/gdi32/CreateBitmap.c trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c trunk/rostests/apitests/gdi32/CreateCompatibleDC.c trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c trunk/rostests/apitests/gdi32/CreateDIBitmap.c trunk/rostests/apitests/gdi32/CreateFont.c trunk/rostests/apitests/gdi32/CreateFontIndirect.c trunk/rostests/apitests/gdi32/CreateIconIndirect.c trunk/rostests/apitests/gdi32/CreatePen.c trunk/rostests/apitests/gdi32/CreateRectRgn.c trunk/rostests/apitests/gdi32/DPtoLP.c trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c trunk/rostests/apitests/gdi32/EngCreateSemaphore.c trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c trunk/rostests/apitests/gdi32/ExtCreatePen.c trunk/rostests/apitests/gdi32/GdiConvertBitmap.c trunk/rostests/apitests/gdi32/GdiConvertBrush.c trunk/rostests/apitests/gdi32/GdiConvertDC.c trunk/rostests/apitests/gdi32/GdiConvertFont.c trunk/rostests/apitests/gdi32/GdiConvertPalette.c trunk/rostests/apitests/gdi32/GdiConvertRegion.c trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c trunk/rostests/apitests/gdi32/GdiGetLocalDC.c trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c trunk/rostests/apitests/gdi32/GdiSetAttrs.c trunk/rostests/apitests/gdi32/GetClipRgn.c trunk/rostests/apitests/gdi32/GetCurrentObject.c trunk/rostests/apitests/gdi32/GetDIBColorTable.c trunk/rostests/apitests/gdi32/GetDIBits.c trunk/rostests/apitests/gdi32/GetObject.c trunk/rostests/apitests/gdi32/GetPixel.c trunk/rostests/apitests/gdi32/GetRandomRgn.c trunk/rostests/apitests/gdi32/GetStockObject.c trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c trunk/rostests/apitests/gdi32/GetTextFace.c trunk/rostests/apitests/gdi32/MaskBlt.c trunk/rostests/apitests/gdi32/PatBlt.c trunk/rostests/apitests/gdi32/Rectangle.c trunk/rostests/apitests/gdi32/SelectObject.c trunk/rostests/apitests/gdi32/SetBrushOrgEx.c trunk/rostests/apitests/gdi32/SetDCPenColor.c trunk/rostests/apitests/gdi32/SetDIBits.c trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c trunk/rostests/apitests/gdi32/SetMapMode.c trunk/rostests/apitests/gdi32/SetPixel.c trunk/rostests/apitests/gdi32/SetSysColors.c trunk/rostests/apitests/gdi32/SetWindowExtEx.c trunk/rostests/apitests/gdi32/SetWorldTransform.c trunk/rostests/apitests/gdi32/testlist.c trunk/rostests/apitests/kernel32/FindFiles.c trunk/rostests/apitests/kernel32/GetCurrentDirectory.c trunk/rostests/apitests/kernel32/GetDriveType.c trunk/rostests/apitests/kernel32/GetModuleFileName.c trunk/rostests/apitests/kernel32/MultiByteToWideChar.c trunk/rostests/apitests/kernel32/SetCurrentDirectory.c trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c trunk/rostests/apitests/kernel32/lstrcpynW.c trunk/rostests/apitests/kernel32/testlist.c trunk/rostests/apitests/msvcrt/CommandLine.c trunk/rostests/apitests/msvcrt/ieee.c trunk/rostests/apitests/msvcrt/splitpath.c trunk/rostests/apitests/msvcrt/testlist.c 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] Sun Sep 22 17:52:42 2013 @@ -1,3 +1,5 @@ +include_directories( + include) add_library(apitest apitest.c) Modified: trunk/rostests/apitests/advapi32/CreateService.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CreateS… ============================================================================== --- trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: Thomas Faber */ -#include <wine/test.h> +#include <apitest.h> + #include <winreg.h> #include <winsvc.h> #include <strsafe.h> Modified: trunk/rostests/apitests/advapi32/LockDatabase.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/LockDat… ============================================================================== --- trunk/rostests/apitests/advapi32/LockDatabase.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/LockDatabase.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO */ -#include <wine/test.h> +#include <apitest.h> + #include <winsvc.h> #include <strsafe.h> Modified: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/QuerySe… ============================================================================== --- trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO */ -#include <wine/test.h> +#include <apitest.h> + #include <winreg.h> #include <winsvc.h> #include <strsafe.h> Modified: trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/SaferId… ============================================================================== --- trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,16 +5,12 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <windows.h> #include <ndk/ntndk.h> #include <winsafer.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 InvalidPointer ((PVOID)0x5555555555555555ULL) #define SaferIdentifyLevel(c, p, h, r) SaferIdentifyLevel(c, (PSAFER_CODE_PROPERTIES)(p), h, r) Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_CreateService(void); extern void func_LockDatabase(void); Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/SHExplo… ============================================================================== --- trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMER: Thomas Faber */ -#define UNICODE -#include <wine/test.h> +#include <apitest.h> + +//#define UNICODE #include <strsafe.h> #include <shlobj.h> @@ -128,8 +129,8 @@ WCHAR OriginalCommandLine[1024]; int i; - CommandLine = GetCommandLine(); - (VOID)StringCbCopy(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); + CommandLine = GetCommandLineW(); + StringCbCopyW(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); for (i = 0; i < TestCount; i++) { Modified: trunk/rostests/apitests/browseui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/testlis… ============================================================================== --- trunk/rostests/apitests/browseui/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include <windows.h> #define STANDALONE -#include "wine/test.h" +#include <apitest.h> extern void func_SHExplorerParseCmdLine(void); Modified: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include <windows.h> #define STANDALONE -#include "wine/test.h" +#include <apitest.h> extern void func_browseui(void); extern void func_ieframe(void); Modified: trunk/rostests/apitests/crt/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,8 +4,9 @@ * PURPOSE: Test for _vscprintf */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <errno.h> Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,8 +4,9 @@ * PURPOSE: Test for _vscprintf */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <errno.h> 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 17:52:42 2013 @@ -4,16 +4,14 @@ * PURPOSE: Test for _vsnprintf */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <pseh/pseh2.h> #include <ndk/mmfuncs.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) static void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...) { Modified: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,16 +4,14 @@ * PURPOSE: Test for _vsnprintf */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <pseh/pseh2.h> #include <ndk/mmfuncs.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) static void call_varargs(wchar_t* buf, size_t buf_size, int expected_ret, LPCWSTR formatString, ...) { Modified: trunk/rostests/apitests/crt/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,10 +4,11 @@ * PURPOSE: Test for mbstowcs_s */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> #include <stdlib.h> -#include <wine/test.h> #include <specstrings.h> #define ok_errno(x) ok_hex(errno, (x)) Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <pseh/pseh2.h> #include <ndk/mmfuncs.h> @@ -18,9 +19,6 @@ #pragma GCC diagnostic ignored "-Wformat-zero-length" #pragma GCC diagnostic ignored "-Wnonnull" #endif - -#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 Modified: trunk/rostests/apitests/crt/strcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strcpy.c?rev… ============================================================================== --- trunk/rostests/apitests/crt/strcpy.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/strcpy.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,6 +1,7 @@ + +#include <apitest.h> #include <stdio.h> -#include <wine/test.h> START_TEST(strcpy) { Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> #if defined(TEST_MSVCRT) extern void func_mbstowcs_s(void); Modified: trunk/rostests/apitests/crt/wcstombs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs_s.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/wcstombs_s.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,10 +4,11 @@ * PURPOSE: Test for wcstombs_s */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> #include <stdlib.h> -#include <wine/test.h> #include <specstrings.h> #define ok_errno(x) ok_hex(errno, (x)) Modified: trunk/rostests/apitests/dciman32/DCICreatePrimary.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/DCICrea… ============================================================================== --- trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> void Test_DCICreatePrimary() { Modified: trunk/rostests/apitests/dciman32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/testlis… ============================================================================== --- trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_DCICreatePrimary(void); Modified: trunk/rostests/apitests/gdi32/AddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <stdio.h> +#include <apitest.h> + #include <wine/test.h> #include <wingdi.h> Modified: trunk/rostests/apitests/gdi32/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <libs/pseh/pseh2.h> Modified: trunk/rostests/apitests/gdi32/BeginPath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/BeginPath.… ============================================================================== --- trunk/rostests/apitests/gdi32/BeginPath.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/BeginPath.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_BeginPath() Modified: trunk/rostests/apitests/gdi32/CombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_CombineRgn_Params() Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #define DEFAULT_BITMAP 21 Modified: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_CreateBitmapIndirect() Modified: trunk/rostests/apitests/gdi32/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateComp… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateCompatibleDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,11 +5,10 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> - #include "init.h" - void Test_CreateDIBPatternBrush() { Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include <pseh/pseh2.h> Modified: trunk/rostests/apitests/gdi32/CreateFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateFont.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateFont.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #define INVALIDFONT "ThisFontDoesNotExist" Modified: trunk/rostests/apitests/gdi32/CreateFontIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateFontIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateFontIndirect.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> - void Test_CreateFontIndirectA(void) Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateIcon… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,5 +1,6 @@ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreatePen.… ============================================================================== --- trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <include/ntgdityp.h> Modified: trunk/rostests/apitests/gdi32/CreateRectRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateRect… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateRectRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateRectRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> void Test_CreateRectRgn() { Modified: trunk/rostests/apitests/gdi32/DPtoLP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/DPtoLP.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngAcquire… ============================================================================== --- trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/EngCreateSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngCreateS… ============================================================================== --- trunk/rostests/apitests/gdi32/EngCreateSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngCreateSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngDeleteS… ============================================================================== --- trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngRelease… ============================================================================== --- trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <include/ntgdityp.h> Modified: trunk/rostests/apitests/gdi32/GdiConvertBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertBitmap.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm); Modified: trunk/rostests/apitests/gdi32/GdiConvertBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertBrush.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); Modified: trunk/rostests/apitests/gdi32/GdiConvertDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HDC WINAPI GdiConvertDC(HDC hdc); Modified: trunk/rostests/apitests/gdi32/GdiConvertFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertFont.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertFont.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HFONT WINAPI GdiConvertFont(HFONT); Modified: trunk/rostests/apitests/gdi32/GdiConvertPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertPalette.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertPalette.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HPALETTE WINAPI GdiConvertPalette(HPALETTE); Modified: trunk/rostests/apitests/gdi32/GdiConvertRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertRegion.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertRegion.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HRGN WINAPI GdiConvertRegion(HRGN); Modified: trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiDeleteL… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> BOOL WINAPI GdiDeleteLocalDC(HDC); Modified: trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetChar… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_GdiGetCharDimensions() Modified: trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); Modified: trunk/rostests/apitests/gdi32/GdiGetLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiGetLocalDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiGetLocalDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HDC WINAPI GdiGetLocalDC(HDC); Modified: trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiRelease… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> BOOL WINAPI GdiReleaseLocalDC(HDC); Modified: trunk/rostests/apitests/gdi32/GdiSetAttrs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiSetAttr… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiSetAttrs.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiSetAttrs.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> BOOL WINAPI GdiSetAttrs(HDC); Modified: trunk/rostests/apitests/gdi32/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetCurrentObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetCurrent… ============================================================================== --- trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBColo… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_GetDIBColorTable() Modified: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_GetPixel_1bpp() Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetRandomR… ============================================================================== --- trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb… ============================================================================== --- trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <include/ntgdityp.h> Modified: trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextExt… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetTextFace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextFac… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #define TEST(x) ok(x, #x"\n") Modified: trunk/rostests/apitests/gdi32/MaskBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/MaskBlt.c?… ============================================================================== --- trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/PatBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PatBlt.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> HBITMAP ghbmpTarget; Modified: trunk/rostests/apitests/gdi32/Rectangle.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/Rectangle.… ============================================================================== --- trunk/rostests/apitests/gdi32/Rectangle.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/Rectangle.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_Rectangle(void) Modified: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje… ============================================================================== --- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winddi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOr… ============================================================================== --- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <pseh/pseh2.h> Modified: trunk/rostests/apitests/gdi32/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDCPenCo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDIBits.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_SetDIBits() Modified: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBitsT… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> - #include "init.h" static void Modified: trunk/rostests/apitests/gdi32/SetMapMode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetMapMode… ============================================================================== --- trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <mmsystem.h> Modified: trunk/rostests/apitests/gdi32/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetWindowExtEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE… ============================================================================== --- trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetWorldTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWorldTr… ============================================================================== --- trunk/rostests/apitests/gdi32/SetWorldTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetWorldTransform.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_AddFontResource(void); extern void func_AddFontResourceEx(void); Added: trunk/rostests/apitests/include/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/apitest.… ============================================================================== --- trunk/rostests/apitests/include/apitest.h (added) +++ trunk/rostests/apitests/include/apitest.h [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -0,0 +1,28 @@ +#ifndef _APITEST_H +#define _APITEST_H + +// #define __ROS_LONG64__ + +#define 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 StartSeh() \ + ExceptionStatus = STATUS_SUCCESS; \ + _SEH2_TRY \ + { +#define EndSeh(ExpectedStatus) \ + } \ + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) \ + { \ + ExceptionStatus = _SEH2_GetExceptionCode(); \ + } \ + _SEH2_END; \ + ok(ExceptionStatus == ExpectedStatus, "Exception 0x%08lx, expected 0x%08lx\n", ExceptionStatus, ExpectedStatus) + +#endif /* _APITEST_H */ Propchange: trunk/rostests/apitests/include/apitest.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/FindFiles.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/FindFil… ============================================================================== --- trunk/rostests/apitests/kernel32/FindFiles.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/FindFiles.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO */ -#include <wine/test.h> +#include <apitest.h> + #include <windows.h> /* Modified: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/GetCurrentDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetCurrentDirectory.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <ndk/rtltypes.h> static Modified: trunk/rostests/apitests/kernel32/GetDriveType.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetDriv… ============================================================================== --- trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,4 +1,4 @@ -#include <wine/test.h> +#include <apitest.h> #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR) Modified: trunk/rostests/apitests/kernel32/GetModuleFileName.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetModu… ============================================================================== --- trunk/rostests/apitests/kernel32/GetModuleFileName.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetModuleFileName.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,12 +5,12 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#define UNICODE #include <stdio.h> -#include <wine/test.h> #include <winreg.h> #include <winnls.h> #include <shlwapi.h> @@ -24,7 +24,7 @@ PWSTR FileName; PWSTR Slash; WCHAR CommandLine[MAX_PATH]; - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInfo; DWORD Ret; int Length; @@ -48,7 +48,7 @@ FileName++; FileName[-1] = L'\0'; - Success = SetCurrentDirectory(Path); + Success = SetCurrentDirectoryW(Path); ok(Success == TRUE, "SetCurrentDirectory failed for path '%ls'\n", Path); trace("Starting '%ls' in path '%ls'\n", FileName, Path); @@ -64,16 +64,16 @@ RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); - Success = CreateProcess(FileName, - CommandLine, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInfo); + Success = CreateProcessW(FileName, + CommandLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInfo); if (!Success) { skip("CreateProcess failed with %lu\n", GetLastError()); Modified: trunk/rostests/apitests/kernel32/MultiByteToWideChar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/MultiBy… ============================================================================== --- trunk/rostests/apitests/kernel32/MultiByteToWideChar.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/MultiByteToWideChar.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,9 @@ * PROGRAMMER: Mike "tamlin" Nordell */ -#include <wine/test.h> +#include <apitest.h> + #include <winnls.h> - START_TEST(MultiByteToWideChar) { Modified: trunk/rostests/apitests/kernel32/SetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/SetCurrentDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetCurrentDirectory.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <ndk/rtltypes.h> static Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha… ============================================================================== --- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Mike "tamlin" Nordell */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <ndk/rtltypes.h> #include <xmmintrin.h> Modified: trunk/rostests/apitests/kernel32/lstrcpynW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/lstrcpy… ============================================================================== --- trunk/rostests/apitests/kernel32/lstrcpynW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/lstrcpynW.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,9 +4,10 @@ * PURPOSE: Test for lstrcpynW */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> START_TEST(lstrcpynW) { Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_FindFiles(void); extern void func_GetCurrentDirectory(void); Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,10 +5,10 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO <hermes.belusca(a)sfr.fr> */ +#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE #include <stdio.h> -#include <wine/test.h> #include <ndk/umtypes.h> #include "./CmdLineUtil/CmdLineUtil.h" Modified: trunk/rostests/apitests/msvcrt/ieee.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/ieee.c?re… ============================================================================== --- trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -6,7 +6,8 @@ * REFERENCES: http://msdn.microsoft.com/en-US/library/h7zkk1bz%28v=VS.80%29.aspx */ -#include <wine/test.h> +#include <apitest.h> + #include <float.h> #include <math.h> Modified: trunk/rostests/apitests/msvcrt/splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/splitpath… ============================================================================== --- trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <stdio.h> #include <stdlib.h> #include <strings.h> Modified: trunk/rostests/apitests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.… ============================================================================== --- trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_CommandLine(void); extern void func_ieee(void);

1 0

[akhaldi] 60312: [MSRLE32] * Move resource files to the lang folder. CORE-7470
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:57:15 2013 New Revision: 60312 URL: http://svn.reactos.org/svn/reactos?rev=60312&view=rev Log: [MSRLE32] * Move resource files to the lang folder. CORE-7470 Added: trunk/reactos/dll/win32/msrle32/lang/ (with props) trunk/reactos/dll/win32/msrle32/lang/msrle_Bg.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Bg.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Cs.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Cs.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Cy.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Cy.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Da.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Da.rc trunk/reactos/dll/win32/msrle32/lang/msrle_De.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_De.rc trunk/reactos/dll/win32/msrle32/lang/msrle_En.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_En.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Es.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Es.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Fr.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Fr.rc trunk/reactos/dll/win32/msrle32/lang/msrle_He.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_He.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Hu.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Hu.rc trunk/reactos/dll/win32/msrle32/lang/msrle_It.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_It.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ja.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ja.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ko.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ko.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Lt.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Lt.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Nl.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Nl.rc trunk/reactos/dll/win32/msrle32/lang/msrle_No.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_No.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Pl.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Pl.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Pt.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Pt.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ro.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ro.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ru.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ru.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Si.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Si.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Sv.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Sv.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Tr.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Tr.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Uk.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Uk.rc Removed: trunk/reactos/dll/win32/msrle32/msrle_Bg.rc trunk/reactos/dll/win32/msrle32/msrle_Cs.rc trunk/reactos/dll/win32/msrle32/msrle_Cy.rc trunk/reactos/dll/win32/msrle32/msrle_Da.rc trunk/reactos/dll/win32/msrle32/msrle_De.rc trunk/reactos/dll/win32/msrle32/msrle_En.rc trunk/reactos/dll/win32/msrle32/msrle_Es.rc trunk/reactos/dll/win32/msrle32/msrle_Fr.rc trunk/reactos/dll/win32/msrle32/msrle_He.rc trunk/reactos/dll/win32/msrle32/msrle_Hu.rc trunk/reactos/dll/win32/msrle32/msrle_It.rc trunk/reactos/dll/win32/msrle32/msrle_Ja.rc trunk/reactos/dll/win32/msrle32/msrle_Ko.rc trunk/reactos/dll/win32/msrle32/msrle_Lt.rc trunk/reactos/dll/win32/msrle32/msrle_Nl.rc trunk/reactos/dll/win32/msrle32/msrle_No.rc trunk/reactos/dll/win32/msrle32/msrle_Pl.rc trunk/reactos/dll/win32/msrle32/msrle_Pt.rc trunk/reactos/dll/win32/msrle32/msrle_Ro.rc trunk/reactos/dll/win32/msrle32/msrle_Ru.rc trunk/reactos/dll/win32/msrle32/msrle_Si.rc trunk/reactos/dll/win32/msrle32/msrle_Sv.rc trunk/reactos/dll/win32/msrle32/msrle_Tr.rc trunk/reactos/dll/win32/msrle32/msrle_Uk.rc Modified: trunk/reactos/dll/win32/msrle32/rsrc.rc Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Sep 22 16:57:15 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/dll/win32/msrle32/msrle_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Bg… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Bg.rc (removed) @@ -1,30 +0,0 @@ -/* - * Bulgarian resource file for MS-RLE - * - * Copyright 2005 Milko Krachounov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE âèäåî êîäåê" - IDS_ABOUT "Wine MS-RLE âèäåî êîäåê\nCopyright 2002 by Michael Gunnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Cs… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Cs.rc (removed) @@ -1,34 +0,0 @@ -/* Hey, Emacs, open this file with -*- coding: cp1250 -*- - * - * Czech resource file for MS-RLE - * - * Copyright 2002 Michael Günnewig - * Copyright 2004 David Kredba - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -/* Czech strings in CP1250 */ - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Cy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Cy… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Cy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Cy.rc (removed) @@ -1,33 +0,0 @@ -/* - * Cefnogaeth iaith Cymraeg - * Welsh language support - * - * Copyright 2010 Ken Sharp - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_WELSH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE 'n fideo codec" - IDS_ABOUT "Wine MS-RLE 'n fideo codec\nHawlfraint 2002 Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Da… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Da.rc (removed) @@ -1,30 +0,0 @@ -/* - * Danish language support - * - * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE videokodeks" - IDS_ABOUT "Wine MS-RLE videokodeks\nOphavsret 2002 tilhører Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_De… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_De.rc (removed) @@ -1,32 +0,0 @@ -/* - * German resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE Videodekoder" - IDS_ABOUT "Wine MS-RLE Videodekoder\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_En… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_En.rc (removed) @@ -1,32 +0,0 @@ -/* - * English resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video codec" - IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Es… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Es.rc (removed) @@ -1,30 +0,0 @@ -/* - * Spanish resource file for MS-RLE - * - * Copyright 2003 José Manuel Ferrer Ortiz - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Codec de vídeo MS-RLE de Wine" - IDS_ABOUT "Codec de vídeo MS-RLE de Wine\nCopyright 2002 por Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Fr… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Fr.rc (removed) @@ -1,33 +0,0 @@ -/* - * French resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine : codec vidÃ©o MS-RLE" - IDS_ABOUT "Wine : codec vidÃ©o MS-RLE\nCopyright 2002 par Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_He… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_He.rc (removed) @@ -1,34 +0,0 @@ -/* - * Hebrew resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * Translated by Baruch Rutman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE ××§××× ×××××" - IDS_ABOUT "Wine MS-RLE ××§××× ×××××\n××××××ª ×××¦×¨×× 2002 ×¢""× Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Hu… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Hu.rc (removed) @@ -1,30 +0,0 @@ -/* - * Hungarian resource file for MS-RLE - * - * Copyright 2006 Andras Kovacs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT L"Wine MS-RLE video kodek\nCopyright 2002, Michael G\x00fcnnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_It… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_It.rc (removed) @@ -1,31 +0,0 @@ -/* - * Italian resource file for MS-RLE - * - * Copyright 2002 Michael Günnewig - * Copyright 2003 Ivan Leo Puoti - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Codec video MS-RLE di Wine" - IDS_ABOUT "Codec video MS-RLE di Wine\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ja… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ja.rc (removed) @@ -1,33 +0,0 @@ -/* - * Japanese resource file for MS-RLE - * - * Copyright 2004 Hajime Segawa - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE ãããªã³ã¼ããã¯" - IDS_ABOUT "Wine MS-RLE ãããªã³ã¼ããã¯\nCopyright 2002 by Michael GÃ¼newig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ko… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ko.rc (removed) @@ -1,30 +0,0 @@ -/* - * Korean resource file for MS-RLE - * - * Copyright 2005 YunSong Hwang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE ºñµð¿À ÄÚµ¦" - IDS_ABOUT "Wine MS-RLE ºñµð¿À ÄÚµ¦\nCopyright 2002 by Michael Gunnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Lt… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Lt.rc (removed) @@ -1,33 +0,0 @@ -/* - * Lithuanian resource file for MS-RLE - * - * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE vaizdo kodekas" - IDS_ABOUT "Wine MS-RLE vaizdo kodekas\nAutoriaus teisÄs Michael GÃ¼nnewig, 2002" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Nl… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Nl.rc (removed) @@ -1,30 +0,0 @@ -/* - * MS-RLE (Dutch resources) - * - * Copyright 2003 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE videodecoder" - IDS_ABOUT "Wine MS-RLE videodecoder\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_No… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_No.rc (removed) @@ -1,30 +0,0 @@ -/* - * Norwegian Bokmål resource file for MS-RLE - * - * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE-videokodek" - IDS_ABOUT "Wine MS-RLE-videokodek\nKopirett 2002 tilhører Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pl… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Pl.rc (removed) @@ -1,31 +0,0 @@ -/* - * Polish resource file for MS-RLE - * - * Copyright 2002 Michael Gnnewig - * Copyright 2006 Mikolaj Zalewski - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Kodek Wine MS-RLE" - IDS_ABOUT L"Koder-dekoder Wine MS-RLE\nCopyright 2002 - Michael G\x00fcnnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pt… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Pt.rc (removed) @@ -1,40 +0,0 @@ -/* - * Portuguese resource file for MS-RLE - * - * Copyright 2003 Marcelo Duarte - * Copyright 2006 Américo José Melo - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE codificador/decodificador de vídeo" - IDS_ABOUT "Wine MS-RLE codificador/decodificador de vídeo\nCopyright 2002 por Michael Günnewig" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE codificador/decodificador de vídeo" - IDS_ABOUT "Wine MS-RLE codificador/decodificador de vídeo\nDireitos de autor 2002 por Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ro… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ro.rc (removed) @@ -1,31 +0,0 @@ -/* - * Copyright 2002 Michael GÃ¼nnewig - * Copyright 2008 Michael Stefaniuc - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Codecul video Wine MS-RLE" - IDS_ABOUT "Codecul video Wine MS-RLE\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ru… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ru.rc (removed) @@ -1,33 +0,0 @@ -/* - * Russian resource file for MS-RLE - * - * Copyright 2003 Igor Stepin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "ÐÐ¸Ð´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE" - IDS_ABOUT "ÐÐ¸Ð´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE\nCopyright 2002 by Michael GÑnnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Si… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Si.rc (removed) @@ -1,32 +0,0 @@ -/* - * Slovenian resource file for MS-RLE - * - * Copyright 2003, 2008 Rok Mandeljc - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Sv… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Sv.rc (removed) @@ -1,30 +0,0 @@ -/* - * Swedish resource file for MS-RLE - * - * Copyright 2007 Daniel Nylander - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE videokodek" - IDS_ABOUT "Wine MS-RLE videokodek\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Tr… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Tr.rc (removed) @@ -1,30 +0,0 @@ -/* - * Turkish resource file for MS-RLE - * - * Copyright 2006 Fatih Aþýcý - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE vidyo çözücü" - IDS_ABOUT "Wine MS-RLE vidyo çözücü\nTelif Hakký 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Uk… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Uk.rc (removed) @@ -1,34 +0,0 @@ -/* - * Ukrainian resource file for MS-RLE - * - * Copyright 2002 Michael GÐÑnnewig - * Copyright 2010 Igor Paliychuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "ÐÑÐ´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE" - IDS_ABOUT "ÐÑÐ´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE\nCopyright 2002 by Michael GÐÑnnewig" -} Modified: trunk/reactos/dll/win32/msrle32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msrle32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/rsrc.rc [iso-8859-1] Sun Sep 22 16:57:15 2013 @@ -32,73 +32,73 @@ */ #ifdef LANGUAGE_BG_BG - #include "msrle_Bg.rc" + #include "lang/msrle_Bg.rc" #endif #ifdef LANGUAGE_CS_CZ - #include "msrle_Cs.rc" + #include "lang/msrle_Cs.rc" #endif #ifdef LANGUAGE_DA_DK - #include "msrle_Da.rc" + #include "lang/msrle_Da.rc" #endif #ifdef LANGUAGE_ES_ES - #include "msrle_Es.rc" + #include "lang/msrle_Es.rc" #endif #ifdef LANGUAGE_HU_HU - #include "msrle_Hu.rc" + #include "lang/msrle_Hu.rc" #endif #ifdef LANGUAGE_IT_IT - #include "msrle_It.rc" + #include "lang/msrle_It.rc" #endif #ifdef LANGUAGE_KO_KR - #include "msrle_Ko.rc" + #include "lang/msrle_Ko.rc" #endif #ifdef LANGUAGE_NL_NL - #include "msrle_Nl.rc" + #include "lang/msrle_Nl.rc" #endif #ifdef LANGUAGE_NO_NO - #include "msrle_No.rc" + #include "lang/msrle_No.rc" #endif #ifdef LANGUAGE_PL_PL - #include "msrle_Pl.rc" + #include "lang/msrle_Pl.rc" #endif #ifdef LANGUAGE_PT_PT - #include "msrle_Pt.rc" + #include "lang/msrle_Pt.rc" #endif #ifdef LANGUAGE_SV_SE - #include "msrle_Sv.rc" + #include "lang/msrle_Sv.rc" #endif #ifdef LANGUAGE_TR_TR - #include "msrle_Tr.rc" + #include "lang/msrle_Tr.rc" #endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE - #include "msrle_De.rc" + #include "lang/msrle_De.rc" #endif #ifdef LANGUAGE_EN_US - #include "msrle_En.rc" + #include "lang/msrle_En.rc" #endif #ifdef LANGUAGE_FR_FR - #include "msrle_Fr.rc" + #include "lang/msrle_Fr.rc" #endif #ifdef LANGUAGE_HE_IL - #include "msrle_He.rc" + #include "lang/msrle_He.rc" #endif #ifdef LANGUAGE_JA_JP - #include "msrle_Ja.rc" + #include "lang/msrle_Ja.rc" #endif #ifdef LANGUAGE_LT_LT - #include "msrle_Lt.rc" + #include "lang/msrle_Lt.rc" #endif #ifdef LANGUAGE_RO_RO - #include "msrle_Ro.rc" + #include "lang/msrle_Ro.rc" #endif #ifdef LANGUAGE_RU_RU - #include "msrle_Ru.rc" + #include "lang/msrle_Ru.rc" #endif #ifdef LANGUAGE_SL_SI - #include "msrle_Si.rc" + #include "lang/msrle_Si.rc" #endif #ifdef LANGUAGE_UK_UA - #include "msrle_Uk.rc" + #include "lang/msrle_Uk.rc" #endif

1 0

[akhaldi] 60311: [MSISYS.OCX] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:53:31 2013 New Revision: 60311 URL: http://svn.reactos.org/svn/reactos?rev=60311&view=rev Log: [MSISYS.OCX] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt trunk/reactos/dll/win32/msisys.ocx/msisys.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/CMake… ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msisys.ocx msisys.ocx.spec) list(APPEND SOURCE @@ -9,8 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/msisys.def) add_library(msisys SHARED ${SOURCE}) - set_module_type(msisys win32ocx) -target_link_libraries(msisys uuid wine) +target_link_libraries(msisys wine) add_importlibs(msisys msvcrt kernel32 ntdll) add_cd_file(TARGET msisys DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msisys.ocx/msisys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/msisy… ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/msisys.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisys.ocx/msisys.c [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -37,50 +37,6 @@ /*********************************************************************** - * MSISYS_InitProcess (internal) - */ -static BOOL MSISYS_InitProcess( void ) -{ - TRACE("()\n"); - - return TRUE; -} - -/*********************************************************************** - * MSISYS_UninitProcess (internal) - */ -static void MSISYS_UninitProcess( void ) -{ - TRACE("()\n"); -} - -/*********************************************************************** - * DllMain for MSISYS - */ -BOOL WINAPI DllMain( - HINSTANCE hInstDLL, - DWORD fdwReason, - LPVOID lpvReserved ) -{ - TRACE("(%p,%d,%p)\n",hInstDLL,fdwReason,lpvReserved); - - switch ( fdwReason ) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - if ( !MSISYS_InitProcess() ) - return FALSE; - break; - case DLL_PROCESS_DETACH: - MSISYS_UninitProcess(); - break; - } - - return TRUE; -} - - -/*********************************************************************** * DllCanUnloadNow (MSISYS.@) * * RETURNS @@ -89,7 +45,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /*********************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -120,7 +120,7 @@ reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 reactos/dll/win32/msimtf # Synced to Wine-1.7.1 reactos/dll/win32/msisip # Synced to Wine-1.7.1 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 +reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Autosync reactos/dll/win32/mssign32 # Synced to Wine-1.5.19

1 0

[akhaldi] 60310: [MSISIP] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:47:51 2013 New Revision: 60310 URL: http://svn.reactos.org/svn/reactos?rev=60310&view=rev Log: [MSISIP] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msisip/CMakeLists.txt trunk/reactos/dll/win32/msisip/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msisip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msisip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:47:51 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msisip.dll msisip.spec) list(APPEND SOURCE @@ -10,9 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/msisip.def) add_library(msisip SHARED ${SOURCE}) - set_module_type(msisip win32dll) - target_link_libraries(msisip wine) add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET msisip DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msisip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] Sun Sep 22 16:47:51 2013 @@ -44,10 +44,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 22 16:47:51 2013 @@ -119,7 +119,7 @@ reactos/dll/win32/msi # Synced to Wine-1.7.1 reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 reactos/dll/win32/msimtf # Synced to Wine-1.7.1 -reactos/dll/win32/msisip # Synced to Wine-1.5.19 +reactos/dll/win32/msisip # Synced to Wine-1.7.1 reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Autosync

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs