# HG changeset patch # User Steve Dower # Date 1416784873 28800 # Sun Nov 23 15:21:13 2014 -0800 # Branch Projects # Node ID 85c8c8afbe0669b19b7c1b771769bf762f48c5ca # Parent e28bde691e0b41e87e074a21ee29e07acb0d6dd5 More review feedback diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -82,10 +82,6 @@ #include #include #include "resource.h" -#if defined(_MSC_VER) && _MSC_VER >= 1800 -/* Provides the IsWindowsXPOrGreater() function */ -#include -#endif #include #include @@ -2192,27 +2188,6 @@ return TRUE; } -// Returns TRUE if the platform supports UAC. -BOOL PlatformSupportsUAC() -{ - // Note that win2k does seem to support ShellExecute with 'runas', - // but does *not* support IsUserAnAdmin - so we just pretend things - // only work on XP and later. -#if defined(_MSC_VER) && _MSC_VER >= 1800 - return IsWindowsXPOrGreater(); -#else - BOOL bIsWindowsXPorLater; - OSVERSIONINFO winverinfo; - winverinfo.dwOSVersionInfoSize = sizeof(winverinfo); - if (!GetVersionEx(&winverinfo)) - return FALSE; // something bad has gone wrong - bIsWindowsXPorLater = - ( (winverinfo.dwMajorVersion > 5) || - ( (winverinfo.dwMajorVersion == 5) && (winverinfo.dwMinorVersion >= 1) )); - return bIsWindowsXPorLater; -#endif -} - // Spawn ourself as an elevated application. On failure, a message is // displayed to the user - but this app will always terminate, even // on error. @@ -2268,7 +2243,7 @@ // See if we need to do the Vista UAC magic. if (strcmp(user_access_control, "force")==0) { - if (PlatformSupportsUAC() && !MyIsUserAnAdmin()) { + if (!MyIsUserAnAdmin()) { SpawnUAC(); return 0; } @@ -2276,7 +2251,7 @@ } else if (strcmp(user_access_control, "auto")==0) { // Check if it looks like we need UAC control, based // on how Python itself was installed. - if (PlatformSupportsUAC() && !MyIsUserAnAdmin() && NeedAutoUAC()) { + if (!MyIsUserAnAdmin() && NeedAutoUAC()) { SpawnUAC(); return 0; } diff --git a/PC/python3.def b/PC/python3.def --- a/PC/python3.def +++ b/PC/python3.def @@ -1,4 +1,5 @@ -; When changing this file, run python35gen.py +; This file specifies the import forwarding for python3.dll +; It is used when building python3dll.vcxproj LIBRARY "python3" EXPORTS PyArg_Parse=python35.PyArg_Parse diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -61,13 +61,18 @@ <_Machine Condition="$(Platform) == 'x64'">X64 + + false + - $(OutDir)$(TargetName).lib + $(OutDir)$(TargetName)stub.lib + $(PySourcePath)PC\python3.def + DllMain - lib /def:"$(IntDir)python3stub.def" /out:"$(OutDir)$(TargetName).lib" /MACHINE:$(_Machine) - Rebuilding $(TargetName).lib - $(OutDir)$(TargetName).lib + lib /def:"$(IntDir)python3stub.def" /out:"$(OutDir)$(TargetName)stub.lib" /MACHINE:$(_Machine) + Rebuilding $(TargetName)stub.lib + $(OutDir)$(TargetName)stub.lib @@ -91,7 +96,6 @@ <_Sub>$1 - <_Lines Include="LIBRARY "python$(MajorVersionNumber)$(MinorVersionNumber)"" /> <_Lines Include="EXPORTS" /> <_Symbols Include="@(DefLines)" Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(`%(Identity)`, `$(_Pattern)`))"> $([System.Text.RegularExpressions.Regex]::Replace(`%(Identity)`, `$(_Pattern)`, `$(_Sub)`)) diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -38,8 +38,6 @@ {F749B822-B489-4CA5-A3AD-CE078F5F338A} xxlimited Win32Proj - .pyd - false @@ -49,6 +47,9 @@ false + + .pyd +