shell32/tests: wnsprintfA() is missing on Win9x, so use snprintf() instead.

Francois Gouget fgouget at free.fr
Fri Feb 9 05:37:59 CST 2007


---

I also fixed a format mismatch that went undetected because of 
wnsprintfA().

 dlls/shell32/tests/shellpath.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 3f89ff9..33f02a7 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -265,7 +265,7 @@ static const char *getFolderName(int folder)
     CSIDL_TO_STR(CSIDL_COMPUTERSNEARME);
 #undef CSIDL_TO_STR
     default:
-        wnsprintfA(unknown, sizeof(unknown), "unknown (0x%04x)", folder);
+        snprintf(unknown, sizeof(unknown), "unknown (0x%04x)", folder);
         return unknown;
     }
 }
@@ -276,8 +276,8 @@ static const char *printGUID(const GUID *guid)
 
     if (!guid) return NULL;
 
-    wnsprintfA(guidSTR, sizeof(guidSTR),
-     "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+    snprintf(guidSTR, sizeof(guidSTR),
+     "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
      guid->Data1, guid->Data2, guid->Data3,
      guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
      guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
@@ -835,7 +835,7 @@ static void testNonExistentPath(void)
                 PROCESS_INFORMATION info;
                 HRESULT hr;
 
-                wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 1",
+                snprintf(buffer, sizeof(buffer), "%s tests/shellpath.c 1",
                  selfname);
                 memset(&startup, 0, sizeof(startup));
                 startup.cb = sizeof(startup);
@@ -858,7 +858,7 @@ static void testNonExistentPath(void)
                  strlen(originalPath) + 1);
                 RegFlushKey(key);
 
-                wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 2",
+                snprintf(buffer, sizeof(buffer), "%s tests/shellpath.c 2",
                  selfname);
                 memset(&startup, 0, sizeof(startup));
                 startup.cb = sizeof(startup);
-- 
1.4.4.3




More information about the wine-patches mailing list