Author: sginsberg
Date: Sat Nov 29 15:37:54 2008
New Revision: 37750
URL:
http://svn.reactos.org/svn/reactos?rev=37750&view=rev
Log:
- Hey STDCALL, you just got deprecated from rostests
Modified:
trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c
trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c
trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c
trunk/rostests/apitests/w32knapi/w32knapi.c
trunk/rostests/regtests_by_casper/regtests/regtests.c
trunk/rostests/regtests_by_casper/shared/regtests.c
trunk/rostests/regtests_by_casper/shared/regtests.h
trunk/rostests/tests/apc/apc.c
trunk/rostests/tests/button/buttontst.c
trunk/rostests/tests/capclock/capclock.c
trunk/rostests/tests/lantst/lantest.cpp
trunk/rostests/tests/lpctst/conport.c
trunk/rostests/tests/lpctst/creport.c
trunk/rostests/tests/lpctst/dumpinfo.c
trunk/rostests/tests/polytest/polytest.cpp
trunk/rostests/tests/statst/statst.c
trunk/rostests/tests/suspend/suspend.c
trunk/rostests/tests/terminate/terminate.c
trunk/rostests/win32/kernel32/tests/CreateFile.c
trunk/rostests/win32/user32/drawcaption/drawcap.c
Modified: trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G…
==============================================================================
--- trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c [iso-8859-1] Sat Nov 29
15:37:54 2008
@@ -1,4 +1,4 @@
-LONG STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
+LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
INT
Test_GdiGetCharDimensions(PTESTINFO pti)
Modified: trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/…
==============================================================================
--- trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/user32api/tests/InitializeLpkHooks.c [iso-8859-1] Sat Nov 29
15:37:54 2008
@@ -27,7 +27,7 @@
int Count_myLpkPSMTextOut = 0;
int Count_myLpkDrawTextEx = 0;
-DWORD STDCALL myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5,
LPVOID x6, LPVOID x7, LPVOID x8,
+DWORD WINAPI myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5,
LPVOID x6, LPVOID x7, LPVOID x8,
LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12)
{
Count_myLpkTabbedTextOut++;
@@ -55,7 +55,7 @@
PLPK_LPEDITCONTROL_LIST fpListLpkEditControl;
} USER32_INTERN_INITALIZEHOOKS, *PUSER32_INTERN_INITALIZEHOOKS;
-VOID STDCALL InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS);
+VOID WINAPI InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS);
INT
Test_InitializeLpkHooks(PTESTINFO pti)
Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/…
==============================================================================
--- trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c [iso-8859-1]
(original)
+++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c [iso-8859-1] Sat
Nov 29 15:37:54 2008
@@ -1,5 +1,5 @@
/* First the call stub */
-DWORD STDCALL
+DWORD WINAPI
NtUserCountClipboardFormats(VOID)
{
DWORD p;
Modified: trunk/rostests/apitests/w32knapi/w32knapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap…
==============================================================================
--- trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -13,7 +13,7 @@
return pPeb->GdiSharedHandleTable;
}
-static DWORD STDCALL
+static DWORD WINAPI
IntSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam)
{
DWORD ret;
Modified: trunk/rostests/regtests_by_casper/regtests/regtests.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/regtes…
==============================================================================
--- trunk/rostests/regtests_by_casper/regtests/regtests.c [iso-8859-1] (original)
+++ trunk/rostests/regtests_by_casper/regtests/regtests.c [iso-8859-1] Sat Nov 29 15:37:54
2008
@@ -8,32 +8,32 @@
*/
#include <windows.h>
-HMODULE STDCALL
+HMODULE WINAPI
_GetModuleHandleA(LPCSTR lpModuleName)
{
return GetModuleHandleA(lpModuleName);
}
-FARPROC STDCALL
+FARPROC WINAPI
_GetProcAddress(HMODULE hModule,
LPCSTR lpProcName)
{
return GetProcAddress(hModule, lpProcName);
}
-HINSTANCE STDCALL
+HINSTANCE WINAPI
_LoadLibraryA(LPCSTR lpLibFileName)
{
return LoadLibraryA(lpLibFileName);
}
-VOID STDCALL
+VOID WINAPI
_ExitProcess(UINT uExitCode)
{
ExitProcess(uExitCode);
}
-HANDLE STDCALL
+HANDLE WINAPI
_CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter,
DWORD dwCreationFlags, LPDWORD lpThreadId)
@@ -42,31 +42,31 @@
lpParameter, dwCreationFlags, lpThreadId);
}
-WINBOOL STDCALL
+WINBOOL WINAPI
_TerminateThread(HANDLE hThread, DWORD dwExitCode)
{
return TerminateThread(hThread, dwExitCode);
}
-DWORD STDCALL
+DWORD WINAPI
_WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds)
{
return WaitForSingleObject(hHandle, dwMilliseconds);
}
-DWORD STDCALL
+DWORD WINAPI
_GetLastError()
{
return GetLastError();
}
-VOID STDCALL
+VOID WINAPI
_CloseHandle(HANDLE handle)
{
CloseHandle (handle);
}
-BOOL STDCALL
+BOOL WINAPI
_GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime,
LPFILETIME lpExitTime, LPFILETIME lpKernelTime,
LPFILETIME lpUserTime)
@@ -75,31 +75,31 @@
lpKernelTime, lpUserTime);
}
-BOOL STDCALL
+BOOL WINAPI
_SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass)
{
return SetPriorityClass(hProcess, dwPriorityClass);
}
-BOOL STDCALL
+BOOL WINAPI
_SetThreadPriority(HANDLE hThread, int nPriority)
{
return SetThreadPriority(hThread, nPriority);
}
-HANDLE STDCALL
+HANDLE WINAPI
_GetCurrentProcess()
{
return GetCurrentProcess();
}
-HANDLE STDCALL
+HANDLE WINAPI
_GetCurrentThread()
{
return GetCurrentThread();
}
-VOID STDCALL
+VOID WINAPI
_Sleep(DWORD dwMilliseconds)
{
return Sleep(dwMilliseconds);
Modified: trunk/rostests/regtests_by_casper/shared/regtests.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/shared…
==============================================================================
--- trunk/rostests/regtests_by_casper/shared/regtests.c [iso-8859-1] (original)
+++ trunk/rostests/regtests_by_casper/shared/regtests.c [iso-8859-1] Sat Nov 29 15:37:54
2008
@@ -227,7 +227,7 @@
InsertTailList(&AllTests, &Test->ListEntry);
}
-PVOID STDCALL
+PVOID WINAPI
FrameworkGetHook(ULONG index)
{
return FrameworkGetHookInternal(index);
Modified: trunk/rostests/regtests_by_casper/shared/regtests.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/shared…
==============================================================================
--- trunk/rostests/regtests_by_casper/shared/regtests.h [iso-8859-1] (original)
+++ trunk/rostests/regtests_by_casper/shared/regtests.h [iso-8859-1] Sat Nov 29 15:37:54
2008
@@ -11,7 +11,7 @@
#include <stdio.h>
#include <string.h>
-typedef DWORD (STDCALL _LPTHREAD_START_ROUTINE)(LPVOID lpParameter);
+typedef DWORD (WINAPI _LPTHREAD_START_ROUTINE)(LPVOID lpParameter);
typedef struct __FILETIME
{
@@ -164,7 +164,7 @@
* OutputRoutine - Output routine.
* TestName - If NULL all tests are run. If non-NULL specifies the test to be run
*/
-typedef void (STDCALL *TestDriverMain)(TestOutputRoutine OutputRoutine, char *TestName);
+typedef void (WINAPI *TestDriverMain)(TestOutputRoutine OutputRoutine, char *TestName);
typedef struct __TEST
{
@@ -189,56 +189,56 @@
extern _API_DESCRIPTION ExternalDependencies[];
extern ULONG MaxExternalDependency;
-HANDLE STDCALL
+HANDLE WINAPI
_GetModuleHandleA(LPCSTR lpModuleName);
-PVOID STDCALL
+PVOID WINAPI
_GetProcAddress(HANDLE hModule,
LPCSTR lpProcName);
-HANDLE STDCALL
+HANDLE WINAPI
_LoadLibraryA(LPCSTR lpLibFileName);
-VOID STDCALL
+VOID WINAPI
_ExitProcess(UINT uExitCode);
-HANDLE STDCALL
+HANDLE WINAPI
_CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
_LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter,
DWORD dwCreationFlags, LPDWORD lpThreadId);
-BOOL STDCALL
+BOOL WINAPI
_TerminateThread(HANDLE hThread, DWORD dwExitCode);
-DWORD STDCALL
+DWORD WINAPI
_WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds);
-DWORD STDCALL
+DWORD WINAPI
_GetLastError();
-VOID STDCALL
+VOID WINAPI
_CloseHandle(HANDLE handle);
-BOOL STDCALL
+BOOL WINAPI
_GetThreadTimes(HANDLE hThread,
_LPFILETIME lpCreationTime,
_LPFILETIME lpExitTime,
_LPFILETIME lpKernelTime,
_LPFILETIME lpUserTime);
-BOOL STDCALL
+BOOL WINAPI
_SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass);
-BOOL STDCALL
+BOOL WINAPI
_SetThreadPriority(HANDLE hThread, int nPriority);
-HANDLE STDCALL
+HANDLE WINAPI
_GetCurrentProcess();
-HANDLE STDCALL
+HANDLE WINAPI
_GetCurrentThread();
-VOID STDCALL
+VOID WINAPI
_Sleep(DWORD dwMilliseconds);
Modified: trunk/rostests/tests/apc/apc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/apc/apc.c?rev=37750…
==============================================================================
--- trunk/rostests/tests/apc/apc.c [iso-8859-1] (original)
+++ trunk/rostests/tests/apc/apc.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -8,7 +8,7 @@
HANDLE OutputHandle;
HANDLE InputHandle;
-VOID STDCALL
+VOID WINAPI
ApcRoutine(PVOID Context,
PIO_STATUS_BLOCK IoStatus,
ULONG Reserved)
Modified: trunk/rostests/tests/button/buttontst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/button/buttontst.c?…
==============================================================================
--- trunk/rostests/tests/button/buttontst.c [iso-8859-1] (original)
+++ trunk/rostests/tests/button/buttontst.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -50,7 +50,7 @@
}
}
-int STDCALL WinMain(
+int WINAPI WinMain(
HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPSTR lpCmdLine,
Modified: trunk/rostests/tests/capclock/capclock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/capclock/capclock.c…
==============================================================================
--- trunk/rostests/tests/capclock/capclock.c [iso-8859-1] (original)
+++ trunk/rostests/tests/capclock/capclock.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -15,7 +15,7 @@
static VOID CALLBACK TimerProc(HWND,UINT,UINT,DWORD);
-INT STDCALL WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT
nCmdShow)
+INT WINAPI WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT nCmdShow)
{
WNDCLASS wc;
Modified: trunk/rostests/tests/lantst/lantest.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lantst/lantest.cpp?…
==============================================================================
--- trunk/rostests/tests/lantst/lantest.cpp [iso-8859-1] (original)
+++ trunk/rostests/tests/lantst/lantest.cpp [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -59,7 +59,7 @@
#define ETYPE_ARP WH2N(0x0806)
extern "C"
-NTSTATUS STDCALL NtCreateFile(
+NTSTATUS NTAPI NtCreateFile(
PHANDLE FileHandle,
ACCESS_MASK DesiredAccess,
POBJECT_ATTRIBUTES ObjectAttributes,
Modified: trunk/rostests/tests/lpctst/conport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lpctst/conport.c?re…
==============================================================================
--- trunk/rostests/tests/lpctst/conport.c [iso-8859-1] (original)
+++ trunk/rostests/tests/lpctst/conport.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -31,7 +31,7 @@
#define LPC_CONNECT_FLAG5 0x00010000
NTSTATUS
-(STDCALL * ConnectPort)(
+(WINAPI * ConnectPort)(
OUT PHANDLE PortHandle,
IN PUNICODE_STRING PortName,
IN POBJECT_ATTRIBUTES ObjectAttributes,
@@ -43,7 +43,7 @@
);
NTSTATUS
-(STDCALL * QueryObject)(
+(WINAPI * QueryObject)(
IN HANDLE ObjectHandle,
IN CINT ObjectInformationClass,
OUT PVOID ObjectInformation,
@@ -52,7 +52,7 @@
);
NTSTATUS
-(STDCALL * YieldExecution)(VOID);
+(WINAPI * YieldExecution)(VOID);
#define BUF_SIZE 1024
#define MAXARG 1000000
Modified: trunk/rostests/tests/lpctst/creport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lpctst/creport.c?re…
==============================================================================
--- trunk/rostests/tests/lpctst/creport.c [iso-8859-1] (original)
+++ trunk/rostests/tests/lpctst/creport.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -23,7 +23,7 @@
#define LPC_CONNECT_FLAG5 0x00010000
NTSTATUS
-(STDCALL * CreatePort)(
+(WINAPI * CreatePort)(
/*OUT PHANDLE PortHandle,*/
PVOID Buffer,
IN POBJECT_ATTRIBUTES PortAttributes OPTIONAL,
@@ -33,7 +33,7 @@
);
NTSTATUS
-(STDCALL * QueryObject)(
+(WINAPI * QueryObject)(
IN HANDLE ObjectHandle,
IN CINT ObjectInformationClass,
OUT PVOID ObjectInformation,
@@ -42,7 +42,7 @@
);
NTSTATUS
-(STDCALL * YieldExecution)(VOID);
+(WINAPI * YieldExecution)(VOID);
#define BUF_SIZE 1024
#define MAXARG 5000000
Modified: trunk/rostests/tests/lpctst/dumpinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/lpctst/dumpinfo.c?r…
==============================================================================
--- trunk/rostests/tests/lpctst/dumpinfo.c [iso-8859-1] (original)
+++ trunk/rostests/tests/lpctst/dumpinfo.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -25,7 +25,7 @@
extern
NTSTATUS
-(STDCALL * QueryObject)(
+(WINAPI * QueryObject)(
IN HANDLE ObjectHandle,
IN CINT ObjectInformationClass,
OUT PVOID ObjectInformation,
@@ -35,7 +35,7 @@
extern
NTSTATUS
-(STDCALL * QueryInformationPort)(
+(WINAPI * QueryInformationPort)(
IN HANDLE PortHandle,
IN CINT PortInformationClass, /* guess */
OUT PVOID PortInformation, /* guess */
Modified: trunk/rostests/tests/polytest/polytest.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/polytest/polytest.c…
==============================================================================
--- trunk/rostests/tests/polytest/polytest.cpp [iso-8859-1] (original)
+++ trunk/rostests/tests/polytest/polytest.cpp [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -17,7 +17,6 @@
#include <assert.h>
#define FASTCALL
-#define STDCALL
#define INT int
#define CLIPOBJ int
#define SURFOBJ int
@@ -501,7 +500,7 @@
*/
static
void
-STDCALL
+WINAPI
POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** ActiveHead
)
{
int i;
@@ -526,7 +525,7 @@
*/
static
void
-STDCALL
+WINAPI
POLYGONFILL_FillScanLineAlternate(
PDC dc,
int ScanLine,
@@ -574,7 +573,7 @@
static
void
-STDCALL
+WINAPI
POLYGONFILL_FillScanLineWinding(
PDC dc,
int ScanLine,
@@ -674,7 +673,7 @@
//The direction of each edge of the polygon is important.
BOOL
-STDCALL
+WINAPI
FillPolygon(
PDC dc,
SURFOBJ *SurfObj,
@@ -689,7 +688,7 @@
int ScanLine;
void
- STDCALL
+ WINAPI
(*FillScanLine)(
PDC dc,
int ScanLine,
Modified: trunk/rostests/tests/statst/statst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/statst/statst.c?rev…
==============================================================================
--- trunk/rostests/tests/statst/statst.c [iso-8859-1] (original)
+++ trunk/rostests/tests/statst/statst.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -108,7 +108,7 @@
}
}
-int STDCALL WinMain(
+int WINAPI WinMain(
HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPSTR lpCmdLine,
Modified: trunk/rostests/tests/suspend/suspend.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/suspend/suspend.c?r…
==============================================================================
--- trunk/rostests/tests/suspend/suspend.c [iso-8859-1] (original)
+++ trunk/rostests/tests/suspend/suspend.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -11,7 +11,7 @@
static volatile DWORD z;
static volatile DWORD x=0;
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
thread_1(PVOID Param)
{
DWORD y=0;
Modified: trunk/rostests/tests/terminate/terminate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/terminate/terminate…
==============================================================================
--- trunk/rostests/tests/terminate/terminate.c [iso-8859-1] (original)
+++ trunk/rostests/tests/terminate/terminate.c [iso-8859-1] Sat Nov 29 15:37:54 2008
@@ -11,7 +11,7 @@
static volatile DWORD z;
static volatile DWORD x=0;
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
thread_1(PVOID Param)
{
DWORD y=0;
Modified: trunk/rostests/win32/kernel32/tests/CreateFile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/tests/Crea…
==============================================================================
--- trunk/rostests/win32/kernel32/tests/CreateFile.c [iso-8859-1] (original)
+++ trunk/rostests/win32/kernel32/tests/CreateFile.c [iso-8859-1] Sat Nov 29 15:37:54
2008
@@ -67,7 +67,7 @@
static CreateFileTest_Parameters *CurrentTest;
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
MockNtCreateFile(PHANDLE FileHandle,
ACCESS_MASK DesiredAccess,
POBJECT_ATTRIBUTES ObjectAttributes,
Modified: trunk/rostests/win32/user32/drawcaption/drawcap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/drawcaption/…
==============================================================================
--- trunk/rostests/win32/user32/drawcaption/drawcap.c [iso-8859-1] (original)
+++ trunk/rostests/win32/user32/drawcaption/drawcap.c [iso-8859-1] Sat Nov 29 15:37:54
2008
@@ -25,7 +25,7 @@
HINSTANCE hInst;
INT testnum = 0;
-//BOOL STDCALL (*DrawCaptionTemp) (
+//BOOL WINAPI (*DrawCaptionTemp) (
// HWND hwnd,
// HDC hdc,
// const RECT *rect,