Author: weiden
Date: Sat Jul 28 22:42:36 2007
New Revision: 27962
URL:
http://svn.reactos.org/svn/reactos?rev=27962&view=rev
Log:
Fix incompatible pointer type warnings
Modified:
trunk/reactos/base/shell/explorer/shell/shellfs.cpp
trunk/reactos/base/shell/explorer/shell/webchild.h
Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/…
==============================================================================
--- trunk/reactos/base/shell/explorer/shell/shellfs.cpp (original)
+++ trunk/reactos/base/shell/explorer/shell/shellfs.cpp Sat Jul 28 22:42:36 2007
@@ -399,7 +399,7 @@
attribs |= SFGAO_HASSUBFOLDER;
removeable = true;
} else if (!(scan_flags & SCAN_DONT_ACCESS)) {
- DWORD attribs2 = SFGAO_READONLY;
+ SFGAOF attribs2 = SFGAO_READONLY;
HRESULT hr = _folder->GetAttributesOf(1, (LPCITEMIDLIST*)&pidls[n],
&attribs2);
Modified: trunk/reactos/base/shell/explorer/shell/webchild.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/…
==============================================================================
--- trunk/reactos/base/shell/explorer/shell/webchild.h (original)
+++ trunk/reactos/base/shell/explorer/shell/webchild.h Sat Jul 28 22:42:36 2007
@@ -768,14 +768,19 @@
break;
case DISPID_CLIENTTOHOSTWINDOW:// sent during window.open to request conversion of
dimensions
+ {
+ long cx, cy;
if (pDispParams->cArgs != 2)
return E_INVALIDARG;
if (V_VT(&pDispParams->rgvarg[0]) != (VT_I4|VT_BYREF))
return E_INVALIDARG;
if (V_VT(&pDispParams->rgvarg[1]) != (VT_I4|VT_BYREF))
return E_INVALIDARG;
- _callback->ClientToHostWindow(*V_I4REF(&pDispParams->rgvarg[1]),
*V_I4REF(&pDispParams->rgvarg[0]));
- break;
+ cx = *V_I4REF(&pDispParams->rgvarg[1]);
+ cy = *V_I4REF(&pDispParams->rgvarg[0]);
+ _callback->ClientToHostWindow(cx, cy);
+ break;
+ }
case DISPID_SETSECURELOCKICON:// sent to suggest the appropriate security icon to
show
if (pDispParams->cArgs != 1)