Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[jimtabor] 68920: [Win32k] - Use the same style for get messages in nonclient. - Remove bit checks left over from testing. Fix CORE-10086.
by jimtabor＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: jimtabor Date: Wed Sep 2 23:06:19 2015 New Revision: 68920 URL: http://svn.reactos.org/svn/reactos?rev=68920&view=rev Log: [Win32k] - Use the same style for get messages in nonclient. - Remove bit checks left over from testing. Fix CORE-10086. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Sep 2 23:06:19 2015 @@ -2013,16 +2013,6 @@ IntCoalesceMouseMove(pti); } - if ( pti->nCntsQBits[QSRosMouseButton] != 0 || - pti->nCntsQBits[QSRosMouseMove] != 0 || - pti->nCntsQBits[QSRosKey] != 0 || - pti->nCntsQBits[QSRosSendMessage] != 0 || - pti->nCntsQBits[QSRosPostMessage] != 0 ) - { - TRACE("No time to wait!\n"); - return ret; - } - UserLeaveCo(); ZwYieldExecution(); // Let someone else run! Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Wed Sep 2 23:06:19 2015 @@ -497,7 +497,13 @@ // Only the windows that overlap will be redrawn. if (RECTL_bIntersectRect( &rect, &pwnd->rcWindow, &pwndTemp->rcWindow )) { - co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN); + if (pwnd->head.pti == pwndTemp->head.pti) + co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_UPDATENOW | RDW_NOCHILDREN); + else + { + ERR("Not Same Thread!\n"); + co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN); + } } } } @@ -890,7 +896,7 @@ if (!(Flags & DC_NOVISIBLE) && !IntIsWindowVisible(pWnd)) return; - TRACE("UserDrawCaptionBar: pWnd %p, hDc %p, Flags 0x%x.\n", pWnd, hDC, Flags); + ERR("UserDrawCaptionBar: pWnd %p, hDc %p, Flags 0x%x.\n", pWnd, hDC, Flags); Style = pWnd->style; ExStyle = pWnd->ExStyle; @@ -1506,8 +1512,7 @@ for (;;) { - if (co_IntGetPeekMessage(&Msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE, TRUE) <= 0) - break; + if (!co_IntGetPeekMessage(&Msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE, TRUE)) break; if (IntCallMsgFilter( &Msg, MSGF_MAX )) continue; if (Msg.message == WM_LBUTTONUP)

1 0

[spetreolle] 68919: [COM_APITEST] Do not test for ISFHelper anymore.
by spetreolle＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: spetreolle Date: Wed Sep 2 20:52:34 2015 New Revision: 68919 URL: http://svn.reactos.org/svn/reactos?rev=68919&view=rev Log: [COM_APITEST] Do not test for ISFHelper anymore. Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Wed Sep 2 20:52:34 2015 @@ -219,7 +219,6 @@ { ID_NAME(IID_IRunnableObject) }, { ID_NAME(IID_IServerSecurity), TRUE }, { ID_NAME(IID_IServiceProvider) }, - { ID_NAME(IID_ISFHelper), TRUE }, { ID_NAME(IID_IShellApp), TRUE }, { ID_NAME(IID_IShellBrowser) }, { ID_NAME(IID_IShellBrowserService), TRUE }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Wed Sep 2 20:52:34 2015 @@ -163,5 +163,3 @@ DEFINE_GUID(IID_CDefView, 0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x65, 0x08, 0x00, 0x2b, 0xe2, 0x12, 0x62); DEFINE_GUID(IID_FolderItems2, 0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f); DEFINE_GUID(IID_FolderItems3, 0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f); - -DEFINE_GUID(IID_ISFHelper, 0x1fe68efbL, 0x1874, 0x9812, 0x56, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);

1 0

[pschweitzer] 68918: [RTL] Finally, use the correct implementation for RtlAssert(). In testbots, the behavior will be the following: On prompt, sysreg will always issue a 'break once' instruction. ...
by pschweitzer＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: pschweitzer Date: Wed Sep 2 20:18:42 2015 New Revision: 68918 URL: http://svn.reactos.org/svn/reactos?rev=68918&view=rev Log: [RTL] Finally, use the correct implementation for RtlAssert(). In testbots, the behavior will be the following: On prompt, sysreg will always issue a 'break once' instruction. In umode, where kdbg isn't instructed to handle breakpoint, this will lead to application being killed. With a lot of noise. This matches previous behavior. In kmode, where kdbg handles breakpoints, sysreg2 will ask for a bt and will reboot the VM. As it was done previously. The testbots already have the newest available sysreg2 revision. This was made possible thanks to the help of Stefan and Thomas. It was also made possible thanks to the commits: - in trunk: r68899, r68905, r68917 - in project-tools: r2074, r2232 CORE-10088 #resolve #comment Fixed with r68918 Modified: trunk/reactos/lib/rtl/assert.c Modified: trunk/reactos/lib/rtl/assert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/assert.c?rev=68918… ============================================================================== --- trunk/reactos/lib/rtl/assert.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/assert.c [iso-8859-1] Wed Sep 2 20:18:42 2015 @@ -25,7 +25,6 @@ IN ULONG LineNumber, IN PCHAR Message OPTIONAL) { -#if 0 // Disabled until sysreg can handle debug prompts CHAR Action[2]; CONTEXT Context; @@ -97,23 +96,4 @@ /* Shouldn't get here */ DbgBreakPoint(); ZwTerminateProcess(ZwCurrentProcess(), STATUS_UNSUCCESSFUL); -#else - if (NULL != Message) - { - DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber, - Message); - } - else - { - DbgPrint("Assertion \'%s\' failed at %s line %u\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber); - } - - DbgBreakPoint(); -#endif }

1 0

[pschweitzer] 68917: [KERNEL32] Always print information about unhandled exception, even when GUI error dialog boxes are disabled CORE-10088
by pschweitzer＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: pschweitzer Date: Wed Sep 2 20:11:39 2015 New Revision: 68917 URL: http://svn.reactos.org/svn/reactos?rev=68917&view=rev Log: [KERNEL32] Always print information about unhandled exception, even when GUI error dialog boxes are disabled CORE-10088 Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Wed Sep 2 20:11:39 2015 @@ -292,8 +292,7 @@ return ret; } - if ((GetErrorMode() & SEM_NOGPFAULTERRORBOX) == 0) - PrintStackTrace(ExceptionInfo); + PrintStackTrace(ExceptionInfo); /* Save exception code and address */ ErrorParameters[0] = (ULONG)ExceptionRecord->ExceptionCode;

1 0

[gadamopoulos] 68916: [SHELL32] - Remove Reactos only ISFHelper interface that is no longer used.
by gadamopoulos＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: gadamopoulos Date: Wed Sep 2 18:20:40 2015 New Revision: 68916 URL: http://svn.reactos.org/svn/reactos?rev=68916&view=rev Log: [SHELL32] - Remove Reactos only ISFHelper interface that is no longer used. Removed: trunk/reactos/dll/win32/shell32/shellfolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/wine/brsfolder.c Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Wed Sep 2 18:20:40 2015 @@ -957,41 +957,6 @@ return S_OK; } -HRESULT WINAPI CDesktopFolder::GetUniqueName(LPWSTR pwszName, UINT uLen) -{ - CComPtr<ISFHelper> psfHelper; - HRESULT hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfHelper)); - if (FAILED(hr)) - return hr; - - return psfHelper->GetUniqueName(pwszName, uLen); -} - -HRESULT WINAPI CDesktopFolder::AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut) -{ - CComPtr<ISFHelper> psfHelper; - HRESULT hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfHelper)); - if (FAILED(hr)) - return hr; - - return psfHelper->AddFolder(hwnd, pwszName, ppidlOut); -} - -HRESULT WINAPI CDesktopFolder::DeleteItems(UINT cidl, LPCITEMIDLIST *apidl) -{ - return E_NOTIMPL; -} - -HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy) -{ - CComPtr<ISFHelper> psfHelper; - HRESULT hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfHelper)); - if (FAILED(hr)) - return hr; - - return psfHelper->CopyItems(pSFFrom, cidl, apidl, bCopy); -} - HRESULT WINAPI CDesktopFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { HRESULT hr; Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] Wed Sep 2 18:20:40 2015 @@ -27,8 +27,7 @@ public CComCoClass<CDesktopFolder, &CLSID_ShellDesktop>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder2, - public ISFHelper + public IPersistFolder2 { private: /* both paths are parsible from the desktop */ @@ -75,12 +74,6 @@ // *** IPersistFolder2 methods *** virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); - // *** ISFHelper methods *** - virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); - virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); - virtual HRESULT WINAPI DeleteItems(UINT cidl, LPCITEMIDLIST *apidl); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); - DECLARE_REGISTRY_RESOURCEID(IDR_SHELLDESKTOP) DECLARE_CENTRAL_INSTANCE_NOT_AGGREGATABLE(CDesktopFolder) @@ -92,7 +85,6 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_ISFHelper, ISFHelper) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Wed Sep 2 18:20:40 2015 @@ -821,108 +821,6 @@ } /**************************************************************************** - * ISFHelper for IShellFolder implementation - */ - -/**************************************************************************** - * CFSFolder::GetUniqueName - * - * creates a unique folder name - */ - -HRESULT WINAPI CFSFolder::GetUniqueName(LPWSTR pwszName, UINT uLen) -{ - CComPtr<IEnumIDList> penum; - HRESULT hr; - WCHAR wszText[MAX_PATH]; - WCHAR wszNewFolder[25]; - const WCHAR wszFormat[] = L"%s %d"; - - LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, _countof(wszNewFolder)); - - TRACE ("(%p)(%p %u)\n", this, pwszName, uLen); - - if (uLen < _countof(wszNewFolder) + 3) - return E_POINTER; - - lstrcpynW (pwszName, wszNewFolder, uLen); - - hr = EnumObjects(0, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penum); - if (penum) - { - LPITEMIDLIST pidl; - DWORD dwFetched; - int i = 1; - -next: - penum->Reset (); - while (S_OK == penum->Next(1, &pidl, &dwFetched) && dwFetched) - { - _ILSimpleGetTextW(pidl, wszText, MAX_PATH); - if (0 == lstrcmpiW(wszText, pwszName)) - { - _snwprintf(pwszName, uLen, wszFormat, wszNewFolder, i++); - if (i > 99) - { - hr = E_FAIL; - break; - } - goto next; - } - } - } - return hr; -} - -/**************************************************************************** - * CFSFolder::AddFolder - * - * adds a new folder. - */ - -HRESULT WINAPI CFSFolder::AddFolder(HWND hwnd, LPCWSTR pwszName, - LPITEMIDLIST * ppidlOut) -{ - WCHAR wszNewDir[MAX_PATH]; - DWORD bRes; - HRESULT hres = E_FAIL; - - TRACE ("(%p)(%s %p)\n", this, debugstr_w(pwszName), ppidlOut); - - wszNewDir[0] = 0; - if (sPathTarget) - lstrcpynW(wszNewDir, sPathTarget, MAX_PATH); - PathAppendW(wszNewDir, pwszName); - - bRes = CreateDirectoryW(wszNewDir, NULL); - if (bRes) - { - SHChangeNotify(SHCNE_MKDIR, SHCNF_PATHW, wszNewDir, NULL); - - hres = S_OK; - - if (ppidlOut) - hres = _ILCreateFromPathW(wszNewDir, ppidlOut); - } - else - { - WCHAR wszText[128 + MAX_PATH]; - WCHAR wszTempText[128]; - WCHAR wszCaption[256]; - - /* Cannot Create folder because of permissions */ - LoadStringW(shell32_hInstance, IDS_CREATEFOLDER_DENIED, wszTempText, - _countof(wszTempText)); - LoadStringW(shell32_hInstance, IDS_CREATEFOLDER_CAPTION, wszCaption, - _countof(wszCaption)); - swprintf(wszText, wszTempText, wszNewDir); - MessageBoxW(hwnd, wszText, wszCaption, MB_OK | MB_ICONEXCLAMATION); - } - - return hres; -} - -/**************************************************************************** * BuildPathsList * * Builds a list of paths like the one used in SHFileOperation from a table of @@ -952,70 +850,6 @@ } *pwszListPos = 0; return pwszPathsList; -} - -/**************************************************************************** - * CFSFolder::DeleteItems - * - * deletes items in folder - */ -HRESULT WINAPI CFSFolder::DeleteItems(UINT cidl, LPCITEMIDLIST *apidl) -{ - UINT i; - SHFILEOPSTRUCTW op; - WCHAR wszPath[MAX_PATH]; - WCHAR *wszPathsList; - HRESULT ret; - WCHAR *wszCurrentPath; - - TRACE ("(%p)(%u %p)\n", this, cidl, apidl); - if (cidl == 0) return S_OK; - - if (sPathTarget) - lstrcpynW(wszPath, sPathTarget, MAX_PATH); - else - wszPath[0] = '\0'; - PathAddBackslashW(wszPath); - wszPathsList = BuildPathsList(wszPath, cidl, apidl); - - ZeroMemory(&op, sizeof(op)); - op.hwnd = GetActiveWindow(); - op.wFunc = FO_DELETE; - op.pFrom = wszPathsList; - op.fFlags = FOF_ALLOWUNDO; - if (SHFileOperationW(&op)) - { - WARN("SHFileOperation failed\n"); - ret = E_FAIL; - } - else - ret = S_OK; - - /* we currently need to manually send the notifies */ - wszCurrentPath = wszPathsList; - for (i = 0; i < cidl; i++) - { - LONG wEventId; - - if (_ILIsFolder(apidl[i])) - wEventId = SHCNE_RMDIR; - else if (_ILIsValue(apidl[i])) - wEventId = SHCNE_DELETE; - else - continue; - - /* check if file exists */ - if (GetFileAttributesW(wszCurrentPath) == INVALID_FILE_ATTRIBUTES) - { - LPITEMIDLIST pidl = ILCombine(pidlRoot, apidl[i]); - SHChangeNotify(wEventId, SHCNF_IDLIST, pidl, NULL); - SHFree(pidl); - } - - wszCurrentPath += wcslen(wszCurrentPath) + 1; - } - HeapFree(GetProcessHeap(), 0, wszPathsList); - return ret; } /**************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] Wed Sep 2 18:20:40 2015 @@ -30,8 +30,7 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder3, - public IDropTarget, - public ISFHelper + public IDropTarget { private: CLSID *pclsid; @@ -52,6 +51,7 @@ virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); virtual HRESULT WINAPI _LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut); virtual HRESULT WINAPI _LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut); + virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); public: CFSFolder(); @@ -98,12 +98,6 @@ virtual HRESULT WINAPI DragLeave(); virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - // ISFHelper - virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); - virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); - virtual HRESULT WINAPI DeleteItems(UINT cidl, LPCITEMIDLIST *apidl); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); - DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder) @@ -117,7 +111,6 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder3, IPersistFolder3) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - COM_INTERFACE_ENTRY_IID(IID_ISFHelper, ISFHelper) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Wed Sep 2 18:20:40 2015 @@ -45,7 +45,6 @@ #include "wine/cpanel.h" #include "CEnumIDListBase.h" #include "shfldr.h" -#include "shellfolder.h" #include "CShellItem.h" #include "CShellLink.h" #include "CDropTargetHelper.h" Removed: trunk/reactos/dll/win32/shell32/shellfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellfol… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellfolder.h (removed) @@ -1,61 +0,0 @@ -/* - * Defines helper functions to manipulate the contents of an IShellFolder - * - * Copyright 2000 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_SHELLFOLDER_HELP_H -#define __WINE_SHELLFOLDER_HELP_H - -/***************************************************************************** - * Predeclare the interfaces - */ -DEFINE_GUID(IID_ISFHelper, 0x1fe68efbL, 0x1874, 0x9812, 0x56, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); - -/***************************************************************************** - * ISFHelper interface - */ -#undef INTERFACE - -#define INTERFACE ISFHelper -DECLARE_INTERFACE_(ISFHelper,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** ISFHelper methods ***/ - STDMETHOD(GetUniqueName)(THIS_ LPWSTR lpName, UINT uLen) PURE; - STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCWSTR lpName, LPITEMIDLIST * ppidlOut) PURE; - STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; - STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl, BOOL bCopy) PURE; -}; -#undef INTERFACE - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define ISFHelper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define ISFHelper_AddRef(p) (p)->lpVtbl->AddRef(p) -#define ISFHelper_Release(p) (p)->lpVtbl->Release(p) -/*** ISFHelper methods ***/ -#define ISFHelper_GetUniqueName(p,a,b) (p)->lpVtbl->GetUniqueName(p,a,b) -#define ISFHelper_AddFolder(p,a,b,c) (p)->lpVtbl->AddFolder(p,a,b,c) -#define ISFHelper_DeleteItems(p,a,b) (p)->lpVtbl->DeleteItems(p,a,b) -#define ISFHelper_CopyItems(p,a,b,c) (p)->lpVtbl->CopyItems(p,a,b,c) -#endif - -#endif /* __WINE_SHELLFOLDER_HELP_H */ Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brs… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Wed Sep 2 18:20:40 2015 @@ -38,7 +38,6 @@ #include "pidl.h" #include "shell32_main.h" #include "shresdef.h" -#include "shellfolder.h" WINE_DEFAULT_DEBUG_CHANNEL(shell);

1 0

[gadamopoulos] 68915: [SHELL32] - CNewMenu: Get the folder path from the pidl passed in the Initialize method. No need to query the defview for that. - Dont use a reactos only interface to create a...
by gadamopoulos＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: gadamopoulos Date: Wed Sep 2 13:14:46 2015 New Revision: 68915 URL: http://svn.reactos.org/svn/reactos?rev=68915&view=rev Log: [SHELL32] - CNewMenu: Get the folder path from the pidl passed in the Initialize method. No need to query the defview for that. - Dont use a reactos only interface to create a new directory. Prefer to do it with less code using exported functions. - Add a new SelectNewItem method that is used when creating a new file or directory. - Apply same fix for browse for folder dialog. Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp trunk/reactos/dll/win32/shell32/CNewMenu.h trunk/reactos/dll/win32/shell32/wine/brsfolder.c Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Wed Sep 2 13:14:46 2015 @@ -38,6 +38,9 @@ CNewMenu::~CNewMenu() { UnloadAllItems(); + + if (m_pidlFolder) + ILFree(m_pidlFolder); } void CNewMenu::UnloadItem(SHELLNEW_ITEM *pItem) @@ -296,93 +299,82 @@ return pItem; } -HRESULT CNewMenu::CreateNewFolder(IShellView *psv) -{ - WCHAR wszName[MAX_PATH]; - CComPtr<ISFHelper> psfhlp; - CComPtr<IFolderView> pFolderView; - CComPtr<IShellFolder> pParentFolder; - HRESULT hr; - - //if (m_pSite == NULL) - // return E_FAIL; - - /* Get current folder */ - hr = IUnknown_QueryService(psv, SID_IFolderView, IID_PPV_ARG(IFolderView, &pFolderView)); +HRESULT CNewMenu::SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName) +{ + CComPtr<IShellBrowser> lpSB; + CComPtr<IShellView> lpSV; + HRESULT hr = E_FAIL; + LPITEMIDLIST pidl; + PITEMID_CHILD pidlNewItem; + + /* Notify the view object about the new item */ + SHChangeNotify(wEventId, uFlags, (LPCVOID) pszName, NULL); + + /* FIXME: I think that this can be implemented using callbacks to the shell folder */ + + /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ + lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (!lpSB) + return E_FAIL; + + hr = lpSB->QueryActiveShellView(&lpSV); if (FAILED(hr)) return hr; - hr = pFolderView->GetFolder(IID_PPV_ARG(IShellFolder, &pParentFolder)); - if (FAILED(hr)) + /* Attempt to get the pidl of the new item */ + hr = SHILCreateFromPathW(pszName, &pidl, NULL); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = pParentFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfhlp)); - if (FAILED(hr)) + pidlNewItem = ILFindLastID(pidl); + + hr = lpSV->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | + SVSI_FOCUSED | SVSI_SELECT); + + SHFree(pidl); + + return hr; +} + +HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) +{ + WCHAR wszPath[MAX_PATH]; + WCHAR wszName[MAX_PATH]; + WCHAR wszNewFolder[25]; + HRESULT hr; + + /* Get folder path */ + hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - LPITEMIDLIST pidl; - - /* Get unique name and create a folder */ - hr = psfhlp->GetUniqueName(wszName, _countof(wszName)); - if (hr != S_OK) - return hr; - hr = psfhlp->AddFolder(0, wszName, &pidl); - if (hr != S_OK) - { - WCHAR wszBuf[256]; - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create folder: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create folder", MB_OK|MB_ICONERROR); - return hr; - } - - /* Do a labeledit */ - psv->Refresh(); - psv->SelectItem(pidl, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | - SVSI_FOCUSED | SVSI_SELECT); - - SHFree(pidl); + if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, _countof(wszNewFolder))) + return E_FAIL; + + /* Create the name of the new directory */ + if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFolder)) + return E_FAIL; + + /* Create the new directory and show the appropriate dialog in case of error */ + if (SHCreateDirectory (lpici->hwnd, wszName) != ERROR_SUCCESS) + return E_FAIL; + + /* Show and select the new item in the def view */ + SelectNewItem(lpici, SHCNE_MKDIR, SHCNF_PATHW, wszName); + return S_OK; } -HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv) -{ - LPITEMIDLIST pidl; - STRRET strTemp; +HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi) +{ WCHAR wszBuf[MAX_PATH]; WCHAR wszPath[MAX_PATH]; - CComPtr<IFolderView> pFolderView; - CComPtr<IShellFolder> pParentFolder; - CComPtr<IPersistFolder2> psf; HRESULT hr; - /* Get current folder */ - hr = IUnknown_QueryService(psv, SID_IFolderView, IID_PPV_ARG(IFolderView, &pFolderView)); - if (FAILED(hr)) + /* Get folder path */ + hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - - hr = pFolderView->GetFolder(IID_PPV_ARG(IShellFolder, &pParentFolder)); - if (FAILED(hr)) - return hr; - - if (pParentFolder->QueryInterface(IID_PPV_ARG(IPersistFolder2, &psf)) != S_OK) - { - ERR("Failed to get interface IID_IPersistFolder2\n"); - return E_FAIL; - } - - if (psf->GetCurFolder(&pidl) != S_OK) - { - ERR("IPersistFolder2_GetCurFolder failed\n"); - return E_FAIL; - } - - /* Get folder path */ - if (pParentFolder == NULL || pParentFolder->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strTemp) != S_OK) - { - ERR("IShellFolder_GetDisplayNameOf failed\n"); - return E_FAIL; - } - StrRetToBufW(&strTemp, pidl, wszPath, _countof(wszPath)); switch (pItem->Type) { @@ -468,16 +460,7 @@ if (bSuccess) { TRACE("Notifying fs %s\n", debugstr_w(wszPath)); - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)wszPath, NULL); - psv->Refresh(); - - LPITEMIDLIST pidl; - hr = _ILCreateFromPathW(wszPath, &pidl); - if (SUCCEEDED(hr)) - { - psv->SelectItem(pidl, SVSI_DESELECTOTHERS|SVSI_EDIT|SVSI_ENSUREVISIBLE|SVSI_FOCUSED|SVSI_SELECT); - ILFree(pidl); - } + SelectNewItem(lpcmi, SHCNE_CREATE, SHCNF_PATHW, wszPath); } else { @@ -551,22 +534,15 @@ WINAPI CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - CComPtr<IShellBrowser> lpSB; - CComPtr<IShellView> lpSV; HRESULT hr = E_FAIL; - /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ - lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (lpSB) - lpSB->QueryActiveShellView(&lpSV); - if (LOWORD(lpici->lpVerb) == 0) - hr = CreateNewFolder(lpSV); + hr = CreateNewFolder(lpici); else { SHELLNEW_ITEM *pItem = FindItemFromIdOffset(LOWORD(lpici->lpVerb)); if (pItem) - hr = CreateNewItem(pItem, lpici, lpSV); + hr = CreateNewItem(pItem, lpici); } TRACE("CNewMenu::InvokeCommand %x\n", hr); @@ -657,6 +633,8 @@ CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { + m_pidlFolder = ILClone(pidlFolder); + /* Load folder and shortcut icons */ m_hiconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED); m_hiconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 16, 16, LR_SHARED); Modified: trunk/reactos/dll/win32/shell32/CNewMenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] Wed Sep 2 13:14:46 2015 @@ -51,6 +51,7 @@ SHELLNEW_ITEM *pNext; }; + LPITEMIDLIST m_pidlFolder; LPWSTR m_wszPath; SHELLNEW_ITEM *m_pItems; SHELLNEW_ITEM *m_pLinkItem; @@ -65,8 +66,9 @@ BOOL LoadAllItems(); UINT InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu); SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); - HRESULT CreateNewFolder(IShellView *psv); - HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv); + HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); + HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); + HRESULT SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName); public: CNewMenu(); Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brs… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Wed Sep 2 13:14:46 2015 @@ -735,7 +735,12 @@ { DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); IShellFolder *desktop, *cur; +#ifdef __REACTOS__ + WCHAR wszNewFolder[25]; + WCHAR path[25]; +#else ISFHelper *sfhelper; +#endif WCHAR name[MAX_PATH]; HTREEITEM parent, added; LPTV_ITEMDATA item_data; @@ -758,6 +763,22 @@ if(FAILED(hr)) return hr; +#ifdef __REACTOS__ + hr = SHGetPathFromIDListW(info->pidlRet, path); + if(FAILED(hr)) + return hr; + + len = strlenW(name); + if(len<MAX_PATH) + len++; + + if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, _countof(wszNewFolder))) + return E_FAIL; + + if (!PathYetAnotherMakeUniqueName(name, path, NULL, wszNewFolder)) + return E_FAIL; +#else + hr = IShellFolder_QueryInterface(cur, &IID_ISFHelper, (void**)&sfhelper); if(FAILED(hr)) return hr; @@ -765,7 +786,7 @@ hr = SHGetPathFromIDListW(info->pidlRet, name); if(FAILED(hr)) goto cleanup; - + len = strlenW(name); if(len<MAX_PATH) name[len++] = '\\'; @@ -773,6 +794,7 @@ ISFHelper_Release(sfhelper); if(FAILED(hr)) goto cleanup; +#endif hr = E_FAIL; if(!CreateDirectoryW(name, NULL))

1 0

[cwittich] 68914: [CRT] just print the error number if we don't have a matching string
by cwittich＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: cwittich Date: Wed Sep 2 12:33:11 2015 New Revision: 68914 URL: http://svn.reactos.org/svn/reactos?rev=68914&view=rev Log: [CRT] just print the error number if we don't have a matching string Modified: trunk/reactos/lib/sdk/crt/misc/amsg.c Modified: trunk/reactos/lib/sdk/crt/misc/amsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/amsg.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/amsg.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/amsg.c [iso-8859-1] Wed Sep 2 12:33:11 2015 @@ -46,7 +46,10 @@ */ void _amsg_exit(int errnum) { - fprintf(stderr, "runtime error - %s\n", __rt_err_msg[errnum]); + if ((errnum >=0) && (errnum < sizeof(__rt_err_msg)/sizeof(__rt_err_msg[0]))) + fprintf(stderr, "runtime error - %s\n", __rt_err_msg[errnum]); + else + fprintf(stderr, "runtime error - %d\n", errnum); _exit(-1); }

1 0

[cwittich] 68913: [CRT] fix null pointer deref in _gmtime64_s CID 515314
by cwittich＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: cwittich Date: Wed Sep 2 10:20:21 2015 New Revision: 68913 URL: http://svn.reactos.org/svn/reactos?rev=68913&view=rev Log: [CRT] fix null pointer deref in _gmtime64_s CID 515314 Modified: trunk/reactos/lib/sdk/crt/time/gmtime.c Modified: trunk/reactos/lib/sdk/crt/time/gmtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/gmtime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/gmtime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/gmtime.c [iso-8859-1] Wed Sep 2 10:20:21 2015 @@ -123,7 +123,8 @@ struct tm* ptm, const __time64_t* ptime) { - __time64_t time = *ptime; + __time64_t time; + if (!ptm) { MSVCRT_INVALID_PMT("ptm == NULL", ERROR_BAD_COMMAND); @@ -135,6 +136,8 @@ MSVCRT_INVALID_PMT("ptime == NULL", ERROR_BAD_COMMAND); return ERROR_BAD_COMMAND; } + + time = *ptime; _gmtime_worker(ptm, time, 0);

1 0

[gadamopoulos] 68912: [SHELL32] - Fix copy paste bug
by gadamopoulos＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: gadamopoulos Date: Wed Sep 2 09:31:16 2015 New Revision: 68912 URL: http://svn.reactos.org/svn/reactos?rev=68912&view=rev Log: [SHELL32] - Fix copy paste bug Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Wed Sep 2 09:31:16 2015 @@ -66,6 +66,15 @@ #define MYCOMPUTERSHELLVIEWCOLUMNS 4 +static const DWORD dwComputerAttributes = + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; +static const DWORD dwControlPanelAttributes = + SFGAO_HASSUBFOLDER | SFGAO_FOLDER | SFGAO_CANLINK; +static const DWORD dwDriveAttributes = + SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | + SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; + CDrivesFolderEnum::CDrivesFolderEnum() { } @@ -237,8 +246,8 @@ hr = S_OK; if (pdwAttributes && *pdwAttributes) { - if (_ILIsCPanelStruct(pidlTemp)) - *pdwAttributes &= SFGAO_CANLINK; + if (_ILIsDrive(pidlTemp)) + *pdwAttributes &= dwDriveAttributes; else if (_ILIsSpecialFolder(pidlTemp)) SHELL32_GetGuidItemAttributes(this, pidlTemp, pdwAttributes); else @@ -351,15 +360,6 @@ */ HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { - static const DWORD dwComputerAttributes = - SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | - SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; - static const DWORD dwControlPanelAttributes = - SFGAO_HASSUBFOLDER | SFGAO_FOLDER | SFGAO_CANLINK; - static const DWORD dwDriveAttributes = - SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | - SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);

1 0

[tfaber] 68911: [NTOS:SE] - Correctly check ACE type in SeFastTraverseCheck. CID 1102005
by tfaber＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: tfaber Date: Wed Sep 2 09:19:52 2015 New Revision: 68911 URL: http://svn.reactos.org/svn/reactos?rev=68911&view=rev Log: [NTOS:SE] - Correctly check ACE type in SeFastTraverseCheck. CID 1102005 Modified: trunk/reactos/ntoskrnl/se/accesschk.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Wed Sep 2 09:19:52 2015 @@ -493,7 +493,7 @@ continue; /* If access-allowed ACE */ - if (Ace->Header.AceType & ACCESS_ALLOWED_ACE_TYPE) + if (Ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { /* Check if all accesses are granted */ if (!(Ace->Mask & DesiredAccess)) @@ -504,9 +504,9 @@ return TRUE; } /* If access-denied ACE */ - else if (Ace->Header.AceType & ACCESS_DENIED_ACE_TYPE) - { - /* Here, only check if it denies all the access wanted and deny if so */ + else if (Ace->Header.AceType == ACCESS_DENIED_ACE_TYPE) + { + /* Here, only check if it denies any access wanted and deny if so */ if (Ace->Mask & DesiredAccess) return FALSE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015