nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug22520_031' into maint-0.3.1

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-13 16:52:16 -04:00
commit 1ea155b28f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug22520 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (error reporting, windows):
- When formatting Windows error messages, use the English format
to avoid codepage issues. Fixes bug 22520; bugfix on
0.1.2.8-alpha. Patch from "Vort".

2
src/common/compat.c
View File

@ -3261,7 +3261,7 @@ format_win32_error(DWORD err)
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, err,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
(LPVOID)&str,
0, NULL);