Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/oleaut32/vartype.c | 26 +++++++++++++------------- include/oleauto.h | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 90b3fcaa1a9..06bc70e0a89 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -517,7 +517,7 @@ HRESULT WINAPI VarI1FromUI4(ULONG ulIn, signed char* pcOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI1FromDec(DECIMAL *pdecIn, signed char* pcOut) +HRESULT WINAPI VarI1FromDec(const DECIMAL *pdecIn, signed char* pcOut) { LONG64 i64; HRESULT hRet; @@ -828,7 +828,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI1FromDec(DECIMAL *pdecIn, BYTE* pbOut) +HRESULT WINAPI VarUI1FromDec(const DECIMAL *pdecIn, BYTE* pbOut) { LONG64 i64; HRESULT hRet; @@ -1125,7 +1125,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG ulIn, SHORT* psOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI2FromDec(DECIMAL *pdecIn, SHORT* psOut) +HRESULT WINAPI VarI2FromDec(const DECIMAL *pdecIn, SHORT* psOut) { LONG64 i64; HRESULT hRet; @@ -1422,7 +1422,7 @@ HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* pusOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI2FromDec(DECIMAL *pdecIn, USHORT* pusOut) +HRESULT WINAPI VarUI2FromDec(const DECIMAL *pdecIn, USHORT* pusOut) { LONG64 i64; HRESULT hRet; @@ -1714,7 +1714,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG *piOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI4FromDec(DECIMAL *pdecIn, LONG *piOut) +HRESULT WINAPI VarI4FromDec(const DECIMAL *pdecIn, LONG *piOut) { LONG64 i64; HRESULT hRet; @@ -2006,7 +2006,7 @@ HRESULT WINAPI VarUI4FromUI2(USHORT usIn, ULONG *pulOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI4FromDec(DECIMAL *pdecIn, ULONG *pulOut) +HRESULT WINAPI VarUI4FromDec(const DECIMAL *pdecIn, ULONG *pulOut) { LONG64 i64; HRESULT hRet; @@ -2329,7 +2329,7 @@ HRESULT WINAPI VarI8FromUI4(ULONG ulIn, LONG64* pi64Out) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn, LONG64* pi64Out) +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn, LONG64* pi64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2664,7 +2664,7 @@ HRESULT WINAPI VarUI8FromUI4(ULONG ulIn, ULONG64* pui64Out) * with DISP_E_OVERFLOW. This bug has been fixed in Wine's implementation * (use VarAbs() on pDecIn first if you really want this behaviour). */ -HRESULT WINAPI VarUI8FromDec(DECIMAL *pdecIn, ULONG64* pui64Out) +HRESULT WINAPI VarUI8FromDec(const DECIMAL *pdecIn, ULONG64* pui64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2940,7 +2940,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG ulIn, float *pFltOut) * Success: S_OK. * Failure: E_INVALIDARG, if the source value is invalid. */ -HRESULT WINAPI VarR4FromDec(DECIMAL* pDecIn, float *pFltOut) +HRESULT WINAPI VarR4FromDec(const DECIMAL* pDecIn, float *pFltOut) { BYTE scale = DEC_SCALE(pDecIn); double divisor = 1.0; @@ -3698,7 +3698,7 @@ HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pCyOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarCyFromDec(DECIMAL* pdecIn, CY* pCyOut) +HRESULT WINAPI VarCyFromDec(const DECIMAL* pdecIn, CY* pCyOut) { DECIMAL rounded; HRESULT hRet; @@ -6269,7 +6269,7 @@ HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL *pBoolOut) * Success: S_OK. * Failure: E_INVALIDARG, if pDecIn is invalid. */ -HRESULT WINAPI VarBoolFromDec(DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) +HRESULT WINAPI VarBoolFromDec(const DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) { if (DEC_SCALE(pDecIn) > DEC_MAX_SCALE || (DEC_SIGN(pDecIn) & ~DECIMAL_NEG)) return E_INVALIDARG; @@ -6984,7 +6984,7 @@ HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO * Failure: E_INVALIDARG, if pbstrOut is invalid. * E_OUTOFMEMORY, if memory allocation fails. */ -HRESULT WINAPI VarBstrFromDec(DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) +HRESULT WINAPI VarBstrFromDec(const DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { WCHAR buff[256]; VARIANT_DI temp; @@ -7998,7 +7998,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut) * RETURNS * S_OK. */ -HRESULT WINAPI VarDateFromDec(DECIMAL *pdecIn, DATE* pdateOut) +HRESULT WINAPI VarDateFromDec(const DECIMAL *pdecIn, DATE* pdateOut) { return VarR8FromDec(pdecIn, pdateOut); } diff --git a/include/oleauto.h b/include/oleauto.h index 45edfbb84af..f00bfa0c7f8 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -239,7 +239,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG,BYTE*); HRESULT WINAPI VarUI1FromUI8(ULONG64,BYTE*); HRESULT WINAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); HRESULT WINAPI VarUI1FromCy(CY,BYTE*); -HRESULT WINAPI VarUI1FromDec(DECIMAL*,BYTE*); +HRESULT WINAPI VarUI1FromDec(const DECIMAL*,BYTE*); HRESULT WINAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*);
HRESULT WINAPI VarI2FromUI1(BYTE,SHORT*); @@ -255,7 +255,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG,SHORT*); HRESULT WINAPI VarI2FromUI8(ULONG64,SHORT*); HRESULT WINAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); HRESULT WINAPI VarI2FromCy(CY,SHORT*); -HRESULT WINAPI VarI2FromDec(DECIMAL*,SHORT*); +HRESULT WINAPI VarI2FromDec(const DECIMAL*,SHORT*); HRESULT WINAPI VarI2FromDisp(IDispatch*,LCID,SHORT*);
HRESULT WINAPI VarI4FromUI1(BYTE,LONG*); @@ -271,7 +271,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG,LONG*); HRESULT WINAPI VarI4FromUI8(ULONG64,LONG*); HRESULT WINAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); HRESULT WINAPI VarI4FromCy(CY,LONG*); -HRESULT WINAPI VarI4FromDec(DECIMAL*,LONG*); +HRESULT WINAPI VarI4FromDec(const DECIMAL*,LONG*); HRESULT WINAPI VarI4FromDisp(IDispatch*,LCID,LONG*);
HRESULT WINAPI VarI8FromUI1(BYTE,LONG64*); @@ -286,7 +286,7 @@ HRESULT WINAPI VarI8FromI1(signed char,LONG64*); HRESULT WINAPI VarI8FromUI2(USHORT,LONG64*); HRESULT WINAPI VarI8FromUI4(ULONG,LONG64*); HRESULT WINAPI VarI8FromUI8(ULONG64,LONG64*); -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn,LONG64*); +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn,LONG64*); HRESULT WINAPI VarI8FromInt(INT intIn,LONG64*); HRESULT WINAPI VarI8FromCy(CY,LONG64*); HRESULT WINAPI VarI8FromDisp(IDispatch*,LCID,LONG64*); @@ -304,7 +304,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG,FLOAT*); HRESULT WINAPI VarR4FromUI8(ULONG64,FLOAT*); HRESULT WINAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); HRESULT WINAPI VarR4FromCy(CY,FLOAT*); -HRESULT WINAPI VarR4FromDec(DECIMAL*,FLOAT*); +HRESULT WINAPI VarR4FromDec(const DECIMAL*,FLOAT*); HRESULT WINAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*);
HRESULT WINAPI VarR8FromUI1(BYTE,double*); @@ -336,7 +336,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG,DATE*); HRESULT WINAPI VarDateFromUI8(ULONG64,DATE*); HRESULT WINAPI VarDateFromBool(VARIANT_BOOL,DATE*); HRESULT WINAPI VarDateFromCy(CY,DATE*); -HRESULT WINAPI VarDateFromDec(DECIMAL*,DATE*); +HRESULT WINAPI VarDateFromDec(const DECIMAL*,DATE*); HRESULT WINAPI VarDateFromDisp(IDispatch*,LCID,DATE*);
HRESULT WINAPI VarCyFromUI1(BYTE,CY*); @@ -352,7 +352,7 @@ HRESULT WINAPI VarCyFromI1(signed char,CY*); HRESULT WINAPI VarCyFromUI2(USHORT,CY*); HRESULT WINAPI VarCyFromUI4(ULONG,CY*); HRESULT WINAPI VarCyFromUI8(ULONG64,CY*); -HRESULT WINAPI VarCyFromDec(DECIMAL*,CY*); +HRESULT WINAPI VarCyFromDec(const DECIMAL*,CY*); HRESULT WINAPI VarCyFromDisp(IDispatch*,LCID,CY*);
HRESULT WINAPI VarBstrFromUI1(BYTE,LCID,ULONG,BSTR*); @@ -368,7 +368,7 @@ HRESULT WINAPI VarBstrFromUI2(USHORT,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI8(ULONG64,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI4(ULONG,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromCy(CY,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromDec(DECIMAL*,LCID,ULONG,BSTR*); +HRESULT WINAPI VarBstrFromDec(const DECIMAL*,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromDisp(IDispatch*,LCID,ULONG,BSTR*);
HRESULT WINAPI VarBoolFromUI1(BYTE,VARIANT_BOOL*); @@ -384,7 +384,7 @@ HRESULT WINAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI8(ULONG64,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromCy(CY,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromDec(DECIMAL*,VARIANT_BOOL*); +HRESULT WINAPI VarBoolFromDec(const DECIMAL*,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromDisp(IDispatch*,LCID,VARIANT_BOOL*);
HRESULT WINAPI VarI1FromUI1(BYTE,signed char*); @@ -400,7 +400,7 @@ HRESULT WINAPI VarI1FromUI2(USHORT,signed char*); HRESULT WINAPI VarI1FromUI4(ULONG,signed char*); HRESULT WINAPI VarI1FromUI8(ULONG64,signed char*); HRESULT WINAPI VarI1FromCy(CY,signed char*); -HRESULT WINAPI VarI1FromDec(DECIMAL*,signed char*); +HRESULT WINAPI VarI1FromDec(const DECIMAL*,signed char*); HRESULT WINAPI VarI1FromDisp(IDispatch*,LCID,signed char*);
HRESULT WINAPI VarUI2FromUI1(BYTE,USHORT*); @@ -416,7 +416,7 @@ HRESULT WINAPI VarUI2FromI1(signed char,USHORT*); HRESULT WINAPI VarUI2FromUI4(ULONG,USHORT*); HRESULT WINAPI VarUI2FromUI8(ULONG64,USHORT*); HRESULT WINAPI VarUI2FromCy(CY,USHORT*); -HRESULT WINAPI VarUI2FromDec(DECIMAL*,USHORT*); +HRESULT WINAPI VarUI2FromDec(const DECIMAL*,USHORT*); HRESULT WINAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*);
HRESULT WINAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); @@ -432,7 +432,7 @@ HRESULT WINAPI VarUI4FromI1(signed char,ULONG*); HRESULT WINAPI VarUI4FromUI2(USHORT,ULONG*); HRESULT WINAPI VarUI4FromUI8(ULONG64,ULONG*); HRESULT WINAPI VarUI4FromCy(CY,ULONG*); -HRESULT WINAPI VarUI4FromDec(DECIMAL*,ULONG*); +HRESULT WINAPI VarUI4FromDec(const DECIMAL*,ULONG*); HRESULT WINAPI VarUI4FromDisp(IDispatch*,LCID,ULONG*);
HRESULT WINAPI VarUI8FromUI1(BYTE,ULONG64*); @@ -447,7 +447,7 @@ HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); HRESULT WINAPI VarUI8FromI1(signed char,ULONG64*); HRESULT WINAPI VarUI8FromUI2(USHORT,ULONG64*); HRESULT WINAPI VarUI8FromUI4(ULONG,ULONG64*); -HRESULT WINAPI VarUI8FromDec(DECIMAL*,ULONG64*); +HRESULT WINAPI VarUI8FromDec(const DECIMAL*,ULONG64*); HRESULT WINAPI VarUI8FromInt(INT,ULONG64*); HRESULT WINAPI VarUI8FromCy(CY,ULONG64*); HRESULT WINAPI VarUI8FromDisp(IDispatch*,LCID,ULONG64*);