Changeset 31857 in vbox for trunk/src/VBox/Installer/win/InstallHelper

Timestamp:

Aug 23, 2010 12:13:39 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

65065

Message:

VBoxInstallerHelper/win: Move _stprintf_s to common code base.

Location:

trunk/src/VBox/Installer/win/InstallHelper

Files:

• VBoxCommon.cpp (modified) (1 diff)
• VBoxCommon.h (modified) (1 diff)
• VBoxInstallHelper.cpp (modified) (1 diff)

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp

@@ -22 +22 @@
 #include <msi.h>
 #include <msiquery.h>
+
+
+#if (_MSC_VER < 1400) /* Provide _stprintf_s to VC < 8.0. */
+int _stprintf_s(TCHAR *buffer, size_t cbBuffer, const TCHAR *format, ...)
+{
+    int ret;
+    va_list args;
+    va_start(args, format);
+    ret = _vsntprintf(buffer, cbBuffer, format, args);
+    va_end(args);
+    return ret;
+}
+#endif
 
 UINT VBoxGetProperty(MSIHANDLE a_hModule, TCHAR* a_pszName, TCHAR* a_pValue, DWORD a_dwSize)

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.h

@@ -19 +19 @@
 #define __VBoxInstallHelper_Common_h__
 
+#if (_MSC_VER < 1400) /* Provide _stprintf_s to VC < 8.0. */
+int _stprintf_s(TCHAR *buffer, size_t cbBuffer, const TCHAR *format, ...);
+#endif
+
 UINT VBoxGetProperty(MSIHANDLE a_hModule, TCHAR* a_pszName, TCHAR* a_pValue, DWORD a_dwSize);
 UINT VBoxSetProperty(MSIHANDLE a_hModule, TCHAR* a_pszName, TCHAR* a_pValue);

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -59 +59 @@
     return TRUE;
 }
-
-#if (_MSC_VER < 1400) /* Provide _stprintf_s to VC < 8.0. */
-int _stprintf_s(TCHAR *buffer, size_t cbBuffer, const TCHAR *format, ...)
-{
-    int ret;
-    va_list args;
-    va_start(args, format);
-    ret = _vsntprintf(buffer, cbBuffer, format, args);
-    va_end(args);
-    return ret;
-}
-#endif
 
 void LogString(MSIHANDLE hInstall, TCHAR* szString, ...)