From e7fad406bfecd0d68124a1596b9eb987a1f93754 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 4 Mar 2026 13:52:32 +0100
Subject: [PATCH 1/4] Update windows.cfg

---
 cfg/windows.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 7020162805a..4baf8655884 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -13345,9 +13345,9 @@ HFONT CreateFont(
   <define name="MiniDumpWithAvxXStateContext" value="0x0200000"/>
   <define name="MiniDumpWithIptTrace" value="0x0400000"/>
   <define name="MiniDumpValidTypeFlags" value="0x0800000"/>
-  <define name="MAKEINTRESOURCEA(i)" value="i"/>
-  <define name="MAKEINTRESOURCEW(i)" value="i"/>
-  <define name="MAKEINTRESOURCE(i)" value="i"/>
+  <define name="MAKEINTRESOURCEA(i)" value="((LPSTR)((ULONG_PTR)((WORD)(i))))"/>
+  <define name="MAKEINTRESOURCEW(i)" value="((LPWSTR)((ULONG_PTR)((WORD)(i))))"/>
+  <define name="MAKEINTRESOURCE(i)" value="((LPTSTR)((ULONG_PTR)((WORD)(i))))"/>
   <define name="FILE_ATTRIBUTE_ARCHIVE" value="0x20"/>
   <define name="FILE_ATTRIBUTE_COMPRESSED" value="0x800"/>
   <define name="FILE_ATTRIBUTE_DEVICE" value="0x40"/>

From 17d016c322ac4e7db59135c91e2fdf95e291391d Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 4 Mar 2026 13:56:45 +0100
Subject: [PATCH 2/4] Update windows.cpp

---
 test/cfg/windows.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index a07e1b09365..12dc9864253 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -84,7 +84,10 @@ BOOL unreachableCode_FlushConsoleInputBuffer(int &val)
     return retVal;
 }
 
-/// https://learn.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulefilenamew
+const char* constVariable_MAKEINTRESSOURCE() {
+    return MAKEINTRESSOURCE(5 - 1);
+}
+
 std::string constVariable_GetModuleFileName(void) {
     char path[42];
     if (GetModuleFileNameA(NULL, path, sizeof(path))==0)

From d7a68b4e533b64c66ef3dfc7c061a0e5497805f6 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 4 Mar 2026 14:09:19 +0100
Subject: [PATCH 3/4] Update windows.cpp

---
 test/cfg/windows.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index 12dc9864253..9c9cbe35fef 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -84,10 +84,7 @@ BOOL unreachableCode_FlushConsoleInputBuffer(int &val)
     return retVal;
 }
 
-const char* constVariable_MAKEINTRESSOURCE() {
-    return MAKEINTRESSOURCE(5 - 1);
-}
-
+/// https://learn.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulefilenamew
 std::string constVariable_GetModuleFileName(void) {
     char path[42];
     if (GetModuleFileNameA(NULL, path, sizeof(path))==0)
@@ -95,6 +92,10 @@ std::string constVariable_GetModuleFileName(void) {
     return std::string{path};
 }
 
+const char* constVariable_MAKEINTRESOURCE() { // #14564
+    return MAKEINTRESOURCE(5 - 1);
+}
+
 int stringCompare_mbscmp(const unsigned char *string1, const unsigned char *string2)
 {
     // cppcheck-suppress stringCompare

From eb1a94cd5b7aa0b8af80b9c44643d635eb66b543 Mon Sep 17 00:00:00 2001
From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
Date: Wed, 4 Mar 2026 14:49:00 +0100
Subject: [PATCH 4/4] Update windows.cpp

---
 test/cfg/windows.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index 9c9cbe35fef..b8d62d00577 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -92,7 +92,7 @@ std::string constVariable_GetModuleFileName(void) {
     return std::string{path};
 }
 
-const char* constVariable_MAKEINTRESOURCE() { // #14564
+const TCHAR* constVariable_MAKEINTRESOURCE() { // #14564
     return MAKEINTRESOURCE(5 - 1);
 }