Changeset 1278 for trunk/eraser6

Timestamp:

10/19/2009 10:43:42 AM (4 years ago)

Author:

lowjoel

Message:

-Display a useful error message when an error is encountered initiating a setup program - say whether it is the .NET runtime or the Eraser binary that didn't start
-Refresh the progress bar when extracting the setup files

Location:

trunk/eraser6/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (7 diffs)
• Main.cpp (modified) (4 diffs)

trunk/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -143 +143 @@
 
         LZMemStream* s = static_cast<LZMemStream*>(object);
+
+        //Copy the memory to the provided buffer.
+        *size = std::min(std::min(*size, s->BufferSize - s->CurrentOffset),
+            static_cast<size_t>(32768));
         char* dstBuffer = reinterpret_cast<char*>(SzAlloc(object, *size));
+        memcpy(dstBuffer, s->Buffer + s->CurrentOffset, *size);
+
+        *buf = dstBuffer;
+        s->BufferRead += *size;
+
+        MainWindow& mainWin = Application::Get().GetTopWindow();
+        mainWin.SetProgress((float)((double)s->BufferRead / s->BufferSize));
+        return SZ_OK;
+    }
+
+    static SRes LZMemStreamRead(void* object, void* buf, size_t* size)
+    {
+        LZMemStream* s = static_cast<LZMemStream*>(object);
 
         //Copy the memory to the provided buffer.
-        *size = std::min(*size, s->BufferSize - s->CurrentOffset);
-        memcpy(dstBuffer, s->Buffer + s->CurrentOffset, *size);
-        *buf = dstBuffer;
-        return SZ_OK;
-    }
-
-    static SRes LZMemStreamRead(void* object, void* buf, size_t* size)
-    {
-        LZMemStream* s = static_cast<LZMemStream*>(object);
-
-        //Copy the memory to the provided buffer.
-        *size = std::min(*size, s->BufferSize - s->CurrentOffset);
+        *size = std::min(std::min(*size, s->BufferSize - s->CurrentOffset),
+            static_cast<size_t>(32768));
         memcpy(buf, s->Buffer + s->CurrentOffset, *size);
 
@@ -194 +201 @@
         if (newPos > s->BufferSize || newPos < 0)
             return SZ_ERROR_INPUT_EOF;
-        s->CurrentOffset = newPos;
+        s->CurrentOffset = static_cast<size_t>(newPos);
         *position = newPos;
         return SZ_OK;
@@ -241 +248 @@
     unsigned blockIndex = 0;
     Byte* outBuffer = NULL;
-    size_t outBufferSize = 0;
+    size_t outBufferSize = 0;
     for (unsigned i = 0; i < db.db.NumFiles; ++i)
     {
@@ -322 +329 @@
 }
 
-int CreateProcessAndWait(const std::wstring& commandLine)
+int CreateProcessAndWait(const std::wstring& commandLine, const std::wstring& appName)
 {
     //Get a mutable version of the command line
@@ -337 +344 @@
     {
         delete[] cmdLine;
-        throw GetErrorMessage(GetLastError());
+        throw L"Error while executing " + appName + L": " + GetErrorMessage(GetLastError());
     }
     delete[] cmdLine;
@@ -379 +386 @@
 
     //And the return code is true if the process exited with 0.
-    return CreateProcessAndWait(commandLine) == 0;
+    return CreateProcessAndWait(commandLine, L".NET Framework Installer") == 0;
 }
 
@@ -415 +422 @@
     
     //And the return code is true if the process exited with 0.
-    return CreateProcessAndWait(commandLine) == 0;
-}
+    return CreateProcessAndWait(commandLine, L"Eraser") == 0;
+}

trunk/eraser6/Installer/Bootstrapper/Main.cpp

@@ -345 +345 @@
 {
     EnableWindow(hWndCancelBtn, enable);
+    Application::Get().Yield();
 }
 
@@ -353 +354 @@
         SetWindowLongPtr(hWndProgressBar, GWL_STYLE, pbStyle & (~PBS_MARQUEE));
     SendMessage(hWndProgressBar, PBM_SETPOS, (int)(progress * 1000), 0);
+    Application::Get().Yield();
 }
 
@@ -360 +362 @@
         GetWindowLongPtr(hWndProgressBar, GWL_STYLE) | PBS_MARQUEE);
     SendMessage(hWndProgressBar, PBM_SETMARQUEE, true, 100);
+    Application::Get().Yield();
 }
 
@@ -365 +368 @@
 {
     SetWindowTextW(hWndStatusLbl, message.c_str());
+    Application::Get().Yield();
 }