Fix argument direction in windows.cfg, missing Qt macros (danmar#5302)

chrchr-github · Aug 8, 2023 · 5ea1bca · 5ea1bca
1 parent c3d7c91
commit 5ea1bca
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
@@ -5097,6 +5097,9 @@
   <define name="QT_TRANSLATE_NOOP_UTF8(scope, x)" value="x"/>
   <define name="QT_TRANSLATE_NOOP3(scope, x, comment)" value="{x, comment}"/>
   <define name="QT_TRANSLATE_NOOP3_UTF8(scope, x, comment)" value="{x, comment}"/>
+  <define name="QT_WARNING_PUSH" value=""/>
+  <define name="QT_WARNING_POP" value=""/>
+  <define name="QT_STRINGIFY(x)" value="#x"/>
   <define name="QCOMPARE(actual, expected)" value="(void)((actual)==(expected))"/>
   <define name="QVERIFY(condition)" value="(void)(condition)"/>
   <define name="QVERIFY2(condition, message)" value="(void)(condition),(void)(message)"/>

diff --git a/cfg/windows.cfg b/cfg/windows.cfg
@@ -2960,7 +2960,7 @@ HFONT CreateFont(
     <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3" direction="in">
@@ -2985,7 +2985,7 @@ HFONT CreateFont(
     <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3" direction="in">
@@ -3023,7 +3023,7 @@ HFONT CreateFont(
   _In_ LPARAM lParam); -->
   <function name="SendMessage,SendMessageA,SendMessageW">
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3044,7 +3044,7 @@ HFONT CreateFont(
   _In_     LPARAM lParam); -->
   <function name="PostMessage,PostMessageA,PostMessageW">
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -3306,7 +3306,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="LPVOID"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
     </arg>
   </function>
@@ -3315,10 +3315,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HGLOBAL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
   </function>
@@ -3327,7 +3327,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3339,7 +3339,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>

diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
@@ -1113,4 +1113,8 @@ void invalidPrintfArgType_StructMember(double d) { // #9672
     my_struct_t my_struct;
     // cppcheck-suppress invalidPrintfArgType_sint
     my_struct.st.Format("%d", d);
+}
+
+BOOL MyEnableWindow(HWND hWnd, BOOL bEnable) {
+    return EnableWindow(hWnd, bEnable);
 }