Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Customizing option for setup.exe bootstrapper #1248

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added Customizing option for setup.exe bootstrapper #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Setup/Setup.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;secur32.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;secur32.lib;version.lib</AdditionalDependencies>
</Link>
<Manifest>
<AdditionalManifestFiles>compat.manifest</AdditionalManifestFiles>
Expand All @@ -109,7 +109,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;secur32.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;secur32.lib;version.lib</AdditionalDependencies>
</Link>
<Manifest>
<AdditionalManifestFiles>compat.manifest</AdditionalManifestFiles>
Expand Down Expand Up @@ -137,7 +137,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;secur32.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;secur32.lib;version.lib</AdditionalDependencies>
</Link>
<Manifest>
<AdditionalManifestFiles>compat.manifest</AdditionalManifestFiles>
Expand Down
103 changes: 91 additions & 12 deletions src/Setup/UpdateRunner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
#include "Resource.h"
#include "UpdateRunner.h"
#include <vector>
#include <string>
#include <sstream>
#include <iostream>
#include <iomanip>
#include <winver.h>

void CUpdateRunner::DisplayErrorMessage(CString& errorMessage, wchar_t* logFile)
{
Expand All @@ -15,7 +20,8 @@ void CUpdateRunner::DisplayErrorMessage(CString& errorMessage, wchar_t* logFile)
// TODO: Something about contacting support?
if (logFile == NULL) {
dlg.SetButtons(&buttons[1], 1, 1);
} else {
}
else {
dlg.SetButtons(buttons, 2, 1);
}

Expand Down Expand Up @@ -138,13 +144,13 @@ bool CUpdateRunner::DirectoryExists(wchar_t* szPath)

bool CUpdateRunner::DirectoryIsWritable(wchar_t * szPath)
{
wchar_t szTempFileName[MAX_PATH];
UINT uRetVal = GetTempFileNameW(szPath, L"Squirrel", 0, szTempFileName);
if (uRetVal == 0) {
return false;
}
DeleteFile(szTempFileName);
return true;
wchar_t szTempFileName[MAX_PATH];
UINT uRetVal = GetTempFileNameW(szPath, L"Squirrel", 0, szTempFileName);
if (uRetVal == 0) {
return false;
}
DeleteFile(szTempFileName);
return true;
}

int CUpdateRunner::ExtractUpdaterAndRun(wchar_t* lpCommandLine, bool useFallbackDir)
Expand Down Expand Up @@ -190,8 +196,10 @@ int CUpdateRunner::ExtractUpdaterAndRun(wchar_t* lpCommandLine, bool useFallback

gotADir:

CheckSpecialBuild(targetDir, lpCommandLine);

wcscat_s(targetDir, _countof(targetDir), L"\\SquirrelTemp");

if (!CreateDirectory(targetDir, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) {
wchar_t err[4096];
_swprintf_c(err, _countof(err), L"Unable to write to %s - IT policies may be restricting access to this folder", targetDir);
Expand Down Expand Up @@ -275,7 +283,7 @@ int CUpdateRunner::ExtractUpdaterAndRun(wchar_t* lpCommandLine, bool useFallback

if (dwExitCode != 0) {
DisplayErrorMessage(CString(
L"There was an error while installing the application. "
L"There was an error while installing the application. "
L"Check the setup log for more information and contact the author."), logFile);
}

Expand All @@ -285,7 +293,7 @@ int CUpdateRunner::ExtractUpdaterAndRun(wchar_t* lpCommandLine, bool useFallback

CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
return (int) dwExitCode;
return (int)dwExitCode;

failedExtract:
if (!useFallbackDir) {
Expand All @@ -294,5 +302,76 @@ int CUpdateRunner::ExtractUpdaterAndRun(wchar_t* lpCommandLine, bool useFallback
}

DisplayErrorMessage(CString(L"Failed to extract installer"), NULL);
return (int) dwExitCode;
return (int)dwExitCode;
}

void CUpdateRunner::CheckSpecialBuild(wchar_t* targetDir, wchar_t* commandLine) {
CString specialBuild = CString();

std::wstringstream iss(commandLine);
std::vector<std::wstring> v;
std::wstring s;

while (iss >> std::quoted(s)) {
v.push_back(s);
}

auto index = std::find(v.begin(), v.end(), std::wstring(L"--special-build"));
if (index != v.end()) {
index = std::next(index, 1);
if (index != v.end()) {
specialBuild = index->c_str();
}
}

if (specialBuild.IsEmpty()) {
HMODULE hLib = GetModuleHandle(NULL);

HRSRC hVersion = FindResource(hLib,
MAKEINTRESOURCE(VS_VERSION_INFO), RT_VERSION);
if (hVersion != NULL)
{
HGLOBAL hGlobal = LoadResource(hLib, hVersion);
if (hGlobal != NULL)
{
LPVOID versionInfo = LockResource(hGlobal);
if (versionInfo != NULL)
{
DWORD vLen, langD;
BOOL retVal;

LPVOID retbuf = NULL;

static wchar_t fileEntry[256];

wsprintf(fileEntry, L"\\VarFileInfo\\Translation");
retVal = VerQueryValue(versionInfo, fileEntry, &retbuf, (UINT *)&vLen);
if (retVal && vLen == 4)
{
memcpy(&langD, retbuf, 4);
wsprintf(fileEntry, L"\\StringFileInfo\\%02X%02X%02X%02X\\%s",
(langD & 0xff00) >> 8, langD & 0xff, (langD & 0xff000000) >> 24,
(langD & 0xff0000) >> 16, L"SpecialBuild");
}
else
wsprintf(fileEntry, L"\\StringFileInfo\\%04X04B0\\%s",
GetUserDefaultLangID(), L"SpecialBuild");

if (VerQueryValue(versionInfo, fileEntry, &retbuf, (UINT *)&vLen)) {
if (vLen > 0)
{
specialBuild = CString((wchar_t*)retbuf);
}
}
}
}

UnlockResource(hGlobal);
FreeResource(hGlobal);
}
}

if (!specialBuild.IsEmpty()) {
SetEnvironmentVariable(L"SQUIRREL_SPECIAL_BUILD", specialBuild);
}
}
4 changes: 3 additions & 1 deletion src/Setup/UpdateRunner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#pragma once
class CUpdateRunner
{

public:
static void DisplayErrorMessage(CString& errorMessage, wchar_t* logFile);
static HRESULT AreWeUACElevated();
static HRESULT ShellExecuteFromExplorer(LPWSTR pszFile, LPWSTR pszParameters);
static bool DirectoryExists(wchar_t* szPath);
static bool DirectoryIsWritable(wchar_t* szPath);
static int ExtractUpdaterAndRun(wchar_t* lpCommandLine, bool useFallbackDir);

protected:
static void CheckSpecialBuild(wchar_t* targetDir, wchar_t* commandLine);
};