Showing with 2 additions and 1 deletion.

+0 −1 common.gypi

+1 −0 deps/openssl/openssl.gyp

+1 −0 tools/msvs/msi/nodemsi.wixproj
diff --git a/common.gypi b/common.gypi
@@ -117,7 +117,6 @@
         'WarningLevel': 3,
         'BufferSecurityCheck': 'true',
         'ExceptionHandling': 1, # /EHsc
-        'ImageHasSafeExceptionHandlers': 0, # /SAFESEH:NO
         'SuppressStartupBanner': 'true',
         'WarnAsError': 'false',
       },

diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
@@ -762,6 +762,7 @@
                   'action': [
                     'ml.exe',
                     '/Zi',
+                    '/safeseh',
                     '/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
                     '/c', '<(RULE_INPUT_PATH)',
                   ],

diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj
@@ -9,6 +9,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>node-v$(NodeVersion)-$(Platform)</OutputName>
     <OutputType>Package</OutputType>
+    <EnableProjectHarvesting>True</EnableProjectHarvesting>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <NodeVersion Condition=" '$(NodeVersion)' == '' ">0.0.0.0</NodeVersion>