Merge from 3.5

Misc/NEWS

@@ -253,6 +253,8 @@ Build
 Windows
 -------
 
+- Issues #25112: py.exe launcher is missing icons
+
 - Issue #25102: Windows installer does not precompile for -O or -OO.
 
 - Issue #25081: Makes Back button in installer go back to upgrade page when

PC/pylauncher.rc

@@ -1,51 +1,50 @@
 #include <windows.h>
 
-#define MS_WINDOWS
+#include "python_ver_rc.h"
-#include "..\Include\modsupport.h"
-#include "..\Include\patchlevel.h"
-#ifdef _DEBUG
-#   include "pythonnt_rc_d.h"
-#else
-#   include "pythonnt_rc.h"
-#endif
 
-#define PYTHON_VERSION PY_VERSION "\0"
+// Include the manifest file that indicates we support all
-#define PYVERSION64 PY_MAJOR_VERSION, PY_MINOR_VERSION, FIELD3, PYTHON_API_VERSION
+// current versions of Windows.
+#include <winuser.h>
+1 RT_MANIFEST "python.manifest"
+
+1 ICON DISCARDABLE "launcher.ico" 
+2 ICON DISCARDABLE "py.ico" 
+3 ICON DISCARDABLE "pyc.ico" 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION PYVERSION64
  PRODUCTVERSION PYVERSION64
- FILEFLAGSMASK 0x17L
+ FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+ FILEFLAGS VS_FF_DEBUG
 #else
  FILEFLAGS 0x0L
 #endif
- FILEOS 0x4L
+ FILEOS VOS__WINDOWS32
- FILETYPE 0x1L
+ FILETYPE VFT_APP
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "080904b0"
+        BLOCK "000004b0"
         BEGIN
-            VALUE "Comments", "Python Launcher for Windows"
+            VALUE "CompanyName", PYTHON_COMPANY "\0"
-            VALUE "CompanyName", "Python Software Foundation"
+            VALUE "FileDescription", "Python\0"
-            VALUE "FileDescription", "Python Launcher for Windows (Console)"
             VALUE "FileVersion", PYTHON_VERSION
-            VALUE "InternalName", "py"
+            VALUE "InternalName", "Python Launcher\0"
-            VALUE "LegalCopyright", "Copyright (C) 2011-2014 Python Software Foundation"
+            VALUE "LegalCopyright", PYTHON_COPYRIGHT "\0"
-            VALUE "OriginalFilename", "py"
+            VALUE "OriginalFilename", "py" PYTHON_DEBUG_EXT ".exe\0"
-            VALUE "ProductName", "Python Launcher for Windows"
+            VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x809, 1200
+        VALUE "Translation", 0x0, 1200
     END
-END
+END
-
-IDI_ICON1               ICON                    "launcher.ico"
-
-