Commit fc51a268 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

Fix declaration warnings in the test cases.

parent b9208137
...@@ -89,7 +89,7 @@ static void test_profile_int(void) ...@@ -89,7 +89,7 @@ static void test_profile_int(void)
DeleteFileA( TESTFILE); DeleteFileA( TESTFILE);
} }
void test_profile_string() static void test_profile_string(void)
{ {
HANDLE h; HANDLE h;
int ret; int ret;
......
...@@ -86,7 +86,7 @@ typedef struct { ...@@ -86,7 +86,7 @@ typedef struct {
that the thread local storage routines work correctly, and that that the thread local storage routines work correctly, and that
threads actually run concurrently threads actually run concurrently
*/ */
DWORD WINAPI threadFunc1(LPVOID p) static DWORD WINAPI threadFunc1(LPVOID p)
{ {
t1Struct *tstruct = (t1Struct *)p; t1Struct *tstruct = (t1Struct *)p;
int i; int i;
...@@ -111,12 +111,12 @@ DWORD WINAPI threadFunc1(LPVOID p) ...@@ -111,12 +111,12 @@ DWORD WINAPI threadFunc1(LPVOID p)
return NUM_THREADS+tstruct->threadnum; return NUM_THREADS+tstruct->threadnum;
} }
DWORD WINAPI threadFunc2(LPVOID p) static DWORD WINAPI threadFunc2(LPVOID p)
{ {
return 99; return 99;
} }
DWORD WINAPI threadFunc3(LPVOID p) static DWORD WINAPI threadFunc3(LPVOID p)
{ {
HANDLE thread; HANDLE thread;
thread=GetCurrentThread(); thread=GetCurrentThread();
...@@ -124,7 +124,7 @@ DWORD WINAPI threadFunc3(LPVOID p) ...@@ -124,7 +124,7 @@ DWORD WINAPI threadFunc3(LPVOID p)
return 99; return 99;
} }
DWORD WINAPI threadFunc4(LPVOID p) static DWORD WINAPI threadFunc4(LPVOID p)
{ {
HANDLE event = (HANDLE)p; HANDLE event = (HANDLE)p;
if(event != NULL) { if(event != NULL) {
...@@ -135,7 +135,7 @@ DWORD WINAPI threadFunc4(LPVOID p) ...@@ -135,7 +135,7 @@ DWORD WINAPI threadFunc4(LPVOID p)
} }
#if CHECK_STACK #if CHECK_STACK
DWORD WINAPI threadFunc5(LPVOID p) static DWORD WINAPI threadFunc5(LPVOID p)
{ {
DWORD *exitCode = (DWORD *)p; DWORD *exitCode = (DWORD *)p;
SYSTEM_INFO sysInfo; SYSTEM_INFO sysInfo;
...@@ -155,7 +155,7 @@ DWORD WINAPI threadFunc5(LPVOID p) ...@@ -155,7 +155,7 @@ DWORD WINAPI threadFunc5(LPVOID p)
#endif #endif
/* Check basic funcationality of CreateThread and Tls* functions */ /* Check basic funcationality of CreateThread and Tls* functions */
VOID test_CreateThread_basic(void) static VOID test_CreateThread_basic(void)
{ {
HANDLE thread[NUM_THREADS],event[NUM_THREADS]; HANDLE thread[NUM_THREADS],event[NUM_THREADS];
DWORD threadid[NUM_THREADS],curthreadId; DWORD threadid[NUM_THREADS],curthreadId;
...@@ -217,7 +217,7 @@ VOID test_CreateThread_basic(void) ...@@ -217,7 +217,7 @@ VOID test_CreateThread_basic(void)
} }
/* Check that using the CREATE_SUSPENDED flag works */ /* Check that using the CREATE_SUSPENDED flag works */
VOID test_CreateThread_suspended(void) static VOID test_CreateThread_suspended(void)
{ {
HANDLE thread; HANDLE thread;
DWORD threadId; DWORD threadId;
...@@ -246,7 +246,7 @@ VOID test_CreateThread_suspended(void) ...@@ -246,7 +246,7 @@ VOID test_CreateThread_suspended(void)
} }
/* Check that SuspendThread and ResumeThread work */ /* Check that SuspendThread and ResumeThread work */
VOID test_SuspendThread(void) static VOID test_SuspendThread(void)
{ {
HANDLE thread,access_thread; HANDLE thread,access_thread;
DWORD threadId,exitCode,error; DWORD threadId,exitCode,error;
...@@ -303,7 +303,7 @@ VOID test_SuspendThread(void) ...@@ -303,7 +303,7 @@ VOID test_SuspendThread(void)
/* Check that TerminateThread works properly /* Check that TerminateThread works properly
*/ */
VOID test_TerminateThread(void) static VOID test_TerminateThread(void)
{ {
HANDLE thread,access_thread,event; HANDLE thread,access_thread,event;
DWORD threadId,exitCode; DWORD threadId,exitCode;
...@@ -342,7 +342,7 @@ VOID test_TerminateThread(void) ...@@ -342,7 +342,7 @@ VOID test_TerminateThread(void)
/* Check if CreateThread obeys the specified stack size. This code does /* Check if CreateThread obeys the specified stack size. This code does
not work properly, and is currently disabled not work properly, and is currently disabled
*/ */
VOID test_CreateThread_stack(void) static VOID test_CreateThread_stack(void)
{ {
#if CHECK_STACK #if CHECK_STACK
/* The only way I know of to test the stack size is to use alloca /* The only way I know of to test the stack size is to use alloca
...@@ -369,7 +369,7 @@ VOID test_CreateThread_stack(void) ...@@ -369,7 +369,7 @@ VOID test_CreateThread_stack(void)
} }
/* Check whether setting/retrieving thread priorities works */ /* Check whether setting/retrieving thread priorities works */
VOID test_thread_priority(void) static VOID test_thread_priority(void)
{ {
HANDLE curthread,access_thread; HANDLE curthread,access_thread;
DWORD curthreadId,exitCode; DWORD curthreadId,exitCode;
...@@ -455,7 +455,7 @@ VOID test_thread_priority(void) ...@@ -455,7 +455,7 @@ VOID test_thread_priority(void)
} }
/* check the GetThreadTimes function */ /* check the GetThreadTimes function */
VOID test_GetThreadTimes(void) static VOID test_GetThreadTimes(void)
{ {
HANDLE thread,access_thread=NULL; HANDLE thread,access_thread=NULL;
FILETIME creationTime,exitTime,kernelTime,userTime; FILETIME creationTime,exitTime,kernelTime,userTime;
...@@ -506,7 +506,7 @@ VOID test_GetThreadTimes(void) ...@@ -506,7 +506,7 @@ VOID test_GetThreadTimes(void)
/* Check the processor affinity functions */ /* Check the processor affinity functions */
/* NOTE: These functions should also be checked that they obey access control /* NOTE: These functions should also be checked that they obey access control
*/ */
VOID test_thread_processor(void) static VOID test_thread_processor(void)
{ {
HANDLE curthread,curproc; HANDLE curthread,curproc;
DWORD processMask,systemMask; DWORD processMask,systemMask;
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
static void test_conversions() static void test_conversions(void)
{ {
FILETIME ft; FILETIME ft;
SYSTEMTIME st; SYSTEMTIME st;
...@@ -116,7 +116,7 @@ static void test_conversions() ...@@ -116,7 +116,7 @@ static void test_conversions()
} }
static void test_invalid_arg() static void test_invalid_arg(void)
{ {
FILETIME ft; FILETIME ft;
SYSTEMTIME st; SYSTEMTIME st;
...@@ -154,7 +154,7 @@ static void test_invalid_arg() ...@@ -154,7 +154,7 @@ static void test_invalid_arg()
ok( !SystemTimeToFileTime(&st, &ft), "bad minute\n"); ok( !SystemTimeToFileTime(&st, &ft), "bad minute\n");
} }
void test_GetTimeZoneInformation() static void test_GetTimeZoneInformation(void)
{ {
TIME_ZONE_INFORMATION tzinfo, tzinfo1; TIME_ZONE_INFORMATION tzinfo, tzinfo1;
DWORD res = GetTimeZoneInformation(&tzinfo); DWORD res = GetTimeZoneInformation(&tzinfo);
...@@ -173,7 +173,7 @@ void test_GetTimeZoneInformation() ...@@ -173,7 +173,7 @@ void test_GetTimeZoneInformation()
} }
void test_FileTimeToSystemTime() static void test_FileTimeToSystemTime(void)
{ {
FILETIME ft; FILETIME ft;
SYSTEMTIME st; SYSTEMTIME st;
...@@ -203,7 +203,7 @@ void test_FileTimeToSystemTime() ...@@ -203,7 +203,7 @@ void test_FileTimeToSystemTime()
st.wMilliseconds); st.wMilliseconds);
} }
void test_FileTimeToLocalFileTime() static void test_FileTimeToLocalFileTime(void)
{ {
FILETIME ft, lft; FILETIME ft, lft;
SYSTEMTIME st; SYSTEMTIME st;
...@@ -260,7 +260,7 @@ typedef struct { ...@@ -260,7 +260,7 @@ typedef struct {
WORD ehour; /* expected hour */ WORD ehour; /* expected hour */
} TZLT2ST_case; } TZLT2ST_case;
void test_TzSpecificLocalTimeToSystemTime() static void test_TzSpecificLocalTimeToSystemTime(void)
{ {
HMODULE hKernel = GetModuleHandle("kernel32"); HMODULE hKernel = GetModuleHandle("kernel32");
fnTzSpecificLocalTimeToSystemTime pTzSpecificLocalTimeToSystemTime; fnTzSpecificLocalTimeToSystemTime pTzSpecificLocalTimeToSystemTime;
......
...@@ -27,7 +27,7 @@ typedef HANDLE (WINAPI *fnCreateWaitableTimerA)( SECURITY_ATTRIBUTES*, BOOL, LPS ...@@ -27,7 +27,7 @@ typedef HANDLE (WINAPI *fnCreateWaitableTimerA)( SECURITY_ATTRIBUTES*, BOOL, LPS
typedef BOOL (WINAPI *fnSetWaitableTimer)(HANDLE, LARGE_INTEGER*, LONG, PTIMERAPCROUTINE, LPVOID, BOOL); typedef BOOL (WINAPI *fnSetWaitableTimer)(HANDLE, LARGE_INTEGER*, LONG, PTIMERAPCROUTINE, LPVOID, BOOL);
void test_timer(void) static void test_timer(void)
{ {
HMODULE hker = GetModuleHandle("kernel32"); HMODULE hker = GetModuleHandle("kernel32");
fnCreateWaitableTimerA pCreateWaitableTimerA; fnCreateWaitableTimerA pCreateWaitableTimerA;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment