[ros-diffs] [chorns] 17027: Fix building 'make test'

[chorns at svn.reactos.com]

Fix building 'make test'
Modified: trunk/reactos/regtests/shared/regtests.c
Modified: trunk/reactos/regtests/shared/regtests.h
Modified: trunk/reactos/subsys/win32k/tests/stubs.xml
Modified:
trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.
c
  _____  

Modified: trunk/reactos/regtests/shared/regtests.c
--- trunk/reactos/regtests/shared/regtests.c	2005-08-03 17:46:56 UTC
(rev 17026)
+++ trunk/reactos/regtests/shared/regtests.c	2005-08-03 19:15:47 UTC
(rev 17027)
@@ -78,8 +78,8 @@

             PERFORM_TEST_ARGS *Args,
             DWORD TimeOut)
 {
-  FILETIME time;
-  FILETIME executionTime;
+  _FILETIME time;
+  _FILETIME executionTime;
   DWORD status;
 
   status = _WaitForSingleObject(hThread, TimeOut);
  _____  

Modified: trunk/reactos/regtests/shared/regtests.h
--- trunk/reactos/regtests/shared/regtests.h	2005-08-03 17:46:56 UTC
(rev 17026)
+++ trunk/reactos/regtests/shared/regtests.h	2005-08-03 19:15:47 UTC
(rev 17027)
@@ -9,6 +9,14 @@

 #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() \
@@ -195,7 +203,7 @@
 
 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 @@
 _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);
  _____  

Modified: trunk/reactos/subsys/win32k/tests/stubs.xml
--- trunk/reactos/subsys/win32k/tests/stubs.xml	2005-08-03 17:46:56 UTC
(rev 17026)
+++ trunk/reactos/subsys/win32k/tests/stubs.xml	2005-08-03 19:15:47 UTC
(rev 17027)
@@ -148,6 +148,8 @@

 	<symbol>PsGetThreadWin32Thread at 4</symbol>
 	<symbol>PsEstablishWin32Callouts at 4</symbol>
 	<symbol>PsSetThreadWin32Thread at 8</symbol>
+	<symbol>ProbeForRead at 12</symbol>
+	<symbol>ProbeForWrite at 12</symbol>
 </component>
 <component name="freetype.dll">
 	<symbol>FT_Init_FreeType</symbol>
  _____  

Modified:
trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.
c
---
trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.
c	2005-08-03 17:46:56 UTC (rev 17026)
+++
trunk/reactos/subsys/win32k/tests/tests/DIB_24BPP_ColorFill-performance.
c	2005-08-03 19:15:47 UTC (rev 17027)
@@ -9,7 +9,7 @@

   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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050803/53f81ff0/attachment.html