diff options
| author | Odd Stranne <odd@mullvad.net> | 2018-12-05 11:53:09 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2018-12-05 11:53:09 +0100 |
| commit | aecaaa2a5652bf787e8000eaeea5b820456122ee (patch) | |
| tree | 513739b9d5d2f06f72e311665a54a9d19e0cfb31 /windows/nsis-plugins/src/tray/dllmain.cpp | |
| parent | 39678f83206d92905cb401643d7b78a06131c398 (diff) | |
| parent | 941ebe599354844f01b3bc1efb2fe236fbbb3e30 (diff) | |
| download | mullvadvpn-aecaaa2a5652bf787e8000eaeea5b820456122ee.tar.xz mullvadvpn-aecaaa2a5652bf787e8000eaeea5b820456122ee.zip | |
Merge branch 'win-promote-tray'
Diffstat (limited to 'windows/nsis-plugins/src/tray/dllmain.cpp')
| -rw-r--r-- | windows/nsis-plugins/src/tray/dllmain.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/windows/nsis-plugins/src/tray/dllmain.cpp b/windows/nsis-plugins/src/tray/dllmain.cpp new file mode 100644 index 0000000000..a5a44613dd --- /dev/null +++ b/windows/nsis-plugins/src/tray/dllmain.cpp @@ -0,0 +1,11 @@ +#include "stdafx.h" +#include <windows.h> + +BOOL APIENTRY DllMain(HMODULE, DWORD reason, LPVOID) +{ + // + // Avoid doing work in DllMain since the loader lock is held + // + + return TRUE; +} |