From 558e00272d8b4c214b8c589d462a2b574cd1c518 Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Fri, 27 May 2022 12:28:30 +0200
Subject: [PATCH] windows.cfg: Improved configuration of _mbscmp() and
 _mbscmp_l().

---
 cfg/windows.cfg      |  6 +++---
 test/cfg/windows.cpp | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 97b7c70ed..16e40140e 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -2589,7 +2589,7 @@ HFONT CreateFont(
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
-    <returnValue type="int"/>
+    <returnValue type="int">strcmp(arg1,arg2)</returnValue>
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-null/>
@@ -2602,12 +2602,12 @@ HFONT CreateFont(
       <strz/>
     </arg>
   </function>
-  <!-- int _mbscmp_l(const unsigned char *string1, const unsigned char *string2,  _locale_t locale); -->
+  <!-- int _mbscmp_l(const unsigned char *string1, const unsigned char *string2, _locale_t locale); -->
   <function name="_mbscmp_l,_tscmp_l">
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
-    <returnValue type="int"/>
+    <returnValue type="int">strcmp(arg1,arg2)</returnValue>
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-null/>
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index db171ac83..4a5d48218 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -16,6 +16,24 @@
 #include <mbstring.h>
 #include <wchar.h>
 
+int stringCompare_mbscmp(const unsigned char *string1, const unsigned char *string2)
+{
+    // cppcheck-suppress stringCompare
+    (void) _mbscmp(string1, string1);
+    // cppcheck-suppress staticStringCompare
+    (void) _mbscmp("x", "x");
+    return _mbscmp(string1, string2);
+}
+
+int stringCompare_mbscmp_l(const unsigned char *string1, const unsigned char *string2, _locale_t locale)
+{
+    // cppcheck-suppress stringCompare
+    (void) _mbscmp_l(string1, string1, locale);
+    // cppcheck-suppress staticStringCompare
+    (void) _mbscmp_l("x", "x", locale);
+    return _mbscmp_l(string1, string2, locale);
+}
+
 int ignoredReturnValue__wtoi_l(const wchar_t *str, _locale_t locale)
 {
     // cppcheck-suppress ignoredReturnValue