Minor bug fixes

Author: zooba

src/manage/aliasutils.py

@@ -277,6 +277,10 @@ def cleanup_alias(cmd, site_dirs_written, *, _unlink_many=atomic_unlink, _scan=_
     for i in cmd.get_installs():
         expected.update(a.get("name", "").casefold() for a in i.get("alias", ()))
 
+    if expected:
+        expected.add("python".casefold())
+        expected.add("pythonw".casefold())
+
     for i, s in site_dirs_written or ():
         for alias, code in _scan(i["prefix"], s.get("dirs")):
             expected.add(alias.get("name", "").casefold())

src/pymanager/launcher.cpp

@@ -192,7 +192,7 @@ insert_script(int *argc, wchar_t ***argv)
             return HRESULT_FROM_WIN32(error);
         }
     }
-    CloseHandle(fh);
+    FindClose(fh);
 
     // Create a new argv that will be used to launch the script.
     wchar_t **argv2 = (wchar_t **)HeapAlloc(ph, HEAP_ZERO_MEMORY, sizeof(wchar_t *) * (*argc + 1));
@@ -209,6 +209,7 @@ insert_script(int *argc, wchar_t ***argv)
         argv2[i + 1] = (*argv)[i];
     }
     *argv = argv2;
+    *argc += 1;
     return 0;
 }