Alexandre Julliard : xml2: Use WINAPIV calling convention for variadic functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e742eeb6c37031ec4911c1749f4c12717b8fb9b2
URL:    https://gitlab.winehq.org/wine/wine/-/commit/e742eeb6c37031ec4911c1749f4c127...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Nov  4 21:17:42 2022 +0100

xml2: Use WINAPIV calling convention for variadic functions.

---

 libs/xml2/globals.c                   | 2 +-
 libs/xml2/include/libxml/xmlerror.h   | 2 +-
 libs/xml2/include/libxml/xmlexports.h | 2 +-
 libs/xml2/include/libxml/xmlstring.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/xml2/globals.c b/libs/xml2/globals.c
index 4d28fed8156..6d8e75175a6 100644
--- a/libs/xml2/globals.c
+++ b/libs/xml2/globals.c
@@ -827,7 +827,7 @@ int xmlThrDefDoValidityCheckingDefaultValue(int v) {
 }
 
 #undef	xmlGenericError
-xmlGenericErrorFunc *
+xmlGenericErrorFunc * XMLCALL
 __xmlGenericError(void) {
     if (IS_MAIN_THREAD)
 	return (&xmlGenericError);
diff --git a/libs/xml2/include/libxml/xmlerror.h b/libs/xml2/include/libxml/xmlerror.h
index ee95be9c9c2..97e463f0040 100644
--- a/libs/xml2/include/libxml/xmlerror.h
+++ b/libs/xml2/include/libxml/xmlerror.h
@@ -916,7 +916,7 @@ XMLPUBFUN int XMLCALL
 /*
  * Internal callback reporting routine
  */
-XMLPUBFUN void XMLCALL
+XMLPUBFUN void XMLCDECL
     __xmlRaiseError		(xmlStructuredErrorFunc schannel,
 				 xmlGenericErrorFunc channel,
 				 void *data,
diff --git a/libs/xml2/include/libxml/xmlexports.h b/libs/xml2/include/libxml/xmlexports.h
index 1fd7c5c5bf7..c81043cd26f 100644
--- a/libs/xml2/include/libxml/xmlexports.h
+++ b/libs/xml2/include/libxml/xmlexports.h
@@ -26,7 +26,7 @@
 #else
   #define XMLCALL __cdecl
 #endif
-#define XMLCDECL __cdecl
+#define XMLCDECL WINAPIV
 
 /** DOC_ENABLE */
 #else /* not Windows */
diff --git a/libs/xml2/include/libxml/xmlstring.h b/libs/xml2/include/libxml/xmlstring.h
index 2d0b2d1668e..338c3845fae 100644
--- a/libs/xml2/include/libxml/xmlstring.h
+++ b/libs/xml2/include/libxml/xmlstring.h
@@ -94,7 +94,7 @@ XMLPUBFUN xmlChar * XMLCALL
                 xmlStrncatNew            (const xmlChar *str1,
                                          const xmlChar *str2,
                                          int len);
-XMLPUBFUN int XMLCALL
+XMLPUBFUN int XMLCDECL
                 xmlStrPrintf             (xmlChar *buf,
                                          int len,
                                          const char *msg,