From 676507fd728f7baa3bc16058d098a7cfadb28b56 Mon Sep 17 00:00:00 2001
From: gerikintercede <gerik.rhoden@intercede.com>
Date: Fri, 10 Jun 2022 11:04:00 +0100
Subject: [PATCH] Extra defines added to Windows and ATL (#4191)

---
 cfg/microsoft_atl.cfg | 13 +++++++++++++
 cfg/windows.cfg       |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/cfg/microsoft_atl.cfg b/cfg/microsoft_atl.cfg
index 05e26a90b..3cd784bbf 100644
--- a/cfg/microsoft_atl.cfg
+++ b/cfg/microsoft_atl.cfg
@@ -3,6 +3,11 @@
   <!-- Microsoft Windows ATL (Active Template Library) https://docs.microsoft.com/en-us/cpp/atl/atl-com-desktop-components -->
   <define name="BEGIN_COM_MAP(x)" value=""/>
   <define name="END_COM_MAP()" value=""/>
+  <define name="BEGIN_MSG_MAP(x)" value=""/>
+  <define name="MESSAGE_HANDLER(msg, func)" value=""/>
+  <define name="COMMAND_HANDLER(id, code, func)" value=""/>
+  <define name="CHAIN_MSG_MAP(theChainClass)" value=""/>
+  <define name="END_MSG_MAP()" value=""/>
   <define name="COM_INTERFACE_ENTRY(x)" value=""/>
   <define name="COM_INTERFACE_ENTRY2(x, x2)" value=""/>
   <define name="COM_INTERFACE_ENTRY_IID(iid, x)" value=""/>
@@ -20,8 +25,16 @@
   <define name="COM_INTERFACE_ENTRY_NOINTERFACE(x)" value=""/>
   <define name="DECLARE_LIBID(libid)" value=""/>
   <define name="DECLARE_NO_REGISTRY()" value=""/>
+  <define name="DECLARE_NOT_AGGREGATABLE(x)" value=""/>
+  <define name="DECLARE_OBJECT_DESCRIPTION(x)" value=""/>
+  <define name="DECLARE_PROTECT_FINAL_CONSTRUCT()" value=""/>
   <define name="DECLARE_REGISTRY(class,pid,vpid,nid,flags)" value=""/>
   <define name="DECLARE_REGISTRY_APPID_RESOURCEID(resid,appid)" value=""/>
   <define name="DECLARE_REGISTRY_RESOURCE(x)" value=""/>
   <define name="DECLARE_REGISTRY_RESOURCEID(x)" value=""/>
+  <define name="STDMETHOD(method)" value="HRESULT STDMETHODCALLTYPE method"/>
+  <define name="STDMETHOD_(type,method)" value="type STDMETHODCALLTYPE method"/>
+  <define name="IFACEMETHOD(method)" value="STDMETHOD(method)"/>
+  <define name="IFACEMETHOD_(type,method)" value="STDMETHOD_(type,method)"/>
+  <define name="OBJECT_ENTRY_AUTO(clsid, class)" value=""/>
 </def>
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 7cbc05829..6bdec154e 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -7006,6 +7006,8 @@ HFONT CreateFont(
   <define name="STDMETHODCALLTYPE" value="__stdcall"/>
   <define name="STDMETHODIMP" value="HRESULT STDMETHODCALLTYPE"/>
   <define name="STDMETHODIMP_(type)" value="type STDMETHODCALLTYPE"/>
+  <define name="IFACEMETHODIMP" value="STDMETHODIMP"/>
+  <define name="IFACEMETHODIMP_(type)" value="STDMETHODIMP_(type)"/>
   <!-- Text conversion macros like 'TEXT()', '_TEXT()' and '_T()' are handled internally by Cppcheck. There is no need to added them here. -->
   <define name="__pragma(x)" value=""/>
   <define name="_countof(_Array)" value="(sizeof(_Array) / sizeof(_Array[0]))"/>