Changeset 535

Timestamp:

11/13/2008 9:56:14 AM (3 years ago)

Author:

lowjoel

Message:

-Calculate the progress of the extraction
-Added functions to handle the progress updates on-screen

Location:

branches/eraser6/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (4 diffs)
• Bootstrapper.h (modified) (1 diff)
• Main.cpp (modified) (7 diffs)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -35 +35 @@
         InStream.Seek = LzFileStreamSeek;
         FileHandle = fileHandle;
+
+        FileRead = FileRead = 0;
+        LARGE_INTEGER largeInt;
+        largeInt.QuadPart = 0;
+        if (!SetFilePointerEx(FileHandle, largeInt, &largeInt, FILE_CURRENT))
+            throw GetErrorMessage(GetLastError());
+
+        long long currPos = largeInt.QuadPart;
+        largeInt.QuadPart = 0;
+        if (!SetFilePointerEx(FileHandle, largeInt, &largeInt, FILE_END))
+            throw GetErrorMessage(GetLastError());
+        FileSize = largeInt.QuadPart - currPos;
+
+        largeInt.QuadPart = currPos;
+        if (!SetFilePointerEx(FileHandle, largeInt, NULL, FILE_BEGIN))
+            throw GetErrorMessage(GetLastError());
     }
 
@@ -43 +59 @@
 
     ISzInStream InStream;
+
+private:
     HANDLE FileHandle;
-
-private:
+    long long FileRead;
+    long long FileSize;
+
     static SZ_RESULT LZFileStreamRead(void* object, void** bufferPtr, size_t size,
         size_t* processedSize)
@@ -61 +80 @@
             *bufferPtr = buffer;
             *processedSize = readSize;
+            s->FileRead += readSize;
+
+            SetProgress((double)s->FileRead / s->FileSize);
         }
 
@@ -128 +150 @@
     unsigned blockIndex = 0;
     Byte* outBuffer = NULL;
-    size_t outBufferSize = 0;
+    size_t outBufferSize = 524288;
     for (unsigned i = 0; i < db.Database.NumFiles; ++i)
     {

branches/eraser6/Installer/Bootstrapper/Bootstrapper.h

@@ -37 +37 @@
 HWND GetTopWindow();
 
+void SetProgress(float progress);
+void SetProgressIndeterminate();
+void SetMessage(std::wstring message);
+
 /// Retrieves the path to the executable file.
 std::wstring GetApplicationPath();

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -38 +38 @@
     HINSTANCE hInstance = NULL;
     HWND hWndParent = NULL;
+    HWND hWndStatusLbl = NULL;
+    HWND hWndProgressBar = NULL;
+    HWND hWndCancelBtn = NULL;
 
     bool              InitInstance(HINSTANCE hInstance, HWND& hWnd);
@@ -60 +63 @@
         ~TempDir()
         {
+            //TODO: remove files in the directory.
             RemoveDirectoryW(DirName.c_str());
         }
@@ -111 +115 @@
             if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0) )
             {
-    #if WINVER >= 0x0600
+#if WINVER >= 0x0600
                 // a new field has been added to NONCLIENTMETRICS under Vista, so
                 // the call to SystemParametersInfo() fails if we use the struct
@@ -118 +122 @@
                 ncm.cbSize -= sizeof(int);
                 if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0) )
-    #endif
+#endif
                     return;
             }
@@ -181 +185 @@
     HWND hWndPanel = CreateWindowExW(0, STATIC_CLASS, NULL, WS_CHILD | WS_VISIBLE,
         0, 0, 294, 104, hWndParent, NULL, hInstance, NULL);
-    HWND hWndStatusLbl = CreateWindowExW(0, STATIC_CLASS, L"Extracting setup files...",
+    hWndStatusLbl = CreateWindowExW(0, STATIC_CLASS, L"Extracting setup files...",
         WS_CHILD | WS_VISIBLE, 13, 38, 270, 19, hWndPanel, NULL, hInstance, NULL);
-    HWND hWndProgressBar = CreateWindowExW(0, PROGRESS_CLASS, NULL,
-        WS_CHILD | WS_VISIBLE, 13, 13, 270, 24, hWndPanel, NULL, hInstance, NULL);
-    HWND hWndCancelBtn = CreateWindowExW(0, BUTTON_CLASS, L"Cancel", WS_TABSTOP |
+    hWndProgressBar = CreateWindowExW(0, PROGRESS_CLASS, NULL,
+        WS_CHILD | WS_VISIBLE | PBS_SMOOTH, 13, 13, 270, 24, hWndPanel, NULL,
+        hInstance, NULL);
+    hWndCancelBtn = CreateWindowExW(0, BUTTON_CLASS, L"Cancel", WS_TABSTOP |
         WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON, 193, 65, 90, 23, hWndPanel, NULL,
         hInstance, NULL);
@@ -195 +200 @@
     SetWindowFont(hWndProgressBar);
     SetWindowFont(hWndCancelBtn);
+    SendMessage(hWndProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0, 1000));
 
     ShowWindow(hWndParent, nCmdShow);
@@ -228 +234 @@
 }
 
+void SetProgress(float progress)
+{
+    SetWindowLong(hWndProgressBar, GWL_STYLE,
+        GetWindowLong(hWndProgressBar, GWL_STYLE) & (~PBS_MARQUEE));
+    SendMessage(hWndProgressBar, PBM_SETPOS, (int)(progress * 1000), 0);
+}
+
+void SetProgressIndeterminate()
+{
+    SetWindowLong(hWndProgressBar, GWL_STYLE,
+        GetWindowLong(hWndProgressBar, GWL_STYLE) | PBS_MARQUEE);
+    SendMessage(hWndProgressBar, PBM_SETMARQUEE, true, 100);
+}
+
+void SetMessage(std::wstring message)
+{
+}
+
 void Yield()
 {