Merge revs 65842 65843 65844 65845 from Zope/tags/2-8-6/.

Move to pywin32 build 207, and repair mangling of installer bitmaps.
These should have been done before the 2.8.6 tag was made.

inst/WinBuilders/README.txt

@@ -27,7 +27,7 @@ directory.  At the time of this writing, this includes:
 
   - Python-2.3.5.tgz
   - Python-2.3.5.exe (used for binary modules)
-  - pywin32-205.win32-py2.3.exe (extracts binaries and sources)
+  - pywin32-207.win32-py2.3.exe (extracts binaries and sources)
   - Zope.tgz
 
 As time marches on, these version numbers will obviously change.  See/edit

inst/WinBuilders/etc/zeo.iss.in

@@ -10,6 +10,10 @@ DefaultGroupName=ZEO <<VERSION>>
 OutputBaseFilename=ZEO-<<VERSION>>-win32
 WizardImageFile=<<MAKEFILEDIR>>\etc\zlogo_left.bmp
 WizardSmallImageFile=<<MAKEFILEDIR>>\etc\zlogo_top.bmp
+; Starting w/ Inno 4.1.3, Inno decided to stretch the .bmp files in various
+; ways.  Hard to know why, but it looks terrible on my pretty vanilla box.
+; Luckily, 4.1.3 also added WizardImageStretch to turn that off.
+WizardImageStretch=no
 
 SourceDir=.
 OutputDir=.

inst/WinBuilders/etc/zope.iss.in

@@ -10,6 +10,10 @@ DefaultGroupName=Zope <<VERSION>>
 OutputBaseFilename=Zope-<<VERSION>>-win32
 WizardImageFile=<<MAKEFILEDIR>>\etc\zlogo_left.bmp
 WizardSmallImageFile=<<MAKEFILEDIR>>\etc\zlogo_top.bmp
+; Starting w/ Inno 4.1.3, Inno decided to stretch the .bmp files in various
+; ways.  Hard to know why, but it looks terrible on my pretty vanilla box.
+; Luckily, 4.1.3 also added WizardImageStretch to turn that off.
+WizardImageStretch=no
 SolidCompression=yes
 
 SourceDir=.
@@ -69,7 +73,7 @@ var
   PasswordChars		  : array of char;
 
   DataDirValues: array of String;
-  
+
   Password	  : string;
   DataDir		  :  String;
 
@@ -87,7 +91,7 @@ begin
   { set up data dir data structures }
   SetArrayLength(DataDirValues, 1);
   DataDir := '';
-  
+
   Result := True;
 end;
 
@@ -106,9 +110,9 @@ begin
 	if DataDirValues[0] <> '' then DataDirValues[0]:= '';
 
 	{ Ask for a dir until the user has approved one or clicked Back or Cancel }
-	
+
   Next:= InputDir(False, DataDirValues[0], DataDir);
-	
+
   if Next and FileOrDirExists(DataDir) then DirOk := False;
 
 	while Next and not DirOk do begin
@@ -133,7 +137,7 @@ begin
   ScriptDlgPageSetSubCaption1('Specify administrator password');
 	ScriptDlgPageSetSubCaption2('The login name for your Zope administrator account is "admin". When you first connect to the Zope management interface, you will need to login using the "admin" username and the password you specify below.');
 	Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
-	
+
 	while Next and (PasswordValues[0] = '') do begin
 	  MsgBox('You must enter an administrator password', mbError, MB_OK)
 		Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
@@ -172,7 +176,7 @@ begin
   if ( (not BackClicked and (CurPage = wpSelectTasks)) or (BackClicked and (CurPage = wpReady))  )
         and DoInstanceHome() then begin
     if not BackClicked then CurSubPage:=0 else CurSubPage:=1;
-     
+
     ScriptDlgPageOpen();
     ScriptDlgPageSetCaption('Instance Setup');