Skip to content

bpo-45220: Ensure RT_MANIFEST is defined when compiling Windows resource files #29501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2021

Conversation

zooba
Copy link
Member

@zooba zooba commented Nov 9, 2021

@zooba zooba added skip news needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Nov 9, 2021
@zooba zooba requested a review from a team as a code owner November 9, 2021 19:42
@zooba zooba changed the title bpo-45220: Ensure RT_MANIFEST is defined bpo-45220: Ensure RT_MANIFEST is defined when compiling Windows resource files Nov 9, 2021
@zooba zooba merged commit a56fbad into python:main Nov 9, 2021
@miss-islington
Copy link
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry @zooba, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker a56fbad85ea655631bce68d4c0f47f1a8b500abd 3.10

@zooba zooba deleted the bpo-45220 branch November 9, 2021 20:12
@bedevere-bot
Copy link

GH-29503 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Nov 9, 2021
@zooba zooba removed the needs backport to 3.10 only security fixes label Nov 9, 2021
@@ -2,6 +2,11 @@

#include "python_ver_rc.h"

#ifndef RT_MANIFEST
// bpo-45220: Cannot reliably #include RT_MANIFEST from
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue was with #include <winuser.h>, no?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it matter? We no longer need to include any C++ headers here (you're not meant to include winuser.h directly anyway).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's just that I don't understand what #include RT_MANIFEST means. I guess that you mean that we cannot add an include to get the RT_MANIFEST constant. It's just a remark about the comment. You can ignore it ;-)

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 9, 2021
…rce files (pythonGH-29501)

(cherry picked from commit a56fbad)

Co-authored-by: Steve Dower <[email protected]>
@zooba zooba added the needs backport to 3.10 only security fixes label Nov 9, 2021
@miss-islington
Copy link
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 9, 2021
…rce files (pythonGH-29501)

(cherry picked from commit a56fbad)

Co-authored-by: Steve Dower <[email protected]>
@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Nov 9, 2021
@bedevere-bot
Copy link

GH-29504 is a backport of this pull request to the 3.10 branch.

miss-islington added a commit that referenced this pull request Nov 9, 2021
…rce files (GH-29501)

(cherry picked from commit a56fbad)

Co-authored-by: Steve Dower <[email protected]>
thatbirdguythatuknownot added a commit to thatbirdguythatuknownot/cpython that referenced this pull request Nov 9, 2021
thatbirdguythatuknownot added a commit to thatbirdguythatuknownot/cpython that referenced this pull request Nov 9, 2021
thatbirdguythatuknownot added a commit to thatbirdguythatuknownot/cpython that referenced this pull request Nov 9, 2021
thatbirdguythatuknownot added a commit to thatbirdguythatuknownot/cpython that referenced this pull request Nov 9, 2021
thatbirdguythatuknownot added a commit to thatbirdguythatuknownot/cpython that referenced this pull request Nov 9, 2021
thatbirdguythatuknownot added a commit to thatbirdguythatuknownot/cpython that referenced this pull request Nov 9, 2021
zooba added a commit that referenced this pull request Nov 15, 2021
…rce files (GH-29501)

(cherry picked from commit a56fbad)

Co-authored-by: Steve Dower <[email protected]>
remykarem pushed a commit to remykarem/cpython that referenced this pull request Dec 7, 2021
remykarem pushed a commit to remykarem/cpython that referenced this pull request Jan 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants