Paul Vriens : kernel32/tests: Correct some ok() statements.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3b43c4e585fbf96df8c7e97ca08746be33c0b41c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b43c4e585fbf96df8c7e97ca0...

Author: Paul Vriens 
Date:   Fri Dec  4 12:43:40 2009 +0100

kernel32/tests: Correct some ok() statements.

---

dlls/kernel32/tests/path.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index ca56002..c8ab0a8 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -954,7 +954,7 @@ static void test_GetTempPath(void)

static void test_GetLongPathNameA(void)
 {
-    DWORD length, templength, hostsize;
+    DWORD length, explength, hostsize;
     char tempfile[MAX_PATH];
     char longpath[MAX_PATH];
     char unc_prefix[MAX_PATH];
@@ -984,16 +984,16 @@ static void test_GetLongPathNameA(void)
     memset(temppath2, 0, MAX_PATH);
     lstrcpyA(temppath2, "\\?\");
     lstrcatA(temppath2, tempfile);
-    templength = length;
+    explength = length + 4;

length = pGetLongPathNameA(temppath2, NULL, 0);
-    ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4);
+    ok(length == explength, "Wrong length %d, expected %d\n", length, explength);

length = pGetLongPathNameA(temppath2, NULL, MAX_PATH);
-    ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4);
+    ok(length == explength, "Wrong length %d, expected %d\n", length, explength);

length = pGetLongPathNameA(temppath2, temppath, 4);
-    ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4);
+    ok(length == explength, "Wrong length %d, expected %d\n", length, explength);
     ok(temppath[0] == 0, "Buffer should not have been touched\n");

/* Now an UNC path with the computername */
@@ -1020,27 +1020,30 @@ static void test_GetLongPathNameA(void)

/* NULL test */
     length = pGetLongPathNameA(unc_short, NULL, 0);
+    explength = lstrlenA(longpath) + 1;
     todo_wine
-    ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length);
+    ok(length == explength, "Wrong length %d, expected %d\n", length, explength);

length = pGetLongPathNameA(unc_short, NULL, MAX_PATH);
     todo_wine
-    ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length);
+    ok(length == explength, "Wrong length %d, expected %d\n", length, explength);

memset(unc_long, 0, MAX_PATH);
     length = pGetLongPathNameA(unc_short, unc_long, lstrlenA(unc_short));
     /* length will include terminating '0' on failure */
     todo_wine
-    ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length);
+    ok(length == explength, "Wrong length %d, expected %d\n", length, explength);
     ok(unc_long[0] == 0, "Buffer should not have been touched\n");

memset(unc_long, 0, MAX_PATH);
-    templength = length;
     length = pGetLongPathNameA(unc_short, unc_long, length);
     /* length doesn't include terminating '0' on success */
-    ok(length == templength - 1, "Wrong length %d, expected %d\n", length, templength - 1);
+    explength--;
     todo_wine
+    {
+    ok(length == explength, "Wrong length %d, expected %d\n", length, explength);
     ok(!lstrcmpiA(unc_long, longpath), "Expected (%s), got (%s)\n", longpath, unc_long);
+    }

DeleteFileA(tempfile);
 }