Fix building 'make test'

svn path=/trunk/; revision=17027

diff --git a/reactos/regtests/shared/regtests.c b/reactos/regtests/shared/regtests.c
index fe927b0..0068b41 100755 (executable)
--- 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)
 {
             PERFORM_TEST_ARGS *Args,
             DWORD TimeOut)
 {

-  FILETIME time;
-  FILETIME executionTime;
+  _FILETIME time;
+  _FILETIME executionTime;

   DWORD status;
 
   status = _WaitForSingleObject(hThread, TimeOut);
   DWORD status;
 
   status = _WaitForSingleObject(hThread, TimeOut);

diff --git a/reactos/regtests/shared/regtests.h b/reactos/regtests/shared/regtests.h
index e64ac39..1510cf1 100755 (executable)
--- a/reactos/regtests/shared/regtests.h
+++ b/reactos/regtests/shared/regtests.h
@@ -9,6 +9,14 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

+typedef DWORD (STDCALL _LPTHREAD_START_ROUTINE)(LPVOID lpParameter);
+
+typedef struct __FILETIME
+{
+  DWORD dwLowDateTime;
+  DWORD dwHighDateTime;
+} _FILETIME, *_PFILETIME, *_LPFILETIME;
+

 extern void SetupOnce();
 
 #define _SetupOnce() \
 extern void SetupOnce();
 
 #define _SetupOnce() \


@@ -195,7 +203,7 @@ _ExitProcess(UINT uExitCode);
 
 HANDLE STDCALL
 _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
 
 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
               DWORD dwCreationFlags, LPDWORD lpThreadId);
 
 WINBOOL STDCALL


@@ -211,9 +219,11 @@ VOID STDCALL
 _CloseHandle(HANDLE handle);
 
 BOOL 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);
 
 BOOL STDCALL
 _SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass);

diff --git a/reactos/subsys/win32k/tests/stubs.xml b/reactos/subsys/win32k/tests/stubs.xml
index 4db1e5b..d881427 100644 (file)
--- a/reactos/subsys/win32k/tests/stubs.xml
+++ b/reactos/subsys/win32k/tests/stubs.xml
@@ -148,6 +148,8 @@
        <symbol>PsGetThreadWin32Thread@4</symbol>
        <symbol>PsEstablishWin32Callouts@4</symbol>
        <symbol>PsSetThreadWin32Thread@8</symbol>
        <symbol>PsGetThreadWin32Thread@4</symbol>
        <symbol>PsEstablishWin32Callouts@4</symbol>
        <symbol>PsSetThreadWin32Thread@8</symbol>

+       <symbol>ProbeForRead@12</symbol>
+       <symbol>ProbeForWrite@12</symbol>

 </component>
 <component name="freetype.dll">
        <symbol>FT_Init_FreeType</symbol>
 </component>
 <component name="freetype.dll">
        <symbol>FT_Init_FreeType</symbol>

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 60e4cb8..5e63b0f 100644 (file)
--- 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;
 
   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;
   depth = BitsPerFormat(BMF_24BPP);
   sizex = rect->right - rect->left;
   sizey = rect->bottom - rect->top;