Changeset 1445 for branches/eraser6/6.0

Timestamp:

1/4/2010 10:12:06 AM (3 years ago)

Author:

lowjoel

Message:

-Ensure that the bootstrapper checks the service pack level for the installed .NET framework; currently we check for .NET 3.5 SP1.
-Minor code cleanup (factored out the Handle class to be a template, allowing any abstract handle to be used)

Location:

branches/eraser6/6.0

Files:

• . (modified) (1 prop)
• Installer/Bootstrapper/Bootstrapper.cpp (modified) (6 diffs)
• Installer/Bootstrapper/Bootstrapper.vcproj (modified) (1 diff)
• Installer/Bootstrapper/Handle.h (copied) (copied from trunk/eraser6/Installer/Bootstrapper/Handle.h)
• Installer/Bootstrapper/stdafx.h (modified) (1 diff)

branches/eraser6/6.0/Installer/Bootstrapper/Bootstrapper.cpp

@@ -22 +22 @@
 #include "stdafx.h"
 #include "Bootstrapper.h"
-
-class Handle
-{
-public:
-    Handle(HANDLE handle)
-    {
-        thisHandle = handle;
-    }
-
-    ~Handle()
-    {
-        CloseHandle(thisHandle);
-    }
-
-    operator HANDLE()
-    {
-        return thisHandle;
-    }
-
-private:
-    HANDLE thisHandle;
-};
+#include "Handle.h"
 
 const wchar_t *ResourceName = MAKEINTRESOURCE(101);
@@ -52 +31 @@
     DWORD lastOperation = 0;
     {
-        Handle srcFile(CreateFileW(Application::Get().GetPath().c_str(), GENERIC_READ,
+        Handle<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)
@@ -58 +37 @@
 
         //Copy ourselves
-        Handle destFile(CreateFileW(destItem.c_str(), GENERIC_WRITE, 0, NULL,
+        Handle<HANDLE> destFile(CreateFileW(destItem.c_str(), GENERIC_WRITE, 0, NULL,
             CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
         if (destFile == INVALID_HANDLE_VALUE)
@@ -74 +53 @@
 
     //Read the package into memory
-    Handle packageFile(CreateFileW(package.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
+    Handle<HANDLE> packageFile(CreateFileW(package.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
         OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
     if (packageFile == INVALID_HANDLE_VALUE)
@@ -271 +250 @@
             sizeof(fileName) / sizeof(fileName[0]) - wcslen(baseFileName), fileExt);
 
-        Handle destFile(CreateFileW((pathToExtract + fileName).c_str(), GENERIC_WRITE, 0,
-            NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
+        Handle<HANDLE> destFile(CreateFileW((pathToExtract + fileName).c_str(), GENERIC_WRITE,
+            0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
         if (destFile == INVALID_HANDLE_VALUE)
             throw GetErrorMessage(GetLastError());
@@ -300 +279 @@
 bool HasNetFramework()
 {
-    HKEY key;
-    std::wstring highestVer;
-    std::wstring keys[] = { L"v3.5" };
-
-    for (int i = 0, j = sizeof(keys) / sizeof(keys[0]); i != j; ++i)
-    {
-        //Open the key for reading
-        DWORD result = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-            (L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\" + keys[i]).c_str(),
-            0, KEY_READ, &key);
-
-        //Retry for 64-bit WoW
+    const std::wstring versionKey(L"v3.5");
+
+    //Open the key for reading
+    Handle<HKEY> key;
+    DWORD result = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+        (L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\" + versionKey).c_str(),
+        0, KEY_READ, key);
+
+    //Retry for 64-bit WoW
+    if (result == ERROR_FILE_NOT_FOUND)
+    {
+        result = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+            (L"SOFTWARE\\Wow6432Node\\Microsoft\\NET Framework Setup\\NDP\\" + versionKey).c_str(),
+            0, KEY_READ, key);
+
         if (result == ERROR_FILE_NOT_FOUND)
-        {
-            result = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-                (L"SOFTWARE\\Wow6432Node\\Microsoft\\NET Framework Setup\\NDP\\" + keys[i]).c_str(),
-                0, KEY_READ, &key);
-
-            if (result == ERROR_FILE_NOT_FOUND)
-                continue;
-        }
-
-        if (result != ERROR_SUCCESS)
-            throw GetErrorMessage(result);
-
-        //Query the Installed string
-        DWORD installedVal = 0;
-        DWORD bufferSize = sizeof(installedVal);
-        result = RegQueryValueExW(key, L"Install", NULL, NULL, (BYTE*)&installedVal,
-            &bufferSize);
-        if (result != ERROR_SUCCESS && result != ERROR_MORE_DATA)
-            throw GetErrorMessage(result);
-        if (installedVal == 1)
-            highestVer = keys[i].substr(1);
-        RegCloseKey(key);
-    }
-
-    return !highestVer.empty();
+            return false;
+    }
+
+    if (result != ERROR_SUCCESS)
+        throw GetErrorMessage(result);
+
+    //Query the Install string
+    wchar_t buffer[32];
+    DWORD bufferSize = sizeof(buffer);
+    ::ZeroMemory(buffer, sizeof(buffer));
+    result = RegQueryValueExW(key, L"Install", NULL, NULL, reinterpret_cast<BYTE*>(buffer),
+        &bufferSize);
+    if (result != ERROR_SUCCESS && result != ERROR_MORE_DATA)
+        throw GetErrorMessage(result);
+    
+    //If we got more data than we wanted or if the value is not zero, it's invalid.
+    if (bufferSize != sizeof(DWORD) || *reinterpret_cast<DWORD*>(buffer) == 0)
+        return false;
+
+    //Next get the exact version installed
+    bufferSize = sizeof(buffer);
+    ::ZeroMemory(buffer, sizeof(buffer));
+    result = RegQueryValueExW(key, L"Version", NULL, NULL, reinterpret_cast<BYTE*>(buffer),
+        &bufferSize);
+    if ((result != ERROR_SUCCESS && result != ERROR_MORE_DATA) || bufferSize == sizeof(buffer))
+        throw GetErrorMessage(result);
+
+    //Ensure that the version string is NULL terminated
+    buffer[bufferSize / sizeof(wchar_t)] = L'\0';
+
+    //Split the version into its four components
+    int versionComponents[] = { 0, 0, 0, 0 };
+    wchar_t* previousDot = buffer - 1;
+    wchar_t* nextDot = NULL;
+    for (unsigned i = 0; i < sizeof(versionComponents) / sizeof(versionComponents[0]); ++i)
+    {
+        nextDot = wcschr(previousDot + 1, L'.');
+        versionComponents[i] = boost::lexical_cast<int>(
+            nextDot ? std::wstring(++previousDot, nextDot) : std::wstring(++previousDot));
+        if (!nextDot)
+            break;
+
+        previousDot = nextDot;
+    }
+
+    return versionComponents[0] == 3 && versionComponents[1] == 5 && versionComponents[2] >= 30729;
 }
 

branches/eraser6/6.0/Installer/Bootstrapper/Bootstrapper.vcproj

@@ -218 +218 @@
             </File>
             <File
+                RelativePath=".\Handle.h"
+                >
+            </File>
+            <File
                 RelativePath=".\Resource.h"
                 >

branches/eraser6/6.0/Installer/Bootstrapper/stdafx.h

@@ -45 +45 @@
     #include <C/Archive/7z/7zExtract.h>
 }
+
+//Boost
+#include <boost/lexical_cast.hpp>