From: YongHaoHu <christopherwuy@gmail.com>
Subject: [PATCH 6/6]: msvcp110: Fix TRACE and msg of tr2 functions. (resend)
Message-Id: <559608F6.8070306@gmail.com>
Date: Fri, 3 Jul 2015 12:00:54 +0800

---
  dlls/msvcp120/tests/msvcp120.c | 17 +++++++++--------
  dlls/msvcp90/ios.c             | 12 ++++++------
  2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c
index 3d5f7c1..6c46817 100644
--- a/dlls/msvcp120/tests/msvcp120.c
+++ b/dlls/msvcp120/tests/msvcp120.c
@@ -396,9 +396,9 @@ static void test_tr2_sys__File_size(void)
     ok(val == 0, "file_size is %s\n", debugstr_longlong(val));
     ok(errno == 0xdeadbeef, "errno = %d\n", errno);
 
-    ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n");
-    ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n");
-    ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n");
+    ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n");
+    ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n");
+    ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n");
 }
 
 static void test_tr2_sys__Equivalent(void)
@@ -443,13 +443,14 @@ static void test_tr2_sys__Equivalent(void)
     for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {
         errno = 0xdeadbeef;
         val = p_tr2_sys__Equivalent(tests[i].path1, tests[i].path2);
-        ok(tests[i].equivalent == val, "tr2_sys__Equivalent(): test %d expect: %d, got %d\n", i+1, tests[i].equivalent, val);
+        ok(tests[i].equivalent == val, "tr2_sys__Equivalent(): test %d expect: %d, got %d\n",
+                i+1, tests[i].equivalent, val);
         ok(errno == 0xdeadbeef, "errno = %d\n", errno);
     }
 
-    ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n");
-    ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n");
-    ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n");
+    ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n");
+    ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n");
+    ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n");
     ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n");
 }
 
@@ -536,7 +537,7 @@ static void test_tr2_sys__Make_dir(void)
         ok(errno == 0xdeadbeef, "tr2_sys__Make_dir(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno);
     }
 
-    ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n");
+    ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n");
 }
 
 static void test_tr2_sys__Remove_dir(void)
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 8ac427c..5383fa2 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -14208,7 +14208,7 @@ ULONGLONG __cdecl tr2_sys__File_size(const char* path)
 {
     WIN32_FILE_ATTRIBUTE_DATA fad;
 
-    TRACE("(%p)\n", path);
+    TRACE("(%s)\n", debugstr_a(path));
     if(!GetFileAttributesExA(path, GetFileExInfoStandard, &fad))
         return 0;
     if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@@ -14224,7 +14224,7 @@ int __cdecl tr2_sys__Equivalent(char const* path1, char const* path2)
     HANDLE h1, h2;
     int ret;
     BY_HANDLE_FILE_INFORMATION info1, info2;
-    TRACE("(%p %p)\n", path1, path2);
+    TRACE("(%s %s)\n", debugstr_a(path1), debugstr_a(path2));
 
     h1 = CreateFileA(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
             NULL, OPEN_EXISTING, 0, 0);
@@ -14257,7 +14257,7 @@ int __cdecl tr2_sys__Equivalent(char const* path1, char const* path2)
 /* ?_Current_get@sys@tr2@std@@YAPEADAEAY0BAE@D@Z */
 char* __cdecl tr2_sys__Current_get(char *current_path)
 {
-    TRACE("(%p)\n", current_path);
+    TRACE("(%s)\n", debugstr_a(current_path));
 
     if(!GetCurrentDirectoryA(MAX_PATH, current_path))
         return NULL;
@@ -14268,7 +14268,7 @@ char* __cdecl tr2_sys__Current_get(char *current_path)
 /* ?_Current_set@sys@tr2@std@@YA_NPEBD@Z */
 MSVCP_bool __cdecl tr2_sys__Current_set(char const* path)
 {
-    TRACE("(%p)\n", path);
+    TRACE("(%s)\n", debugstr_a(path));
     return SetCurrentDirectoryA(path) != 0;
 }
 
@@ -14276,7 +14276,7 @@ MSVCP_bool __cdecl tr2_sys__Current_set(char const* path)
 /* ?_Make_dir@sys@tr2@std@@YAHPEBD@Z */
 int __cdecl tr2_sys__Make_dir(char const* path)
 {
-    TRACE("(%p)\n", path);
+    TRACE("(%s)\n", debugstr_a(path));
 
     if(!CreateDirectoryA(path, NULL)) {
         if(GetLastError() == ERROR_ALREADY_EXISTS)
@@ -14292,7 +14292,7 @@ int __cdecl tr2_sys__Make_dir(char const* path)
 /* ?_Remove_dir@sys@tr2@std@@YA_NPEBD@Z */
 MSVCP_bool __cdecl tr2_sys__Remove_dir(char const* path)
 {
-    TRACE("(%p)\n", path);
+    TRACE("(%s)\n", debugstr_a(path));
     return RemoveDirectoryA(path) != 0;
 }