From 555dc7c2aa1edf8aca0f65effc242fea9ee62465 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 9 Feb 2013 10:56:28 +0000 Subject: [PATCH] [KERNEL32_APITEST] - Fix GCC 4.7 warning; fix a typo spotted by Edijus svn path=/trunk/; revision=58295 --- rostests/apitests/kernel32/CMakeLists.txt | 4 +--- rostests/apitests/kernel32/GetModuleFileName.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rostests/apitests/kernel32/CMakeLists.txt b/rostests/apitests/kernel32/CMakeLists.txt index 1ea96f65ddc..d6d2f32c482 100644 --- a/rostests/apitests/kernel32/CMakeLists.txt +++ b/rostests/apitests/kernel32/CMakeLists.txt @@ -1,12 +1,10 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) - list(APPEND SOURCE GetCurrentDirectory.c GetDriveType.c GetModuleFileName.c lstrcpynW.c - MultiByteToWideChar.c + MultiByteToWideChar.c SetCurrentDirectory.c SetUnhandledExceptionFilter.c testlist.c) diff --git a/rostests/apitests/kernel32/GetModuleFileName.c b/rostests/apitests/kernel32/GetModuleFileName.c index 7022d91df52..f0d6f14a9b7 100644 --- a/rostests/apitests/kernel32/GetModuleFileName.c +++ b/rostests/apitests/kernel32/GetModuleFileName.c @@ -35,6 +35,7 @@ StartChild(char **argv) -1, Path, sizeof(Path) / sizeof(WCHAR)); + ok(Length > 0, "Length = %d\n", Length); FileName = wcsrchr(Path, '\\'); Slash = wcsrchr(Path, L'/'); @@ -113,7 +114,7 @@ TestGetModuleFileNameW(VOID) ok(Length < sizeof(Buffer) / sizeof(WCHAR), "Length = %lu\n", Length); ok(Buffer[Length] == 0, "Buffer not null terminated\n"); Relative = PathIsRelativeW(Buffer); - ok(Relative == FALSE, "GetModuleFileNameA returned relative path: %ls\n", Buffer); + ok(Relative == FALSE, "GetModuleFileNameW returned relative path: %ls\n", Buffer); } START_TEST(GetModuleFileName)