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

Timestamp:

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

Author:

lowjoel

Message:

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

File:

• branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp (modified) (4 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)
     {