Changeset 36570 in vbox for trunk/src/VBox

Timestamp:

Apr 6, 2011 9:25:21 AM (14 years ago)

Author:

vboxsync

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

71006

Message:

Windows Guest Additions installer: Use dynamic char2wchar conversion for WFP API.

File:

• trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -17 +17 @@
 
 #include <windows.h>
+#include <atlconv.h>
 #include <stdlib.h>
 #include <Strsafe.h>
@@ -27 +28 @@
 HWND g_hwndParent;
 
-typedef DWORD (__stdcall *fnSfcFileException) (DWORD param1, PWCHAR param2, DWORD param3);
+typedef DWORD (WINAPI *fnSfcFileException) (DWORD param1, PWCHAR param2, DWORD param3);
 fnSfcFileException g_pfnSfcFileException = NULL;
 
@@ -76 +77 @@
             *g_stacktop = pStack->next;
             GlobalFree((HGLOBAL)pStack);
+        }
+    }
+    return hr;
+}
+
+void Char2WCharFree(PWCHAR pwString)
+{
+    if (pwString)
+        HeapFree(GetProcessHeap(), 0, pwString);
+}
+
+HRESULT Char2WCharAlloc(const char *pszString, PWCHAR *ppwString)
+{
+    HRESULT hr;
+    int iLen = strlen(pszString) + 2;
+        WCHAR *pwString = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, iLen * sizeof(WCHAR));
+    if (!pwString)
+        hr = ERROR_NOT_ENOUGH_MEMORY;
+    else
+    {
+        if (MultiByteToWideChar(CP_ACP, 0, pszString, -1, pwString, iLen) == 0)
+        {
+            hr = HRESULT_FROM_WIN32(GetLastError());
+            HeapFree(GetProcessHeap(), 0, pwString);
+        }
+        else
+        {
+            hr = S_OK;
+            *ppwString = pwString;
         }
     }
@@ -220 +250 @@
         if (SUCCEEDED(hr))
         {
-            WCHAR wszFile[MAX_PATH + 1];
-            hr = StringCchPrintfW(wszFile, sizeof(wszFile), L"%s", szFile);
+            WCHAR *pwszFile;
+            hr = Char2WCharAlloc(szFile, &pwszFile);
             if (SUCCEEDED(hr))
-                hr = HRESULT_FROM_WIN32(g_pfnSfcFileException(0, wszFile, -1));
+            {
+                if (g_pfnSfcFileException(0, pwszFile, -1) != 0)
+                    hr = HRESULT_FROM_WIN32(GetLastError());
+                Char2WCharFree(pwszFile);
+            }
         }