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

Timestamp:

11/13/2008 10:54:09 AM (4 years ago)

Author:

lowjoel

Message:

-Fixed Yield
-Fixed the TempDir? destructor
-Added exception handlers to Main, since it can't throw
-Few warning fixes

File:

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

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -57 +57 @@
             : DirName(dirName)
         {
+            if (std::wstring(L"\\/").find(dirName[dirName.length() - 1]) == std::wstring::npos)
+                dirName += L"\\";
+
             if (!CreateDirectoryW(dirName.c_str(), NULL))
                 throw GetErrorMessage(GetLastError());
@@ -64 +67 @@
         {
             //Clean up the files in the directory.
-
-
+            WIN32_FIND_DATAW findData;
+            ZeroMemory(&findData, sizeof(findData));
+            HANDLE findHandle = FindFirstFileW((DirName + L"*").c_str(), &findData);
+            if (findHandle == INVALID_HANDLE_VALUE)
+                throw GetErrorMessage(GetLastError());
+
+            //Delete!
+            do
+                DeleteFileW((DirName + findData.cFileName).c_str());
+            while (FindNextFileW(findHandle, &findData));
+
+            //Clean up.
+            FindClose(findHandle);
             RemoveDirectoryW(DirName.c_str());
         }
@@ -155 +169 @@
         }
 
-        case WM_PAINT:
-        {
-            PAINTSTRUCT ps;
-            HDC hdc = BeginPaint(hWnd, &ps);
-
-            // TODO: Add any drawing code here...
-            EndPaint(hWnd, &ps);
-            break;
-        }
-
         case WM_DESTROY:
             PostQuitMessage(0);
@@ -207 +211 @@
     UpdateWindow(hWndParent);
 
-    //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();
-
-    //Main message loop
-    MSG msg;
-    while (GetMessage(&msg, NULL, 0, 0))
-    {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-
-    return (int) msg.wParam;
+    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;
 }
 
@@ -265 +268 @@
     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);
-    }
+    }
 }