diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2019-09-09 09:20:39 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@python.org> | 2019-09-09 09:20:38 (GMT) |
| commit | a6563650c835d50f7302971a5b145e94f9d0dc68 (patch) | |
| tree | 9633cf07c93d183f095a39314b55e59d26b68bcd | |
| parent | 7669cb8b21c7c9cef758609c44017c09d1ce4658 (diff) | |
| download | cpython-a6563650c835d50f7302971a5b145e94f9d0dc68.zip cpython-a6563650c835d50f7302971a5b145e94f9d0dc68.tar.gz cpython-a6563650c835d50f7302971a5b145e94f9d0dc68.tar.bz2 | |
bpo-37445: Include FORMAT_MESSAGE_IGNORE_INSERTS in FormatMessageW() calls (GH-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.
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2019-06-28-18-10-29.bpo-37445.LsdYO6.rst | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/callproc.c | 4 | ||||
| -rw-r--r-- | Modules/overlapped.c | 3 | ||||
| -rw-r--r-- | PC/bdist_wininst/install.c | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Misc/NEWS.d/next/Windows/2019-06-28-18-10-29.bpo-37445.LsdYO6.rst b/Misc/NEWS.d/next/Windows/2019-06-28-18-10-29.bpo-37445.LsdYO6.rst new file mode 100644 index 0000000..e4805b4 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-06-28-18-10-29.bpo-37445.LsdYO6.rst @@ -0,0 +1,2 @@ +Include the ``FORMAT_MESSAGE_IGNORE_INSERTS`` flag in ``FormatMessageW()`` +calls. diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 85fa799..a13c89f 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -242,7 +242,9 @@ static WCHAR *FormatError(DWORD code) { WCHAR *lpMsgBuf; DWORD n; - n = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + n = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, NULL, code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ diff --git a/Modules/overlapped.c b/Modules/overlapped.c index 44a0a5a..52ed0bc 100644 --- a/Modules/overlapped.c +++ b/Modules/overlapped.c @@ -500,7 +500,8 @@ overlapped_FormatMessage(PyObject *ignore, PyObject *args) return NULL; n = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, NULL, code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index 0219a19..5d77542 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -938,7 +938,8 @@ static BOOL SystemError(int error, char *msg) LPVOID lpMsgBuf; FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), |