about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCharles Lew <crlf0710@gmail.com>2023-08-19 14:32:15 +0800
committerCharles Lew <crlf0710@gmail.com>2023-08-19 14:32:15 +0800
commit4504cc513fb794116d0d2b9b73a40658a2f472cc (patch)
tree1f9eae8a054b5e037615be5ef38e9ca1bc9aa99e
parentd06ca0ffaf4ac72732665f99dd9ad962194cd0b3 (diff)
downloadrust-4504cc513fb794116d0d2b9b73a40658a2f472cc.tar.gz
rust-4504cc513fb794116d0d2b9b73a40658a2f472cc.zip
Usage zero as language id for FormatMessageW()
-rw-r--r--library/std/src/sys/windows/os.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/library/std/src/sys/windows/os.rs b/library/std/src/sys/windows/os.rs
index 2329426ad1d..58afca088ef 100644
--- a/library/std/src/sys/windows/os.rs
+++ b/library/std/src/sys/windows/os.rs
@@ -25,10 +25,6 @@ pub fn errno() -> i32 {
 
 /// Gets a detailed string description for the given error number.
 pub fn error_string(mut errnum: i32) -> String {
-    // This value is calculated from the macro
-    // MAKELANGID(LANG_SYSTEM_DEFAULT, SUBLANG_SYS_DEFAULT)
-    let langId = 0x0800 as c::DWORD;
-
     let mut buf = [0 as c::WCHAR; 2048];
 
     unsafe {
@@ -56,13 +52,13 @@ pub fn error_string(mut errnum: i32) -> String {
             flags | c::FORMAT_MESSAGE_FROM_SYSTEM | c::FORMAT_MESSAGE_IGNORE_INSERTS,
             module,
             errnum as c::DWORD,
-            langId,
+            0,
             buf.as_mut_ptr(),
             buf.len() as c::DWORD,
             ptr::null(),
         ) as usize;
         if res == 0 {
-            // Sometimes FormatMessageW can fail e.g., system doesn't like langId,
+            // Sometimes FormatMessageW can fail e.g., system doesn't like 0 as langId,
             let fm_err = errno();
             return format!("OS Error {errnum} (FormatMessageW() returned error {fm_err})");
         }