oleaut32: Cast-qual warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Tue Nov 7 15:55:29 CST 2006
Changelog:
oleaut32: Cast-qual warnings fix.
diff -urN a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
--- a/dlls/oleaut32/varformat.c 2006-10-13 11:27:25.000000000 +0100
+++ b/dlls/oleaut32/varformat.c 2006-11-07 21:43:12.000000000 +0000
@@ -1858,7 +1858,7 @@
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 @@
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 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 @@
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 -urN a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
--- a/dlls/oleaut32/vartype.c 2006-10-13 11:27:25.000000000 +0100
+++ b/dlls/oleaut32/vartype.c 2006-11-07 21:40:49.000000000 +0000
@@ -114,7 +114,7 @@
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 @@
/* 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-patches
mailing list