bpo-37445: Include FORMAT_MESSAGE_IGNORE_INSERTS in FormatMessageW() … · python-emscripten/cpython@1af2c0e · GitHub

1. python-emscripten
2. cpython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 1af2c0e

Browse filesBrowse the repository at this point in the historyBrowse files

miss-islington

and

ZackerySpytz

authored

bpo-37445: Include FORMAT_MESSAGE_IGNORE_INSERTS in FormatMessageW() calls (pythonGH-14462)

If FormatMessageW() is passed the FORMAT_MESSAGE_FROM_SYSTEM flag without FORMAT_MESSAGE_IGNORE_INSERTS, it will fail if there are insert sequences in the message definition. (cherry picked from commit a656365) Co-authored-by: Zackery Spytz <zspytz@gmail.com>

1 parent 5190b71 commit 1af2c0e
Copy full SHA for 1af2c0e

4 files changed

+9-3Lines changed: 9 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Misc/NEWS.d/next/Windows
  • 2019-06-28-18-10-29.bpo-37445.LsdYO6.rst
• Modules
  • _ctypes
    • callproc.c
  • overlapped.c
• PC/bdist_wininst
  • install.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Misc/NEWS.d/next/Windows/2019-06-28-18-10-29.bpo-37445.LsdYO6.rst‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,2 @@
	1	+ Include the ``FORMAT_MESSAGE_IGNORE_INSERTS`` flag in ``FormatMessageW()``
	2	+ calls.

Collapse file

‎Modules/_ctypes/callproc.c‎

Copy file name to clipboardExpand all lines: Modules/_ctypes/callproc.c

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -239,7 +239,9 @@ static WCHAR *FormatError(DWORD code)
239	239	{
240	240	WCHAR *lpMsgBuf;
241	241	DWORD n;
242		- n = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
	242	+ n = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
	243	+ FORMAT_MESSAGE_FROM_SYSTEM |
	244	+ FORMAT_MESSAGE_IGNORE_INSERTS,
243	245	NULL,
244	246	code,
245	247	MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */

Collapse file

‎Modules/overlapped.c‎

Copy file name to clipboardExpand all lines: Modules/overlapped.c

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -486,7 +486,8 @@ overlapped_FormatMessage(PyObject *ignore, PyObject *args)
486	486	return NULL;
487	487
488	488	n = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
489		- FORMAT_MESSAGE_FROM_SYSTEM,
	489	+ FORMAT_MESSAGE_FROM_SYSTEM |
	490	+ FORMAT_MESSAGE_IGNORE_INSERTS,
490	491	NULL,
491	492	code,
492	493	MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),

Collapse file

‎PC/bdist_wininst/install.c‎

Copy file name to clipboardExpand all lines: PC/bdist_wininst/install.c

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -939,7 +939,8 @@ static BOOL SystemError(int error, char *msg)
939	939	LPVOID lpMsgBuf;
940	940	FormatMessage(
941	941	FORMAT_MESSAGE_ALLOCATE_BUFFER |
942		- FORMAT_MESSAGE_FROM_SYSTEM,
	942	+ FORMAT_MESSAGE_FROM_SYSTEM |
	943	+ FORMAT_MESSAGE_IGNORE_INSERTS,
943	944	NULL,
944	945	error,
945	946	MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),

0 commit comments

Comments

0 (0)