ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Cast-qual warnings fix.

This commit is contained in:
Andrew Talbot 2006-11-07 21:55:29 +00:00 committed by Alexandre Julliard
parent e9ae478c14
commit 501e2dcc99
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/oleaut32/varformat.c
View File

@ -1858,7 +1858,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat,
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(LPVARIANT pVarIn, LPOLESTR lpszFormat,
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 pVarIn, LPOLESTR lpszFormat,
*/
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(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B
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);
}

4
dlls/oleaut32/vartype.c
View File

@ -114,7 +114,7 @@ static HRESULT VARIANT_NumberFromBstr(OLECHAR* pStrIn, LCID lcid, ULONG ulFlags,
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(IDispatch* pdispIn, LCID lcid, void* pOut,
/* 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))
{