Changeset 21754 for branches/gcc-kmk/src

Timestamp:

Oct 27, 2011, 6:49:38 PM (14 years ago)

Author:

dmik

Message:

GCC has snprintf().

Location:

branches/gcc-kmk/src

Files:

• oleaut32/old/typelib.cpp (modified) (3 diffs)
• shell32/shlfolder.c (modified) (2 diffs)

branches/gcc-kmk/src/oleaut32/old/typelib.cpp

@@ -25 +25 @@
 #include "itypelib.h"
 
+#if defined(__WIN32OS2__) && !defined(__GNUC__)
+#define snprintf wsnprintfA
+#endif
+
 static FILE *_privateLogFile = NULL;
 
@@ -268 +272 @@
     guidA = HEAP_strdupWtoA(GetProcessHeap(), 0, guid);
 #ifdef __WIN32OS2__
-    sprintf(keyName, "SOFTWARE\\Classes\\TypeLib\\%s\\%x.%x",
+    snprintf(keyName, sizeof(keyName), "SOFTWARE\\Classes\\TypeLib\\%s\\%x.%x",
             guidA, attr->wMajorVerNum, attr->wMinorVerNum);
 #else
@@ -315 +319 @@
             CHAR buf[20];
             /* FIXME: is %u correct? */
-#ifdef __WIN32OS2__
-            sprintf(buf, "%u", attr->wLibFlags);
+            snprintf(buf, strlen(buf), "%u", attr->wLibFlags);
             if (RegSetValueExA(subKey, NULL, 0, REG_SZ,
                 (LPBYTE)buf, lstrlenA(buf) + 1) != ERROR_SUCCESS)
-#else
-            snprintf(buf, strlen(buf), "%u", attr->wLibFlags);
-            if (RegSetValueExA(subKey, NULL, 0, REG_SZ,
-                buf, lstrlenA(buf) + 1) != ERROR_SUCCESS)
-#endif
                 res = E_FAIL;
         }

branches/gcc-kmk/src/shell32/shlfolder.c

@@ -21 +21 @@
 
 
-#ifdef __WIN32OS2__
-#define snprintf(a,b,c,d)       sprintf(a,c,d)
-#endif
 #include <stdlib.h>
 #include <string.h>
@@ -47 +44 @@
 DEFAULT_DEBUG_CHANNEL(shell);
 
+#if defined(__WIN32OS2__) && !defined(__GNUC__)
+#define snprintf wsnprintfA
+#endif
 
 /***************************************************************************