Changeset 537 for branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

Timestamp:

11/13/2008 10:54:09 AM (4 years ago)

Author:

lowjoel

Message:

-Fixed Yield
-Fixed the TempDir? destructor
-Added exception handlers to Main, since it can't throw
-Few warning fixes

File:

• branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp (modified) (7 diffs)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -82 +82 @@
             s->FileRead += readSize;
 
-            SetProgress((double)s->FileRead / s->FileSize);
+            SetProgress((float)((double)s->FileRead / s->FileSize));
         }
 
@@ -104 +104 @@
 void ExtractTempFiles(std::wstring pathToExtract)
 {
-    if (std::wstring(L"\\/").find(pathToExtract[pathToExtract.length() - 1]))
+    if (std::wstring(L"\\/").find(pathToExtract[pathToExtract.length() - 1]) == std::wstring::npos)
         pathToExtract += L"\\";
 
@@ -159 +159 @@
 
         //Create the output file
+        size_t convertedChars = 0;
         wchar_t fileName[MAX_PATH];
-        mbstowcs(fileName, f->Name, sizeof(fileName) / sizeof(fileName[0]));
+        mbstowcs_s(&convertedChars, fileName, f->Name, sizeof(fileName) / sizeof(fileName[0]));
         HANDLE destFile = CreateFileW((pathToExtract + fileName).c_str(), GENERIC_WRITE, 0,
             NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -231 +232 @@
     //Get a mutable version of the command line
     wchar_t* cmdLine = new wchar_t[commandLine.length() + 1];
-    wcscpy(cmdLine, commandLine.c_str());
+    wcscpy_s(cmdLine, commandLine.length() + 1, commandLine.c_str());
 
     //Launch the process
     STARTUPINFOW startupInfo;
-    PROCESS_INFORMATIONW pInfo;
+    PROCESS_INFORMATION pInfo;
     ::ZeroMemory(&startupInfo, sizeof(startupInfo));
     ::ZeroMemory(&pInfo, sizeof(pInfo));
@@ -273 +274 @@
 
     //Get the path to the installer
-    if (std::wstring(L"\\/").find(tempDir[tempDir.length() - 1]))
+    if (std::wstring(L"\\/").find(tempDir[tempDir.length() - 1]) == std::wstring::npos)
         tempDir += L"\\";
-    std::wstring commandLine('"' + tempDir);
+    std::wstring commandLine(L'"' + tempDir);
     commandLine += L"dotnetfx.exe\"";
 
@@ -290 +291 @@
     SYSTEM_INFO sysInfo;
     ZeroMemory(&sysInfo, sizeof(sysInfo));
-    sysInfo.cbSize = sizeof(sysInfo);
     GetSystemInfo(&sysInfo);
 
-    if (std::wstring(L"\\/").find(tempDir[tempDir.length() - 1]))
+    if (std::wstring(L"\\/").find(tempDir[tempDir.length() - 1]) == std::wstring::npos)
         tempDir += L"\\";
     switch (sysInfo.wProcessorArchitecture)
@@ -307 +307 @@
 
     std::wstring commandLine(L"msiexec.exe /i ");
-    commandLine += '"' + tempDir + '"';
+    commandLine += L'"' + tempDir + L'"';
     
     //And the return code is true if the process exited with 0.