Changeset 539

Timestamp:

11/13/08 11:26:52 (5 years ago)

Author:

lowjoel

Message:

Further extend the Application class.

Location:

branches/eraser6/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (2 diffs)
• Bootstrapper.h (modified) (2 diffs)
• Main.cpp (modified) (5 diffs)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -110 +110 @@
     //Open the file
 #if _DEBUG
-    HANDLE srcFile = CreateFileW((GetApplicationPath() + 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());
@@ -119 +119 @@
     fPos.QuadPart = 0;
 #else
-    HANDLE srcFile = CreateFileW(GetApplicationPath().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());

branches/eraser6/Installer/Bootstrapper/Bootstrapper.h

@@ -27 +27 @@
 #include "resource.h"
 #undef Yield
-
-class Application
-{
-public:
-    /// Gets the Singleton instance of the Application object.
-    static Application& Get();
-
-    /// Processes messages in the message queue.
-    void Yield();
-
-    /// Retrieves the MainWindow object representing the Application's top window.
-    class MainWindow& GetTopWindow();
-
-private:
-    Application();
-};
 
 class MainWindow
@@ -86 +70 @@
 };
 
+class Application
+{
+public:
+    /// Gets the Singleton instance of the Application object.
+    static Application& Get();
+
+    /// Retrieves the path to the executable file.
+    std::wstring GetPath();
+
+    /// Processes messages in the message queue.
+    void Yield();
+
+    /// Retrieves the MainWindow object representing the Application's top window.
+    MainWindow& GetTopWindow();
+
+private:
+    /// Constructor.
+    Application();
+
+private:
+    /// The Application main window.
+    MainWindow MainWin;
+};
+
 /// Formats the system error code using FormatMessage, returning the message as
 /// a std::wstring.
 std::wstring GetErrorMessage(DWORD lastError);
-
-/// Retrieves the path to the executable file.
-std::wstring GetApplicationPath();
 
 /// Extracts the setup files to the users' temporary folder.

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -37 +37 @@
     //Static variables
     HINSTANCE hInstance = NULL;
-    MainWindow MainWin;
 
     bool              InitInstance(HINSTANCE hInstance, HWND& hWnd);
@@ -150 +149 @@
 
 int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/,
-                       LPTSTR /*lpCmdLine*/, int nCmdShow)
+                       LPTSTR /*lpCmdLine*/, int /*nCmdShow*/)
 {
     //Create the parent window and the child controls
     ::hInstance = hInstance;
-    MainWin.Create();
+    Application::Get();
 
     try
@@ -185 +184 @@
 
     return 0;
+}
+
+Application::Application()
+{
+    MainWin.Create();
+}
+
+Application& Application::Get()
+{
+    static Application Instance;
+    return Instance;
+}
+
+MainWindow& Application::GetTopWindow()
+{
+    return MainWin;
+}
+
+void Application::Yield()
+{
+    MSG msg;
+    while (PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
+    {
+        if (GetMessageW(&msg, NULL, 0, 0) == 0)
+            return;
+
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+}
+
+std::wstring Application::GetPath()
+{
+    wchar_t filePath[MAX_PATH];
+    DWORD result = GetModuleFileNameW(hInstance, filePath,
+        sizeof(filePath) / sizeof(filePath[0]));
+
+    if (result == 0)
+        throw GetErrorMessage(GetLastError());
+    return std::wstring(filePath, result);
 }
 
@@ -211 +250 @@
     SendMessage(hWndProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0, 1000));
 
-    ShowWindow(hWnd, nCmdShow);
+    ShowWindow(hWnd, SW_SHOWDEFAULT);
     UpdateWindow(hWnd);
+    return true;
 }
 
@@ -264 +304 @@
 }
 
-void Application::Yield()
-{
-    MSG msg;
-    while (PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
-    {
-        if (GetMessageW(&msg, NULL, 0, 0) == 0)
-            return;
-
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-}
-
-std::wstring GetApplicationPath()
-{
-    wchar_t filePath[MAX_PATH];
-    DWORD result = GetModuleFileNameW(hInstance, filePath,
-        sizeof(filePath) / sizeof(filePath[0]));
-
-    if (result == 0)
-        throw GetErrorMessage(GetLastError());
-    return std::wstring(filePath, result);
-}
-
 std::wstring GetErrorMessage(DWORD lastError)
 {