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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 667b150a98a5df15302749cb5243568b8ffa1564
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=667b150a98a5df15302749cb52...

Author: Alexandre Julliard 
Date:   Thu Nov  2 10:20:27 2017 +0100

include: Use WINAPIV calling convention for variadic functions.

Signed-off-by: Alexandre Julliard

---

include/oledlg.h | 4 ++--
 include/rpcndr.h | 2 +-
 include/vfw.h    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/oledlg.h b/include/oledlg.h
index f009d76..80829ec 100644
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -967,8 +967,8 @@ BOOL WINAPI  OleUIAddVerbMenuW(LPOLEOBJECT lpOleObj, LPCWSTR lpszShortType, HMEN
 UINT WINAPI  OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial);
 UINT WINAPI  OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial);
 #define      OleUIPasteSpecial WINELIB_NAME_AW(OleUIPasteSpecial)
-INT  __cdecl OleUIPromptUserA(INT,HWND, ...);
-INT  __cdecl OleUIPromptUserW(INT,HWND, ...);
+INT  WINAPIV OleUIPromptUserA(INT,HWND, ...);
+INT  WINAPIV OleUIPromptUserW(INT,HWND, ...);
 #define      OleUIPromptUser WINELIB_NAME_AW(OleUIPromptUser)

#ifdef __cplusplus
diff --git a/include/rpcndr.h b/include/rpcndr.h
index 9029950..0f751d7 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -114,7 +114,7 @@ typedef UINT64 MIDL_uhyper;
 typedef unsigned char boolean;

#define __RPC_CALLEE WINAPI
-#define RPC_VAR_ENTRY __cdecl
+#define RPC_VAR_ENTRY WINAPIV
 #define NDR_SHAREABLE static

#define MIDL_ascii_strlen(s) strlen(s)
diff --git a/include/vfw.h b/include/vfw.h
index aa3d4f5..cec5345 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -1082,10 +1082,10 @@ BOOL WINAPI AVISaveOptions(HWND hWnd,UINT uFlags,INT nStream,
    		   PAVISTREAM *ppavi,LPAVICOMPRESSOPTIONS *ppOptions);
 HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions);

-HRESULT CDECL AVISaveA(LPCSTR szFile, CLSID *pclsidHandler,
+HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID *pclsidHandler,
              AVISAVECALLBACK lpfnCallback, int nStreams,
              PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...);
-HRESULT CDECL AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler,
+HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler,
              AVISAVECALLBACK lpfnCallback, int nStreams,
              PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...);
 #define AVISave WINELIB_NAME_AW(AVISave)