Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delay initialization of AppModule until after we set DLL paths

Browse Source
This commit is contained in:
Paul Betts
2016-09-29 15:10:30 -07:00
parent 14d6dc1599
commit 6722c66f77
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Setup/winmain.cpp
View File

@@ -8,7 +8,7 @@
#include "MachineInstaller.h" #include "MachineInstaller.h"
#include <cstdio> #include <cstdio>
CAppModule _Module; CAppModule* _Module;
typedef BOOL(WINAPI *SetDefaultDllDirectoriesFunction)(DWORD DirectoryFlags); typedef BOOL(WINAPI *SetDefaultDllDirectoriesFunction)(DWORD DirectoryFlags);
@@ -42,7 +42,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
ATLASSERT(SUCCEEDED(hr)); ATLASSERT(SUCCEEDED(hr));
AtlInitCommonControls(ICC_COOL_CLASSES | ICC_BAR_CLASSES); AtlInitCommonControls(ICC_COOL_CLASSES | ICC_BAR_CLASSES);
hr = _Module.Init(NULL, hInstance); _Module = new CAppModule();
hr = _Module->Init(NULL, hInstance);
bool isQuiet = (cmdLine.Find(L"-s") >= 0); bool isQuiet = (cmdLine.Find(L"-s") >= 0);
bool weAreUACElevated = CUpdateRunner::AreWeUACElevated() == S_OK; bool weAreUACElevated = CUpdateRunner::AreWeUACElevated() == S_OK;
@@ -92,7 +93,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
exitCode = CUpdateRunner::ExtractUpdaterAndRun(lpCmdLine, false); exitCode = CUpdateRunner::ExtractUpdaterAndRun(lpCmdLine, false);
out: out:
_Module.Term(); _Module->Term();
::CoUninitialize(); ::CoUninitialize();
return exitCode; return exitCode;
} }