Issue #29416: Prevent infinite loop in pathlib.Path.mkdir

5 files changed, 77 insertions, 90 deletions

diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm
index 4d9c97a194..1c0bd08eec 100644
--- a/Tools/msi/bundle/Default.thm
+++ b/Tools/msi/bundle/Default.thm
@@ -116,10 +116,11 @@
         <Text X="185" Y="11" Width="-11" Height="36" FontId="1" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
         <Image X="0" Y="0" Width="178" Height="382" ImageFile="SideBar.png"/>
 
-        <Hypertext Name="SuccessText" X="205" Y="71" Width="-31" Height="100" FontId="3" DisablePrefix="yes"></Hypertext>
+        <Hypertext Name="SuccessText" X="205" Y="71" Width="-71" Height="150" FontId="3" DisablePrefix="yes"></Hypertext>
 
-        <Text Name="SuccessRestartText" X="205" Y="-100" Width="-11" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
-        <Button Name="LaunchButton" X="185" Y="-50" Width="-11" Height="59" TabStop="yes" FontId="3" HexStyle="0xF" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
+        <Button Name="SuccessMaxPathButton" X="185" Y="-70" Width="-11" Height="81" TabStop="yes" FontId="3" HexStyle="0xE" HideWhenDisabled="yes">#(loc.SuccessMaxPathButton)</Button>
+
+        <Text Name="SuccessRestartText" X="205" Y="-40" Width="-11" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
         <Button Name="SuccessRestartButton" X="-101" Y="-11" Width="85" Height="27" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
         <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="85" Height="27" TabStop="yes" FontId="0">#(loc.CloseButton)</Button>
     </Page>
diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl
index ed792460e6..43506d6100 100644
--- a/Tools/msi/bundle/Default.wxl
+++ b/Tools/msi/bundle/Default.wxl
@@ -142,4 +142,7 @@ Please &lt;a href="https://www.bing.com/search?q=how%20to%20install%20windows%20
   <String Id="FailureWS2K3OrEarlier">Windows Server 2008 SP2 or later is required to install and use [WixBundleName].
 
 Visit &lt;a href="https://www.python.org/"&gt;python.org&lt;/a&gt; to download Python 3.4.</String>
+
+  <String Id="SuccessMaxPathButton">Disable path length limit</String>
+  <String Id="SuccessMaxPathButtonNote">Changes your machine configuration to allow programs, including Python, to bypass the 260 character "MAX_PATH" limitation.</String>
 </WixLocalization>
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index 6a67ee211c..e88981fc3a 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -11,10 +11,6 @@
 #include "pch.h"
 
 static const LPCWSTR PYBA_WINDOW_CLASS = L"PythonBA";
-static const LPCWSTR PYBA_VARIABLE_LAUNCH_TARGET_PATH = L"LaunchTarget";
-static const LPCWSTR PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID = L"LaunchTargetElevatedId";
-static const LPCWSTR PYBA_VARIABLE_LAUNCH_ARGUMENTS = L"LaunchArguments";
-static const LPCWSTR PYBA_VARIABLE_LAUNCH_HIDDEN = L"LaunchHidden";
 static const DWORD PYBA_ACQUIRE_PERCENTAGE = 30;
 static const LPCWSTR PYBA_VARIABLE_BUNDLE_FILE_VERSION = L"WixBundleFileVersion";
 
@@ -129,11 +125,11 @@ enum CONTROL_ID {
     ID_PROGRESS_CANCEL_BUTTON,
 
     // Success page
-    ID_LAUNCH_BUTTON,
     ID_SUCCESS_TEXT,
     ID_SUCCESS_RESTART_TEXT,
     ID_SUCCESS_RESTART_BUTTON,
     ID_SUCCESS_CANCEL_BUTTON,
+    ID_SUCCESS_MAX_PATH_BUTTON,
 
     // Failure page
     ID_FAILURE_LOGFILE_LINK,
@@ -188,11 +184,11 @@ static THEME_ASSIGN_CONTROL_ID CONTROL_ID_NAMES[] = {
     { ID_OVERALL_PROGRESS_TEXT, L"OverallProgressText" },
     { ID_PROGRESS_CANCEL_BUTTON, L"ProgressCancelButton" },
 
-    { ID_LAUNCH_BUTTON, L"LaunchButton" },
     { ID_SUCCESS_TEXT, L"SuccessText" },
     { ID_SUCCESS_RESTART_TEXT, L"SuccessRestartText" },
     { ID_SUCCESS_RESTART_BUTTON, L"SuccessRestartButton" },
     { ID_SUCCESS_CANCEL_BUTTON, L"SuccessCancelButton" },
+    { ID_SUCCESS_MAX_PATH_BUTTON, L"SuccessMaxPathButton" },
 
     { ID_FAILURE_LOGFILE_LINK, L"FailureLogFileLink" },
     { ID_FAILURE_MESSAGE_TEXT, L"FailureMessageText" },
@@ -436,6 +432,11 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
         case ID_UNINSTALL_BUTTON:
             OnPlan(BOOTSTRAPPER_ACTION_UNINSTALL);
             break;
+
+        case ID_SUCCESS_MAX_PATH_BUTTON:
+            EnableMaxPathSupport();
+            ThemeControlEnable(_theme, ID_SUCCESS_MAX_PATH_BUTTON, FALSE);
+            break;
         }
 
     LExit:
@@ -533,9 +534,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
     }
 
     void SuccessPage_Show() {
-        // on the "Success" page, check if the restart or launch button should be enabled.
+        // on the "Success" page, check if the restart button should be enabled.
         BOOL showRestartButton = FALSE;
-        BOOL launchTargetExists = FALSE;
         LOC_STRING *successText = nullptr;
         HRESULT hr = S_OK;
         
@@ -543,8 +543,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
             if (BOOTSTRAPPER_RESTART_PROMPT == _command.restart) {
                 showRestartButton = TRUE;
             }
-        } else if (ThemeControlExists(_theme, ID_LAUNCH_BUTTON)) {
-            launchTargetExists = BalStringVariableExists(PYBA_VARIABLE_LAUNCH_TARGET_PATH);
         }
 
         switch (_plannedAction) {
@@ -571,9 +569,41 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
             }
         }
 
-        ThemeControlEnable(_theme, ID_LAUNCH_BUTTON, launchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < _plannedAction);
         ThemeControlEnable(_theme, ID_SUCCESS_RESTART_TEXT, showRestartButton);
         ThemeControlEnable(_theme, ID_SUCCESS_RESTART_BUTTON, showRestartButton);
+
+        if (_command.action != BOOTSTRAPPER_ACTION_INSTALL ||
+            !IsWindowsVersionOrGreater(10, 0, 0)) {
+            ThemeControlEnable(_theme, ID_SUCCESS_MAX_PATH_BUTTON, FALSE);
+        } else {
+            DWORD dataType = 0, buffer = 0, bufferLen = sizeof(buffer);
+            HKEY hKey;
+            LRESULT res = RegOpenKeyExW(
+                HKEY_LOCAL_MACHINE,
+                L"SYSTEM\\CurrentControlSet\\Control\\FileSystem",
+                0,
+                KEY_READ,
+                &hKey
+            );
+            if (res == ERROR_SUCCESS) {
+                res = RegQueryValueExW(hKey, L"LongPathsEnabled", nullptr, &dataType,
+                    (LPBYTE)&buffer, &bufferLen);
+                RegCloseKey(hKey);
+            }
+            else {
+                BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Failed to open SYSTEM\\CurrentControlSet\\Control\\FileSystem: error code %d", res);
+            }
+            if (res == ERROR_SUCCESS && dataType == REG_DWORD && buffer == 0) {
+                ThemeControlElevates(_theme, ID_SUCCESS_MAX_PATH_BUTTON, TRUE);
+            }
+            else {
+                if (res == ERROR_SUCCESS)
+                    BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Failed to read LongPathsEnabled value: error code %d", res);
+                else
+                    BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Hiding MAX_PATH button because it is already enabled");
+                ThemeControlEnable(_theme, ID_SUCCESS_MAX_PATH_BUTTON, FALSE);
+            }
+        }
     }
 
     void FailurePage_Show() {
@@ -626,6 +656,34 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
         ThemeControlEnable(_theme, ID_FAILURE_RESTART_BUTTON, showRestartButton);
     }
 
+    static void EnableMaxPathSupport() {
+        LPWSTR targetDir = nullptr, defaultDir = nullptr;
+        HRESULT hr = BalGetStringVariable(L"TargetDir", &targetDir);
+        if (FAILED(hr) || !targetDir || !targetDir[0]) {
+            BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to get TargetDir");
+            return;
+        }
+
+        LPWSTR pythonw = nullptr;
+        StrAllocFormatted(&pythonw, L"%ls\\pythonw.exe", targetDir);
+        if (!pythonw || !pythonw[0]) {
+            BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to construct pythonw.exe path");
+            return;
+        }
+
+        LPCWSTR arguments = L"-c \"import winreg; "
+            "winreg.SetValueEx("
+                "winreg.CreateKey(winreg.HKEY_LOCAL_MACHINE, "
+                    "r'SYSTEM\\CurrentControlSet\\Control\\FileSystem'), "
+                "'LongPathsEnabled', "
+                "None, "
+                "winreg.REG_DWORD, "
+                "1"
+            ")\"";
+        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Executing %ls %ls", pythonw, arguments);
+        HINSTANCE res = ShellExecuteW(0, L"runas", pythonw, arguments, NULL, SW_HIDE);
+        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "return code 0x%08x", res);
+    }
 
 public: // IBootstrapperApplication
     virtual STDMETHODIMP OnStartup() {
@@ -1216,12 +1274,6 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP_(void) OnLaunchApprovedExeComplete(__in HRESULT hrStatus, __in DWORD /*processId*/) {
-        if (HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) == hrStatus) {
-            //try with ShelExec next time
-            OnClickLaunchButton();
-        } else {
-            ::PostMessageW(_hWnd, WM_CLOSE, 0, 0);
-        }
     }
 
 
@@ -1867,10 +1919,6 @@ private:
             switch (LOWORD(wParam)) {
             // Customize commands
             // Success/failure commands
-            case ID_LAUNCH_BUTTON:
-                pBA->OnClickLaunchButton();
-                return 0;
-
             case ID_SUCCESS_RESTART_BUTTON: __fallthrough;
             case ID_FAILURE_RESTART_BUTTON:
                 pBA->OnClickRestartButton();
@@ -2372,69 +2420,6 @@ private:
     }
 
 
-    //
-    // OnClickLaunchButton - launch the app from the success page.
-    //
-    void OnClickLaunchButton() {
-        HRESULT hr = S_OK;
-        LPWSTR sczUnformattedLaunchTarget = nullptr;
-        LPWSTR sczLaunchTarget = nullptr;
-        LPWSTR sczLaunchTargetElevatedId = nullptr;
-        LPWSTR sczUnformattedArguments = nullptr;
-        LPWSTR sczArguments = nullptr;
-        int nCmdShow = SW_SHOWNORMAL;
-
-        hr = BalGetStringVariable(PYBA_VARIABLE_LAUNCH_TARGET_PATH, &sczUnformattedLaunchTarget);
-        BalExitOnFailure1(hr, "Failed to get launch target variable '%ls'.", PYBA_VARIABLE_LAUNCH_TARGET_PATH);
-
-        hr = BalFormatString(sczUnformattedLaunchTarget, &sczLaunchTarget);
-        BalExitOnFailure1(hr, "Failed to format launch target variable: %ls", sczUnformattedLaunchTarget);
-
-        if (BalStringVariableExists(PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) {
-            hr = BalGetStringVariable(PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID, &sczLaunchTargetElevatedId);
-            BalExitOnFailure1(hr, "Failed to get launch target elevated id '%ls'.", PYBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID);
-        }
-
-        if (BalStringVariableExists(PYBA_VARIABLE_LAUNCH_ARGUMENTS)) {
-            hr = BalGetStringVariable(PYBA_VARIABLE_LAUNCH_ARGUMENTS, &sczUnformattedArguments);
-            BalExitOnFailure1(hr, "Failed to get launch arguments '%ls'.", PYBA_VARIABLE_LAUNCH_ARGUMENTS);
-        }
-
-        if (BalStringVariableExists(PYBA_VARIABLE_LAUNCH_HIDDEN)) {
-            nCmdShow = SW_HIDE;
-        }
-
-        if (sczLaunchTargetElevatedId && !_triedToLaunchElevated) {
-            _triedToLaunchElevated = TRUE;
-            hr = _engine->LaunchApprovedExe(_hWnd, sczLaunchTargetElevatedId, sczUnformattedArguments, 0);
-            if (FAILED(hr)) {
-                BalLogError(hr, "Failed to launch elevated target: %ls", sczLaunchTargetElevatedId);
-
-                //try with ShelExec next time
-                OnClickLaunchButton();
-            }
-        } else {
-            if (sczUnformattedArguments) {
-                hr = BalFormatString(sczUnformattedArguments, &sczArguments);
-                BalExitOnFailure1(hr, "Failed to format launch arguments variable: %ls", sczUnformattedArguments);
-            }
-
-            hr = ShelExec(sczLaunchTarget, sczArguments, L"open", nullptr, nCmdShow, _hWnd, nullptr);
-            BalExitOnFailure1(hr, "Failed to launch target: %ls", sczLaunchTarget);
-
-            ::PostMessageW(_hWnd, WM_CLOSE, 0, 0);
-        }
-
-    LExit:
-        StrSecureZeroFreeString(sczArguments);
-        ReleaseStr(sczUnformattedArguments);
-        ReleaseStr(sczLaunchTargetElevatedId);
-        StrSecureZeroFreeString(sczLaunchTarget);
-        ReleaseStr(sczUnformattedLaunchTarget);
-
-        return;
-    }
-
 
     //
     // OnClickRestartButton - allows the restart and closes the app.
@@ -3157,7 +3142,6 @@ public:
         _taskbarButtonCreatedMessage = UINT_MAX;
         _taskbarButtonOK = FALSE;
         _showingInternalUIThisPackage = FALSE;
-        _triedToLaunchElevated = FALSE;
 
         _suppressPaint = FALSE;
 
@@ -3242,7 +3226,6 @@ private:
     UINT _taskbarButtonCreatedMessage;
     BOOL _taskbarButtonOK;
     BOOL _showingInternalUIThisPackage;
-    BOOL _triedToLaunchElevated;
 
     BOOL _suppressPaint;
 
diff --git a/Tools/msi/bundle/bundle.ico b/Tools/msi/bundle/bundle.ico
deleted file mode 100644
index 1ab629eff2..0000000000
--- a/Tools/msi/bundle/bundle.ico
+++ /dev/null
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
index eda088404f..02a456b3fd 100644
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -5,7 +5,7 @@
   <Bundle Name="!(loc.FullProductName)"
           UpgradeCode="$(var.CoreUpgradeCode)"
           Version="$(var.Version)"
-          IconSourceFile="bundle.ico"
+          IconSourceFile="..\..\..\PC\icons\setup.ico"
           Manufacturer="!(loc.Manufacturer)"
           AboutUrl="http://www.python.org/"
           DisableModify="button"