Changeset 543

Timestamp:

11/13/2008 12:32:28 PM (3 years ago)

Author:

lowjoel

Message:

Added a self-scoping Handle class; fixed a few memory leaks.

Location:

branches/eraser6/Installer/Bootstrapper

Files:

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

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -23 +23 @@
 #include "Bootstrapper.h"
 
+class Handle
+{
+public:
+    Handle(HANDLE handle)
+    {
+        thisHandle = handle;
+    }
+
+    ~Handle()
+    {
+        CloseHandle(thisHandle);
+    }
+
+    operator HANDLE()
+    {
+        return thisHandle;
+    }
+
+private:
+    HANDLE thisHandle;
+};
+
 /// ISzInStream interface for extracting the archives.
 struct LZFileStream
@@ -110 +132 @@
     //Open the file
 #if _DEBUG
-    HANDLE srcFile = CreateFileW((Application::Get().GetPath() + L".7z").c_str(),
-        GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    Handle srcFile(CreateFileW((Application::Get().GetPath() + L".7z").c_str(),
+        GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
     if (srcFile == INVALID_HANDLE_VALUE)
         throw GetErrorMessage(GetLastError());
 #else
-    HANDLE srcFile = CreateFileW(Application::Get().GetPath().c_str(), GENERIC_READ,
-        FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    Handle srcFile(CreateFileW(Application::Get().GetPath().c_str(), GENERIC_READ,
+        FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
     if (srcFile == INVALID_HANDLE_VALUE)
         throw GetErrorMessage(GetLastError());
@@ -147 +169 @@
     unsigned blockIndex = 0;
     Byte* outBuffer = NULL;
-    size_t outBufferSize = 524288;
+    size_t outBufferSize = 0;
     for (unsigned i = 0; i < db.Database.NumFiles; ++i)
     {
         size_t offset = 0;
         size_t processedSize = 0;
-        CFileItem *f = db.Database.Files + i;
+        CFileItem* file = db.Database.Files + i;
         SZ_RESULT result = SZ_OK;
 
@@ -158 +180 @@
         size_t convertedChars = 0;
         wchar_t fileName[MAX_PATH];
-        mbstowcs_s(&convertedChars, fileName, f->Name, sizeof(fileName) / sizeof(fileName[0]));
-        HANDLE destFile = CreateFileW((pathToExtract + fileName).c_str(), GENERIC_WRITE, 0,
-            NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+        mbstowcs_s(&convertedChars, fileName, file->Name, sizeof(fileName) / sizeof(fileName[0]));
+        Handle destFile(CreateFileW((pathToExtract + fileName).c_str(), GENERIC_WRITE, 0,
+            NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
         if (destFile == INVALID_HANDLE_VALUE)
             throw GetErrorMessage(GetLastError());
-        unsigned long long destFileSize = f->Size;
+        unsigned long long destFileSize = file->Size;
 
         //Extract the file
@@ -172 +194 @@
                 &allocTempImp);
             if (result != SZ_OK)
-                _asm int 3;
+                throw std::wstring(L"Could not decompress data as it is corrupt.");
 
             DWORD bytesWritten = 0;
@@ -181 +203 @@
             Application::Get().Yield();
         }
-
-        CloseHandle(destFile);
-    }
+    }
+
     allocImp.Free(outBuffer);
 }
@@ -276 +297 @@
         tempDir += L"\\";
     std::wstring commandLine(L'"' + tempDir);
-    commandLine += L"dotnetfx.exe\"";
+    commandLine += L"dotnetfx35.exe\"";
 
     //And the return code is true if the process exited with 0.

branches/eraser6/Installer/Bootstrapper/Bootstrapper.h

@@ -38 +38 @@
         hWnd = hWndStatusLbl = hWndProgressBar = hWndCancelBtn = NULL;
     }
+
+    /// Destructor.
+    ~MainWindow();
 
     /// Creates the Window.

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -176 +176 @@
 
 std::map<HWND, MainWindow::WndProcData> MainWindow::OldWndProcs;
+MainWindow::~MainWindow()
+{
+    DestroyWindow(hWndStatusLbl);
+    DestroyWindow(hWndProgressBar);
+    DestroyWindow(hWndCancelBtn);
+    DestroyWindow(hWndPanel);
+    DestroyWindow(hWnd);
+}
+
 bool MainWindow::Create()
 {
@@ -286 +295 @@
 }
 
-LRESULT MainWindow::WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
+LRESULT MainWindow::WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM /*lParam*/,
     bool& handled)
 {
@@ -297 +306 @@
         break;
     }
+
+    return 0;
 }