[KERNEL32_APITEST]

- Fix GCC 4.7 warning; fix a typo spotted by Edijus

svn path=/trunk/; revision=58295

diff --git a/rostests/apitests/kernel32/CMakeLists.txt b/rostests/apitests/kernel32/CMakeLists.txt
index 1ea96f6..d6d2f32 100644 (file)
--- 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 7022d91..f0d6f14 100644 (file)
--- 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)