From d3f84391180f1adcff034ea367cca676035be542 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Thu, 30 Jan 2025 13:43:26 +0100
Subject: [PATCH] Win: Trim trailing zeros in LoadStringW

When resources are compiled with /n (default), all strings are zero
terminated and LoadStringW returns number of characters including this
terminator.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 include/WinStd/Win.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h
index 607a4e4b..2fae240b 100644
--- a/include/WinStd/Win.h
+++ b/include/WinStd/Win.h
@@ -726,6 +726,7 @@ static _Success_(return != 0) int LoadStringW(_In_opt_ HINSTANCE hInstance, _In_
     LPCWSTR pszStr;
     int i = LoadStringW(hInstance, uID, reinterpret_cast<LPWSTR>(&pszStr), 0);
     if (i) {
+        i = wcsnlen_s(pszStr, i);
         sBuffer.assign(pszStr, i);
         return i;
     } else