traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 63828 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63828 | mark.hammond | 2008-05-31 07:11:07 +0200 (Sat, 31 May 2008) | 2 lines

  Fix bdist_wininst --user-access-control for win2k
........
This commit is contained in:
Georg Brandl 2008-07-16 02:02:25 +00:00
parent 21967458f0
commit 26adf520f3
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Lib/distutils/command/wininst-6.0.exe
View File

Binary file not shown.

BIN
Lib/distutils/command/wininst-7.1.exe
View File

Binary file not shown.

BIN
Lib/distutils/command/wininst-9.0-amd64.exe
View File

Binary file not shown.

BIN
Lib/distutils/command/wininst-9.0.exe
View File

Binary file not shown.

26
PC/bdist_wininst/install.c
View File

@ -2115,11 +2115,6 @@ BOOL NeedAutoUAC()
{ {
HKEY hk; HKEY hk;
char key_name[80]; char key_name[80];
OSVERSIONINFO winverinfo;
winverinfo.dwOSVersionInfoSize = sizeof(winverinfo);
// If less than XP, then we can't do it (and its not necessary).
if (!GetVersionEx(&winverinfo) || winverinfo.dwMajorVersion < 5)
return FALSE;
// no Python version info == we can't know yet. // no Python version info == we can't know yet.
if (target_version[0] == '\0') if (target_version[0] == '\0')
return FALSE; return FALSE;
@ -2135,6 +2130,23 @@ BOOL NeedAutoUAC()
return TRUE; 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.
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;
}
// Spawn ourself as an elevated application. On failure, a message is // Spawn ourself as an elevated application. On failure, a message is
// displayed to the user - but this app will always terminate, even // displayed to the user - but this app will always terminate, even
// on error. // on error.
@ -2190,7 +2202,7 @@ int DoInstall(void)
// See if we need to do the Vista UAC magic. // See if we need to do the Vista UAC magic.
if (strcmp(user_access_control, "force")==0) { if (strcmp(user_access_control, "force")==0) {
if (!MyIsUserAnAdmin()) { if (PlatformSupportsUAC() && !MyIsUserAnAdmin()) {
SpawnUAC(); SpawnUAC();
return 0; return 0;
} }
@ -2198,7 +2210,7 @@ int DoInstall(void)
} else if (strcmp(user_access_control, "auto")==0) { } else if (strcmp(user_access_control, "auto")==0) {
// Check if it looks like we need UAC control, based // Check if it looks like we need UAC control, based
// on how Python itself was installed. // on how Python itself was installed.
if (!MyIsUserAnAdmin() && NeedAutoUAC()) { if (PlatformSupportsUAC() && !MyIsUserAnAdmin() && NeedAutoUAC()) {
SpawnUAC(); SpawnUAC();
return 0; return 0;
} }