diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-07 19:02:44 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-07 19:37:43 +0400 |
| commit | 8d50410afd5b4900edc54270ca5383b4ad241af0 (patch) | |
| tree | 40921bb50029738c915b173730f2b765c0855554 | |
| parent | da78edbb2f15fc75ca6e5182bed9dcbebafad1f0 (diff) | |
Use our IsVistaOrLater function.
| -rw-r--r-- | src/DSUtil/DSUtil.vcxproj | 4 | ||||
| -rw-r--r-- | src/thirdparty/xpsupportvc11upd2/xpatl.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/DSUtil/DSUtil.vcxproj b/src/DSUtil/DSUtil.vcxproj index 241bc35ef..342548608 100644 --- a/src/DSUtil/DSUtil.vcxproj +++ b/src/DSUtil/DSUtil.vcxproj @@ -111,7 +111,9 @@ </Lib>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\thirdparty\xpsupportvc11upd2\xpatl.cpp" />
+ <ClCompile Include="..\thirdparty\xpsupportvc11upd2\xpatl.cpp">
+ <AdditionalIncludeDirectories>..\DSUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
<ClCompile Include="AudioParser.cpp" />
<ClCompile Include="deinterlace.cpp" />
<ClCompile Include="DSMPropertyBag.cpp" />
diff --git a/src/thirdparty/xpsupportvc11upd2/xpatl.cpp b/src/thirdparty/xpsupportvc11upd2/xpatl.cpp index 489de93d9..bb0e42128 100644 --- a/src/thirdparty/xpsupportvc11upd2/xpatl.cpp +++ b/src/thirdparty/xpsupportvc11upd2/xpatl.cpp @@ -25,15 +25,16 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // 2013-04-17 1.02 cleaned up Vista check (was triggering RTCs) #include "stdafx.h" +#include "SysVersion.h" // ATL stuff -bool Is_VistaOrLater() { +/*bool Is_VistaOrLater() { DWORD version = ::GetVersion(); DWORD major = (DWORD) (LOBYTE(LOWORD(version))); return (major >= 6); -} +}*/ typedef BOOL (WINAPI *pInitializeCriticalSectionEx)(__out LPCRITICAL_SECTION lpCriticalSection, __in DWORD dwSpinCount, __in DWORD Flags); @@ -41,7 +42,7 @@ extern "C" BOOL WINAPI VC11Update2InitializeCriticalSectionEx(__out LPCRITICAL_S { static pInitializeCriticalSectionEx InitializeCriticalSectionEx_p = NULL; - if (Is_VistaOrLater()) { // Vista or higher + if (SysVersion::IsVistaOrLater()) { // Vista or higher if (!InitializeCriticalSectionEx_p) { HMODULE mod = GetModuleHandle( _T("kernel32.dll")); if (mod) { |