Changeset 38794 in vbox for trunk/src/VBox

Timestamp:

Sep 19, 2011 2:26:22 PM (13 years ago)

Author:

vboxsync

Message:

Cleanup / build fixes.

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (12 diffs)

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

@@ -127 +127 @@
            DWORD *pdwExitCode)
 {
-    STARTUPINFO si;
+    STARTUPINFOW si;
     PROCESS_INFORMATION pi;
     DWORD rc = ERROR_SUCCESS;
@@ -144 +144 @@
 
     SetLastError(0);
-    if (!CreateProcess(pwszAppName,  /* Module name. */
-                       pwszCmdLine,  /* Command line. */
-                       NULL,         /* Process handle not inheritable. */
-                       NULL,         /* Thread handle not inheritable. */
-                       FALSE,        /* Set handle inheritance to FALSE .*/
-                       0,            /* No creation flags. */
-                       NULL,         /* Use parent's environment block. */
-                       pwszWorkDir,  /* Use parent's starting directory. */
-                       &si,          /* Pointer to STARTUPINFO structure. */
-                       &pi))         /* Pointer to PROCESS_INFORMATION structure. */
+    if (!CreateProcessW(pwszAppName,  /* Module name. */
+                        pwszCmdLine,  /* Command line. */
+                        NULL,         /* Process handle not inheritable. */
+                        NULL,         /* Thread handle not inheritable. */
+                        FALSE,        /* Set handle inheritance to FALSE .*/
+                        0,            /* No creation flags. */
+                        NULL,         /* Use parent's environment block. */
+                        pwszWorkDir,  /* Use parent's starting directory. */
+                        &si,          /* Pointer to STARTUPINFO structure. */
+                        &pi))         /* Pointer to PROCESS_INFORMATION structure. */
     {
         rc = GetLastError();
@@ -189 +189 @@
     HKEY hkPythonCore = NULL;
     BOOL bFound = FALSE;
-    LONG rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Python\\PythonCore", 0, KEY_READ, &hkPythonCore);
+    LONG rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Python\\PythonCore", 0, KEY_READ, &hkPythonCore);
     if (rc != ERROR_SUCCESS)
     {
@@ -205 +205 @@
         DWORD dwKeyType = REG_SZ;
 
-        rc = RegEnumKeyEx(hkPythonCore, i, wszRoot, &dwLen, NULL, NULL, NULL, NULL);
+        rc = RegEnumKeyExW(hkPythonCore, i, wszRoot, &dwLen, NULL, NULL, NULL, NULL);
         if (rc != ERROR_SUCCESS || dwLen <= 0)
             break;
@@ -213 +213 @@
 
         HKEY hkPythonInstPath = NULL;
-        rc = RegOpenKeyEx(hkPythonCore, wszPath, 0, KEY_READ,  &hkPythonInstPath);
+        rc = RegOpenKeyExW(hkPythonCore, wszPath, 0, KEY_READ,  &hkPythonInstPath);
         if (rc != ERROR_SUCCESS)
             continue;
 
-        rc = RegQueryValueEx(hkPythonInstPath, L"", NULL, &dwKeyType, (LPBYTE)wszVal, &dwLen);
+        rc = RegQueryValueExW(hkPythonInstPath, L"", NULL, &dwKeyType, (LPBYTE)wszVal, &dwLen);
         if (rc == ERROR_SUCCESS)
             logStringW(hModule, L"InstallPythonAPI: Path \"%s\" detected.", wszVal);
@@ -303 +303 @@
     LONG rc;
     WCHAR wszValue[_MAX_PATH];
-    if (GetPrivateProfileString(pwszSection, pwszValue, NULL,
-                                wszValue, sizeof(wszValue), pwszFileName) > 0)
+    if (GetPrivateProfileStringW(pwszSection, pwszValue, NULL,
+                                 wszValue, sizeof(wszValue), pwszFileName) > 0)
     {
         HKEY hkBranding;
@@ -314 +314 @@
             swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding", VBOX_VENDOR_SHORT);
 
-        rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, wszKey, 0, KEY_WRITE, &hkBranding);
+        rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszKey, 0, KEY_WRITE, &hkBranding);
         if (rc == ERROR_SUCCESS)
         {
@@ -342 +342 @@
     swprintf_s(wszSource, RT_ELEMENTS(wszSource), L"%s%c", pwszSourceDir, '\0');
 
-    SHFILEOPSTRUCT s = {0};
+    SHFILEOPSTRUCTW s = {0};
     s.hwnd = NULL;
     s.wFunc = FO_COPY;
@@ -353 +353 @@
 
     logStringW(hModule, L"CopyDir: DestDir=%s, SourceDir=%s", wszDest, wszSource);
-    int r = SHFileOperation(&s);
+    int r = SHFileOperationW(&s);
     if (r != 0)
     {
@@ -539 +539 @@
         {
             logStringW(hModule, L"Reboot required, setting REBOOT property to Force");
-            HRESULT hr2 = MsiSetProperty(hModule, L"REBOOT", L"Force");
+            HRESULT hr2 = MsiSetPropertyW(hModule, L"REBOOT", L"Force");
             if (hr2 != ERROR_SUCCESS)
                 logStringW(hModule, L"Failed to set REBOOT property, error = 0x%x", hr2);
@@ -979 +979 @@
 
         DWORD dwLen = sizeof(wszEnumName);
-        lStatus = RegEnumKeyEx(hNetcard, i, wszEnumName, &dwLen, NULL, NULL, NULL, NULL);
+        lStatus = RegEnumKeyExW(hNetcard, i, wszEnumName, &dwLen, NULL, NULL, NULL, NULL);
         if (lStatus != ERROR_SUCCESS)
             break;
 
-        lStatus = RegOpenKeyEx(hNetcard, wszEnumName, 0, KEY_READ, &hNetCardGUID);
+        lStatus = RegOpenKeyExW(hNetcard, wszEnumName, 0, KEY_READ, &hNetCardGUID);
         if (lStatus == ERROR_SUCCESS)
         {
@@ -1170 +1170 @@
                           /* get the device instance ID */
                           WCHAR wszDevID[MAX_DEVICE_ID_LEN];
-                          if (CM_Get_Device_ID(DeviceInfoData.DevInst,
-                                               wszDevID, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS)
+                          if (CM_Get_Device_IDW(DeviceInfoData.DevInst,
+                                                wszDevID, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS)
                           {
                               /* compare to what we determined before */