Changeset 538 for branches/eraser6/Installer/Bootstrapper/Main.cpp

Timestamp:

11/13/08 11:06:33 (5 years ago)

Author:

lowjoel

Message:

Reshuffle all the global functions into classes. It is way neater now.

File:

• branches/eraser6/Installer/Bootstrapper/Main.cpp (modified) (6 diffs)

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -37 +37 @@
     //Static variables
     HINSTANCE hInstance = NULL;
-    HWND hWndParent = NULL;
-    HWND hWndStatusLbl = NULL;
-    HWND hWndProgressBar = NULL;
-    HWND hWndCancelBtn = NULL;
+    MainWindow MainWin;
 
     bool              InitInstance(HINSTANCE hInstance, HWND& hWnd);
@@ -87 +84 @@
     };
 
-    /// Registers the main window class and creates it.
-    bool InitInstance(HINSTANCE hInstance, HWND& hWnd)
-    {
-        WNDCLASSEX wcex;
-        ::ZeroMemory(&wcex, sizeof(wcex));
-
-        wcex.cbSize         = sizeof(WNDCLASSEX);
-        wcex.style          = CS_HREDRAW | CS_VREDRAW;
-        wcex.lpfnWndProc    = WndProc;
-        wcex.cbClsExtra     = 0;
-        wcex.cbWndExtra     = 0;
-        wcex.hInstance      = hInstance;
-        wcex.hIcon          = LoadIcon(hInstance, MAKEINTRESOURCE(BOOTSTRAPPER_ICON));
-        wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
-        wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW + 1);
-        wcex.lpszClassName  = szWindowClass;
-        wcex.hIconSm        = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(BOOTSTRAPPER_ICON));
-        RegisterClassExW(&wcex);
-        InitCommonControls();
-
-        //Create the window
-        hWnd = CreateWindowW(szWindowClass, L"Eraser Setup", WS_CAPTION | WS_SYSMENU,
-            CW_USEDEFAULT, 0, 300, 130, NULL, NULL, hInstance, NULL);
-
-        if (!hWnd)
-            return false;
-
-        //Set default settings (font)
-        SetWindowFont(hWnd);
-        return true;
-    }
+    
+    
 
     /// Helper function to set the window font for created windows to the system default.
@@ -186 +154 @@
     //Create the parent window and the child controls
     ::hInstance = hInstance;
-    if (!InitInstance(hInstance, hWndParent))
+    MainWin.Create();
+
+    try
+    {
+        //OK, now we do the hard work. Create a folder to place our payload into
+        wchar_t tempPath[MAX_PATH];
+        DWORD result = GetTempPathW(sizeof(tempPath) / sizeof(tempPath[0]), tempPath);
+        if (!result)
+            throw GetErrorMessage(GetLastError());
+
+        std::wstring tempDir(tempPath, result);
+        if (std::wstring(L"\\/").find(tempDir[tempDir.length() - 1]) == std::wstring::npos)
+            tempDir += L"\\";
+        tempDir += L"eraserInstallBootstrapper\\";
+        TempDir dir(tempDir);
+        ExtractTempFiles(tempDir);
+
+        //Install the .NET framework
+        if (!HasNetFramework())
+            InstallNetFramework(tempDir);
+
+        //Then install Eraser!
+        InstallEraser(tempDir);
+    }
+    catch (const std::wstring& e)
+    {
+        MessageBoxW(Application::Get().GetTopWindow().GetHandle(), e.c_str(),
+            L"Eraser Setup", MB_OK | MB_ICONERROR);
+    }
+
+    return 0;
+}
+
+bool MainWindow::Create()
+{
+    if (!InitInstance())
         return false;
 
     HWND hWndPanel = CreateWindowExW(0, STATIC_CLASS, NULL, WS_CHILD | WS_VISIBLE,
-        0, 0, 294, 104, hWndParent, NULL, hInstance, NULL);
+        0, 0, 294, 104, hWnd, NULL, hInstance, NULL);
     hWndStatusLbl = CreateWindowExW(0, STATIC_CLASS, L"Extracting setup files...",
         WS_CHILD | WS_VISIBLE, 13, 38, 270, 19, hWndPanel, NULL, hInstance, NULL);
@@ -208 +211 @@
     SendMessage(hWndProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0, 1000));
 
-    ShowWindow(hWndParent, nCmdShow);
-    UpdateWindow(hWndParent);
-
-    try
-    {
-        //OK, now we do the hard work. Create a folder to place our payload into
-        wchar_t tempPath[MAX_PATH];
-        DWORD result = GetTempPathW(sizeof(tempPath) / sizeof(tempPath[0]), tempPath);
-        if (!result)
-            throw GetErrorMessage(GetLastError());
-
-        std::wstring tempDir(tempPath, result);
-        if (std::wstring(L"\\/").find(tempDir[tempDir.length() - 1]) == std::wstring::npos)
-            tempDir += L"\\";
-        tempDir += L"eraserInstallBootstrapper\\";
-        TempDir dir(tempDir);
-        ExtractTempFiles(tempDir);
-
-        //Install the .NET framework
-        if (!HasNetFramework())
-            InstallNetFramework(tempDir);
-
-        //Then install Eraser!
-        InstallEraser(tempDir);
-    }
-    catch (const std::wstring& e)
-    {
-        MessageBoxW(GetTopWindow(), e.c_str(), L"Eraser Setup", MB_OK | MB_ICONERROR);
-    }
-
-    return 0;
-}
-
-HWND GetTopWindow()
-{
-    return hWndParent;
-}
-
-void SetProgress(float progress)
+    ShowWindow(hWnd, nCmdShow);
+    UpdateWindow(hWnd);
+}
+
+bool MainWindow::InitInstance()
+{
+    WNDCLASSEX wcex;
+    ::ZeroMemory(&wcex, sizeof(wcex));
+
+    wcex.cbSize         = sizeof(WNDCLASSEX);
+    wcex.style          = CS_HREDRAW | CS_VREDRAW;
+    wcex.lpfnWndProc    = WndProc;
+    wcex.cbClsExtra     = 0;
+    wcex.cbWndExtra     = 0;
+    wcex.hInstance      = hInstance;
+    wcex.hIcon          = LoadIcon(hInstance, MAKEINTRESOURCE(BOOTSTRAPPER_ICON));
+    wcex.hCursor        = LoadCursor(NULL, IDC_ARROW);
+    wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW + 1);
+    wcex.lpszClassName  = szWindowClass;
+    wcex.hIconSm        = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(BOOTSTRAPPER_ICON));
+    RegisterClassExW(&wcex);
+    InitCommonControls();
+
+    //Create the window
+    hWnd = CreateWindowW(szWindowClass, L"Eraser Setup", WS_CAPTION | WS_SYSMENU,
+        CW_USEDEFAULT, 0, 300, 130, NULL, NULL, hInstance, NULL);
+
+    if (!hWnd)
+        return false;
+
+    //Set default settings (font)
+    SetWindowFont(hWnd);
+    return true;
+}
+
+void MainWindow::SetProgress(float progress)
 {
     SetWindowLong(hWndProgressBar, GWL_STYLE,
@@ -253 +253 @@
 }
 
-void SetProgressIndeterminate()
+void MainWindow::SetProgressIndeterminate()
 {
     SetWindowLong(hWndProgressBar, GWL_STYLE,
@@ -260 +260 @@
 }
 
-void SetMessage(std::wstring message)
-{
-}
-
-void Yield()
+void MainWindow::SetMessage(std::wstring message)
+{
+}
+
+void Application::Yield()
 {
     MSG msg;