Changeset 534

Timestamp:

11/13/2008 9:35:24 AM (5 years ago)

Author:

lowjoel

Message:

Pass the temporary directory into the ExtractTempFiles? function, since the "scope" of the directory is beyond the function and pretty much the process lifetime.

Location:

branches/eraser6/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (2 diffs)
• Bootstrapper.h (modified) (1 diff)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.cpp

@@ -80 +80 @@
 };
 
-/// Creates a temporary directory with the given name. The directory and files in it
-/// are deleted when this object is destroyed.
-class TempDir
-{
-public:
-    /// Constructor.
-    ///
-    /// \param[in] dirName The path to the directory. This directory will be created.
-    TempDir(std::wstring dirName)
-        : DirName(dirName)
-    {
-        if (!CreateDirectoryW(dirName.c_str(), NULL))
-            throw GetErrorMessage(GetLastError());
-    }
-
-    ~TempDir()
-    {
-        RemoveDirectoryW(DirName.c_str());
-    }
-
-private:
-    std::wstring DirName;
-};
-
-void ExtractTempFiles()
-{
-    //Get the path to the temporary folder
-    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);
+void ExtractTempFiles(std::wstring pathToExtract)
+{
+    if (std::wstring(L"\\/").find(pathToExtract[pathToExtract.length() - 1]))
+        pathToExtract += L"\\";
 
     //Open the file
@@ -172 +139 @@
         wchar_t fileName[MAX_PATH];
         mbstowcs(fileName, f->Name, sizeof(fileName) / sizeof(fileName[0]));
-        HANDLE destFile = CreateFileW((tempDir + fileName).c_str(), GENERIC_WRITE, 0,
+        HANDLE destFile = CreateFileW((pathToExtract + fileName).c_str(), GENERIC_WRITE, 0,
             NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
         if (destFile == INVALID_HANDLE_VALUE)

branches/eraser6/Installer/Bootstrapper/Bootstrapper.h

@@ -41 +41 @@
 
 /// Extracts the setup files to the users' temporary folder.
-void ExtractTempFiles();
+/// 
+/// \param[in] pathToExtract The path to extract the temporary files to.
+void ExtractTempFiles(std::wstring pathToExtract);
 
 /// Checks for the presence of the .NET Framework on the client computer.