From f82b9c232180bb79fc4b6d3df02f9f7c6fd5dcf5 Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sat, 28 Jul 2007 18:42:36 +0000 Subject: [PATCH] Fix incompatible pointer type warnings svn path=/trunk/; revision=27962 --- reactos/base/shell/explorer/shell/shellfs.cpp | 2 +- reactos/base/shell/explorer/shell/webchild.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/reactos/base/shell/explorer/shell/shellfs.cpp b/reactos/base/shell/explorer/shell/shellfs.cpp index 01018ff30a7..39519089337 100644 --- a/reactos/base/shell/explorer/shell/shellfs.cpp +++ b/reactos/base/shell/explorer/shell/shellfs.cpp @@ -399,7 +399,7 @@ void ShellDirectory::read_directory(int scan_flags) 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); diff --git a/reactos/base/shell/explorer/shell/webchild.h b/reactos/base/shell/explorer/shell/webchild.h index 4347dc7e8bb..4793a77c9f7 100644 --- a/reactos/base/shell/explorer/shell/webchild.h +++ b/reactos/base/shell/explorer/shell/webchild.h @@ -768,14 +768,19 @@ struct ANSUNC DWebBrowserEvents2Impl 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])); + 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)