win32_common.c: get NTSTATUS error messages from ntdll

[wimlib] / src / win32_common.c

diff --git a/src/win32_common.c b/src/win32_common.c
index 30f7d6238c9f8b20835debeebe2171b0491e6548..b25871a3a316f027089d16bebda4fb8876e1add0 100644 (file)
--- a/src/win32_common.c
+++ b/src/win32_common.c
@@ -449,9 +449,11 @@ retry:
        if (n >= buflen)
                goto realloc;
 
-       ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                           NULL,
-                           is_ntstatus ? (*func_RtlNtStatusToDosError)(code) : code,
+       ret = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
+                               FORMAT_MESSAGE_IGNORE_INSERTS |
+                               (is_ntstatus ? FORMAT_MESSAGE_FROM_HMODULE : 0),
+                           (is_ntstatus ? ntdll_spec.handle : NULL),
+                           code,
                            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                            &buf[n],
                            buflen - n,