From 97bf5de1335074569d612c10cb39cc83ee0fdfcc Mon Sep 17 00:00:00 2001
From: amai2012 <amai@users.sf.net>
Date: Tue, 8 Jan 2019 21:15:04 +0100
Subject: [PATCH] Add more Windows (Microsoft) macros and a few lines of
 related test code

---
 cfg/windows.cfg      |  6 ++++--
 test/cfg/windows.cpp | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index f0950ac65..7dd14639a 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -5540,14 +5540,16 @@ HFONT CreateFont(
   <podtype name="__time64_t" sign="s" size="8"/>
   <podtype name="_locale_t"/>
   <define name="afx_msg" value=""/>
+  <define name="AFX_EXT_CLASS" value=""/>
   <define name="DEBUG_NEW" value="new"/>
   <define name="DECLARE_MESSAGE_MAP()" value=""/>
   <define name="DECLARE_DYNAMIC(x)" value=""/>
   <define name="DECLARE_DYNAMIC_CLASS(x)" value=""/>
   <define name="DECLARE_DYNCREATE(x)" value=""/>
   <define name="DECLARE_SERIAL(x)" value=""/>
-  <define name="IMPLEMENT_DYNCREATE(x,y)" value=""/>
-  <define name="IMPLEMENT_SERIAL(x,y,z)" value=""/>
+  <define name="IMPLEMENT_DYNAMIC(name,base)" value=""/>
+  <define name="IMPLEMENT_DYNCREATE(name,base)" value=""/>
+  <define name="IMPLEMENT_SERIAL(name,base,schema)" value=""/>
   <define name="INVALID_HANDLE_VALUE" value="0"/>
   <define name="INVALID_SOCKET" value="0"/>
   <define name="WINAPI" value="__stdcall"/>
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index b9134f63e..3dd969373 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -858,3 +858,14 @@ error_t nullPointer__strncpy_s_l(char *strDest, size_t numberOfElements, const c
     // no warning shall be shown for
     return _strncpy_s_l(strDest, numberOfElements, strSource, count, locale);
 }
+
+class MyClass :public CObject {
+    DECLARE_DYNAMIC(MyClass)
+    DECLARE_DYNCREATE(MyClass)
+    DECLARE_SERIAL(MyClass)
+public:
+    MyClass() {}
+};
+IMPLEMENT_DYNAMIC(MyClass, CObject)
+IMPLEMENT_DYNCREATE(MyClass, CObject)
+IMPLEMENT_SERIAL(MyClass,CObject, 42)