commit e103732f5df13a97f610a8b80883895f7a273573
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Sep 09 02:50:30 2019 -0700
committer GitHub <noreply@github.com> Mon Sep 09 02:50:30 2019 -0700
tree 096e25c0407f7cc42a2d7da9fa5356931adc01a4
parent 6e3809c7ce9fbee11c3a3f89dd7e89829b7581ac

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.
(cherry picked from commit a6563650c835d50f7302971a5b145e94f9d0dc68)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>

Modules/overlapped.c

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 @@
         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),