Andrew Talbot : oleaut32: Cast-qual warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Nov 8 14:12:10 CST 2006
Module: wine
Branch: master
Commit: 501e2dcc996509b5303965933aec3d751a1cc500
URL: http://source.winehq.org/git/wine.git/?a=commit;h=501e2dcc996509b5303965933aec3d751a1cc500
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Tue Nov 7 21:55:29 2006 +0000
oleaut32: Cast-qual warnings fix.
---
dlls/oleaut32/varformat.c | 8 ++++----
dlls/oleaut32/vartype.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
index 0abc78c..f8ccfd3 100644
--- a/dlls/oleaut32/varformat.c
+++ b/dlls/oleaut32/varformat.c
@@ -1858,7 +1858,7 @@ static HRESULT VARIANT_FormatString(LPVA
LPBYTE rgbTok, ULONG dwFlags,
BSTR *pbstrOut, LCID lcid)
{
- static const WCHAR szEmpty[] = { '\0' };
+ static WCHAR szEmpty[] = { '\0' };
WCHAR buff[256], *pBuff = buff;
WCHAR *pSrc;
FMT_HEADER *header = (FMT_HEADER*)rgbTok;
@@ -1878,7 +1878,7 @@ static HRESULT VARIANT_FormatString(LPVA
if (V_TYPE(pVarIn) == VT_EMPTY || V_TYPE(pVarIn) == VT_NULL)
{
strHeader = (FMT_STRING_HEADER*)(rgbTok + FmtGetNegative(header));
- V_BSTR(&vStr) = (WCHAR*)szEmpty;
+ V_BSTR(&vStr) = szEmpty;
}
else
{
@@ -2131,7 +2131,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarI
*/
HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, BSTR *pbstrOut)
{
- static const WCHAR szEmpty[] = { '\0' };
+ static WCHAR szEmpty[] = { '\0' };
const BYTE* lpFmt = NULL;
TRACE("(%p->(%s%s),%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn),
@@ -2148,7 +2148,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIA
case 3: lpFmt = fmtLongTime; break;
case 4: lpFmt = fmtShortTime; break;
}
- return VarFormatFromTokens(pVarIn, (LPWSTR)szEmpty, (BYTE*)lpFmt, dwFlags,
+ return VarFormatFromTokens(pVarIn, szEmpty, (BYTE*)lpFmt, dwFlags,
pbstrOut, LOCALE_USER_DEFAULT);
}
diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index f379517..57239a4 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -114,7 +114,7 @@ static HRESULT VARIANT_NumberFromBstr(OL
static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut,
VARTYPE vt, DWORD dwFlags)
{
- static const DISPPARAMS emptyParams = { NULL, NULL, 0, 0 };
+ static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 };
VARIANTARG srcVar, dstVar;
HRESULT hRet;
@@ -123,7 +123,7 @@ static HRESULT VARIANT_FromDisp(IDispatc
/* Get the default 'value' property from the IDispatch */
hRet = IDispatch_Invoke(pdispIn, DISPID_VALUE, &IID_NULL, lcid, DISPATCH_PROPERTYGET,
- (DISPPARAMS*)&emptyParams, &srcVar, NULL, NULL);
+ &emptyParams, &srcVar, NULL, NULL);
if (SUCCEEDED(hRet))
{
More information about the wine-cvs
mailing list