Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 73243: [SHELL32] - CDefaultContextMenu: Add rudimentary support for callbacks so as to let folders have item specific commands and remove all item specific code from this class. - Im...
by gadamopoulos＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: gadamopoulos Date: Thu Nov 17 14:35:19 2016 New Revision: 73243 URL: http://svn.reactos.org/svn/reactos?rev=73243&view=rev Log: [SHELL32] - CDefaultContextMenu: Add rudimentary support for callbacks so as to let folders have item specific commands and remove all item specific code from this class. - Implement context menu callbacks for CFSFolder, CRegFolder, CDrivesFolder in order to let them handle the properties item and let the CDrivesFolder add and handle the Format item itself. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/dialogs/drive.cpp trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.h trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -61,6 +61,8 @@ private: CComPtr<IUnknown> m_site; CComPtr<IShellFolder> m_psf; + CComPtr<IContextMenuCB> m_pmcb; + LPFNDFMCALLBACK m_pfnmcb; UINT m_cidl; PCUITEMID_CHILD_ARRAY m_apidl; CComPtr<IDataObject> m_pDataObj; @@ -75,6 +77,7 @@ UINT m_iIdSCMFirst; /* first static used id */ UINT m_iIdSCMLast; /* last static used id */ + HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam); void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb); void AddStaticEntriesForKey(HKEY hKey); BOOL IsShellExtensionAlreadyLoaded(const CLSID *pclsid); @@ -93,7 +96,6 @@ HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy); HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoProperties(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoFormat(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT DoDynamicShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoStaticShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); @@ -106,7 +108,7 @@ public: CDefaultContextMenu(); ~CDefaultContextMenu(); - HRESULT WINAPI Initialize(const DEFCONTEXTMENU *pdcm); + HRESULT WINAPI Initialize(const DEFCONTEXTMENU *pdcm, LPFNDFMCALLBACK lpfn); // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); @@ -133,6 +135,8 @@ CDefaultContextMenu::CDefaultContextMenu() : m_psf(NULL), + m_pmcb(NULL), + m_pfnmcb(NULL), m_cidl(0), m_apidl(NULL), m_pDataObj(NULL), @@ -180,7 +184,7 @@ _ILFreeaPidl(const_cast<PITEMID_CHILD *>(m_apidl), m_cidl); } -HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm) +HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm, LPFNDFMCALLBACK lpfn) { TRACE("cidl %u\n", pdcm->cidl); @@ -189,6 +193,8 @@ if (m_cidl && !m_apidl) return E_OUTOFMEMORY; m_psf = pdcm->psf; + m_pmcb = pdcm->pcmcb; + m_pfnmcb = lpfn; m_cKeys = pdcm->cKeys; if (pdcm->cKeys) @@ -214,6 +220,20 @@ ERR("GetCurFolder failed\n"); } TRACE("pidlFolder %p\n", m_pidlFolder); + } + + return S_OK; +} + +HRESULT CDefaultContextMenu::_DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam) +{ + if (m_pmcb) + { + return m_pmcb->CallBack(m_psf, NULL, m_pDataObj, uMsg, wParam, (LPARAM)lParam); + } + else if(m_pfnmcb) + { + return m_pfnmcb(m_psf, NULL, m_pDataObj, uMsg, wParam, (LPARAM)lParam); } return S_OK; @@ -712,23 +732,15 @@ IndexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, IndexMenu, iIdCmdFirst, iIdCmdLast); TRACE("IndexMenu %d\n", IndexMenu); - if (_ILIsDrive(m_apidl[0])) - { - char szDrive[8] = {0}; - DWORD dwFlags; - - _ILGetDrive(m_apidl[0], szDrive, sizeof(szDrive)); - if (GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0)) - { - /* Disable format if read only */ - if (!(dwFlags & FILE_READ_ONLY_VOLUME)) - { - _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); - bAddSep = TRUE; - } - } - } + /* Now let the callback add its own items */ + QCMINFO qcminfo; + qcminfo.hmenu = hMenu; + qcminfo.indexMenu = IndexMenu; + qcminfo.idCmdFirst = iIdCmdFirst; + qcminfo.idCmdLast = iIdCmdLast; + qcminfo.pIdMap = NULL; + _DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo); + IndexMenu = GetMenuItemCount(hMenu); BOOL bClipboardData = (HasClipboardData() && (rfg & SFGAO_FILESYSTEM)); if (rfg & (SFGAO_CANCOPY | SFGAO_CANMOVE) || bClipboardData) @@ -971,105 +983,8 @@ CDefaultContextMenu::DoProperties( LPCMINVOKECOMMANDINFO lpcmi) { - HRESULT hr = S_OK; - const ITEMIDLIST *pidlParent = m_pidlFolder, *pidlChild; - - if (!pidlParent) - { - CComPtr<IPersistFolder2> pf; - - /* pidlFolder is optional */ - if (SUCCEEDED(m_psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) - { - pf->GetCurFolder((_ITEMIDLIST**)&pidlParent); - } - } - - if (m_cidl > 0) - pidlChild = m_apidl[0]; - else - { - /* Set pidlChild to last pidl of current folder */ - if (pidlParent == m_pidlFolder) - pidlParent = (ITEMIDLIST*)ILClone(pidlParent); - - pidlChild = (ITEMIDLIST*)ILClone(ILFindLastID(pidlParent)); - ILRemoveLastID((ITEMIDLIST*)pidlParent); - } - - if (_ILIsMyComputer(pidlChild)) - { - if (32 >= (UINT)ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL)) - hr = E_FAIL; - } - else if (_ILIsDesktop(pidlChild)) - { - if (32 >= (UINT)ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL)) - hr = E_FAIL; - } - else if (_ILIsDrive(pidlChild)) - { - WCHAR wszBuf[MAX_PATH]; - ILGetDisplayName(pidlChild, wszBuf); - if (!SH_ShowDriveProperties(wszBuf, pidlParent, &pidlChild)) - hr = E_FAIL; - } - else if (_ILIsNetHood(pidlChild)) - { - // FIXME path! - if (32 >= (UINT)ShellExecuteW(NULL, L"open", L"explorer.exe", - L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", - NULL, SW_SHOWDEFAULT)) - hr = E_FAIL; - } - else if (_ILIsBitBucket(pidlChild)) - { - /* FIXME: detect the drive path of bitbucket if appropiate */ - if (!SH_ShowRecycleBinProperties(L'C')) - hr = E_FAIL; - } - else - { - if (m_cidl > 1) - WARN("SHMultiFileProperties is not yet implemented\n"); - - STRRET strFile; - hr = m_psf->GetDisplayNameOf(pidlChild, SHGDN_FORPARSING, &strFile); - if (SUCCEEDED(hr)) - { - WCHAR wszBuf[MAX_PATH]; - hr = StrRetToBufW(&strFile, pidlChild, wszBuf, _countof(wszBuf)); - if (SUCCEEDED(hr)) - hr = SH_ShowPropertiesDialog(wszBuf, pidlParent, &pidlChild); - else - ERR("StrRetToBufW failed\n"); - } - else - ERR("IShellFolder_GetDisplayNameOf failed for apidl\n"); - } - - /* Free allocated PIDLs */ - if (pidlParent != m_pidlFolder) - ILFree((ITEMIDLIST*)pidlParent); - if (m_cidl < 1 || pidlChild != m_apidl[0]) - ILFree((ITEMIDLIST*)pidlChild); - - return hr; -} - -HRESULT -CDefaultContextMenu::DoFormat( - LPCMINVOKECOMMANDINFO lpcmi) -{ - char szDrive[8] = {0}; - - if (!_ILGetDrive(m_apidl[0], szDrive, sizeof(szDrive))) - { - ERR("pidl is not a drive\n"); - return E_FAIL; - } - - SHFormatDrive(lpcmi->hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + _DoCallback(DFM_INVOKECOMMAND, DFM_CMD_PROPERTIES, NULL); + return S_OK; } @@ -1411,13 +1326,13 @@ case FCIDM_SHVIEW_PROPERTIES: Result = DoProperties(&LocalInvokeInfo); break; - case 0x7ABC: - Result = DoFormat(&LocalInvokeInfo); - break; case FCIDM_SHVIEW_NEWFOLDER: Result = DoCreateNewFolder(&LocalInvokeInfo); break; default: + + _DoCallback(DFM_INVOKECOMMAND, LOWORD(LocalInvokeInfo.lpVerb), NULL); + Result = E_UNEXPECTED; break; } @@ -1561,9 +1476,9 @@ static HRESULT -CDefaultContextMenu_CreateInstance(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) -{ - return ShellObjectCreatorInit<CDefaultContextMenu>(pdcm, riid, ppv); +CDefaultContextMenu_CreateInstance(const DEFCONTEXTMENU *pdcm, LPFNDFMCALLBACK lpfn, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CDefaultContextMenu>(pdcm, lpfn, riid, ppv); } /************************************************************************* @@ -1575,7 +1490,7 @@ WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) { - HRESULT hr = CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); + HRESULT hr = CDefaultContextMenu_CreateInstance(pdcm, NULL, riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -1600,20 +1515,20 @@ const HKEY *ahkeyClsKeys, IContextMenu **ppcm) { - DEFCONTEXTMENU pdcm; - pdcm.hwnd = hwnd; - pdcm.pcmcb = NULL; - pdcm.pidlFolder = pidlFolder; - pdcm.psf = psf; - pdcm.cidl = cidl; - pdcm.apidl = apidl; - pdcm.punkAssociationInfo = NULL; - pdcm.cKeys = nKeys; - pdcm.aKeys = ahkeyClsKeys; - - HRESULT hr = SHCreateDefaultContextMenu(&pdcm, IID_PPV_ARG(IContextMenu, ppcm)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return S_OK; -} + DEFCONTEXTMENU dcm; + dcm.hwnd = hwnd; + dcm.pcmcb = NULL; + dcm.pidlFolder = pidlFolder; + dcm.psf = psf; + dcm.cidl = cidl; + dcm.apidl = apidl; + dcm.punkAssociationInfo = NULL; + dcm.cKeys = nKeys; + dcm.aKeys = ahkeyClsKeys; + + HRESULT hr = CDefaultContextMenu_CreateInstance(&dcm, lpfn, IID_PPV_ARG(IContextMenu, ppcm)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -123,7 +123,7 @@ } DRIVE_PROP_PAGE; BOOL -SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) +SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl) { HPSXA hpsx = NULL; HPROPSHEETPAGE hpsp[MAX_PROPERTY_SHEET_PAGE]; Modified: trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/fprop.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -95,7 +95,7 @@ */ BOOL -SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) +SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl) { HPSXA hpsxa[3] = {NULL, NULL, NULL}; CComObject<CFileDefExt> *pFileDefExt = NULL; Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -133,8 +133,8 @@ CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; initIcon->SetNormalIcon(pData->szName, (int)pData->iconIdx != -1 ? pData->iconIdx : 0); 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] Thu Nov 17 14:35:19 2016 @@ -39,6 +39,69 @@ * IShellFolder implementation */ +HRESULT CALLBACK DrivesContextMenuCallback(IShellFolder *psf, + HWND hwnd, + IDataObject *pdtobj, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + if (uMsg != DFM_MERGECONTEXTMENU && uMsg != DFM_INVOKECOMMAND) + return S_OK; + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + char szDrive[8] = {0}; + if (!_ILGetDrive(apidl[0], szDrive, sizeof(szDrive))) + { + ERR("pidl is not a drive\n"); + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + return E_FAIL; + } + + if (uMsg == DFM_MERGECONTEXTMENU) + { + QCMINFO *pqcminfo = (QCMINFO *)lParam; + DWORD dwFlags; + + if (GetVolumeInformationA(szDrive, NULL, 0, NULL, NULL, &dwFlags, NULL, 0)) + { + /* Disable format if read only */ + if (!(dwFlags & FILE_READ_ONLY_VOLUME) && GetDriveTypeA(szDrive) != DRIVE_REMOTE) + { + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + } + } + } + else if (uMsg == DFM_INVOKECOMMAND) + { + if(wParam == 0x7ABC) + { + SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + } + else if (wParam == DFM_CMD_PROPERTIES) + { + WCHAR wszBuf[4]; + wcscpy(wszBuf, L"A:\\"); + wszBuf[0] = (WCHAR)szDrive[0]; + if (!SH_ShowDriveProperties(wszBuf, pidlFolder, apidl)) + hr = E_FAIL; + } + } + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + + return hr; +} + HRESULT CDrivesContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, HWND hwnd, UINT cidl, @@ -51,16 +114,15 @@ AddClassKeyToArray(L"Drive", hKeys, &cKeys); AddClassKeyToArray(L"Folder", hKeys, &cKeys); - /* TODO: also pass a callback here */ - return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, DrivesContextMenuCallback, cKeys, hKeys, ppcm); } HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; CHAR* pszDrive = _ILGetDataPointer(pidl)->u.drive.szDriveName; WCHAR wTemp[MAX_PATH]; 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] Thu Nov 17 14:35:19 2016 @@ -489,12 +489,21 @@ if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { - IContextMenu * pCm = NULL; HKEY hKeys[16]; UINT cKeys = 0; AddFSClassKeysToArray(apidl[0], hKeys, &cKeys); - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, cKeys, hKeys, &pCm); - pObj = pCm; + + DEFCONTEXTMENU dcm; + dcm.hwnd = hwndOwner; + dcm.pcmcb = this; + dcm.pidlFolder = pidlRoot; + dcm.psf = this; + dcm.cidl = cidl; + dcm.apidl = apidl; + dcm.cKeys = cKeys; + dcm.aKeys = hKeys; + dcm.punkAssociationInfo = NULL; + hr = SHCreateDefaultContextMenu (&dcm, riid, &pObj); } else if (IsEqualIID (riid, IID_IDataObject)) { @@ -1088,4 +1097,38 @@ return hr; } return hr; -} +} + +HRESULT WINAPI CFSFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) + return S_OK; + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (cidl > 1) + ERR("SHMultiFileProperties is not yet implemented\n"); + + STRRET strFile; + hr = GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strFile); + if (SUCCEEDED(hr)) + { + hr = SH_ShowPropertiesDialog(strFile.pOleStr, pidlFolder, apidl); + if (FAILED(hr)) + ERR("SH_ShowPropertiesDialog failed\n"); + } + else + { + ERR("Failed to get display name\n"); + } + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + + return hr; +} 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] Thu Nov 17 14:35:19 2016 @@ -27,7 +27,8 @@ public CComCoClass<CFSFolder, &CLSID_ShellFSFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder3 + public IPersistFolder3, + public IContextMenuCB { private: CLSID *pclsid; @@ -80,6 +81,9 @@ virtual HRESULT WINAPI InitializeEx(IBindCtx *pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti); virtual HRESULT WINAPI GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO *ppfti); + // IContextMenuCB + virtual HRESULT WINAPI CallBack(IShellFolder *psf, HWND hwndOwner, IDataObject *pdtobj, UINT uMsg, WPARAM wParam, LPARAM lParam); + DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) DECLARE_NOT_AGGREGATABLE(CFSFolder) Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -53,8 +53,8 @@ { CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_NETWORK_FOLDER); Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -67,8 +67,8 @@ { CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; /* FIXME: This is completely unimplemented */ initIcon->SetNormalIcon(swShell32Name, 0); Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -22,6 +22,54 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf, + HWND hwnd, + IDataObject *pdtobj, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) + return S_OK; + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (_ILIsMyComputer(apidl[0])) + { + if (32 >= (UINT)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL)) + hr = E_FAIL; + } + else if (_ILIsDesktop(apidl[0])) + { + if (32 >= (UINT)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL)) + hr = E_FAIL; + } + else if (_ILIsNetHood(apidl[0])) + { + // FIXME path! + if (32 >= (UINT)ShellExecuteW(NULL, L"open", L"explorer.exe", + L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", + NULL, SW_SHOWDEFAULT)) + hr = E_FAIL; + } + else if (_ILIsBitBucket(apidl[0])) + { + /* FIXME: detect the drive path of bitbucket if appropiate */ + if (!SH_ShowRecycleBinProperties(L'C')) + hr = E_FAIL; + } + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + + return hr; +} + HRESULT CGuidItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, HWND hwnd, UINT cidl, @@ -48,7 +96,7 @@ } AddClassKeyToArray(L"Folder", hKeys, &cKeys); - return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, RegFolderContextMenuCallback, cKeys, hKeys, ppcm); } HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) @@ -397,6 +445,10 @@ } hr = CGuidItemContextMenu_CreateInstance(m_pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); + } + else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) + { + hr = IDataObject_Constructor (hwndOwner, m_pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else { Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -63,6 +63,8 @@ void AddFSClassKeysToArray(PCUITEMID_CHILD pidl, HKEY* array, UINT* cKeys); +HRESULT SH_GetApidlFromDataObject(IDataObject *pDataObject, PIDLIST_ABSOLUTE* ppidlfolder, PUITEMID_CHILD **apidlItems, UINT *pcidl); + static __inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -547,6 +547,49 @@ } } +HRESULT SH_GetApidlFromDataObject(IDataObject *pDataObject, PIDLIST_ABSOLUTE* ppidlfolder, PUITEMID_CHILD **apidlItems, UINT *pcidl) +{ + UINT cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + if (!cfShellIDList) + return E_FAIL; + + FORMATETC fmt; + InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + + HRESULT hr = pDataObject->QueryGetData(&fmt); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + STGMEDIUM medium; + hr = pDataObject->GetData(&fmt, &medium); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + /* lock the handle */ + LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); + if (!lpcida) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* convert the data into pidl */ + LPITEMIDLIST pidl; + LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + if (!apidl) + { + ReleaseStgMedium(&medium); + return E_OUTOFMEMORY; + } + + *ppidlfolder = pidl; + *apidlItems = apidl; + *pcidl = lpcida->cidl; + + ReleaseStgMedium(&medium); + return S_OK; +} + /*********************************************************************** * SHCreateLinks * Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Thu Nov 17 14:35:19 2016 @@ -189,10 +189,9 @@ INT_PTR CALLBACK SH_FileGeneralDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SH_FileVersionDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); HPROPSHEETPAGE SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle); -BOOL SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl); +BOOL SH_ShowDriveProperties(WCHAR *drive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); -BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl); -BOOL SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl); +BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, PCUITEMID_CHILD_ARRAY apidl); LPWSTR SH_FormatFileSizeWithBytes(PULARGE_INTEGER lpQwSize, LPWSTR pszBuf, UINT cchBuf); HRESULT WINAPI DoRegisterServer(void);

1 0

[akhaldi] 73242: [WLANAPI_APITEST] Bring these tests back home.
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 13:46:36 2016 New Revision: 73242 URL: http://svn.reactos.org/svn/reactos?rev=73242&view=rev Log: [WLANAPI_APITEST] Bring these tests back home. Added: trunk/rostests/apitests/wlanapi/ - copied from r73241, trunk/rostests/winetests/wlanapi/ Removed: trunk/rostests/winetests/wlanapi/ Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/wlanapi/CMakeLists.txt trunk/rostests/apitests/wlanapi/testlist.c trunk/rostests/apitests/wlanapi/wlanapi.c trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -37,4 +37,5 @@ add_subdirectory(wininet) add_subdirectory(winprint) add_subdirectory(winspool) +add_subdirectory(wlanapi) add_subdirectory(ws2_32) Modified: trunk/rostests/apitests/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/CMakeLis… ============================================================================== --- trunk/rostests/apitests/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/wlanapi/CMakeLists.txt [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -1,5 +1,5 @@ -add_executable(wlanapi_winetest wlanapi.c testlist.c) -set_module_type(wlanapi_winetest win32cui) -add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32) -add_cd_file(TARGET wlanapi_winetest DESTINATION reactos/bin FOR all) +add_executable(wlanapi_apitest wlanapi.c testlist.c) +set_module_type(wlanapi_apitest win32cui) +add_importlibs(wlanapi_apitest wlanapi msvcrt kernel32) +add_cd_file(TARGET wlanapi_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/wlanapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/testlist… ============================================================================== --- trunk/rostests/apitests/wlanapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wlanapi/testlist.c [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -1,10 +1,7 @@ -/* Automatically generated file; DO NOT EDIT!! */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#define __ROS_LONG64__ #define STANDALONE -#include "wine/test.h" +#include <apitest.h> extern void func_wlanapi(void); Modified: trunk/rostests/apitests/wlanapi/wlanapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wlanapi/wlanapi.… ============================================================================== --- trunk/rostests/apitests/wlanapi/wlanapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wlanapi/wlanapi.c [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -18,15 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wlanapi.h" - -#include "wine/test.h" +#include <apitest.h> + +#include <wlanapi.h> static const GUID InterfaceGuid = {0x439b20af, 0x8955, 0x405b, {0x99, 0xf0, 0xa6, 0x2a, 0xf0, 0xc6, 0x8d, 0x43}}; @@ -43,20 +37,20 @@ skip("Skipping wlanapi tests, WlanSvc is not running\n"); return; } - ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %d\n", ret); + ok(ret == ERROR_SUCCESS, "WlanOpenHandle failed, error %ld\n", ret); WlanCloseHandle(hClientHandle, NULL); /* invalid pdwNegotiatedVersion */ ret = WlanOpenHandle(1, NULL, NULL, &hClientHandle); - ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* invalid hClientHandle */ ret = WlanOpenHandle(1, NULL, &dwNegotiatedVersion, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* invalid pReserved */ ret = WlanOpenHandle(1, (PVOID) 1, &dwNegotiatedVersion, &hClientHandle); - ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } static void WlanCloseHandle_test(void) Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Thu Nov 17 13:46:36 2016 @@ -114,7 +114,6 @@ add_subdirectory(winmm) #add_subdirectory(winspool) add_subdirectory(wintrust) -add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(wmiutils) add_subdirectory(ws2_32)

1 0

[phater] 73241: [MSAFD] Fix WSPSelect heap corruption and don't repeat sockets if they are in different fd_sets. CORE-12324
by phater＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: phater Date: Thu Nov 17 12:57:32 2016 New Revision: 73241 URL: http://svn.reactos.org/svn/reactos?rev=73241&view=rev Log: [MSAFD] Fix WSPSelect heap corruption and don't repeat sockets if they are in different fd_sets. CORE-12324 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Nov 17 12:57:32 2016 @@ -1045,13 +1045,34 @@ PSOCKET_INFORMATION Socket; SOCKET Handle; ULONG Events; + fd_set selectfds; /* Find out how many sockets we have, and how large the buffer needs * to be */ - - HandleCount = ( readfds ? readfds->fd_count : 0 ) + - ( writefds ? writefds->fd_count : 0 ) + - ( exceptfds ? exceptfds->fd_count : 0 ); + FD_ZERO(&selectfds); + if (readfds != NULL) + { + for (i = 0; i < readfds->fd_count; i++) + { + FD_SET(readfds->fd_array[i], &selectfds); + } + } + if (writefds != NULL) + { + for (i = 0; i < writefds->fd_count; i++) + { + FD_SET(writefds->fd_array[i], &selectfds); + } + } + if (exceptfds != NULL) + { + for (i = 0; i < exceptfds->fd_count; i++) + { + FD_SET(exceptfds->fd_array[i], &selectfds); + } + } + + HandleCount = selectfds.fd_count; if ( HandleCount == 0 ) { @@ -1082,7 +1103,7 @@ if (Timeout.QuadPart > 0) { if (lpErrno) *lpErrno = WSAEINVAL; - return SOCKET_ERROR; + return SOCKET_ERROR; } TRACE("Timeout: Orig %d.%06d kernel %d\n", timeout->tv_sec, timeout->tv_usec, @@ -1123,9 +1144,26 @@ PollInfo->Exclusive = FALSE; PollInfo->Timeout = Timeout; + for (i = 0; i < selectfds.fd_count; i++) + { + PollInfo->Handles[i].Handle = selectfds.fd_array[i]; + } if (readfds != NULL) { - for (i = 0; i < readfds->fd_count; i++, j++) - { + for (i = 0; i < readfds->fd_count; i++) + { + for (j = 0; j < HandleCount; j++) + { + if (PollInfo->Handles[j].Handle == readfds->fd_array[i]) + break; + } + if (j >= HandleCount) + { + ERR("Error while counting readfds %ld > %ld\n", j, HandleCount); + if (lpErrno) *lpErrno = WSAEFAULT; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } Socket = GetSocketStructure(readfds->fd_array[i]); if (!Socket) { @@ -1135,20 +1173,32 @@ NtClose(SockEvent); return SOCKET_ERROR; } - PollInfo->Handles[j].Handle = readfds->fd_array[i]; - PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE | - AFD_EVENT_DISCONNECT | - AFD_EVENT_ABORT | - AFD_EVENT_CLOSE | - AFD_EVENT_ACCEPT; - if (Socket->SharedData->OobInline != 0) - PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; + PollInfo->Handles[j].Events |= AFD_EVENT_RECEIVE | + AFD_EVENT_DISCONNECT | + AFD_EVENT_ABORT | + AFD_EVENT_CLOSE | + AFD_EVENT_ACCEPT; + //if (Socket->SharedData->OobInline != 0) + // PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; } } if (writefds != NULL) { - for (i = 0; i < writefds->fd_count; i++, j++) - { + for (i = 0; i < writefds->fd_count; i++) + { + for (j = 0; j < HandleCount; j++) + { + if (PollInfo->Handles[j].Handle == writefds->fd_array[i]) + break; + } + if (j >= HandleCount) + { + ERR("Error while counting writefds %ld > %ld\n", j, HandleCount); + if (lpErrno) *lpErrno = WSAEFAULT; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } Socket = GetSocketStructure(writefds->fd_array[i]); if (!Socket) { @@ -1159,15 +1209,28 @@ return SOCKET_ERROR; } PollInfo->Handles[j].Handle = writefds->fd_array[i]; - PollInfo->Handles[j].Events = AFD_EVENT_SEND; + PollInfo->Handles[j].Events |= AFD_EVENT_SEND; if (Socket->SharedData->NonBlocking != 0) PollInfo->Handles[j].Events |= AFD_EVENT_CONNECT; } } if (exceptfds != NULL) { - for (i = 0; i < exceptfds->fd_count; i++, j++) - { + for (i = 0; i < exceptfds->fd_count; i++) + { + for (j = 0; j < HandleCount; j++) + { + if (PollInfo->Handles[j].Handle == exceptfds->fd_array[i]) + break; + } + if (j > HandleCount) + { + ERR("Error while counting exceptfds %ld > %ld\n", j, HandleCount); + if (lpErrno) *lpErrno = WSAEFAULT; + HeapFree(GlobalHeap, 0, PollBuffer); + NtClose(SockEvent); + return SOCKET_ERROR; + } Socket = GetSocketStructure(exceptfds->fd_array[i]); if (!Socket) { @@ -1178,20 +1241,14 @@ return SOCKET_ERROR; } PollInfo->Handles[j].Handle = exceptfds->fd_array[i]; - PollInfo->Handles[j].Events = 0; if (Socket->SharedData->OobInline == 0) PollInfo->Handles[j].Events |= AFD_EVENT_OOB_RECEIVE; if (Socket->SharedData->NonBlocking != 0) PollInfo->Handles[j].Events |= AFD_EVENT_CONNECT_FAIL; - if (PollInfo->Handles[j].Events == 0) - { - TRACE("No events can be checked for exceptfds %d. It is nonblocking and OOB line is disabled. Skipping it.", exceptfds->fd_array[i]); - j--; - } - } - } - - PollInfo->HandleCount = j; + } + } + + PollInfo->HandleCount = HandleCount; PollBufferSize = FIELD_OFFSET(AFD_POLL_INFO, Handles) + PollInfo->HandleCount * sizeof(AFD_HANDLE); /* Send IOCTL */

1 0

[akhaldi] 73240: [NOTEPAD] Fix a typo. Spotted by Laur Florin. CORE-12405
by akhaldi＠svn.reactos.org 17 Nov '16

17 Nov '16

Author: akhaldi Date: Thu Nov 17 11:56:16 2016 New Revision: 73240 URL: http://svn.reactos.org/svn/reactos?rev=73240&view=rev Log: [NOTEPAD] Fix a typo. Spotted by Laur Florin. CORE-12405 Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/en-US.rc Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] Thu Nov 17 11:56:16 2016 @@ -51,7 +51,7 @@ END POPUP "&SÃ¸g" BEGIN - MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Word Wrap", CMD_WRAP MENUITEM "&Font...", CMD_FONT END POPUP "&View" Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] Thu Nov 17 11:56:16 2016 @@ -51,7 +51,7 @@ END POPUP "F&ormat" BEGIN - MENUITEM "&Wrap Wrap", CMD_WRAP + MENUITEM "&Word Wrap", CMD_WRAP MENUITEM "&Font...", CMD_FONT END POPUP "&View"

1 0

[cfinck] 73239: [LOCALSPL_APITEST] Fix some NULL vs. INVALID_HANDLE_VALUE checks. Now localspl_apitest.exe should properly quit when it cannot find its DLL.
by cfinck＠svn.reactos.org 16 Nov '16

16 Nov '16

Author: cfinck Date: Wed Nov 16 14:59:01 2016 New Revision: 73239 URL: http://svn.reactos.org/svn/reactos?rev=73239&view=rev Log: [LOCALSPL_APITEST] Fix some NULL vs. INVALID_HANDLE_VALUE checks. Now localspl_apitest.exe should properly quit when it cannot find its DLL. Modified: trunk/rostests/apitests/localspl/tests.c Modified: trunk/rostests/apitests/localspl/tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/tests.c… ============================================================================== --- trunk/rostests/apitests/localspl/tests.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/tests.c [iso-8859-1] Wed Nov 16 14:59:01 2016 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Test list - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> */ /* @@ -45,7 +45,7 @@ DWORD cbRead; DWORD cbWritten; HANDLE hCommandPipe = INVALID_HANDLE_VALUE; - HANDLE hFind = NULL; + HANDLE hFind = INVALID_HANDLE_VALUE; HANDLE hOutputPipe = INVALID_HANDLE_VALUE; PWSTR p; SC_HANDLE hSC = NULL; @@ -77,7 +77,7 @@ // Check if the corresponding DLL file exists. hFind = FindFirstFileW(wszFilePath, &fd); - if (!hFind) + if (hFind == INVALID_HANDLE_VALUE) { skip("My DLL file \"%S\" does not exist!\n", wszFilePath); goto Cleanup; @@ -187,13 +187,13 @@ bSuccessful = TRUE; Cleanup: - if (hCommandPipe) + if (hCommandPipe != INVALID_HANDLE_VALUE) CloseHandle(hCommandPipe); - if (hOutputPipe) + if (hOutputPipe != INVALID_HANDLE_VALUE) CloseHandle(hOutputPipe); - if (hFind) + if (hFind != INVALID_HANDLE_VALUE) FindClose(hFind); if (hService)

1 0

[cfinck] 73238: [WINSPOOL_APITEST] Add tests for GetPrintProcessorDirectoryA and another one for GetPrintProcessorDirectoryW. Tested against Windows Server 2003 SP2. Step 1 for CORE-12399
by cfinck＠svn.reactos.org 16 Nov '16

16 Nov '16

Author: cfinck Date: Wed Nov 16 08:54:54 2016 New Revision: 73238 URL: http://svn.reactos.org/svn/reactos?rev=73238&view=rev Log: [WINSPOOL_APITEST] Add tests for GetPrintProcessorDirectoryA and another one for GetPrintProcessorDirectoryW. Tested against Windows Server 2003 SP2. Step 1 for CORE-12399 Modified: trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c trunk/rostests/apitests/winspool/testlist.c Modified: trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetPrin… ============================================================================== --- trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] Wed Nov 16 08:54:54 2016 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler DLL API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for GetPrintProcessorDirectoryA/GetPrintProcessorDirectoryW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -13,7 +13,59 @@ #include <wingdi.h> #include <winspool.h> -START_TEST(GetPrintProcessorDirectory) +START_TEST(GetPrintProcessorDirectoryA) +{ + DWORD cbNeeded; + DWORD cbTemp; + PSTR pszBuffer; + + // Try with an invalid level, this needs to be caught first. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 0, NULL, 0, NULL), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_LEVEL, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + + // Now try with valid level, but no pcbNeeded. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, NULL), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == RPC_X_NULL_REF_POINTER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + + // Try with an invalid environment as well. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, "invalid", 1, NULL, 0, &cbNeeded), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_ENVIRONMENT, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbNeeded == 0, "cbNeeded is %lu!\n", cbNeeded); + + // Now get the required buffer size by supplying pcbNeeded. This needs to fail with ERROR_INSUFFICIENT_BUFFER. + // Note for GetPrintProcessorDirectoryA: cbNeeded will be the same as for GetPrintProcessorDirectoryW, even though the ANSI string only needs half of it! + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, &cbNeeded), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + + // Now provide the demanded size, but no buffer. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + + // Same error has to occur with a size too small. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 1, &cbTemp), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + + // Finally use the function as intended and aim for success! + pszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNeeded); + SetLastError(0xDEADBEEF); + ok(GetPrintProcessorDirectoryA(NULL, NULL, 1, (PBYTE)pszBuffer, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryA returns FALSE!\n"); + ok(GetLastError() == ERROR_SUCCESS, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + + // Note for GetPrintProcessorDirectoryA: cbNeeded is the same as for GetPrintProcessorDirectoryW! + ok(strlen(pszBuffer) == cbNeeded / sizeof(WCHAR) - 1, "GetPrintProcessorDirectoryA string is %Iu characters long, but %lu characters expected!\n", strlen(pszBuffer), cbNeeded / sizeof(WCHAR) - 1); + HeapFree(GetProcessHeap(), 0, pszBuffer); +} + +START_TEST(GetPrintProcessorDirectoryW) { DWORD cbNeeded; DWORD cbTemp; @@ -54,9 +106,10 @@ ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); // Finally use the function as intended and aim for success! - pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbNeeded); + pwszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNeeded); SetLastError(0xDEADBEEF); - ok(GetPrintProcessorDirectoryW(NULL, NULL, 1, (PBYTE)pwszBuffer, cbNeeded, &cbNeeded), "GetPrintProcessorDirectoryW returns FALSE!\n"); + ok(GetPrintProcessorDirectoryW(NULL, NULL, 1, (PBYTE)pwszBuffer, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryW returns FALSE!\n"); ok(GetLastError() == ERROR_SUCCESS, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); + ok(wcslen(pwszBuffer) == cbNeeded / sizeof(WCHAR) - 1, "GetPrintProcessorDirectoryW string is %Iu characters long, but %lu characters expected!\n", wcslen(pwszBuffer), cbNeeded / sizeof(WCHAR) - 1); HeapFree(GetProcessHeap(), 0, pwszBuffer); } Modified: trunk/rostests/apitests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/testlis… ============================================================================== --- trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] Wed Nov 16 08:54:54 2016 @@ -13,7 +13,8 @@ extern void func_ClosePrinter(void); extern void func_EnumPrinters(void); extern void func_EnumPrintProcessorDatatypes(void); -extern void func_GetPrintProcessorDirectory(void); +extern void func_GetPrintProcessorDirectoryA(void); +extern void func_GetPrintProcessorDirectoryW(void); extern void func_IsValidDevmodeA(void); extern void func_IsValidDevmodeW(void); extern void func_OpenPrinter(void); @@ -24,7 +25,8 @@ { "ClosePrinter", func_ClosePrinter }, { "EnumPrinters", func_EnumPrinters }, { "EnumPrintProcessorDatatypes", func_EnumPrintProcessorDatatypes }, - { "GetPrintProcessorDirectory", func_GetPrintProcessorDirectory }, + { "GetPrintProcessorDirectoryA", func_GetPrintProcessorDirectoryA }, + { "GetPrintProcessorDirectoryW", func_GetPrintProcessorDirectoryW }, { "IsValidDevmodeA", func_IsValidDevmodeA }, { "IsValidDevmodeW", func_IsValidDevmodeW }, { "OpenPrinter", func_OpenPrinter },

1 0

[gadamopoulos] 73237: [SHELL32] - Implement filling in needed keys passed to CDefFolderMenu_Create2. - CDefaultContextMenu: Remove the code that filled the array of keys as this is now moved to the...
by gadamopoulos＠svn.reactos.org 15 Nov '16

15 Nov '16

Author: gadamopoulos Date: Tue Nov 15 20:14:56 2016 New Revision: 73237 URL: http://svn.reactos.org/svn/reactos?rev=73237&view=rev Log: [SHELL32] - Implement filling in needed keys passed to CDefFolderMenu_Create2. - CDefaultContextMenu: Remove the code that filled the array of keys as this is now moved to the implementation of the shell folder. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -1571,96 +1571,10 @@ * */ -static void AddClassKey(const WCHAR * szClass, HKEY* buffer, UINT* cKeys) -{ - LSTATUS result; - HKEY hkey; - result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szClass, 0, KEY_READ | KEY_QUERY_VALUE, &hkey); - if (result != ERROR_SUCCESS) - return; - - buffer[*cKeys] = hkey; - *cKeys +=1; -} - -void HackFillKeys(DEFCONTEXTMENU *pdcm, HKEY* buffer) -{ - PCUITEMID_CHILD pidl = pdcm->apidl[0]; - pdcm->cKeys = 0; - pdcm->aKeys = buffer; - - if (_ILIsValue(pidl)) - { - FileStructW* pFileData = _ILGetFileStructW(pidl); - LPWSTR extension = PathFindExtension(pFileData->wszName); - - if (extension) - { - AddClassKey(extension, buffer, &pdcm->cKeys); - - WCHAR wszClass[40], wszClass2[40]; - DWORD dwSize = sizeof(wszClass); - if (RegGetValueW(HKEY_CLASSES_ROOT, extension, NULL, RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) - { - swprintf(wszClass2, L"%s//%s", extension, wszClass); - - AddClassKey(wszClass, buffer, &pdcm->cKeys); - AddClassKey(wszClass2, buffer, &pdcm->cKeys); - } - - swprintf(wszClass2, L"SystemFileAssociations//%s", extension); - AddClassKey(wszClass2, buffer, &pdcm->cKeys); - - if (RegGetValueW(HKEY_CLASSES_ROOT, extension, L"PerceivedType ", RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) - { - swprintf(wszClass2, L"SystemFileAssociations//%s", wszClass); - AddClassKey(wszClass2, buffer, &pdcm->cKeys); - } - } - - AddClassKey(L"AllFilesystemObjects", buffer, &pdcm->cKeys); - AddClassKey(L"*", buffer, &pdcm->cKeys); - } - else if (_ILIsSpecialFolder(pidl)) - { - GUID *pGuid = _ILGetGUIDPointer(pidl); - if (pGuid) - { - LPOLESTR pwszCLSID; - WCHAR key[60]; - - wcscpy(key, L"CLSID\\"); - HRESULT hr = StringFromCLSID(*pGuid, &pwszCLSID); - if (hr == S_OK) - { - wcscpy(&key[6], pwszCLSID); - AddClassKey(key, buffer, &pdcm->cKeys); - } - } - AddClassKey(L"Folder", buffer, &pdcm->cKeys); - } - else if (_ILIsFolder(pidl)) - { - AddClassKey(L"AllFilesystemObjects", buffer, &pdcm->cKeys); - AddClassKey(L"Directory", buffer, &pdcm->cKeys); - AddClassKey(L"Folder", buffer, &pdcm->cKeys); - } - else if (_ILIsDrive(pidl)) - { - AddClassKey(L"Drive", buffer, &pdcm->cKeys); - AddClassKey(L"Folder", buffer, &pdcm->cKeys); - } -} - HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) { - /* HACK: move to the shell folders implementation */ - HKEY hkeyHack[16]; - if (!pdcm->aKeys && pdcm->cidl) - HackFillKeys((DEFCONTEXTMENU *)pdcm, hkeyHack); - HRESULT hr = CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -486,7 +486,7 @@ if (bHasCpl) hr = ShellObjectCreatorInit<CCPLItemMenu>(cidl, apidl, riid, &pObj); else - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else if ((IsEqualIID(riid, IID_IExtractIconA) || IsEqualIID(riid, IID_IExtractIconW)) && (cidl == 1)) { 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] Tue Nov 15 20:14:56 2016 @@ -639,7 +639,21 @@ if (IsEqualIID (riid, IID_IContextMenu)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder *)this, NULL, 0, NULL, (IContextMenu **)&pObj); + if (_ILIsSpecialFolder(apidl[0])) + { + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); + } + else + { + /* Do not use the context menu of the CFSFolder here. */ + /* We need to pass a pointer of the CDesktopFolder so as the data object that the context menu gets is rooted to the desktop */ + /* Otherwise operations like that involve items from both user and shared desktop will not work */ + IContextMenu * pCm = NULL; + HKEY hKeys[16]; + UINT cKeys = 0; + AddFSClassKeysToArray(apidl[0], hKeys, &cKeys); + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, cKeys, hKeys, &pCm); + } } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { @@ -817,14 +831,15 @@ { TRACE ("(%p)->(%p)\n", this, pidl); - return E_NOTIMPL; + return E_INVALIDARG; } HRESULT WINAPI CDesktopFolder::GetCurFolder(LPITEMIDLIST * pidl) { TRACE ("(%p)->(%p)\n", this, pidl); - if (!pidl) return E_POINTER; + if (!pidl) + return E_INVALIDARG; /* xp doesn't have this check and crashes on NULL */ *pidl = ILClone (pidlRoot); return S_OK; } 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] Tue Nov 15 20:14:56 2016 @@ -39,6 +39,22 @@ * IShellFolder implementation */ +HRESULT CDrivesContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, + HWND hwnd, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + IShellFolder *psf, + IContextMenu **ppcm) +{ + HKEY hKeys[2]; + UINT cKeys = 0; + AddClassKeyToArray(L"Drive", hKeys, &cKeys); + AddClassKeyToArray(L"Folder", hKeys, &cKeys); + + /* TODO: also pass a callback here */ + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); +} + HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; @@ -536,7 +552,10 @@ if (IsEqualIID (riid, IID_IContextMenu) && (cidl >= 1)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + if (_ILIsDrive(apidl[0])) + hr = CDrivesContextMenu_CreateInstance(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); + else + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { @@ -812,12 +831,6 @@ */ HRESULT WINAPI CDrivesFolder::Initialize(LPCITEMIDLIST pidl) { - TRACE ("(%p)->(%p)\n", this, pidl); - - if (pidlRoot) - SHFree((LPVOID)pidlRoot); - - pidlRoot = ILClone(pidl); return S_OK; } @@ -829,7 +842,7 @@ TRACE("(%p)->(%p)\n", this, pidl); if (!pidl) - return E_POINTER; + return E_INVALIDARG; /* xp doesn't have this check and crashes on NULL */ *pidl = ILClone(pidlRoot); return S_OK; 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] Tue Nov 15 20:14:56 2016 @@ -490,7 +490,10 @@ if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { IContextMenu * pCm = NULL; - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + HKEY hKeys[16]; + UINT cKeys = 0; + AddFSClassKeysToArray(apidl[0], hKeys, &cKeys); + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, cKeys, hKeys, &pCm); pObj = pCm; } else if (IsEqualIID (riid, IID_IDataObject)) Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -22,6 +22,35 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +HRESULT CGuidItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, + HWND hwnd, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + IShellFolder *psf, + IContextMenu **ppcm) +{ + HKEY hKeys[10]; + UINT cKeys = 0; + + GUID *pGuid = _ILGetGUIDPointer(apidl[0]); + if (pGuid) + { + LPOLESTR pwszCLSID; + WCHAR key[60]; + + wcscpy(key, L"CLSID\\"); + HRESULT hr = StringFromCLSID(*pGuid, &pwszCLSID); + if (hr == S_OK) + { + wcscpy(&key[6], pwszCLSID); + AddClassKeyToArray(key, hKeys, &cKeys); + } + } + AddClassKeyToArray(L"Folder", hKeys, &cKeys); + + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); +} + HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; @@ -175,13 +204,26 @@ HRESULT CRegFolder::GetGuidItemAttributes (LPCITEMIDLIST pidl, LPDWORD pdwAttributes) { + DWORD dwAttributes = *pdwAttributes; + /* First try to get them from the registry */ - if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) - { - return S_OK; - } - - *pdwAttributes &= SFGAO_CANLINK; + if (!HCR_GetFolderAttributes(pidl, pdwAttributes)) + { + /* We couldn't get anything */ + *pdwAttributes = 0; + } + + /* Items have more attributes when on desktop */ + if (_ILIsDesktop(m_pidlRoot)) + { + *pdwAttributes |= (dwAttributes & (SFGAO_CANLINK|SFGAO_CANDELETE|SFGAO_CANRENAME|SFGAO_HASPROPSHEET)); + } + + /* In any case, links can be created */ + if (*pdwAttributes == NULL) + { + *pdwAttributes |= (dwAttributes & SFGAO_CANLINK); + } return S_OK; } @@ -346,8 +388,20 @@ { hr = CGuidItemExtractIcon_CreateInstance(apidl[0], riid, &pObj); } + else if (IsEqualIID (riid, IID_IContextMenu) && (cidl >= 1)) + { + if (!_ILGetGUIDPointer (apidl[0])) + { + ERR("Got non guid item!\n"); + return E_FAIL; + } + + hr = CGuidItemContextMenu_CreateInstance(m_pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); + } else + { hr = E_NOINTERFACE; + } *ppvOut = pObj; return hr; Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -61,6 +61,8 @@ extern "C" BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey); +void AddFSClassKeysToArray(PCUITEMID_CHILD pidl, HKEY* array, UINT* cKeys); + static __inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -501,6 +501,52 @@ *cKeys += 1; } +void AddFSClassKeysToArray(PCUITEMID_CHILD pidl, HKEY* array, UINT* cKeys) +{ + if (_ILIsValue(pidl)) + { + FileStructW* pFileData = _ILGetFileStructW(pidl); + LPWSTR extension = PathFindExtension(pFileData->wszName); + + if (extension) + { + AddClassKeyToArray(extension, array, cKeys); + + WCHAR wszClass[40], wszClass2[40]; + DWORD dwSize = sizeof(wszClass); + if (RegGetValueW(HKEY_CLASSES_ROOT, extension, NULL, RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) + { + swprintf(wszClass2, L"%s//%s", extension, wszClass); + + AddClassKeyToArray(wszClass, array, cKeys); + AddClassKeyToArray(wszClass2, array, cKeys); + } + + swprintf(wszClass2, L"SystemFileAssociations//%s", extension); + AddClassKeyToArray(wszClass2, array, cKeys); + + if (RegGetValueW(HKEY_CLASSES_ROOT, extension, L"PerceivedType ", RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) + { + swprintf(wszClass2, L"SystemFileAssociations//%s", wszClass); + AddClassKeyToArray(wszClass2, array, cKeys); + } + } + + AddClassKeyToArray(L"AllFilesystemObjects", array, cKeys); + AddClassKeyToArray(L"*", array, cKeys); + } + else if (_ILIsFolder(pidl)) + { + AddClassKeyToArray(L"AllFilesystemObjects", array, cKeys); + AddClassKeyToArray(L"Directory", array, cKeys); + AddClassKeyToArray(L"Folder", array, cKeys); + } + else + { + ERR("Got non FS pidl\n"); + } +} + /*********************************************************************** * SHCreateLinks *

1 0

[gadamopoulos] 73236: [SHELL32] - Accept NULL pidl in CRegFolder::GetDisplayNameOf. CORE-12317
by gadamopoulos＠svn.reactos.org 15 Nov '16

15 Nov '16

Author: gadamopoulos Date: Tue Nov 15 14:25:05 2016 New Revision: 73236 URL: http://svn.reactos.org/svn/reactos?rev=73236&view=rev Log: [SHELL32] - Accept NULL pidl in CRegFolder::GetDisplayNameOf. CORE-12317 Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Tue Nov 15 14:25:05 2016 @@ -356,10 +356,10 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - if (!strRet || !_ILIsSpecialFolder(pidl)) - return E_INVALIDARG; - - if (!pidl->mkid.cb) + if (!strRet || (!_ILIsSpecialFolder(pidl) && pidl != NULL)) + return E_INVALIDARG; + + if (!pidl || !pidl->mkid.cb) { if ((GET_SHGDN_RELATION(dwFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING)) {

1 0

[gadamopoulos] 73235: [SHELL32_APITEST] - Add a test for CShellDesktop to show what breaks the select folder dialog.
by gadamopoulos＠svn.reactos.org 15 Nov '16

15 Nov '16

Author: gadamopoulos Date: Tue Nov 15 14:08:57 2016 New Revision: 73235 URL: http://svn.reactos.org/svn/reactos?rev=73235&view=rev Log: [SHELL32_APITEST] - Add a test for CShellDesktop to show what breaks the select folder dialog. Modified: trunk/rostests/apitests/shell32/CShellDesktop.cpp Modified: trunk/rostests/apitests/shell32/CShellDesktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellDe… ============================================================================== --- trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] Tue Nov 15 14:08:57 2016 @@ -182,6 +182,10 @@ hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IShellView, &psv_2)); ok(hr == S_OK, "hr = %lx\n", hr); ok(psv != psv_2, "Expected %p != %p\n", static_cast<PVOID>(psv), static_cast<PVOID>(psv_2)); + + STRRET strret; + hr = psf2->GetDisplayNameOf(NULL, 0, &strret); + ok(hr == S_OK, "hr = %lx\n", hr); } VOID TestInitialize(_In_ IShellFolder *psf)

1 0

[hbelusca] 73234: [LSASRV]: Revert part of r73233: GetModuleHandle(NULL) retrieves the exe module in which the dll is loaded, not the dll instance itself. (an alternative might be to use the hinsta...
by hbelusca＠svn.reactos.org 14 Nov '16

14 Nov '16

Author: hbelusca Date: Mon Nov 14 18:57:18 2016 New Revision: 73234 URL: http://svn.reactos.org/svn/reactos?rev=73234&view=rev Log: [LSASRV]: Revert part of r73233: GetModuleHandle(NULL) retrieves the exe module in which the dll is loaded, not the dll instance itself. (an alternative might be to use the hinstance from DllMain...). Thanks Thomas for having pointed this to me. Modified: trunk/reactos/dll/win32/lsasrv/lookup.c Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Mon Nov 14 18:57:18 2016 @@ -186,7 +186,7 @@ InitializeListHead(&WellKnownSidListHead); - hInstance = GetModuleHandleW(NULL); + hInstance = GetModuleHandleW(L"lsasrv.dll"); /* NT Authority */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs