From cf211610d3b8167314e907c0a9c3c017f7285f62 Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Tue, 13 Apr 2021 13:07:15 +0200
Subject: [PATCH] wxwidgets.cfg: Fixed wrong configuration for wxLogApiError().
 This function does return after appending data to wxLog(). Ensure that no
 duplicateBreak-warning is issued in case code resides afterwards.

---
 cfg/wxwidgets.cfg      |  2 +-
 test/cfg/runtests.sh   |  2 +-
 test/cfg/wxwidgets.cpp | 19 ++++++++++++++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index c12a1f7db..00eaf19ea 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -5539,7 +5539,7 @@
   </function>
   <!-- #define wxLogApiError(api, rc) -->
   <function name="wxLogApiError">
-    <noreturn>true</noreturn>
+    <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
     <arg nr="1" direction="in">
diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 29f2558d4..312a75ac7 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -93,7 +93,7 @@ else
         ${CXX} ${CXX_OPT} ${WXCONFIG} -Wno-deprecated-declarations ${DIR}wxwidgets.cpp
     fi
 fi
-${CPPCHECK} ${CPPCHECK_OPT} --inconclusive --library=wxwidgets -f ${DIR}wxwidgets.cpp
+${CPPCHECK} ${CPPCHECK_OPT} --inconclusive --library=wxwidgets,windows -f ${DIR}wxwidgets.cpp
 
 # gtk.c
 set +e
diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp
index a315c135f..3e03ef105 100644
--- a/test/cfg/wxwidgets.cpp
+++ b/test/cfg/wxwidgets.cpp
@@ -28,19 +28,32 @@
 #include <wx/textctrl.h>
 #include <wx/propgrid/property.h>
 
-wxString useRetval_wxString_MakeCapitalized(wxString &str)
+#ifdef __VISUALC__
+// Ensure no duplicateBreak warning is issued after wxLogApiError() calls.
+// This function does not terminate execution.
+bool duplicateBreak_wxLogApiError(const wxString &msg, const HRESULT &hr)
+{
+    if (FAILED(hr)) {
+        wxLogApiError(msg,hr);
+        return false;
+    }
+    return true;
+}
+#endif
+
+void useRetval_wxString_MakeCapitalized(wxString &str)
 {
     // No warning is expected for
     str.MakeCapitalized();
 }
 
-wxString useRetval_wxString_MakeLower(wxString &str)
+void useRetval_wxString_MakeLower(wxString &str)
 {
     // No warning is expected for
     str.MakeLower();
 }
 
-wxString useRetval_wxString_MakeUpper(wxString &str)
+void useRetval_wxString_MakeUpper(wxString &str)
 {
     // No warning is expected for
     str.MakeUpper();