diff --git a/include/oleauto.h b/include/oleauto.h
index 70f753fd6573628c19d1be2175660ac4f5af2a9e..a3aba36036eb0fc98596b7d6cf8ee62270ca3f48 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -227,18 +227,18 @@ struct tagVARIANT {
  * VARIANT API
  */
 
-void VariantInit32(VARIANTARG* pvarg);
+void WINAPI VariantInit32(VARIANTARG* pvarg);
 #define VariantInit WINELIB_NAME(VariantInit)
-HRESULT VariantClear32(VARIANTARG* pvarg);
+HRESULT WINAPI VariantClear32(VARIANTARG* pvarg);
 #define VariantClear WINELIB_NAME(VariantClear)
-HRESULT VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc);
+HRESULT WINAPI VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc);
 #define VariantCopy WINELIB_NAME(VariantCopy)
-HRESULT VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc);
+HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc);
 #define VariantCopyInd WINELIB_NAME(VariantCopyInd)
-HRESULT VariantChangeType32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+HRESULT WINAPI VariantChangeType32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 						  USHORT wFlags, VARTYPE vt);
 #define VariantChangeType WINELIB_NAME(VariantChangeType)
-HRESULT VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 							LCID lcid, USHORT wFlags, VARTYPE vt);
 #define VariantChangeTypeEx WINELIB_NAME(VariantChangeTypeEx)
 
@@ -276,377 +276,377 @@ HRESULT VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 #define VAR_DATEVALUEONLY	((DWORD)0x00000002)
 
 
-HRESULT VarUI1FromI232(short sIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromI232(short sIn, BYTE* pbOut);
 #define VarUI1FromI2 WINELIB_NAME(VarUI1FromI2)
-HRESULT VarUI1FromI432(LONG lIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromI432(LONG lIn, BYTE* pbOut);
 #define VarUI1FromI4 WINELIB_NAME(VarUI1FromI4)
-HRESULT VarUI1FromR432(FLOAT fltIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromR432(FLOAT fltIn, BYTE* pbOut);
 #define VarUI1FromR4 WINELIB_NAME(VarUI1FromR4)
-HRESULT VarUI1FromR832(double dblIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromR832(double dblIn, BYTE* pbOut);
 #define VarUI1FromR8 WINELIB_NAME(VarUI1FromR8)
-HRESULT VarUI1FromDate32(DATE dateIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromDate32(DATE dateIn, BYTE* pbOut);
 #define VarUI1FromDate WINELIB_NAME(VarUI1FromDate)
-HRESULT VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut);
 #define VarUI1FromBool WINELIB_NAME(VarUI1FromBool)
-HRESULT VarUI1FromI132(CHAR cIn, BYTE*pbOut);
+HRESULT WINAPI VarUI1FromI132(CHAR cIn, BYTE*pbOut);
 #define VarUI1FromI1 WINELIB_NAME(VarUI1FromI1)
-HRESULT VarUI1FromUI232(USHORT uiIn, BYTE*pbOut);
+HRESULT WINAPI VarUI1FromUI232(USHORT uiIn, BYTE*pbOut);
 #define VarUI1FromUI2 WINELIB_NAME(VarUI1FromUI2)
-HRESULT VarUI1FromUI432(ULONG ulIn, BYTE*pbOut);
+HRESULT WINAPI VarUI1FromUI432(ULONG ulIn, BYTE*pbOut);
 #define VarUI1FromUI4 WINELIB_NAME(VarUI1FromUI4)
-HRESULT VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut);
 #define VarUI1FromStr WINELIB_NAME(VarUI1FromStr)
 
 /*
-HRESULT VarUI1FromDec32(DECIMAL*pdecIn, BYTE*pbOut);
+HRESULT WINAPI VarUI1FromDec32(DECIMAL*pdecIn, BYTE*pbOut);
 #define VarUI1FromDec WINELIB_NAME(VarUI1FromDec)
-HRESULT VarUI1FromDisp32(IDispatch* pdispIn, LCID lcid, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromDisp32(IDispatch* pdispIn, LCID lcid, BYTE* pbOut);
 #define VarUI1FromDisp WINELIB_NAME(VarUI1FromDisp)
-HRESULT VarUI1FromCy32(CY cyIn, BYTE* pbOut);
+HRESULT WINAPI VarUI1FromCy32(CY cyIn, BYTE* pbOut);
 #define VarUI1FromCy WINELIB_NAME(VarUI1FromCy)
 */
 
-HRESULT VarI2FromUI132(BYTE bIn, short* psOut);
+HRESULT WINAPI VarI2FromUI132(BYTE bIn, short* psOut);
 #define VarI2FromUI1 WINELIB_NAME(VarI2FromUI1)
-HRESULT VarI2FromI432(LONG lIn, short* psOut);
+HRESULT WINAPI VarI2FromI432(LONG lIn, short* psOut);
 #define VarI2FromI4 WINELIB_NAME(VarI2FromI4)
-HRESULT VarI2FromR432(FLOAT fltIn, short* psOut);
+HRESULT WINAPI VarI2FromR432(FLOAT fltIn, short* psOut);
 #define VarI2FromR4 WINELIB_NAME(VarI2FromR4)
-HRESULT VarI2FromR832(double dblIn, short* psOut);
+HRESULT WINAPI VarI2FromR832(double dblIn, short* psOut);
 #define VarI2FromR8 WINELIB_NAME(VarI2FromR8)
-HRESULT VarI2FromDate32(DATE dateIn, short* psOut);
+HRESULT WINAPI VarI2FromDate32(DATE dateIn, short* psOut);
 #define VarI2FromDate WINELIB_NAME(VarI2FromDate)
-HRESULT VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut);
+HRESULT WINAPI VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut);
 #define VarI2FromBool WINELIB_NAME(VarI2FromBool)
-HRESULT VarI2FromI132(CHAR cIn, short*psOut);
+HRESULT WINAPI VarI2FromI132(CHAR cIn, short*psOut);
 #define VarI2FromI1 WINELIB_NAME(VarI2FromI1)
-HRESULT VarI2FromUI232(USHORT uiIn, short*psOut);
+HRESULT WINAPI VarI2FromUI232(USHORT uiIn, short*psOut);
 #define VarI2FromUI2 WINELIB_NAME(VarI2FromUI2)
-HRESULT VarI2FromUI432(ULONG ulIn, short*psOut);
+HRESULT WINAPI VarI2FromUI432(ULONG ulIn, short*psOut);
 #define VarI2FromUI4 WINELIB_NAME(VarI2FromUI4)
-HRESULT VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short* psOut);
+HRESULT WINAPI VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short* psOut);
 #define VarI2FromStr WINELIB_NAME(VarI2FromStr)
 /*
-HRESULT VarI2FromDec32(DECIMAL*pdecIn, short*psOut);
+HRESULT WINAPI VarI2FromDec32(DECIMAL*pdecIn, short*psOut);
 #define VarI2FromDec WINELIB_NAME(VarI2FromDec)
-HRESULT VarI2FromDisp32(IDispatch* pdispIn, LCID lcid, short* psOut);
+HRESULT WINAPI VarI2FromDisp32(IDispatch* pdispIn, LCID lcid, short* psOut);
 #define VarI2FromDisp WINELIB_NAME(VarI2FromDisp)
-HRESULT VarI2FromCy32(CY cyIn, short* psOut);
+HRESULT WINAPI VarI2FromCy32(CY cyIn, short* psOut);
 #define VarI2FromCy WINELIB_NAME(VarI2FromCy)
 */
 
-HRESULT VarI4FromUI132(BYTE bIn, LONG* plOut);
+HRESULT WINAPI VarI4FromUI132(BYTE bIn, LONG* plOut);
 #define VarI4FromUI1 WINELIB_NAME(VarI4FromUI1)
-HRESULT VarI4FromI232(short sIn, LONG* plOut);
+HRESULT WINAPI VarI4FromI232(short sIn, LONG* plOut);
 #define VarI4FromI2 WINELIB_NAME(VarI4FromI2)
-HRESULT VarI4FromR432(FLOAT fltIn, LONG* plOut);
+HRESULT WINAPI VarI4FromR432(FLOAT fltIn, LONG* plOut);
 #define VarI4FromR4 WINELIB_NAME(VarI4FromR4)
-HRESULT VarI4FromR832(double dblIn, LONG* plOut);
+HRESULT WINAPI VarI4FromR832(double dblIn, LONG* plOut);
 #define VarI4FromR8 WINELIB_NAME(VarI4FromR8)
-HRESULT VarI4FromDate32(DATE dateIn, LONG* plOut);
+HRESULT WINAPI VarI4FromDate32(DATE dateIn, LONG* plOut);
 #define VarI4FromDate WINELIB_NAME(VarI4FromDate)
-HRESULT VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut);
+HRESULT WINAPI VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut);
 #define VarI4FromBool WINELIB_NAME(VarI4FromBool)
-HRESULT VarI4FromI132(CHAR cIn, LONG* plOut);
+HRESULT WINAPI VarI4FromI132(CHAR cIn, LONG* plOut);
 #define VarI4FromI1 WINELIB_NAME(VarI4FromI1)
-HRESULT VarI4FromUI232(USHORT uiIn, LONG*plOut);
+HRESULT WINAPI VarI4FromUI232(USHORT uiIn, LONG*plOut);
 #define VarI4FromUI2 WINELIB_NAME(VarI4FromUI2)
-HRESULT VarI4FromUI432(ULONG ulIn, LONG*plOut);
+HRESULT WINAPI VarI4FromUI432(ULONG ulIn, LONG*plOut);
 #define VarI4FromUI4 WINELIB_NAME(VarI4FromUI4)
-HRESULT VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG* plOut);
+HRESULT WINAPI VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG* plOut);
 #define VarI4FromStr WINELIB_NAME(VarI4FromStr)
 /*
-HRESULT VarI4FromCy32(CY cyIn, LONG* plOut);
+HRESULT WINAPI VarI4FromCy32(CY cyIn, LONG* plOut);
 #define VarI4FromCy WINELIB_NAME(VarI4FromCy)
-HRESULT VarI4FromDec32(DECIMAL*pdecIn, LONG*plOut);
+HRESULT WINAPI VarI4FromDec32(DECIMAL*pdecIn, LONG*plOut);
 #define VarI4FromDec WINELIB_NAME(VarI4FromDec)
-HRESULT VarI4FromDisp32(IDispatch* pdispIn, LCID lcid, LONG* plOut);
+HRESULT WINAPI VarI4FromDisp32(IDispatch* pdispIn, LCID lcid, LONG* plOut);
 #define VarI4FromDisp WINELIB_NAME(VarI4FromDisp)
 */
 
-HRESULT VarR4FromUI132(BYTE bIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromUI132(BYTE bIn, FLOAT* pfltOut);
 #define VarR4FromUI1 WINELIB_NAME(VarR4FromUI1)
-HRESULT VarR4FromI232(short sIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromI232(short sIn, FLOAT* pfltOut);
 #define VarR4FromI2 WINELIB_NAME(VarR4FromI2)
-HRESULT VarR4FromI432(LONG lIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromI432(LONG lIn, FLOAT* pfltOut);
 #define VarR4FromI4 WINELIB_NAME(VarR4FromI4)
-HRESULT VarR4FromR832(double dblIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromR832(double dblIn, FLOAT* pfltOut);
 #define VarR4FromR8 WINELIB_NAME(VarR4FromR8)
-HRESULT VarR4FromDate32(DATE dateIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromDate32(DATE dateIn, FLOAT* pfltOut);
 #define VarR4FromDate WINELIB_NAME(VarR4FromDate)
-HRESULT VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut);
 #define VarR4FromBool WINELIB_NAME(VarR4FromBool)
-HRESULT VarR4FromI132(CHAR cIn, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromI132(CHAR cIn, FLOAT*pfltOut);
 #define VarR4FromI1 WINELIB_NAME(VarR4FromI1)
-HRESULT VarR4FromUI232(USHORT uiIn, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromUI232(USHORT uiIn, FLOAT*pfltOut);
 #define VarR4FromUI2 WINELIB_NAME(VarR4FromUI2)
-HRESULT VarR4FromUI432(ULONG ulIn, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromUI432(ULONG ulIn, FLOAT*pfltOut);
 #define VarR4FromUI4 WINELIB_NAME(VarR4FromUI4)
-HRESULT VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT*pfltOut);
 #define VarR4FromStr WINELIB_NAME(VarR4FromStr)
 /*
-HRESULT VarR4FromDec32(DECIMAL*pdecIn, FLOAT*pfltOut);
+HRESULT WINAPI VarR4FromDec32(DECIMAL*pdecIn, FLOAT*pfltOut);
 #define VarR4FromDec WINELIB_NAME(VarR4FromDec)
-HRESULT VarR4FromDisp32(IDispatch* pdispIn, LCID lcid, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromDisp32(IDispatch* pdispIn, LCID lcid, FLOAT* pfltOut);
 #define VarR4FromDisp WINELIB_NAME(VarR4FromDisp)
-HRESULT VarR4FromCy32(CY cyIn, FLOAT* pfltOut);
+HRESULT WINAPI VarR4FromCy32(CY cyIn, FLOAT* pfltOut);
 #define VarR4FromCy WINELIB_NAME(VarR4FromCy)
 */
 
-HRESULT VarR8FromUI132(BYTE bIn, double* pdblOut);
+HRESULT WINAPI VarR8FromUI132(BYTE bIn, double* pdblOut);
 #define VarR8FromUI1 WINELIB_NAME(VarR8FromUI1)
-HRESULT VarR8FromI232(short sIn, double* pdblOut);
+HRESULT WINAPI VarR8FromI232(short sIn, double* pdblOut);
 #define VarR8FromI2 WINELIB_NAME(VarR8FromI2)
-HRESULT VarR8FromI432(LONG lIn, double* pdblOut);
+HRESULT WINAPI VarR8FromI432(LONG lIn, double* pdblOut);
 #define VarR8FromI4 WINELIB_NAME(VarR8FromI4)
-HRESULT VarR8FromR432(FLOAT fltIn, double* pdblOut);
+HRESULT WINAPI VarR8FromR432(FLOAT fltIn, double* pdblOut);
 #define VarR8FromR4 WINELIB_NAME(VarR8FromR4)
-HRESULT VarR8FromDate32(DATE dateIn, double* pdblOut);
+HRESULT WINAPI VarR8FromDate32(DATE dateIn, double* pdblOut);
 #define VarR8FromDate WINELIB_NAME(VarR8FromDate)
-HRESULT VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut);
+HRESULT WINAPI VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut);
 #define VarR8FromBool WINELIB_NAME(VarR8FromBool)
-HRESULT VarR8FromI132(CHAR cIn, double*pdblOut);
+HRESULT WINAPI VarR8FromI132(CHAR cIn, double*pdblOut);
 #define VarR8FromI1 WINELIB_NAME(VarR8FromI1)
-HRESULT VarR8FromUI232(USHORT uiIn, double*pdblOut);
+HRESULT WINAPI VarR8FromUI232(USHORT uiIn, double*pdblOut);
 #define VarR8FromUI2 WINELIB_NAME(VarR8FromUI2)
-HRESULT VarR8FromUI432(ULONG ulIn, double*pdblOut);
+HRESULT WINAPI VarR8FromUI432(ULONG ulIn, double*pdblOut);
 #define VarR8FromUI4 WINELIB_NAME(VarR8FromUI4)
-HRESULT VarR8FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, double*pdblOut);
+HRESULT WINAPI VarR8FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, double*pdblOut);
 #define VarR8FromStr WINELIB_NAME(VarR8FromStr)
 /*
-HRESULT VarR8FromDec32(DECIMAL*pdecIn, double*pdblOut);
+HRESULT WINAPI VarR8FromDec32(DECIMAL*pdecIn, double*pdblOut);
 #define VarR8FromDec WINELIB_NAME(VarR8FromDec)
-HRESULT VarR8FromCy32(CY cyIn, double* pdblOut);
+HRESULT WINAPI VarR8FromCy32(CY cyIn, double* pdblOut);
 #define VarR8FromCy WINELIB_NAME(VarR8FromCy)
-HRESULT VarR8FromDisp32(IDispatch* pdispIn, LCID lcid, double* pdblOut);
+HRESULT WINAPI VarR8FromDisp32(IDispatch* pdispIn, LCID lcid, double* pdblOut);
 #define VarR8FromDisp WINELIB_NAME(VarR8FromDisp)
 */
 
-HRESULT VarDateFromUI132(BYTE bIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromUI132(BYTE bIn, DATE* pdateOut);
 #define VarDateFromUI1 WINELIB_NAME(VarDateFromUI1)
-HRESULT VarDateFromI232(short sIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromI232(short sIn, DATE* pdateOut);
 #define VarDateFromI2 WINELIB_NAME(VarDateFromI2)
-HRESULT VarDateFromI432(LONG lIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromI432(LONG lIn, DATE* pdateOut);
 #define VarDateFromI4 WINELIB_NAME(VarDateFromI4)
-HRESULT VarDateFromR432(FLOAT fltIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromR432(FLOAT fltIn, DATE* pdateOut);
 #define VarDateFromR4 WINELIB_NAME(VarDateFromR4)
-HRESULT VarDateFromR832(double dblIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromR832(double dblIn, DATE* pdateOut);
 #define VarDateFromR8 WINELIB_NAME(VarDateFromR8)
-HRESULT VarDateFromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, DATE*pdateOut);
+HRESULT WINAPI VarDateFromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, DATE*pdateOut);
 #define VarDateFromStr WINELIB_NAME(VarDateFromStr)
-HRESULT VarDateFromI132(CHAR cIn, DATE*pdateOut);
+HRESULT WINAPI VarDateFromI132(CHAR cIn, DATE*pdateOut);
 #define VarDateFromI1 WINELIB_NAME(VarDateFromI1)
-HRESULT VarDateFromUI232(USHORT uiIn, DATE*pdateOut);
+HRESULT WINAPI VarDateFromUI232(USHORT uiIn, DATE*pdateOut);
 #define VarDateFromUI2 WINELIB_NAME(VarDateFromUI2)
-HRESULT VarDateFromUI432(ULONG ulIn, DATE*pdateOut);
+HRESULT WINAPI VarDateFromUI432(ULONG ulIn, DATE*pdateOut);
 #define VarDateFromUI4 WINELIB_NAME(VarDateFromUI4)
-HRESULT VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut);
 #define VarDateFromBool WINELIB_NAME(VarDateFromBool)
 /*
-HRESULT VarDateFromDec32(DECIMAL*pdecIn, DATE*pdateOut);
+HRESULT WINAPI VarDateFromDec32(DECIMAL*pdecIn, DATE*pdateOut);
 #define VarDateFromDec WINELIB_NAME(VarDateFromDec)
-HRESULT VarDateFromDisp32(IDispatch* pdispIn, LCID lcid, DATE* pdateOut);
+HRESULT WINAPI VarDateFromDisp32(IDispatch* pdispIn, LCID lcid, DATE* pdateOut);
 #define VarDateFromDisp WINELIB_NAME(VarDateFromDisp)
-HRESULT VarDateFromCy32(CY cyIn, DATE* pdateOut);
+HRESULT WINAPI VarDateFromCy32(CY cyIn, DATE* pdateOut);
 #define VarDateFromCy WINELIB_NAME(VarDateFromCy)
 
-HRESULT VarCyFromUI132(BYTE bIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromUI132(BYTE bIn, CY* pcyOut);
 #define VarCyFromUI1 WINELIB_NAME(VarCyFromUI1)
-HRESULT VarCyFromI232(short sIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromI232(short sIn, CY* pcyOut);
 #define VarCyFromI2 WINELIB_NAME(VarCyFromI2)
-HRESULT VarCyFromI432(LONG lIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromI432(LONG lIn, CY* pcyOut);
 #define VarCyFromI4 WINELIB_NAME(VarCyFromI4)
-HRESULT VarCyFromR432(FLOAT fltIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromR432(FLOAT fltIn, CY* pcyOut);
 #define VarCyFromR4 WINELIB_NAME(VarCyFromR4)
-HRESULT VarCyFromR832(double dblIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromR832(double dblIn, CY* pcyOut);
 #define VarCyFromR8 WINELIB_NAME(VarCyFromR8)
-HRESULT VarCyFromDate32(DATE dateIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromDate32(DATE dateIn, CY* pcyOut);
 #define VarCyFromDate WINELIB_NAME(VarCyFromDate)
-HRESULT VarCyFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CY* pcyOut);
+HRESULT WINAPI VarCyFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CY* pcyOut);
 #define VarCyFromStr WINELIB_NAME(VarCyFromStr)
-HRESULT VarCyFromDisp32(IDispatch* pdispIn, LCID lcid, CY* pcyOut);
+HRESULT WINAPI VarCyFromDisp32(IDispatch* pdispIn, LCID lcid, CY* pcyOut);
 #define VarCyFromDisp WINELIB_NAME(VarCyFromDisp)
-HRESULT VarCyFromBool32(VARIANT_BOOL boolIn, CY* pcyOut);
+HRESULT WINAPI VarCyFromBool32(VARIANT_BOOL boolIn, CY* pcyOut);
 #define VarCyFromBool WINELIB_NAME(VarCyFromBool)
-HRESULT VarCyFromI132(CHAR cIn, CY*pcyOut);
+HRESULT WINAPI VarCyFromI132(CHAR cIn, CY*pcyOut);
 #define VarCyFromI1 WINELIB_NAME(VarCyFromI1)
-HRESULT VarCyFromUI232(USHORT uiIn, CY*pcyOut);
+HRESULT WINAPI VarCyFromUI232(USHORT uiIn, CY*pcyOut);
 #define VarCyFromUI2 WINELIB_NAME(VarCyFromUI2)
-HRESULT VarCyFromUI432(ULONG ulIn, CY*pcyOut);
+HRESULT WINAPI VarCyFromUI432(ULONG ulIn, CY*pcyOut);
 #define VarCyFromUI4 WINELIB_NAME(VarCyFromUI4)
-HRESULT VarCyFromDec32(DECIMAL*pdecIn, CY*pcyOut);
+HRESULT WINAPI VarCyFromDec32(DECIMAL*pdecIn, CY*pcyOut);
 #define VarCyFromDec WINELIB_NAME(VarCyFromDec)
 */
 
-HRESULT VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromUI1 WINELIB_NAME(VarBstrFromUI1)
-HRESULT VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromI2 WINELIB_NAME(VarBstrFromI2)
-HRESULT VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromI4 WINELIB_NAME(VarBstrFromI4)
-HRESULT VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromR4 WINELIB_NAME(VarBstrFromR4)
-HRESULT VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromR8 WINELIB_NAME(VarBstrFromR8)
-HRESULT VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromDate WINELIB_NAME(VarBstrFromDate)
-HRESULT VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromBool WINELIB_NAME(VarBstrFromBool)
-HRESULT VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
+HRESULT WINAPI VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
 #define VarBstrFromI1 WINELIB_NAME(VarBstrFromI1)
-HRESULT VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
+HRESULT WINAPI VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
 #define VarBstrFromUI2 WINELIB_NAME(VarBstrFromUI2)
-HRESULT VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
+HRESULT WINAPI VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
 #define VarBstrFromUI4 WINELIB_NAME(VarBstrFromUI4)
 /*
-HRESULT VarBstrFromDec32(DECIMAL*pdecIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
+HRESULT WINAPI VarBstrFromDec32(DECIMAL*pdecIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
 #define VarBstrFromDec WINELIB_NAME(VarBstrFromDec)
-HRESULT VarBstrFromCy32(CY cyIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromCy32(CY cyIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromCy WINELIB_NAME(VarBstrFromCy)
-HRESULT VarBstrFromDisp32(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
+HRESULT WINAPI VarBstrFromDisp32(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
 #define VarBstrFromDisp WINELIB_NAME(VarBstrFromDisp)
 */
 
-HRESULT VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut);
 #define VarBoolFromUI1 WINELIB_NAME(VarBoolFromUI1)
-HRESULT VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut);
 #define VarBoolFromI2 WINELIB_NAME(VarBoolFromI2)
-HRESULT VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut);
 #define VarBoolFromI4 WINELIB_NAME(VarBoolFromI4)
-HRESULT VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut);
 #define VarBoolFromR4 WINELIB_NAME(VarBoolFromR4)
-HRESULT VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut);
 #define VarBoolFromR8 WINELIB_NAME(VarBoolFromR8)
-HRESULT VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut);
 #define VarBoolFromDate WINELIB_NAME(VarBoolFromDate)
-HRESULT VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut);
 #define VarBoolFromStr WINELIB_NAME(VarBoolFromStr)
-HRESULT VarBoolFromI132(CHAR cIn, VARIANT_BOOL*pboolOut);
+HRESULT WINAPI VarBoolFromI132(CHAR cIn, VARIANT_BOOL*pboolOut);
 #define VarBoolFromI1 WINELIB_NAME(VarBoolFromI1)
-HRESULT VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL*pboolOut);
+HRESULT WINAPI VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL*pboolOut);
 #define VarBoolFromUI2 WINELIB_NAME(VarBoolFromUI2)
-HRESULT VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL*pboolOut);
+HRESULT WINAPI VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL*pboolOut);
 #define VarBoolFromUI4 WINELIB_NAME(VarBoolFromUI4)
 /*
-HRESULT VarBoolFromDec32(DECIMAL*pdecIn, VARIANT_BOOL*pboolOut);
+HRESULT WINAPI VarBoolFromDec32(DECIMAL*pdecIn, VARIANT_BOOL*pboolOut);
 #define VarBoolFromDec WINELIB_NAME(VarBoolFromDec)
-HRESULT VarBoolFromCy32(CY cyIn, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromCy32(CY cyIn, VARIANT_BOOL* pboolOut);
 #define VarBoolFromCy WINELIB_NAME(VarBoolFromCy)
-HRESULT VarBoolFromDisp32(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL* pboolOut);
+HRESULT WINAPI VarBoolFromDisp32(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL* pboolOut);
 #define VarBoolFromDisp WINELIB_NAME(VarBoolFromDisp)
 */
 
-HRESULT VarI1FromUI132(BYTE bIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromUI132(BYTE bIn, CHAR*pcOut);
 #define VarI1FromUI1 WINELIB_NAME(VarI1FromUI1)
-HRESULT VarI1FromI232(short uiIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromI232(short uiIn, CHAR*pcOut);
 #define VarI1FromI2 WINELIB_NAME(VarI1FromI2)
-HRESULT VarI1FromI432(LONG lIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromI432(LONG lIn, CHAR*pcOut);
 #define VarI1FromI4 WINELIB_NAME(VarI1FromI4)
-HRESULT VarI1FromR432(FLOAT fltIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromR432(FLOAT fltIn, CHAR*pcOut);
 #define VarI1FromR4 WINELIB_NAME(VarI1FromR4)
-HRESULT VarI1FromR832(double dblIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromR832(double dblIn, CHAR*pcOut);
 #define VarI1FromR8 WINELIB_NAME(VarI1FromR8)
-HRESULT VarI1FromDate32(DATE dateIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromDate32(DATE dateIn, CHAR*pcOut);
 #define VarI1FromDate WINELIB_NAME(VarI1FromDate)
-HRESULT VarI1FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, CHAR*pcOut);
+HRESULT WINAPI VarI1FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, CHAR*pcOut);
 #define VarI1FromStr WINELIB_NAME(VarI1FromStr)
-HRESULT VarI1FromBool32(VARIANT_BOOL boolIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromBool32(VARIANT_BOOL boolIn, CHAR*pcOut);
 #define VarI1FromBool WINELIB_NAME(VarI1FromBool)
-HRESULT VarI1FromUI232(USHORT uiIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromUI232(USHORT uiIn, CHAR*pcOut);
 #define VarI1FromUI2 WINELIB_NAME(VarI1FromUI2)
-HRESULT VarI1FromUI432(ULONG ulIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromUI432(ULONG ulIn, CHAR*pcOut);
 #define VarI1FromUI4 WINELIB_NAME(VarI1FromUI4)
 /*
-HRESULT VarI1FromDec32(DECIMAL*pdecIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromDec32(DECIMAL*pdecIn, CHAR*pcOut);
 #define VarI1FromDec WINELIB_NAME(VarI1FromDec)
-HRESULT VarI1FromDisp32(IDispatch*pdispIn, LCID lcid, CHAR*pcOut);
+HRESULT WINAPI VarI1FromDisp32(IDispatch*pdispIn, LCID lcid, CHAR*pcOut);
 #define VarI1FromDisp WINELIB_NAME(VarI1FromDisp)
-HRESULT VarI1FromCy32(CY cyIn, CHAR*pcOut);
+HRESULT WINAPI VarI1FromCy32(CY cyIn, CHAR*pcOut);
 #define VarI1FromCy WINELIB_NAME(VarI1FromCy)
 */
 
-HRESULT VarUI2FromUI132(BYTE bIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromUI132(BYTE bIn, USHORT*puiOut);
 #define VarUI2FromUI1 WINELIB_NAME(VarUI2FromUI1)
-HRESULT VarUI2FromI232(short uiIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromI232(short uiIn, USHORT*puiOut);
 #define VarUI2FromI2 WINELIB_NAME(VarUI2FromI2)
-HRESULT VarUI2FromI432(LONG lIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromI432(LONG lIn, USHORT*puiOut);
 #define VarUI2FromI4 WINELIB_NAME(VarUI2FromI4)
-HRESULT VarUI2FromR432(FLOAT fltIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromR432(FLOAT fltIn, USHORT*puiOut);
 #define VarUI2FromR4 WINELIB_NAME(VarUI2FromR4)
-HRESULT VarUI2FromR832(double dblIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromR832(double dblIn, USHORT*puiOut);
 #define VarUI2FromR8 WINELIB_NAME(VarUI2FromR8)
-HRESULT VarUI2FromDate32(DATE dateIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromDate32(DATE dateIn, USHORT*puiOut);
 #define VarUI2FromDate WINELIB_NAME(VarUI2FromDate)
-HRESULT VarUI2FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, USHORT*puiOut);
 #define VarUI2FromStr WINELIB_NAME(VarUI2FromStr)
-HRESULT VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT*puiOut);
 #define VarUI2FromBool WINELIB_NAME(VarUI2FromBool)
-HRESULT VarUI2FromI132(CHAR cIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromI132(CHAR cIn, USHORT*puiOut);
 #define VarUI2FromI1 WINELIB_NAME(VarUI2FromI1)
-HRESULT VarUI2FromUI432(ULONG ulIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromUI432(ULONG ulIn, USHORT*puiOut);
 #define VarUI2FromUI4 WINELIB_NAME(VarUI2FromUI4)
 /*
-HRESULT VarUI2FromDec32(DECIMAL*pdecIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromDec32(DECIMAL*pdecIn, USHORT*puiOut);
 #define VarUI2FromDec WINELIB_NAME(VarUI2FromDec)
-HRESULT VarUI2FromCy32(CY cyIn, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromCy32(CY cyIn, USHORT*puiOut);
 #define VarUI2FromCy WINELIB_NAME(VarUI2FromCy)
-HRESULT VarUI2FromDisp32(IDispatch*pdispIn, LCID lcid, USHORT*puiOut);
+HRESULT WINAPI VarUI2FromDisp32(IDispatch*pdispIn, LCID lcid, USHORT*puiOut);
 #define VarUI2FromDisp WINELIB_NAME(VarUI2FromDisp)
 */
 
-HRESULT VarUI4FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, ULONG*pulOut);
 #define VarUI4FromStr WINELIB_NAME(VarUI4FromStr)
-HRESULT VarUI4FromUI132(BYTE bIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromUI132(BYTE bIn, ULONG*pulOut);
 #define VarUI4FromUI1 WINELIB_NAME(VarUI4FromUI1)
-HRESULT VarUI4FromI232(short uiIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromI232(short uiIn, ULONG*pulOut);
 #define VarUI4FromI2 WINELIB_NAME(VarUI4FromI2)
-HRESULT VarUI4FromI432(LONG lIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromI432(LONG lIn, ULONG*pulOut);
 #define VarUI4FromI4 WINELIB_NAME(VarUI4FromI4)
-HRESULT VarUI4FromR432(FLOAT fltIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromR432(FLOAT fltIn, ULONG*pulOut);
 #define VarUI4FromR4 WINELIB_NAME(VarUI4FromR4)
-HRESULT VarUI4FromR832(double dblIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromR832(double dblIn, ULONG*pulOut);
 #define VarUI4FromR8 WINELIB_NAME(VarUI4FromR8)
-HRESULT VarUI4FromDate32(DATE dateIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromDate32(DATE dateIn, ULONG*pulOut);
 #define VarUI4FromDate WINELIB_NAME(VarUI4FromDate)
-HRESULT VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG*pulOut);
 #define VarUI4FromBool WINELIB_NAME(VarUI4FromBool)
-HRESULT VarUI4FromI132(CHAR cIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromI132(CHAR cIn, ULONG*pulOut);
 #define VarUI4FromI1 WINELIB_NAME(VarUI4FromI1)
-HRESULT VarUI4FromUI232(USHORT uiIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromUI232(USHORT uiIn, ULONG*pulOut);
 #define VarUI4FromUI2 WINELIB_NAME(VarUI4FromUI2)
 /*
-HRESULT VarUI4FromDec32(DECIMAL*pdecIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromDec32(DECIMAL*pdecIn, ULONG*pulOut);
 #define VarUI4FromDec WINELIB_NAME(VarUI4FromDec)
-HRESULT VarUI4FromDisp32(IDispatch*pdispIn, LCID lcid, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromDisp32(IDispatch*pdispIn, LCID lcid, ULONG*pulOut);
 #define VarUI4FromDisp WINELIB_NAME(VarUI4FromDisp)
-HRESULT VarUI4FromCy32(CY cyIn, ULONG*pulOut);
+HRESULT WINAPI VarUI4FromCy32(CY cyIn, ULONG*pulOut);
 #define VarUI4FromCy WINELIB_NAME(VarUI4FromCy)
 
-HRESULT VarDecFromUI132(BYTE bIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromUI132(BYTE bIn, DECIMAL*pdecOut);
 #define VarDecFromUI1 WINELIB_NAME(VarDecFromUI1)
-HRESULT VarDecFromI232(short uiIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromI232(short uiIn, DECIMAL*pdecOut);
 #define VarDecFromI2 WINELIB_NAME(VarDecFromI2)
-HRESULT VarDecFromI432(LONG lIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromI432(LONG lIn, DECIMAL*pdecOut);
 #define VarDecFromI4 WINELIB_NAME(VarDecFromI4)
-HRESULT VarDecFromR432(FLOAT fltIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromR432(FLOAT fltIn, DECIMAL*pdecOut);
 #define VarDecFromR4 WINELIB_NAME(VarDecFromR4)
-HRESULT VarDecFromR832(double dblIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromR832(double dblIn, DECIMAL*pdecOut);
 #define VarDecFromR8 WINELIB_NAME(VarDecFromR8)
-HRESULT VarDecFromDate32(DATE dateIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromDate32(DATE dateIn, DECIMAL*pdecOut);
 #define VarDecFromDate WINELIB_NAME(VarDecFromDate)
-HRESULT VarDecFromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, DECIMAL*pdecOut);
 #define VarDecFromStr WINELIB_NAME(VarDecFromStr)
-HRESULT VarDecFromBool32(VARIANT_BOOL boolIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromBool32(VARIANT_BOOL boolIn, DECIMAL*pdecOut);
 #define VarDecFromBool WINELIB_NAME(VarDecFromBool)
-HRESULT VarDecFromI132(CHAR cIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromI132(CHAR cIn, DECIMAL*pdecOut);
 #define VarDecFromI1 WINELIB_NAME(VarDecFromI1)
-HRESULT VarDecFromUI232(USHORT uiIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromUI232(USHORT uiIn, DECIMAL*pdecOut);
 #define VarDecFromUI2 WINELIB_NAME(VarDecFromUI2)
-HRESULT VarDecFromUI432(ULONG ulIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromUI432(ULONG ulIn, DECIMAL*pdecOut);
 #define VarDecFromUI4 WINELIB_NAME(VarDecFromUI4)
-HRESULT VarDecFromCy32(CY cyIn, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromCy32(CY cyIn, DECIMAL*pdecOut);
 #define VarDecFromCy WINELIB_NAME(VarDecFromCy)
-HRESULT VarDecFromDisp32(IDispatch*pdispIn, LCID lcid, DECIMAL*pdecOut);
+HRESULT WINAPI VarDecFromDisp32(IDispatch*pdispIn, LCID lcid, DECIMAL*pdecOut);
 #define VarDecFromDisp WINELIB_NAME(VarDecFromDisp)
 */
 
diff --git a/ole/variant.c b/ole/variant.c
index 010e9a1795625fbc8587dad28270d48a3c26bd67..cdd58a5df5c506a123d1ca707ddfb04582e4858c 100644
--- a/ole/variant.c
+++ b/ole/variant.c
@@ -1107,7 +1107,7 @@ static HRESULT Coerce( VARIANTARG* pd, LCID lcid, ULONG dwFlags, VARIANTARG* ps,
  * Used internally by the hi-level Variant API to determine
  * if the vartypes are valid.
  */
-static HRESULT ValidateVtRange( VARTYPE vt )
+static HRESULT WINAPI ValidateVtRange( VARTYPE vt )
 {
     /* if by value we must make sure it is in the
      * range of the valid types.
@@ -1126,7 +1126,7 @@ static HRESULT ValidateVtRange( VARTYPE vt )
  * Used internally by the hi-level Variant API to determine
  * if the vartypes are valid.
  */
-static HRESULT ValidateVariantType( VARTYPE vt )
+static HRESULT WINAPI ValidateVariantType( VARTYPE vt )
 {
 	HRESULT res = S_OK;
 
@@ -1159,7 +1159,7 @@ static HRESULT ValidateVariantType( VARTYPE vt )
  * Used internally by the hi-level Variant API to determine
  * if the vartypes are valid.
  */
-static HRESULT ValidateVt( VARTYPE vt )
+static HRESULT WINAPI ValidateVt( VARTYPE vt )
 {
 	HRESULT res = S_OK;
 
@@ -1196,7 +1196,7 @@ static HRESULT ValidateVt( VARTYPE vt )
  * Initializes the Variant.  Unlike VariantClear it does not interpret the current
  * contents of the Variant.
  */
-void VariantInit32(VARIANTARG* pvarg)
+void WINAPI VariantInit32(VARIANTARG* pvarg)
 {
 	TRACE(ole,"(%p),stub\n",pvarg);
 
@@ -1216,7 +1216,7 @@ void VariantInit32(VARIANTARG* pvarg)
  * freed.  If the vt is VT_BSTR the string is freed. If VT_DISPATCH the object is
  * released. If VT_ARRAY the array is freed.
  */
-HRESULT VariantClear32(VARIANTARG* pvarg)
+HRESULT WINAPI VariantClear32(VARIANTARG* pvarg)
 {
 	HRESULT res = S_OK;
 	TRACE(ole,"(%p),stub\n",pvarg);
@@ -1260,7 +1260,7 @@ HRESULT VariantClear32(VARIANTARG* pvarg)
  *
  * Frees up the designation variant and makes a copy of the source.
  */
-HRESULT VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
+HRESULT WINAPI VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
 {
 	HRESULT res = S_OK;
 	TRACE(ole,"(%p, %p),stub\n", pvargDest, pvargSrc);
@@ -1324,7 +1324,7 @@ HRESULT VariantCopy32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
  * Frees up the destination variant and makes a copy of the source.  If
  * the source is of type VT_BYREF it performs the necessary indirections.
  */
-HRESULT VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
+HRESULT WINAPI VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 {
 	HRESULT res = S_OK;
 	TRACE(ole,"(%p, %p),stub\n", pvargDest, pvargSrc);
@@ -1426,7 +1426,7 @@ HRESULT VariantCopyInd32(VARIANT* pvargDest, VARIANTARG* pvargSrc)
 /******************************************************************************
  *		VariantChangeType32	[OLEAUT32.12]
  */
-HRESULT VariantChangeType32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+HRESULT WINAPI VariantChangeType32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 							USHORT wFlags, VARTYPE vt)
 {
 	return VariantChangeTypeEx32( pvargDest, pvargSrc, 0, wFlags, vt );
@@ -1435,7 +1435,7 @@ HRESULT VariantChangeType32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 /******************************************************************************
  *		VariantChangeTypeEx32	[OLEAUT32.147]
  */
-HRESULT VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
+HRESULT WINAPI VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 							  LCID lcid, USHORT wFlags, VARTYPE vt)
 {
 	HRESULT res = S_OK;
@@ -1508,7 +1508,7 @@ HRESULT VariantChangeTypeEx32(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
 /******************************************************************************
  *		VarUI1FromI232		[OLEAUT32.130]
  */
-HRESULT VarUI1FromI232(short sIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromI232(short sIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pbOut );
 
@@ -1527,7 +1527,7 @@ HRESULT VarUI1FromI232(short sIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromI432		[OLEAUT32.131]
  */
-HRESULT VarUI1FromI432(LONG lIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromI432(LONG lIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pbOut );
 
@@ -1547,7 +1547,7 @@ HRESULT VarUI1FromI432(LONG lIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromR432		[OLEAUT32.132]
  */
-HRESULT VarUI1FromR432(FLOAT fltIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromR432(FLOAT fltIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pbOut );
 
@@ -1567,7 +1567,7 @@ HRESULT VarUI1FromR432(FLOAT fltIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromR832		[OLEAUT32.133]
  */
-HRESULT VarUI1FromR832(double dblIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromR832(double dblIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pbOut );
 
@@ -1587,7 +1587,7 @@ HRESULT VarUI1FromR832(double dblIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromDate32		[OLEAUT32.135]
  */
-HRESULT VarUI1FromDate32(DATE dateIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromDate32(DATE dateIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pbOut );
 
@@ -1607,7 +1607,7 @@ HRESULT VarUI1FromDate32(DATE dateIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromBool32		[OLEAUT32.138]
  */
-HRESULT VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pbOut );
 
@@ -1619,7 +1619,7 @@ HRESULT VarUI1FromBool32(VARIANT_BOOL boolIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromI132		[OLEAUT32.237]
  */
-HRESULT VarUI1FromI132(CHAR cIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromI132(CHAR cIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pbOut );
 
@@ -1631,7 +1631,7 @@ HRESULT VarUI1FromI132(CHAR cIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromUI232		[OLEAUT32.238]
  */
-HRESULT VarUI1FromUI232(USHORT uiIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromUI232(USHORT uiIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pbOut );
 
@@ -1650,7 +1650,7 @@ HRESULT VarUI1FromUI232(USHORT uiIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromUI432		[OLEAUT32.239]
  */
-HRESULT VarUI1FromUI432(ULONG ulIn, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromUI432(ULONG ulIn, BYTE* pbOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pbOut );
 
@@ -1670,7 +1670,7 @@ HRESULT VarUI1FromUI432(ULONG ulIn, BYTE* pbOut)
 /******************************************************************************
  *		VarUI1FromStr32		[OLEAUT32.54]
  */
-HRESULT VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut)
+HRESULT WINAPI VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -1710,7 +1710,7 @@ HRESULT VarUI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut)
 /******************************************************************************
  *		VarI2FromUI132		[OLEAUT32.48]
  */
-HRESULT VarI2FromUI132(BYTE bIn, short* psOut)
+HRESULT WINAPI VarI2FromUI132(BYTE bIn, short* psOut)
 {
 	TRACE( ole, "( 0x%08x, %p ), stub\n", bIn, psOut );
 
@@ -1722,7 +1722,7 @@ HRESULT VarI2FromUI132(BYTE bIn, short* psOut)
 /******************************************************************************
  *		VarI2FromI432		[OLEAUT32.49]
  */
-HRESULT VarI2FromI432(LONG lIn, short* psOut)
+HRESULT WINAPI VarI2FromI432(LONG lIn, short* psOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", lIn, psOut );
 
@@ -1741,7 +1741,7 @@ HRESULT VarI2FromI432(LONG lIn, short* psOut)
 /******************************************************************************
  *		VarI2FromR432		[OLEAUT32.50]
  */
-HRESULT VarI2FromR432(FLOAT fltIn, short* psOut)
+HRESULT WINAPI VarI2FromR432(FLOAT fltIn, short* psOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, psOut );
 
@@ -1761,7 +1761,7 @@ HRESULT VarI2FromR432(FLOAT fltIn, short* psOut)
 /******************************************************************************
  *		VarI2FromR832		[OLEAUT32.51]
  */
-HRESULT VarI2FromR832(double dblIn, short* psOut)
+HRESULT WINAPI VarI2FromR832(double dblIn, short* psOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, psOut );
 
@@ -1781,7 +1781,7 @@ HRESULT VarI2FromR832(double dblIn, short* psOut)
 /******************************************************************************
  *		VarI2FromDate32		[OLEAUT32.53]
  */
-HRESULT VarI2FromDate32(DATE dateIn, short* psOut)
+HRESULT WINAPI VarI2FromDate32(DATE dateIn, short* psOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, psOut );
 
@@ -1801,7 +1801,7 @@ HRESULT VarI2FromDate32(DATE dateIn, short* psOut)
 /******************************************************************************
  *		VarI2FromBool32		[OLEAUT32.56]
  */
-HRESULT VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut)
+HRESULT WINAPI VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, psOut );
 
@@ -1813,7 +1813,7 @@ HRESULT VarI2FromBool32(VARIANT_BOOL boolIn, short* psOut)
 /******************************************************************************
  *		VarI2FromI132		[OLEAUT32.48]
  */
-HRESULT VarI2FromI132(CHAR cIn, short* psOut)
+HRESULT WINAPI VarI2FromI132(CHAR cIn, short* psOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, psOut );
 
@@ -1825,7 +1825,7 @@ HRESULT VarI2FromI132(CHAR cIn, short* psOut)
 /******************************************************************************
  *		VarI2FromUI232		[OLEAUT32.206]
  */
-HRESULT VarI2FromUI232(USHORT uiIn, short* psOut)
+HRESULT WINAPI VarI2FromUI232(USHORT uiIn, short* psOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, psOut );
 
@@ -1844,7 +1844,7 @@ HRESULT VarI2FromUI232(USHORT uiIn, short* psOut)
 /******************************************************************************
  *		VarI2FromUI432		[OLEAUT32.49]
  */
-HRESULT VarI2FromUI432(ULONG ulIn, short* psOut)
+HRESULT WINAPI VarI2FromUI432(ULONG ulIn, short* psOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", ulIn, psOut );
 
@@ -1863,7 +1863,7 @@ HRESULT VarI2FromUI432(ULONG ulIn, short* psOut)
 /******************************************************************************
  *		VarI2FromStr32		[OLEAUT32.54]
  */
-HRESULT VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short* psOut)
+HRESULT WINAPI VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short* psOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -1903,7 +1903,7 @@ HRESULT VarI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, short* psOut)
 /******************************************************************************
  *		VarI4FromUI132		[OLEAUT32.58]
  */
-HRESULT VarI4FromUI132(BYTE bIn, LONG* plOut)
+HRESULT WINAPI VarI4FromUI132(BYTE bIn, LONG* plOut)
 {
 	TRACE( ole, "( %X, %p ), stub\n", bIn, plOut );
 
@@ -1916,7 +1916,7 @@ HRESULT VarI4FromUI132(BYTE bIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromR432		[OLEAUT32.60]
  */
-HRESULT VarI4FromR432(FLOAT fltIn, LONG* plOut)
+HRESULT WINAPI VarI4FromR432(FLOAT fltIn, LONG* plOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, plOut );
 
@@ -1936,7 +1936,7 @@ HRESULT VarI4FromR432(FLOAT fltIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromR832		[OLEAUT32.61]
  */
-HRESULT VarI4FromR832(double dblIn, LONG* plOut)
+HRESULT WINAPI VarI4FromR832(double dblIn, LONG* plOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, plOut );
 
@@ -1956,7 +1956,7 @@ HRESULT VarI4FromR832(double dblIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromDate32		[OLEAUT32.63]
  */
-HRESULT VarI4FromDate32(DATE dateIn, LONG* plOut)
+HRESULT WINAPI VarI4FromDate32(DATE dateIn, LONG* plOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, plOut );
 
@@ -1976,7 +1976,7 @@ HRESULT VarI4FromDate32(DATE dateIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromBool32		[OLEAUT32.66]
  */
-HRESULT VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut)
+HRESULT WINAPI VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, plOut );
 
@@ -1988,7 +1988,7 @@ HRESULT VarI4FromBool32(VARIANT_BOOL boolIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromI132		[OLEAUT32.209]
  */
-HRESULT VarI4FromI132(CHAR cIn, LONG* plOut)
+HRESULT WINAPI VarI4FromI132(CHAR cIn, LONG* plOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, plOut );
 
@@ -2000,7 +2000,7 @@ HRESULT VarI4FromI132(CHAR cIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromUI232		[OLEAUT32.210]
  */
-HRESULT VarI4FromUI232(USHORT uiIn, LONG* plOut)
+HRESULT WINAPI VarI4FromUI232(USHORT uiIn, LONG* plOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, plOut );
 
@@ -2012,7 +2012,7 @@ HRESULT VarI4FromUI232(USHORT uiIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromUI432		[OLEAUT32.211]
  */
-HRESULT VarI4FromUI432(ULONG ulIn, LONG* plOut)
+HRESULT WINAPI VarI4FromUI432(ULONG ulIn, LONG* plOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", ulIn, plOut );
 
@@ -2031,7 +2031,7 @@ HRESULT VarI4FromUI432(ULONG ulIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromI232		[OLEAUT32.59]
  */
-HRESULT VarI4FromI232(short sIn, LONG* plOut)
+HRESULT WINAPI VarI4FromI232(short sIn, LONG* plOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, plOut );
 
@@ -2043,7 +2043,7 @@ HRESULT VarI4FromI232(short sIn, LONG* plOut)
 /******************************************************************************
  *		VarI4FromStr32		[OLEAUT32.64]
  */
-HRESULT VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG* plOut)
+HRESULT WINAPI VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG* plOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2083,7 +2083,7 @@ HRESULT VarI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, LONG* plOut)
 /******************************************************************************
  *		VarR4FromUI132		[OLEAUT32.68]
  */
-HRESULT VarR4FromUI132(BYTE bIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromUI132(BYTE bIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %X, %p ), stub\n", bIn, pfltOut );
 
@@ -2095,7 +2095,7 @@ HRESULT VarR4FromUI132(BYTE bIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromI232		[OLEAUT32.69]
  */
-HRESULT VarR4FromI232(short sIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromI232(short sIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pfltOut );
 
@@ -2107,7 +2107,7 @@ HRESULT VarR4FromI232(short sIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromI432		[OLEAUT32.70]
  */
-HRESULT VarR4FromI432(LONG lIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromI432(LONG lIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %lx, %p ), stub\n", lIn, pfltOut );
 
@@ -2119,7 +2119,7 @@ HRESULT VarR4FromI432(LONG lIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromR832		[OLEAUT32.71]
  */
-HRESULT VarR4FromR832(double dblIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromR832(double dblIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pfltOut );
 
@@ -2138,7 +2138,7 @@ HRESULT VarR4FromR832(double dblIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromDate32		[OLEAUT32.73]
  */
-HRESULT VarR4FromDate32(DATE dateIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromDate32(DATE dateIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pfltOut );
 
@@ -2157,7 +2157,7 @@ HRESULT VarR4FromDate32(DATE dateIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromBool32		[OLEAUT32.76]
  */
-HRESULT VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pfltOut );
 
@@ -2169,7 +2169,7 @@ HRESULT VarR4FromBool32(VARIANT_BOOL boolIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromI132		[OLEAUT32.213]
  */
-HRESULT VarR4FromI132(CHAR cIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromI132(CHAR cIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pfltOut );
 
@@ -2181,7 +2181,7 @@ HRESULT VarR4FromI132(CHAR cIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromUI232		[OLEAUT32.214]
  */
-HRESULT VarR4FromUI232(USHORT uiIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromUI232(USHORT uiIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pfltOut );
 
@@ -2193,7 +2193,7 @@ HRESULT VarR4FromUI232(USHORT uiIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromUI432		[OLEAUT32.215]
  */
-HRESULT VarR4FromUI432(ULONG ulIn, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromUI432(ULONG ulIn, FLOAT* pfltOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pfltOut );
 
@@ -2205,7 +2205,7 @@ HRESULT VarR4FromUI432(ULONG ulIn, FLOAT* pfltOut)
 /******************************************************************************
  *		VarR4FromStr32		[OLEAUT32.74]
  */
-HRESULT VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfltOut)
+HRESULT WINAPI VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfltOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2244,7 +2244,7 @@ HRESULT VarR4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfltOu
 /******************************************************************************
  *		VarR8FromUI132		[OLEAUT32.68]
  */
-HRESULT VarR8FromUI132(BYTE bIn, double* pdblOut)
+HRESULT WINAPI VarR8FromUI132(BYTE bIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pdblOut );
 
@@ -2256,7 +2256,7 @@ HRESULT VarR8FromUI132(BYTE bIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromI232		[OLEAUT32.69]
  */
-HRESULT VarR8FromI232(short sIn, double* pdblOut)
+HRESULT WINAPI VarR8FromI232(short sIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pdblOut );
 
@@ -2268,7 +2268,7 @@ HRESULT VarR8FromI232(short sIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromI432		[OLEAUT32.70]
  */
-HRESULT VarR8FromI432(LONG lIn, double* pdblOut)
+HRESULT WINAPI VarR8FromI432(LONG lIn, double* pdblOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pdblOut );
 
@@ -2280,7 +2280,7 @@ HRESULT VarR8FromI432(LONG lIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromR432		[OLEAUT32.81]
  */
-HRESULT VarR8FromR432(FLOAT fltIn, double* pdblOut)
+HRESULT WINAPI VarR8FromR432(FLOAT fltIn, double* pdblOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pdblOut );
 
@@ -2292,7 +2292,7 @@ HRESULT VarR8FromR432(FLOAT fltIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromDate32		[OLEAUT32.83]
  */
-HRESULT VarR8FromDate32(DATE dateIn, double* pdblOut)
+HRESULT WINAPI VarR8FromDate32(DATE dateIn, double* pdblOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pdblOut );
 
@@ -2304,7 +2304,7 @@ HRESULT VarR8FromDate32(DATE dateIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromBool32		[OLEAUT32.86]
  */
-HRESULT VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut)
+HRESULT WINAPI VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pdblOut );
 
@@ -2316,7 +2316,7 @@ HRESULT VarR8FromBool32(VARIANT_BOOL boolIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromI132		[OLEAUT32.217]
  */
-HRESULT VarR8FromI132(CHAR cIn, double* pdblOut)
+HRESULT WINAPI VarR8FromI132(CHAR cIn, double* pdblOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pdblOut );
 
@@ -2328,7 +2328,7 @@ HRESULT VarR8FromI132(CHAR cIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromUI232		[OLEAUT32.218]
  */
-HRESULT VarR8FromUI232(USHORT uiIn, double* pdblOut)
+HRESULT WINAPI VarR8FromUI232(USHORT uiIn, double* pdblOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pdblOut );
 
@@ -2340,7 +2340,7 @@ HRESULT VarR8FromUI232(USHORT uiIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromUI432		[OLEAUT32.219]
  */
-HRESULT VarR8FromUI432(ULONG ulIn, double* pdblOut)
+HRESULT WINAPI VarR8FromUI432(ULONG ulIn, double* pdblOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pdblOut );
 
@@ -2352,7 +2352,7 @@ HRESULT VarR8FromUI432(ULONG ulIn, double* pdblOut)
 /******************************************************************************
  *		VarR8FromStr32		[OLEAUT32.84]
  */
-HRESULT VarR8FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, double* pdblOut)
+HRESULT WINAPI VarR8FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, double* pdblOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -2384,7 +2384,7 @@ HRESULT VarR8FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, double* pdblO
 /******************************************************************************
  *		VarDateFromUI132		[OLEAUT32.]
  */
-HRESULT VarDateFromUI132(BYTE bIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromUI132(BYTE bIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pdateOut );
 
@@ -2396,7 +2396,7 @@ HRESULT VarDateFromUI132(BYTE bIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromI232		[OLEAUT32.222]
  */
-HRESULT VarDateFromI232(short sIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromI232(short sIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pdateOut );
 
@@ -2408,7 +2408,7 @@ HRESULT VarDateFromI232(short sIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromI432		[OLEAUT32.90]
  */
-HRESULT VarDateFromI432(LONG lIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromI432(LONG lIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pdateOut );
 
@@ -2425,7 +2425,7 @@ HRESULT VarDateFromI432(LONG lIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromR432		[OLEAUT32.91]
  */
-HRESULT VarDateFromR432(FLOAT fltIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromR432(FLOAT fltIn, DATE* pdateOut)
 {
     unsigned long test = 0;
 
@@ -2445,7 +2445,7 @@ HRESULT VarDateFromR432(FLOAT fltIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromR832		[OLEAUT32.92]
  */
-HRESULT VarDateFromR832(double dblIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromR832(double dblIn, DATE* pdateOut)
 {
     unsigned long test = 0;
 
@@ -2487,7 +2487,7 @@ HRESULT VarDateFromR832(double dblIn, DATE* pdateOut)
  * These are the only characters allowed in a string representing a date and time:
  * [A-Z] [a-z] [0-9] ':' '-' '/' ',' ' ' '\t'
  */
-HRESULT VarDateFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut)
+HRESULT WINAPI VarDateFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, DATE* pdateOut)
 {
 	HRESULT ret = S_OK;
 
@@ -2499,7 +2499,7 @@ HRESULT VarDateFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, DATE* pdate
 /******************************************************************************
  *		VarDateFromI132		[OLEAUT32.221]
  */
-HRESULT VarDateFromI132(CHAR cIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromI132(CHAR cIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pdateOut );
 
@@ -2511,7 +2511,7 @@ HRESULT VarDateFromI132(CHAR cIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromUI232		[OLEAUT32.222]
  */
-HRESULT VarDateFromUI232(USHORT uiIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromUI232(USHORT uiIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pdateOut );
 
@@ -2528,7 +2528,7 @@ HRESULT VarDateFromUI232(USHORT uiIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromUI432		[OLEAUT32.223]
  */
-HRESULT VarDateFromUI432(ULONG ulIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromUI432(ULONG ulIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pdateOut );
 
@@ -2545,7 +2545,7 @@ HRESULT VarDateFromUI432(ULONG ulIn, DATE* pdateOut)
 /******************************************************************************
  *		VarDateFromBool32		[OLEAUT32.96]
  */
-HRESULT VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut)
+HRESULT WINAPI VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pdateOut );
 
@@ -2558,7 +2558,7 @@ HRESULT VarDateFromBool32(VARIANT_BOOL boolIn, DATE* pdateOut)
 /******************************************************************************
  *		VarBstrFromUI132		[OLEAUT32.108]
  */
-HRESULT VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", bVal, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", bVal );
@@ -2571,7 +2571,7 @@ HRESULT VarBstrFromUI132(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 /******************************************************************************
  *		VarBstrFromI232		[OLEAUT32.109]
  */
-HRESULT VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", iVal, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", iVal );
@@ -2583,7 +2583,7 @@ HRESULT VarBstrFromI232(short iVal, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 /******************************************************************************
  *		VarBstrFromI432		[OLEAUT32.110]
  */
-HRESULT VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %ld, %ld, %ld, %p ), stub\n", lIn, lcid, dwFlags, pbstrOut );
 
@@ -2596,7 +2596,7 @@ HRESULT VarBstrFromI432(LONG lIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 /******************************************************************************
  *		VarBstrFromR432		[OLEAUT32.111]
  */
-HRESULT VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %f, %ld, %ld, %p ), stub\n", fltIn, lcid, dwFlags, pbstrOut );
 
@@ -2609,7 +2609,7 @@ HRESULT VarBstrFromR432(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 /******************************************************************************
  *		VarBstrFromR832		[OLEAUT32.112]
  */
-HRESULT VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %f, %ld, %ld, %p ), stub\n", dblIn, lcid, dwFlags, pbstrOut );
 
@@ -2648,7 +2648,7 @@ HRESULT VarBstrFromR832(double dblIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut
  *		  int tm_isdst;    daylight savings time flag
  *		  };
  */
-HRESULT VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	/* If the date is not after the 1900 return an error because
 	 * the tm structure does not allow such dates.
@@ -2772,7 +2772,7 @@ HRESULT VarBstrFromDate32(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOu
 /******************************************************************************
  *		VarBstrFromBool32		[OLEAUT32.116]
  */
-HRESULT VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", boolIn, lcid, dwFlags, pbstrOut );
 
@@ -2793,7 +2793,7 @@ HRESULT VarBstrFromBool32(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR32*
 /******************************************************************************
  *		VarBstrFromI132		[OLEAUT32.229]
  */
-HRESULT VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %c, %ld, %ld, %p ), stub\n", cIn, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", cIn );
@@ -2805,7 +2805,7 @@ HRESULT VarBstrFromI132(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 /******************************************************************************
  *		VarBstrFromUI232		[OLEAUT32.230]
  */
-HRESULT VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", uiIn, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%d", uiIn );
@@ -2817,7 +2817,7 @@ HRESULT VarBstrFromUI232(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut
 /******************************************************************************
  *		VarBstrFromUI432		[OLEAUT32.231]
  */
-HRESULT VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
+HRESULT WINAPI VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 {
 	TRACE( ole, "( %ld, %ld, %ld, %p ), stub\n", ulIn, lcid, dwFlags, pbstrOut );
 	sprintf( pBuffer, "%ld", ulIn );
@@ -2829,7 +2829,7 @@ HRESULT VarBstrFromUI432(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut)
 /******************************************************************************
  *		VarBoolFromUI132		[OLEAUT32.118]
  */
-HRESULT VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pboolOut );
 
@@ -2848,7 +2848,7 @@ HRESULT VarBoolFromUI132(BYTE bIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromI232		[OLEAUT32.119]
  */
-HRESULT VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", sIn, pboolOut );
 
@@ -2867,7 +2867,7 @@ HRESULT VarBoolFromI232(short sIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromI432		[OLEAUT32.120]
  */
-HRESULT VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pboolOut );
 
@@ -2886,7 +2886,7 @@ HRESULT VarBoolFromI432(LONG lIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromR432		[OLEAUT32.121]
  */
-HRESULT VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pboolOut );
 
@@ -2905,7 +2905,7 @@ HRESULT VarBoolFromR432(FLOAT fltIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromR832		[OLEAUT32.122]
  */
-HRESULT VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pboolOut );
 
@@ -2924,7 +2924,7 @@ HRESULT VarBoolFromR832(double dblIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromDate32		[OLEAUT32.123]
  */
-HRESULT VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pboolOut );
 
@@ -2943,7 +2943,7 @@ HRESULT VarBoolFromDate32(DATE dateIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromStr32		[OLEAUT32.125]
  */
-HRESULT VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut)
 {
 	HRESULT ret = S_OK;
 	char* pNewString = NULL;
@@ -2996,7 +2996,7 @@ HRESULT VarBoolFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOO
 /******************************************************************************
  *		VarBoolFromI132		[OLEAUT32.233]
  */
-HRESULT VarBoolFromI132(CHAR cIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromI132(CHAR cIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pboolOut );
 
@@ -3015,7 +3015,7 @@ HRESULT VarBoolFromI132(CHAR cIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromUI232		[OLEAUT32.234]
  */
-HRESULT VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pboolOut );
 
@@ -3034,7 +3034,7 @@ HRESULT VarBoolFromUI232(USHORT uiIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarBoolFromUI432		[OLEAUT32.235]
  */
-HRESULT VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL* pboolOut)
+HRESULT WINAPI VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL* pboolOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pboolOut );
 
@@ -3053,7 +3053,7 @@ HRESULT VarBoolFromUI432(ULONG ulIn, VARIANT_BOOL* pboolOut)
 /******************************************************************************
  *		VarI1FromUI132		[OLEAUT32.244]
  */
-HRESULT VarI1FromUI132(BYTE bIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromUI132(BYTE bIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pcOut );
 
@@ -3072,7 +3072,7 @@ HRESULT VarI1FromUI132(BYTE bIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromI232		[OLEAUT32.245]
  */
-HRESULT VarI1FromI232(short uiIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromI232(short uiIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pcOut );
 
@@ -3089,7 +3089,7 @@ HRESULT VarI1FromI232(short uiIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromI432		[OLEAUT32.246]
  */
-HRESULT VarI1FromI432(LONG lIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromI432(LONG lIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pcOut );
 
@@ -3106,7 +3106,7 @@ HRESULT VarI1FromI432(LONG lIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromR432		[OLEAUT32.247]
  */
-HRESULT VarI1FromR432(FLOAT fltIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromR432(FLOAT fltIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, pcOut );
 
@@ -3124,7 +3124,7 @@ HRESULT VarI1FromR432(FLOAT fltIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromR832		[OLEAUT32.248]
  */
-HRESULT VarI1FromR832(double dblIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromR832(double dblIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pcOut );
 
@@ -3142,7 +3142,7 @@ HRESULT VarI1FromR832(double dblIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromDate32		[OLEAUT32.249]
  */
-HRESULT VarI1FromDate32(DATE dateIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromDate32(DATE dateIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pcOut );
 
@@ -3160,7 +3160,7 @@ HRESULT VarI1FromDate32(DATE dateIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromStr32		[OLEAUT32.251]
  */
-HRESULT VarI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOut)
+HRESULT WINAPI VarI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -3200,7 +3200,7 @@ HRESULT VarI1FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromBool32		[OLEAUT32.253]
  */
-HRESULT VarI1FromBool32(VARIANT_BOOL boolIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromBool32(VARIANT_BOOL boolIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pcOut );
 
@@ -3212,7 +3212,7 @@ HRESULT VarI1FromBool32(VARIANT_BOOL boolIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromUI232		[OLEAUT32.254]
  */
-HRESULT VarI1FromUI232(USHORT uiIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromUI232(USHORT uiIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pcOut );
 
@@ -3229,7 +3229,7 @@ HRESULT VarI1FromUI232(USHORT uiIn, CHAR* pcOut)
 /******************************************************************************
  *		VarI1FromUI432		[OLEAUT32.255]
  */
-HRESULT VarI1FromUI432(ULONG ulIn, CHAR* pcOut)
+HRESULT WINAPI VarI1FromUI432(ULONG ulIn, CHAR* pcOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, pcOut );
 
@@ -3246,7 +3246,7 @@ HRESULT VarI1FromUI432(ULONG ulIn, CHAR* pcOut)
 /******************************************************************************
  *		VarUI2FromUI132		[OLEAUT32.257]
  */
-HRESULT VarUI2FromUI132(BYTE bIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromUI132(BYTE bIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, puiOut );
 
@@ -3258,7 +3258,7 @@ HRESULT VarUI2FromUI132(BYTE bIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromI232		[OLEAUT32.258]
  */
-HRESULT VarUI2FromI232(short uiIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromI232(short uiIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, puiOut );
 
@@ -3275,7 +3275,7 @@ HRESULT VarUI2FromI232(short uiIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromI432		[OLEAUT32.259]
  */
-HRESULT VarUI2FromI432(LONG lIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromI432(LONG lIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, puiOut );
 
@@ -3292,7 +3292,7 @@ HRESULT VarUI2FromI432(LONG lIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromR432		[OLEAUT32.260]
  */
-HRESULT VarUI2FromR432(FLOAT fltIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromR432(FLOAT fltIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", fltIn, puiOut );
 
@@ -3310,7 +3310,7 @@ HRESULT VarUI2FromR432(FLOAT fltIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromR832		[OLEAUT32.261]
  */
-HRESULT VarUI2FromR832(double dblIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromR832(double dblIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, puiOut );
 
@@ -3328,7 +3328,7 @@ HRESULT VarUI2FromR832(double dblIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromDate32		[OLEAUT32.262]
  */
-HRESULT VarUI2FromDate32(DATE dateIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromDate32(DATE dateIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, puiOut );
 
@@ -3346,7 +3346,7 @@ HRESULT VarUI2FromDate32(DATE dateIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromStr32		[OLEAUT32.264]
  */
-HRESULT VarUI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, USHORT* puiOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -3386,7 +3386,7 @@ HRESULT VarUI2FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, USHORT* puiO
 /******************************************************************************
  *		VarUI2FromBool32		[OLEAUT32.266]
  */
-HRESULT VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, puiOut );
 
@@ -3398,7 +3398,7 @@ HRESULT VarUI2FromBool32(VARIANT_BOOL boolIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromI132		[OLEAUT32.267]
  */
-HRESULT VarUI2FromI132(CHAR cIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromI132(CHAR cIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, puiOut );
 
@@ -3410,7 +3410,7 @@ HRESULT VarUI2FromI132(CHAR cIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI2FromUI432		[OLEAUT32.268]
  */
-HRESULT VarUI2FromUI432(ULONG ulIn, USHORT* puiOut)
+HRESULT WINAPI VarUI2FromUI432(ULONG ulIn, USHORT* puiOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", ulIn, puiOut );
 
@@ -3427,7 +3427,7 @@ HRESULT VarUI2FromUI432(ULONG ulIn, USHORT* puiOut)
 /******************************************************************************
  *		VarUI4FromStr32		[OLEAUT32.277]
  */
-HRESULT VarUI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, ULONG* pulOut)
 {
 	double dValue = 0.0;
 	LPSTR pNewString = NULL;
@@ -3467,7 +3467,7 @@ HRESULT VarUI4FromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, ULONG* pulOu
 /******************************************************************************
  *		VarUI4FromUI132		[OLEAUT32.270]
  */
-HRESULT VarUI4FromUI132(BYTE bIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromUI132(BYTE bIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", bIn, pulOut );
 
@@ -3479,7 +3479,7 @@ HRESULT VarUI4FromUI132(BYTE bIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromI232		[OLEAUT32.271]
  */
-HRESULT VarUI4FromI232(short uiIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromI232(short uiIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pulOut );
 
@@ -3496,7 +3496,7 @@ HRESULT VarUI4FromI232(short uiIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromI432		[OLEAUT32.272]
  */
-HRESULT VarUI4FromI432(LONG lIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromI432(LONG lIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %ld, %p ), stub\n", lIn, pulOut );
 
@@ -3513,7 +3513,7 @@ HRESULT VarUI4FromI432(LONG lIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromR432		[OLEAUT32.273]
  */
-HRESULT VarUI4FromR432(FLOAT fltIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromR432(FLOAT fltIn, ULONG* pulOut)
 {
     fltIn = round( fltIn );
     if( fltIn < UI4_MIN || fltIn > UI4_MAX )
@@ -3529,7 +3529,7 @@ HRESULT VarUI4FromR432(FLOAT fltIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromR832		[OLEAUT32.274]
  */
-HRESULT VarUI4FromR832(double dblIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromR832(double dblIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dblIn, pulOut );
 
@@ -3547,7 +3547,7 @@ HRESULT VarUI4FromR832(double dblIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromDate32		[OLEAUT32.275]
  */
-HRESULT VarUI4FromDate32(DATE dateIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromDate32(DATE dateIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %f, %p ), stub\n", dateIn, pulOut );
 
@@ -3565,7 +3565,7 @@ HRESULT VarUI4FromDate32(DATE dateIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromBool32		[OLEAUT32.279]
  */
-HRESULT VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", boolIn, pulOut );
 
@@ -3577,7 +3577,7 @@ HRESULT VarUI4FromBool32(VARIANT_BOOL boolIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromI132		[OLEAUT32.280]
  */
-HRESULT VarUI4FromI132(CHAR cIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromI132(CHAR cIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %c, %p ), stub\n", cIn, pulOut );
 
@@ -3589,7 +3589,7 @@ HRESULT VarUI4FromI132(CHAR cIn, ULONG* pulOut)
 /******************************************************************************
  *		VarUI4FromUI232		[OLEAUT32.281]
  */
-HRESULT VarUI4FromUI232(USHORT uiIn, ULONG* pulOut)
+HRESULT WINAPI VarUI4FromUI232(USHORT uiIn, ULONG* pulOut)
 {
 	TRACE( ole, "( %d, %p ), stub\n", uiIn, pulOut );