Changeset 542

Timestamp:

11/13/2008 12:20:40 PM (3 years ago)

Author:

lowjoel

Message:

Handle the Cancel button clicks.

Location:

branches/eraser6/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (3 diffs)
• Bootstrapper.h (modified) (4 diffs)
• Bootstrapper.vcproj (modified) (2 diffs)
• Main.cpp (modified) (8 diffs)
• stdafx.h (modified) (1 diff)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -114 +114 @@
     if (srcFile == INVALID_HANDLE_VALUE)
         throw GetErrorMessage(GetLastError());
-
-    //Seek to the 128th kb.
-    LARGE_INTEGER fPos;
-    fPos.QuadPart = 0;
 #else
     HANDLE srcFile = CreateFileW(Application::Get().GetPath().c_str(), GENERIC_READ,
@@ -126 +122 @@
     //Seek to the 128th kb.
     LARGE_INTEGER fPos;
-    fPos.QuadPart = 128 * 1024;
+    fPos.QuadPart = DataOffset;
+
+    if (!SetFilePointerEx(srcFile, fPos, &fPos, FILE_BEGIN))
+        throw GetErrorMessage(GetLastError());
 #endif
-
-    if (!SetFilePointerEx(srcFile, fPos, &fPos, FILE_BEGIN))
-        throw GetErrorMessage(GetLastError());
 
     //7z archive database structure
@@ -183 +179 @@
                 throw GetErrorMessage(GetLastError());
             destFileSize -= bytesWritten;
+            Application::Get().Yield();
         }
 

branches/eraser6/Installer/Bootstrapper/Bootstrapper.h

@@ -24 +24 @@
 #include <windows.h>
 #include <string>
+#include <map>
 
 #include "resource.h"
 #undef Yield
+#undef min
 
 class MainWindow
@@ -60 +62 @@
 private:
     HWND hWnd;
+    HWND hWndPanel;
     HWND hWndStatusLbl;
     HWND hWndProgressBar;
     HWND hWndCancelBtn;
+
+    struct WndProcData
+    {
+        WndProcData(WNDPROC oldWndProc, MainWindow& owner)
+            : OldWndProc(oldWndProc), Owner(&owner)
+        {
+        }
+
+        WNDPROC OldWndProc;
+        MainWindow* Owner;
+    };
+
+    static std::map<HWND, WndProcData> OldWndProcs;
 
 private:
@@ -69 +85 @@
 
     /// Helper function to set the window font for created windows to the system default.
+    /// 
+    /// \param[in] hWnd The window whose font needs to be set.
     void SetWindowFont(HWND hWnd);
+
+    /// Handles messages from user interactions.
+    LRESULT WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
+        bool& handled);
+
+    /// Subclasses the given window.
+    /// 
+    /// \param[in] owner The owner of the window.
+    /// \param[in] hWnd The handle to the window to subclass.
+    /// \param[in] wndProc The window message processor.
+    static void SubclassWindow(MainWindow& owner, HWND hWnd, WNDPROC wndProc);
+
+    /// Processes messages for the main window.
+    static LRESULT __stdcall WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 };
 
@@ -96 +128 @@
 };
 
+/// The offset where the package data is stored.
+const unsigned DataOffset = 160 * 1024;
+
 /// Formats the system error code using FormatMessage, returning the message as
 /// a std::wstring.

branches/eraser6/Installer/Bootstrapper/Bootstrapper.vcproj

@@ -61 +61 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib 7z_C.lib"
+                AdditionalDependencies="comctl32.lib 7z_Cd.lib"
                 LinkIncremental="2"
                 GenerateDebugInformation="true"
@@ -134 +134 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib D:\Development\Libraries\C++\LZMA\C\Archive\7z\LzDecode.obj"
+                AdditionalDependencies="comctl32.lib 7z_C.lib"
                 LinkIncremental="1"
                 GenerateDebugInformation="true"

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -50 +50 @@
             : DirName(dirName)
         {
+            //Ensure there is a trailing slash
             if (std::wstring(L"\\/").find(dirName[dirName.length() - 1]) == std::wstring::npos)
                 dirName += L"\\";
 
             if (!CreateDirectoryW(dirName.c_str(), NULL))
-                throw GetErrorMessage(GetLastError());
+                switch (GetLastError())
+                {
+                case ERROR_ALREADY_EXISTS:
+                    DeleteContents();
+                    break;
+
+                default:
+                    throw GetErrorMessage(GetLastError());
+                }
         }
 
         ~TempDir()
+        {
+            DeleteContents();
+            RemoveDirectoryW(DirName.c_str());
+        }
+
+    private:
+        /// The path to the directory.
+        std::wstring DirName;
+
+    private:
+        void DeleteContents()
         {
             //Clean up the files in the directory.
@@ -73 +93 @@
             //Clean up.
             FindClose(findHandle);
-            RemoveDirectoryW(DirName.c_str());
         }
-
-    private:
-        std::wstring DirName;
     };
-
-    /// Processes messages for the main window.
-    /// 
-    /// Current messages processed:
-    /// WM_COMMAND  - process the application menu
-    /// WM_PAINT    - Paint the main window
-    /// WM_DESTROY  - post a quit message and return
-    LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-    {
-        switch (message)
-        {
-        case WM_COMMAND:
-        {
-            /*int wmId    = LOWORD(wParam);
-            switch (wmId)
-            {
-            default:
-                
-            }*/
-            return DefWindowProc(hWnd, message, wParam, lParam);
-        }
-
-        case WM_DESTROY:
-            PostQuitMessage(0);
-            break;
-
-        default:
-            return DefWindowProc(hWnd, message, wParam, lParam);
-        }
-
-        return 0;
-    }
 }
 
@@ -191 +175 @@
 }
 
+std::map<HWND, MainWindow::WndProcData> MainWindow::OldWndProcs;
 bool MainWindow::Create()
 {
@@ -196 +181 @@
         return false;
 
-    HWND hWndPanel = CreateWindowExW(0, STATIC_CLASS, NULL, WS_CHILD | WS_VISIBLE,
+    hWndPanel = CreateWindowExW(0, STATIC_CLASS, NULL, WS_CHILD | WS_VISIBLE,
         0, 0, 294, 104, hWnd, NULL, hInstance, NULL);
     hWndStatusLbl = CreateWindowExW(0, STATIC_CLASS, L"Extracting setup files...",
@@ -213 +198 @@
     SetWindowFont(hWndProgressBar);
     SetWindowFont(hWndCancelBtn);
+
     SendMessage(hWndProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0, 1000));
+    SubclassWindow(*this, hWndCancelBtn, WndProc);
+    SubclassWindow(*this, hWndPanel, WndProc);
 
     ShowWindow(hWnd, SW_SHOWDEFAULT);
@@ -281 +269 @@
 void MainWindow::SetProgress(float progress)
 {
-    SetWindowLong(hWndProgressBar, GWL_STYLE,
-        GetWindowLong(hWndProgressBar, GWL_STYLE) & (~PBS_MARQUEE));
+    SetWindowLongPtr(hWndProgressBar, GWL_STYLE,
+        GetWindowLongPtr(hWndProgressBar, GWL_STYLE) & (~PBS_MARQUEE));
     SendMessage(hWndProgressBar, PBM_SETPOS, (int)(progress * 1000), 0);
 }
@@ -288 +276 @@
 void MainWindow::SetProgressIndeterminate()
 {
-    SetWindowLong(hWndProgressBar, GWL_STYLE,
-        GetWindowLong(hWndProgressBar, GWL_STYLE) | PBS_MARQUEE);
+    SetWindowLongPtr(hWndProgressBar, GWL_STYLE,
+        GetWindowLongPtr(hWndProgressBar, GWL_STYLE) | PBS_MARQUEE);
     SendMessage(hWndProgressBar, PBM_SETMARQUEE, true, 100);
 }
@@ -296 +284 @@
 {
     SetWindowTextW(hWndStatusLbl, message.c_str());
+}
+
+LRESULT MainWindow::WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
+    bool& handled)
+{
+    handled = false;
+    switch (message)
+    {
+    case WM_COMMAND:
+        if (hWnd == hWndCancelBtn && HIWORD(wParam) == BN_CLICKED)
+            PostQuitMessage(1);
+        break;
+    }
+}
+
+void MainWindow::SubclassWindow(MainWindow& owner, HWND hWnd, WNDPROC wndProc)
+{
+    OldWndProcs.insert(std::make_pair(
+        hWnd, WndProcData(reinterpret_cast<WNDPROC>(SetWindowLongPtr(hWnd,
+            GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(wndProc))), owner)
+    ));
+}
+
+LRESULT __stdcall MainWindow::WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    std::map<HWND, WndProcData>::const_iterator iter = OldWndProcs.find(hWnd);
+    if (iter != OldWndProcs.end())
+    {
+        bool handled = false;
+        LRESULT result = iter->second.Owner->WindowProc(hWnd, message, wParam,
+            lParam, handled);
+        if (handled)
+            return result;
+
+        return CallWindowProc(iter->second.OldWndProc, hWnd, message, wParam, lParam);
+    }
+
+    switch (message)
+    {
+    case WM_DESTROY:
+        PostQuitMessage(0);
+        break;
+
+    default:
+        return DefWindowProc(hWnd, message, wParam, lParam);
+    }
+
+    return 0;
 }
 

branches/eraser6/Installer/Bootstrapper/stdafx.h

@@ -31 +31 @@
 #include <windows.h>
 #include <commctrl.h>
-#undef min
 
 #include <tchar.h>
 #include <string>
+#include <map>
 
 //7-zip SDK