Changeset 792

Timestamp:

12/11/2008 1:34:07 PM (5 years ago)

Author:

lowjoel

Message:

Don't reset the progress bar style to remove the marquee if it wasn't set to begin with: this fixes the problem of the progress bar always displaying zero.

Location:

branches/eraser6/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (1 diff)
• Main.cpp (modified) (2 diffs)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -142 +142 @@
         //Since we can allocate as much as we want to allocate, take a decent amount
         //of memory and stop.
-        size = std::min(1048576u * 4, size);
+        size = std::min(1048576u, size);
         static char* dstBuffer = NULL;
         if (dstBuffer)

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -265 +265 @@
     SetWindowFont(hWndCancelBtn);
 
-    SendMessage(hWndProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0, 1000));
+    SendMessage(hWndProgressBar, PBM_SETRANGE32, 0, 1000);
     SubclassWindow(*this, hWndCancelBtn, WndProc);
     SubclassWindow(*this, hWndPanel, WndProc);
@@ -344 +344 @@
 void MainWindow::SetProgress(float progress)
 {
-    SetWindowLongPtr(hWndProgressBar, GWL_STYLE,
-        GetWindowLongPtr(hWndProgressBar, GWL_STYLE) & (~PBS_MARQUEE));
+    LONG_PTR pbStyle = GetWindowLongPtr(hWndProgressBar, GWL_STYLE);
+    if (pbStyle & PBS_MARQUEE)
+        SetWindowLongPtr(hWndProgressBar, GWL_STYLE, pbStyle & (~PBS_MARQUEE));
     SendMessage(hWndProgressBar, PBM_SETPOS, (int)(progress * 1000), 0);
 }