Fix for SF 982215: bdist_wininst - Next button not greyed out during file copy.

Patch from Mark Hammond.
Recompiled binary.

Already packported to the 2.3 branch.

diff --git a/Lib/distutils/command/wininst-6.exe b/Lib/distutils/command/wininst-6.exe
index 8ab173b662012ef4eed68d00f4704b761c182bae..efa3bc4f1f8a2632e71009b24317e5417f2a0522 100644 (file)
Binary files a/Lib/distutils/command/wininst-6.exe and b/Lib/distutils/command/wininst-6.exe differ

diff --git a/Lib/distutils/command/wininst-7.1.exe b/Lib/distutils/command/wininst-7.1.exe
index 858f6f2296b3ccfa8008f5d3575aa0b2ce5e8372..7be9396b8a9c39abaddb789180bfaa6752b8d9a3 100644 (file)
Binary files a/Lib/distutils/command/wininst-7.1.exe and b/Lib/distutils/command/wininst-7.1.exe differ

diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c
index a715528f9ad77c80170ad85f2366df1028524b4c..7ba05aaa8902c3ee384af65092958831b3993f50 100644 (file)
--- a/PC/bdist_wininst/install.c
+++ b/PC/bdist_wininst/install.c
@@ -1708,6 +1708,14 @@ InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                        hDialog = hwnd;
                        success = TRUE;
 
+                       /* Disable the buttons while we work.  Sending CANCELTOCLOSE has
+                         the effect of disabling the cancel button, which is a) as we
+                         do everything synchronously we can't cancel, and b) the next
+                         step is 'finished', when it is too late to cancel anyway.
+                         The next step being 'Finished' means we also don't need to
+                         restore the button state back */
+                       PropSheet_SetWizButtons(GetParent(hwnd), 0);
+                       SendMessage(GetParent(hwnd), PSM_CANCELTOCLOSE, 0, 0);
                        /* Make sure the installation directory name ends in a */
                        /* backslash */
                        if (python_dir[strlen(python_dir)-1] != '\\')