Commit 7064e883 authored by Alexandre Julliard's avatar Alexandre Julliard

kernel32/tests: Make some variables static.

parent c1b1b6f1
...@@ -369,9 +369,8 @@ static void test_ffcnMultipleThreads(void) ...@@ -369,9 +369,8 @@ static void test_ffcnMultipleThreads(void)
ok( r == TRUE, "failed to remove dir\n"); ok( r == TRUE, "failed to remove dir\n");
} }
typedef BOOL (WINAPI *fnReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD, static BOOL (WINAPI *pReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD,
LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
fnReadDirectoryChangesW pReadDirectoryChangesW;
static void test_readdirectorychanges(void) static void test_readdirectorychanges(void)
{ {
...@@ -874,8 +873,7 @@ static void test_ffcn_directory_overlap(void) ...@@ -874,8 +873,7 @@ static void test_ffcn_directory_overlap(void)
START_TEST(change) START_TEST(change)
{ {
HMODULE hkernel32 = GetModuleHandle("kernel32"); HMODULE hkernel32 = GetModuleHandle("kernel32");
pReadDirectoryChangesW = (fnReadDirectoryChangesW) pReadDirectoryChangesW = (void *)GetProcAddress(hkernel32, "ReadDirectoryChangesW");
GetProcAddress(hkernel32, "ReadDirectoryChangesW");
test_ffcnMultipleThreads(); test_ffcnMultipleThreads();
/* The above function runs a test that must occur before FindCloseChangeNotification is run in the /* The above function runs a test that must occur before FindCloseChangeNotification is run in the
......
...@@ -392,7 +392,7 @@ static DWORD CALLBACK alarmThreadMain(LPVOID arg) ...@@ -392,7 +392,7 @@ static DWORD CALLBACK alarmThreadMain(LPVOID arg)
return 1; return 1;
} }
HANDLE hnp = INVALID_HANDLE_VALUE; static HANDLE hnp = INVALID_HANDLE_VALUE;
/** Trivial byte echo server - disconnects after each session */ /** Trivial byte echo server - disconnects after each session */
static DWORD CALLBACK serverThreadMain1(LPVOID arg) static DWORD CALLBACK serverThreadMain1(LPVOID arg)
......
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
static const char filename[] = "test_.exe"; static const char filename[] = "test_.exe";
static DWORD GLE; static DWORD GLE;
enum { enum constants {
page_size = 0x1000, page_size = 0x1000,
rva_rsrc_start = page_size * 3, rva_rsrc_start = page_size * 3,
max_sections = 3 max_sections = 3
} constants; };
/* rodata @ [0x1000-0x3000) */ /* rodata @ [0x1000-0x3000) */
static const IMAGE_SECTION_HEADER sh_rodata_1 = static const IMAGE_SECTION_HEADER sh_rodata_1 =
......
...@@ -146,7 +146,7 @@ static void cleanup_thread_sync_helpers(void) ...@@ -146,7 +146,7 @@ static void cleanup_thread_sync_helpers(void)
CloseHandle(stop_event); CloseHandle(stop_event);
} }
DWORD tlsIndex; static DWORD tlsIndex;
typedef struct { typedef struct {
int threadnum; int threadnum;
...@@ -157,7 +157,7 @@ typedef struct { ...@@ -157,7 +157,7 @@ typedef struct {
/* WinME supports OpenThread but doesn't know about access restrictions so /* WinME supports OpenThread but doesn't know about access restrictions so
we require them to be either completely ignored or always obeyed. we require them to be either completely ignored or always obeyed.
*/ */
INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */ static INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */
#define obey_ar(x) \ #define obey_ar(x) \
(obeying_ars == 0 \ (obeying_ars == 0 \
? ((x) \ ? ((x) \
......
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