C++: Fix spurious columns in 'CRegKey'.

Author: MathiasVP

cpp/ql/lib/ext/CRegKey.model.yml

@@ -15,6 +15,6 @@ extensions:
       - ["", "CRegKey", True, "QueryValue", "(LPCTSTR,DWORD *,void *,ULONG *)", "", "Argument[*0]", "Argument[*2]", "taint", "manual"]
       - ["", "CRegKey", True, "QueryValue", "(DWORD &,LPCTSTR)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
       - ["", "CRegKey", True, "QueryValue", "(LPTSTR,LPCTSTR,DWORD *)", "", "Argument[*1]", "Argument[*0]", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryValue", "operator HKEY", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
-      - ["", "CRegKey", True, "QueryValue", "operator=", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
-      - ["", "CRegKey", True, "QueryValue", "operator=", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["", "CRegKey", True, "operator HKEY", "", "", "Argument[-1]", "ReturnValue", "taint", "manual"]
+      - ["", "CRegKey", True, "operator=", "", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["", "CRegKey", True, "operator=", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]

cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected

@@ -1,4 +1,5 @@
 | Dubious member name "operator BSTR" in summary model. |
+| Dubious member name "operator HKEY" in summary model. |
 | Dubious member name "operator LPCSTR" in summary model. |
 | Dubious member name "operator LPSAFEARRAY" in summary model. |
 | Dubious member name "operator LPSTR" in summary model. |
@@ -44,5 +45,3 @@
 | Dubious signature "(size_type,const T &,const Allocator &)" in summary model. |
 | Dubious signature "(vector &&)" in summary model. |
 | Dubious signature "(vector &&,const Allocator &)" in summary model. |
-| Dubious signature "operator HKEY" in summary model. |
-| Dubious signature "operator=" in summary model. |