SF bug 497854: Short-cuts missing for All Users

Fix Windows-specific install glitch.  Tested on Win2K, but I can't test
on XP.
Already checked in to the release22-maint branch.

diff --git a/Misc/NEWS b/Misc/NEWS
index 06df8e8083b0732a72340c04677288af7704d57c..15a049d955840aea66e92dd59d5b1c1f7789e329 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -142,6 +142,9 @@ Tests
 
 Windows
 
+- The installer now installs Start menu shortcuts under (the local
+  equivalent of) "All Users" when doing an Admin install.
+
 - file.truncate([newsize]) now works on Windows for all newsize values.
   It used to fail if newsize didn't fit in 32 bits, reflecting a
   limitation of MS _chsize (which is no longer used).
@@ -151,7 +154,9 @@ Windows
   the same as, os.waitpid() on POSIX systems.  If you're waiting for
   a specific process whose pid was obtained from one of the spawn()
   functions, the same Python os.waitpid() code works across platforms.
-  See the docs for details.
+  See the docs for details.  The docs were changed to clarify that
+  spawn functions return, and waitpid requires, a process handle on
+  Windows (not the same thing as a Windows process id).
 
 - New tempfile.TemporaryFile implementation for Windows:  this doesn't
   need a TemproraryFileWrapper wrapper anymore, and should be immune

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 721e4e60fcb024f31f67130a2bd37e55737554ee..230bce47f4c88381fa97432dc9d6a73d18d07ce3 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1512,14 +1512,6 @@ item: Get Registry Key Value
   Value Name=Common Programs
   Flags=00000100
 end
-item: Set Variable
-  Variable=CGROUP_SAVE
-  Value=%GROUP%
-end
-item: Set Variable
-  Variable=GROUP
-  Value=%GROUPDIR%\%GROUP%
-end
 item: Else Statement
 end
 item: Remark
@@ -1556,13 +1548,30 @@ item: End Block
 end
 item: Remark
 end
+item: Set Variable
+  Variable=CGROUP_SAVE
+  Value=%GROUP%
+end
 item: If/While Statement
   Variable=TASKS
   Value=B
-  Flags=00000011
+  Flags=00000010
+end
+item: If/While Statement
+  Variable=DOADMIN
+  Value=1
 end
 item: Set Variable
   Variable=GROUP
+  Value=%CGROUPDIR%\%GROUP%
+end
+item: Else Statement
+end
+item: Set Variable
+  Variable=GROUP
+  Value=%GROUPDIR%\%GROUP%
+end
+item: End Block
 end
 item: End Block
 end