diff --git a/reactos/regtests/shared/regtests.c b/reactos/regtests/shared/regtests.c index fe927b034a7..0068b41236b 100755 --- a/reactos/regtests/shared/regtests.c +++ b/reactos/regtests/shared/regtests.c @@ -78,8 +78,8 @@ ControlNormalTest(HANDLE hThread, PERFORM_TEST_ARGS *Args, DWORD TimeOut) { - FILETIME time; - FILETIME executionTime; + _FILETIME time; + _FILETIME executionTime; DWORD status; status = _WaitForSingleObject(hThread, TimeOut); diff --git a/reactos/regtests/shared/regtests.h b/reactos/regtests/shared/regtests.h index e64ac398b21..1510cf1efc1 100755 --- a/reactos/regtests/shared/regtests.h +++ b/reactos/regtests/shared/regtests.h @@ -9,6 +9,14 @@ #include #include +typedef DWORD (STDCALL _LPTHREAD_START_ROUTINE)(LPVOID lpParameter); + +typedef struct __FILETIME +{ + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} _FILETIME, *_PFILETIME, *_LPFILETIME; + extern void SetupOnce(); #define _SetupOnce() \ @@ -195,7 +203,7 @@ _ExitProcess(UINT uExitCode); HANDLE STDCALL _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize, - LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, + _LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId); WINBOOL STDCALL @@ -211,9 +219,11 @@ VOID STDCALL _CloseHandle(HANDLE handle); BOOL STDCALL -_GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime, - LPFILETIME lpExitTime, LPFILETIME lpKernelTime, - LPFILETIME lpUserTime); +_GetThreadTimes(HANDLE hThread, + _LPFILETIME lpCreationTime, + _LPFILETIME lpExitTime, + _LPFILETIME lpKernelTime, + _LPFILETIME lpUserTime); BOOL STDCALL _SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass); diff --git a/reactos/subsys/win32k/tests/stubs.xml b/reactos/subsys/win32k/tests/stubs.xml index 4db1e5be270..d881427172b 100644 --- a/reactos/subsys/win32k/tests/stubs.xml +++ b/reactos/subsys/win32k/tests/stubs.xml @@ -148,6 +148,8 @@ PsGetThreadWin32Thread@4 PsEstablishWin32Callouts@4 PsSetThreadWin32Thread@8 + ProbeForRead@12 + ProbeForWrite@12 FT_Init_FreeType diff --git a/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.c b/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.c index 60e4cb8ee32..5e63b0fbe0e 100644 --- a/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.c +++ b/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.c @@ -9,7 +9,7 @@ static void SetupSurface(SURFOBJ* surface, RECTL* rect) UINT size; UINT depth; - ZeroMemory(surface, sizeof(SURFOBJ)); + RtlZeroMemory(surface, sizeof(SURFOBJ)); depth = BitsPerFormat(BMF_24BPP); sizex = rect->right - rect->left; sizey = rect->bottom - rect->top;