Issues #25112: py.exe launcher is missing icons
diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc
index 634b8d6..a8db0a8 100644
--- a/PC/pylauncher.rc
+++ b/PC/pylauncher.rc
@@ -1,51 +1,50 @@
#include <windows.h>
-#define MS_WINDOWS
-#include "..\Include\modsupport.h"
-#include "..\Include\patchlevel.h"
-#ifdef _DEBUG
-# include "pythonnt_rc_d.h"
-#else
-# include "pythonnt_rc.h"
-#endif
+#include "python_ver_rc.h"
-#define PYTHON_VERSION PY_VERSION "\0"
-#define PYVERSION64 PY_MAJOR_VERSION, PY_MINOR_VERSION, FIELD3, PYTHON_API_VERSION
+// Include the manifest file that indicates we support all
+// 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
- FILETYPE 0x1L
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
- BLOCK "080904b0"
+ BLOCK "000004b0"
BEGIN
- VALUE "Comments", "Python Launcher for Windows"
- VALUE "CompanyName", "Python Software Foundation"
- VALUE "FileDescription", "Python Launcher for Windows (Console)"
+ VALUE "CompanyName", PYTHON_COMPANY "\0"
+ VALUE "FileDescription", "Python\0"
VALUE "FileVersion", PYTHON_VERSION
- VALUE "InternalName", "py"
- VALUE "LegalCopyright", "Copyright (C) 2011-2014 Python Software Foundation"
- VALUE "OriginalFilename", "py"
- VALUE "ProductName", "Python Launcher for Windows"
+ VALUE "InternalName", "Python Launcher\0"
+ VALUE "LegalCopyright", PYTHON_COPYRIGHT "\0"
+ VALUE "OriginalFilename", "py" PYTHON_DEBUG_EXT ".exe\0"
+ VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION
END
END
BLOCK "VarFileInfo"
BEGIN
- VALUE "Translation", 0x809, 1200
+ VALUE "Translation", 0x0, 1200
END
-END
-
-IDI_ICON1 ICON "launcher.ico"
-
-
+END
\ No newline at end of file