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

Some warning fixes for the regression tests.

parent 64de949c
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
void test_GetDriveTypeA(void) static void test_GetDriveTypeA(void)
{ {
char drive[] = "?:\\"; char drive[] = "?:\\";
DWORD logical_drives; DWORD logical_drives;
...@@ -48,7 +48,7 @@ void test_GetDriveTypeA(void) ...@@ -48,7 +48,7 @@ void test_GetDriveTypeA(void)
} }
} }
void test_GetDriveTypeW(void) static void test_GetDriveTypeW(void)
{ {
WCHAR drive[] = {'?',':','\\',0}; WCHAR drive[] = {'?',':','\\',0};
DWORD logical_drives; DWORD logical_drives;
...@@ -76,7 +76,7 @@ void test_GetDriveTypeW(void) ...@@ -76,7 +76,7 @@ void test_GetDriveTypeW(void)
} }
} }
void test_GetDiskFreeSpaceA(void) static void test_GetDiskFreeSpaceA(void)
{ {
BOOL ret; BOOL ret;
DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters; DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters;
...@@ -122,7 +122,7 @@ void test_GetDiskFreeSpaceA(void) ...@@ -122,7 +122,7 @@ void test_GetDiskFreeSpaceA(void)
} }
} }
void test_GetDiskFreeSpaceW(void) static void test_GetDiskFreeSpaceW(void)
{ {
BOOL ret; BOOL ret;
DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters; DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
/* #define ok(cond,failstr) if(!(cond)) {printf("line %d : %s\n",__LINE__,failstr);exit(1);} */ /* #define ok(cond,failstr) if(!(cond)) {printf("line %d : %s\n",__LINE__,failstr);exit(1);} */
DWORD doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, static DWORD doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
LPSTR out, DWORD outsize, ... ) LPSTR out, DWORD outsize, ... )
{ {
va_list list; va_list list;
...@@ -38,7 +38,7 @@ DWORD doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, ...@@ -38,7 +38,7 @@ DWORD doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
return r; return r;
} }
void test_message_from_string(void) static void test_message_from_string(void)
{ {
CHAR out[0x100] = {0}; CHAR out[0x100] = {0};
DWORD r; DWORD r;
......
...@@ -104,7 +104,7 @@ static void InitFunctionPointers(void) ...@@ -104,7 +104,7 @@ static void InitFunctionPointers(void)
(label), (received), (expected)) (label), (received), (expected))
#define BUFFER_SIZE 128 #define BUFFER_SIZE 128
char GlobalBuffer[BUFFER_SIZE]; /* Buffer used by callback function */ static char GlobalBuffer[BUFFER_SIZE]; /* Buffer used by callback function */
#define COUNTOF(x) (sizeof(x)/sizeof(x)[0]) #define COUNTOF(x) (sizeof(x)/sizeof(x)[0])
#define EXPECT_LEN(len) ok(ret == (len), "Expected Len %d, got %d\n", (len), ret) #define EXPECT_LEN(len) ok(ret == (len), "Expected Len %d, got %d\n", (len), ret)
...@@ -759,7 +759,7 @@ static BOOL CALLBACK EnumTimeFormatsProc(char * lpTimeFormatString) ...@@ -759,7 +759,7 @@ static BOOL CALLBACK EnumTimeFormatsProc(char * lpTimeFormatString)
return FALSE; return FALSE;
} }
void test_EnumTimeFormats() static void test_EnumTimeFormats()
{ {
int ret; int ret;
LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
...@@ -957,7 +957,7 @@ static void test_CompareStringA() ...@@ -957,7 +957,7 @@ static void test_CompareStringA()
ok(ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 2, got %d\n", ret); ok(ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 2, got %d\n", ret);
} }
void test_LCMapStringA(void) static void test_LCMapStringA(void)
{ {
int ret, ret2; int ret, ret2;
char buf[256], buf2[256]; char buf[256], buf2[256];
...@@ -1126,7 +1126,7 @@ void test_LCMapStringA(void) ...@@ -1126,7 +1126,7 @@ void test_LCMapStringA(void)
"unexpected error code %ld\n", GetLastError()); "unexpected error code %ld\n", GetLastError());
} }
void test_LCMapStringW(void) static void test_LCMapStringW(void)
{ {
int ret, ret2; int ret, ret2;
WCHAR buf[256], buf2[256]; WCHAR buf[256], buf2[256];
......
...@@ -66,8 +66,9 @@ typedef struct { ...@@ -66,8 +66,9 @@ typedef struct {
for wine. It is not very pretty, but it sure beats duplicating this for wine. It is not very pretty, but it sure beats duplicating this
function lots of times function lots of times
*/ */
static void test_ValidPathA(CHAR *curdir, CHAR *subdir, CHAR *filename, static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR *filename,
CHAR *shortstr, SLpassfail *passfail, CHAR *errstr) { CHAR *shortstr, SLpassfail *passfail, const CHAR *errstr)
{
CHAR tmpstr[MAX_PATH], CHAR tmpstr[MAX_PATH],
fullpath[MAX_PATH], /*full path to the file (not short/long) */ fullpath[MAX_PATH], /*full path to the file (not short/long) */
subpath[MAX_PATH], /*relative path to the file */ subpath[MAX_PATH], /*relative path to the file */
...@@ -208,8 +209,8 @@ static void test_SplitShortPathA(CHAR *path,CHAR *dir,CHAR *eight,CHAR *three) { ...@@ -208,8 +209,8 @@ static void test_SplitShortPathA(CHAR *path,CHAR *dir,CHAR *eight,CHAR *three) {
} }
/* Check that GetShortPathNameA returns a valid 8.3 path */ /* Check that GetShortPathNameA returns a valid 8.3 path */
static void test_LongtoShortA(CHAR *teststr,CHAR *goodstr, static void test_LongtoShortA(CHAR *teststr,const CHAR *goodstr,
CHAR *ext,CHAR *errstr) { const CHAR *ext,const CHAR *errstr) {
CHAR dir[MAX_PATH],eight[MAX_PATH],three[MAX_PATH]; CHAR dir[MAX_PATH],eight[MAX_PATH],three[MAX_PATH];
test_SplitShortPathA(teststr,dir,eight,three); test_SplitShortPathA(teststr,dir,eight,three);
...@@ -263,7 +264,7 @@ static void test_FunnyChars(CHAR *curdir,CHAR *curdir_short,CHAR *filename, INT ...@@ -263,7 +264,7 @@ static void test_FunnyChars(CHAR *curdir,CHAR *curdir_short,CHAR *filename, INT
/* Routine to test that SetCurrentDirectory behaves as expected. */ /* Routine to test that SetCurrentDirectory behaves as expected. */
static void test_setdir(CHAR *olddir,CHAR *newdir, static void test_setdir(CHAR *olddir,CHAR *newdir,
CHAR *cmprstr, INT pass,CHAR *errstr) CHAR *cmprstr, INT pass, const CHAR *errstr)
{ {
CHAR tmppath[MAX_PATH], *dirptr; CHAR tmppath[MAX_PATH], *dirptr;
DWORD val,len,chklen; DWORD val,len,chklen;
......
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