Fix incompatible pointer type warnings

svn path=/trunk/; revision=27962
This commit is contained in:
Thomas Bluemel 2007-07-28 18:42:36 +00:00
parent b6b71503a4
commit f82b9c2321
2 changed files with 7 additions and 2 deletions

View file

@ -399,7 +399,7 @@ void ShellDirectory::read_directory(int scan_flags)
attribs |= SFGAO_HASSUBFOLDER; attribs |= SFGAO_HASSUBFOLDER;
removeable = true; removeable = true;
} else if (!(scan_flags & SCAN_DONT_ACCESS)) { } else if (!(scan_flags & SCAN_DONT_ACCESS)) {
DWORD attribs2 = SFGAO_READONLY; SFGAOF attribs2 = SFGAO_READONLY;
HRESULT hr = _folder->GetAttributesOf(1, (LPCITEMIDLIST*)&pidls[n], &attribs2); HRESULT hr = _folder->GetAttributesOf(1, (LPCITEMIDLIST*)&pidls[n], &attribs2);

View file

@ -768,14 +768,19 @@ struct ANSUNC DWebBrowserEvents2Impl
break; break;
case DISPID_CLIENTTOHOSTWINDOW:// sent during window.open to request conversion of dimensions case DISPID_CLIENTTOHOSTWINDOW:// sent during window.open to request conversion of dimensions
{
long cx, cy;
if (pDispParams->cArgs != 2) if (pDispParams->cArgs != 2)
return E_INVALIDARG; return E_INVALIDARG;
if (V_VT(&pDispParams->rgvarg[0]) != (VT_I4|VT_BYREF)) if (V_VT(&pDispParams->rgvarg[0]) != (VT_I4|VT_BYREF))
return E_INVALIDARG; return E_INVALIDARG;
if (V_VT(&pDispParams->rgvarg[1]) != (VT_I4|VT_BYREF)) if (V_VT(&pDispParams->rgvarg[1]) != (VT_I4|VT_BYREF))
return E_INVALIDARG; return E_INVALIDARG;
_callback->ClientToHostWindow(*V_I4REF(&pDispParams->rgvarg[1]), *V_I4REF(&pDispParams->rgvarg[0])); cx = *V_I4REF(&pDispParams->rgvarg[1]);
cy = *V_I4REF(&pDispParams->rgvarg[0]);
_callback->ClientToHostWindow(cx, cy);
break; break;
}
case DISPID_SETSECURELOCKICON:// sent to suggest the appropriate security icon to show case DISPID_SETSECURELOCKICON:// sent to suggest the appropriate security icon to show
if (pDispParams->cArgs != 1) if (pDispParams->cArgs != 1)