From ea19d942ffd08b74ad8f6ce0994522a9e5ba93ed Mon Sep 17 00:00:00 2001
From: Brian Nixon <nixonb@yahoo.com>
Date: Sun, 16 Apr 2023 23:39:26 +0100
Subject: [PATCH] Correct flags for `FormatMessage()`

Use `FORMAT_MESSAGE_IGNORE_INSERTS` to prevent trying to replace
insert sequences in system message definitions with nonexistent
arguments
---
 lib/win_util.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/win_util.cpp b/lib/win_util.cpp
index 11d14241b30..381e1521f0a 100644
--- a/lib/win_util.cpp
+++ b/lib/win_util.cpp
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2023 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -142,6 +142,7 @@ char* windows_format_error_string(
     LPWSTR lpszTemp = NULL;
 
     dwRet = FormatMessageW(
+        FORMAT_MESSAGE_IGNORE_INSERTS |
         FORMAT_MESSAGE_ALLOCATE_BUFFER |
         FORMAT_MESSAGE_FROM_SYSTEM |
         FORMAT_MESSAGE_ARGUMENT_ARRAY,
@@ -160,7 +161,7 @@ char* windows_format_error_string(
             LocalFree((HLOCAL)lpszTemp);
         }
     } else {
-        strlcpy(pszBuf, "(unknown error)", iSize);
+        snprintf(pszBuf, iSize, "(unknown error) (%lu)", GetLastError());
     }
 
     return pszBuf;