summaryrefslogtreecommitdiffhomepage
path: root/windows/nsis-plugins/src/string/dllmain.cpp
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-01-09 15:51:20 +0100
committerDavid Lönnhager <david.l@mullvad.net>2020-01-09 15:51:20 +0100
commit5b6e776eb9508cc684acf0b7e24ba49101f618a2 (patch)
tree15f91c803a90b3ca43b82e721ba7ed47f4e83757 /windows/nsis-plugins/src/string/dllmain.cpp
parent882c4bcaa4163e91ed7a97ba86f30f1fdf1dc420 (diff)
parentd461128a941d909f8373b7bace8653f9fd6ea964 (diff)
downloadmullvadvpn-5b6e776eb9508cc684acf0b7e24ba49101f618a2.tar.xz
mullvadvpn-5b6e776eb9508cc684acf0b7e24ba49101f618a2.zip
Merge branch 'service-marked-for-deletion-fix'
Diffstat (limited to 'windows/nsis-plugins/src/string/dllmain.cpp')
-rw-r--r--windows/nsis-plugins/src/string/dllmain.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/windows/nsis-plugins/src/string/dllmain.cpp b/windows/nsis-plugins/src/string/dllmain.cpp
new file mode 100644
index 0000000000..a5a44613dd
--- /dev/null
+++ b/windows/nsis-plugins/src/string/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;
+}