Change our Windows header version to WinXP

livecodefraser · livecodefraser · commit 91955014a123 · 2016-01-11T10:04:00.000Z
This ensures that the resulting code will always run on XP.
diff --git a/config/win32.gypi b/config/win32.gypi
@@ -122,6 +122,8 @@
 			'_CRT_SECURE_NO_DEPRECATE',
 			'_CRT_DISABLE_PERFCRIT_LOCKS',
 			'__LITTLE_ENDIAN__',
+			'WINVER=_WIN32_WINNT_WINXP',
+			'_WIN32_WINNT=_WIN32_WINNT_WINXP',
 		],
 		
 		'target_conditions':
diff --git a/engine/src/w32ans.cpp b/engine/src/w32ans.cpp
@@ -41,6 +41,13 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include <strsafe.h>
 
+// We need the Vista versions of the shell headers
+#undef NTDDI_VERSION
+#define NTDDI_VERSION NTDDI_VISTA
+#include <shobjidl.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+
 extern void MCRemoteFileDialog(MCStringRef p_title, MCStringRef p_prompt, MCStringRef *p_types, uint32_t p_type_count, MCStringRef p_initial_folder, MCStringRef p_initial_file, bool p_save, bool p_files, MCStringRef &r_value);
 extern void MCRemoteFolderDialog(MCStringRef p_title, MCStringRef p_prompt, MCStringRef p_initial, MCStringRef &r_value);
 extern void MCRemoteColorDialog(MCStringRef p_title, uint32_t p_red, uint32_t p_green, uint32_t p_blue, bool& r_chosen, MCColor& r_chosen_color);
diff --git a/engine/src/w32dnd.h b/engine/src/w32dnd.h
@@ -17,6 +17,10 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef __W32DND__
 #define __W32DND__
 
+#include <shobjidl.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  Class:
diff --git a/engine/src/w32prefix.h b/engine/src/w32prefix.h
@@ -14,25 +14,13 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
-#define _WIN32_WINNT 0x0500
-#define NTDDI_VERSION 0x05000400
-
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
 
 // w32dcw32
 #include <winsock2.h>
 
-// w32ans
-#undef NTDDI_VERSION
-#define NTDDI_VERSION NTDDI_VISTA
-#include <shobjidl.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#undef NTDDI_VERSION
-#define NTDDI_VERSION 0x05000400
-
 // w32clipboard
 #include <objidl.h>
 
diff --git a/engine/src/w32relaunch.cpp b/engine/src/w32relaunch.cpp
@@ -38,6 +38,10 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include "w32dc.h"
 
+#include <shobjidl.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+
 #ifdef FEATURE_RELAUNCH_SUPPORT
 
 #define CWM_TASKBAR_NOTIFICATION (WM_USER + 1)
