Merge pull request #46 from Microsoft/develop

heaths · web-flow · commit 4f70bea4ad07 · 2017-03-15T14:46:03.000-07:00
Create release with support for XP
diff --git a/src/vswhere.lib/Formatter.cpp b/src/vswhere.lib/Formatter.cpp
@@ -104,28 +104,28 @@ wstring Formatter::FormatDate(_In_ const FILETIME& value)
     }
 
     // Format date
-    auto cch = ::GetDateFormatEx(LOCALE_NAME_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, NULL, 0, NULL);
+    auto cch = ::GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, NULL, 0);
     if (!cch)
     {
         throw win32_error();
     }
 
     date.resize(cch - 1);
-    cch = ::GetDateFormatEx(LOCALE_NAME_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, const_cast<LPWSTR>(date.c_str()), cch, NULL);
+    cch = ::GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, const_cast<LPWSTR>(date.c_str()), cch);
     if (!cch)
     {
         throw win32_error();
     }
 
     // Format time
-    cch = ::GetTimeFormatEx(LOCALE_NAME_USER_DEFAULT, 0, &st, NULL, NULL, 0);
+    cch = ::GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, NULL, 0);
     if (!cch)
     {
         throw win32_error();
     }
 
     time.reserve(cch - 1);
-    cch = ::GetTimeFormatEx(LOCALE_NAME_USER_DEFAULT, 0, &st, NULL, const_cast<LPWSTR>(time.c_str()), cch);
+    cch = ::GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, const_cast<LPWSTR>(time.c_str()), cch);
     if (!cch)
     {
         throw win32_error();
diff --git a/src/vswhere.lib/stdafx.h b/src/vswhere.lib/stdafx.h
@@ -9,6 +9,10 @@
 
 #define WIN32_LEAN_AND_MEAN
 
+#ifndef MAXUINT
+#define MAXUINT 0xffff
+#endif
+
 // Windows headers
 #include <windows.h>
 #include <fcntl.h>
diff --git a/src/vswhere.lib/targetver.h b/src/vswhere.lib/targetver.h
@@ -11,6 +11,6 @@
 #undef  _WIN32_WINNT
 #endif
 
-#define _WIN32_WINNT 0x0601
+#define _WIN32_WINNT 0x0501
 
 #include <sdkddkver.h>
diff --git a/src/vswhere.lib/vswhere.lib.vcxproj b/src/vswhere.lib/vswhere.lib.vcxproj
@@ -29,13 +29,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/src/vswhere/targetver.h b/src/vswhere/targetver.h
@@ -11,6 +11,6 @@
 #undef  _WIN32_WINNT
 #endif
 
-#define _WIN32_WINNT 0x0601
+#define _WIN32_WINNT 0x0501
 
 #include <sdkddkver.h>
diff --git a/src/vswhere/vswhere.vcxproj b/src/vswhere/vswhere.vcxproj
@@ -21,13 +21,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/test/vswhere.test/targetver.h b/test/vswhere.test/targetver.h
@@ -11,6 +11,6 @@
 #undef  _WIN32_WINNT
 #endif
 
-#define _WIN32_WINNT 0x0601
+#define _WIN32_WINNT 0x0501
 
 #include <sdkddkver.h>
diff --git a/test/vswhere.test/vswhere.test.vcxproj b/test/vswhere.test/vswhere.test.vcxproj
@@ -21,14 +21,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>

Original file line number	Diff line number	Diff line change
`@@ -104,28 +104,28 @@ wstring Formatter::FormatDate(_In_ const FILETIME& value)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Format date`
`107`		`- auto cch = ::GetDateFormatEx(LOCALE_NAME_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, NULL, 0, NULL);`
	`107`	`+ auto cch = ::GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, NULL, 0);`
`108`	`108`	`if (!cch)`
`109`	`109`	`{`
`110`	`110`	`throw win32_error();`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`date.resize(cch - 1);`
`114`		`- cch = ::GetDateFormatEx(LOCALE_NAME_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, const_cast<LPWSTR>(date.c_str()), cch, NULL);`
	`114`	`+ cch = ::GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, const_cast<LPWSTR>(date.c_str()), cch);`
`115`	`115`	`if (!cch)`
`116`	`116`	`{`
`117`	`117`	`throw win32_error();`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// Format time`
`121`		`- cch = ::GetTimeFormatEx(LOCALE_NAME_USER_DEFAULT, 0, &st, NULL, NULL, 0);`
	`121`	`+ cch = ::GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, NULL, 0);`
`122`	`122`	`if (!cch)`
`123`	`123`	`{`
`124`	`124`	`throw win32_error();`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`time.reserve(cch - 1);`
`128`		`- cch = ::GetTimeFormatEx(LOCALE_NAME_USER_DEFAULT, 0, &st, NULL, const_cast<LPWSTR>(time.c_str()), cch);`
	`128`	`+ cch = ::GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, const_cast<LPWSTR>(time.c_str()), cch);`
`129`	`129`	`if (!cch)`
`130`	`130`	`{`
`131`	`131`	`throw win32_error();`