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

Timestamp:

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

Author:

lowjoel

Message:

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

File:

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