Changeset 546

Timestamp:

11/13/2008 3:08:07 PM (3 years ago)

Author:

lowjoel

Message:

Hide the Eraser bootstrapper progress screen after .NET has been installed, since the centrepiece should be the Eraser installer.

Location:

branches/eraser6/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (3 diffs)
• Bootstrapper.h (modified) (1 diff)
• Main.cpp (modified) (5 diffs)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -60 +60 @@
 
     DWORD lastOperation = 0;
-    //char buffer[262144];
-    char* buffer = new char[2621440];
-    unsigned bufsize = 2621440;
-    while (ReadFile(srcFile, buffer, bufsize, &lastOperation, NULL) && lastOperation)
+    char buffer[262144];
+    while (ReadFile(srcFile, buffer, sizeof(buffer), &lastOperation, NULL) && lastOperation)
         WriteFile(destFile, buffer, lastOperation, &lastOperation, NULL);
 
@@ -71 +69 @@
         throw std::wstring(L"The file size of the binary is larger than the data "
             L"offset position; recompile the package, increasing DataOffset.");
-    ZeroMemory(buffer, bufsize);
+    ZeroMemory(buffer, sizeof(buffer));
     while (amountToWrite > 0)
     {
-        WriteFile(destFile, buffer, std::min<unsigned>(amountToWrite, bufsize),
+        WriteFile(destFile, buffer, std::min<unsigned>(amountToWrite, sizeof(buffer)),
             &lastOperation, NULL);
         amountToWrite -= lastOperation;
@@ -86 +84 @@
     int error;
     SetLastError(0);
-    while (ReadFile(packageFile, buffer, bufsize, &lastOperation, NULL) && lastOperation)
+    while (ReadFile(packageFile, buffer, sizeof(buffer), &lastOperation, NULL) && lastOperation)
     {
         WriteFile(destFile, buffer, lastOperation, &lastOperation, NULL);

branches/eraser6/Installer/Bootstrapper/Bootstrapper.h

@@ -44 +44 @@
     /// Creates the Window.
     bool Create();
+
+    /// Shows or hides the window.
+    void Show(bool show);
+
+    /// Enables or disables the cancel button.
+    void EnableCancellation(bool enable);
 
     /// Sets the progress of the current operation.

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -134 +134 @@
         //Create the parent window and the child controls
         ::hInstance = hInstance;
-        Application::Get();
+        Application& app = Application::Get();
+        MainWindow& mainWin = app.GetTopWindow();
 
         //OK, now we do the hard work. Create a folder to place our payload into
@@ -148 +149 @@
         TempDir dir(tempDir);
         ExtractTempFiles(tempDir);
+        mainWin.EnableCancellation(false);
 
         //Install the .NET framework
@@ -154 +156 @@
 
         //Then install Eraser!
+        mainWin.Show(false);
         InstallEraser(tempDir);
     }
@@ -267 +270 @@
 
     //Create the window
-    hWnd = CreateWindowW(szWindowClass, L"Eraser Setup", WS_CAPTION | WS_SYSMENU,
+    hWnd = CreateWindowW(szWindowClass, L"Eraser Setup", WS_CAPTION,
         CW_USEDEFAULT, 0, 300, 130, NULL, NULL, hInstance, NULL);
 
@@ -306 +309 @@
 }
 
+void MainWindow::Show(bool show)
+{
+    ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
+}
+
+void MainWindow::EnableCancellation(bool enable)
+{
+    EnableWindow(hWndCancelBtn, enable);
+}
+
 void MainWindow::SetProgress(float progress)
 {