Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[gadamopoulos] 72208: [SHELL32] - Get rid of the functions that handle guid pidls and move their implementation in CRegFolder.cpp.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 12 12:21:13 2016 New Revision: 72208 URL: http://svn.reactos.org/svn/reactos?rev=72208&view=rev Log: [SHELL32] - Get rid of the functions that handle guid pidls and move their implementation in CRegFolder.cpp. Modified: trunk/reactos/dll/win32/shell32/folders.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/… [View More]wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Fri Aug 12 12:21:13 2016 @@ -192,88 +192,6 @@ return FALSE; } -HRESULT CGuidItemExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) -{ - CComPtr<IDefaultExtractIconInit> initIcon; - HRESULT hr; - GUID const * riid; - int icon_idx; - WCHAR wTemp[MAX_PATH]; - - hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); - if (FAILED(hr)) - return hr; - - if (_ILIsDesktop(pidl)) - { - initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_DESKTOP); - return initIcon->QueryInterface(iid, ppvOut); - } - - riid = _ILGetGUIDPointer(pidl); - if (!riid) - return E_FAIL; - - /* my computer and other shell extensions */ - static const WCHAR fmt[] = { 'C', 'L', 'S', 'I', 'D', '\\', - '{', '%', '0', '8', 'l', 'x', '-', '%', '0', '4', 'x', '-', '%', '0', '4', 'x', '-', - '%', '0', '2', 'x', '%', '0', '2', 'x', '-', '%', '0', '2', 'x', '%', '0', '2', 'x', - '%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '}', 0 - }; - WCHAR xriid[50]; - - swprintf(xriid, fmt, - riid->Data1, riid->Data2, riid->Data3, - riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], - riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - const WCHAR* iconname = NULL; - if (_ILIsBitBucket(pidl)) - { - static const WCHAR szFull[] = {'F','u','l','l',0}; - static const WCHAR szEmpty[] = {'E','m','p','t','y',0}; - CComPtr<IEnumIDList> EnumIDList; - CoInitialize(NULL); - - CComPtr<IShellFolder2> psfRecycleBin; - CComPtr<IShellFolder> psfDesktop; - hr = SHGetDesktopFolder(&psfDesktop); - - if (SUCCEEDED(hr)) - hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder2, &psfRecycleBin)); - if (SUCCEEDED(hr)) - hr = psfRecycleBin->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &EnumIDList); - - ULONG itemcount; - LPITEMIDLIST pidl = NULL; - if (SUCCEEDED(hr) && (hr = EnumIDList->Next(1, &pidl, &itemcount)) == S_OK) - { - CoTaskMemFree(pidl); - iconname = szFull; - } else { - iconname = szEmpty; - } - } - - if (HCR_GetIconW(xriid, wTemp, iconname, MAX_PATH, &icon_idx)) - { - initIcon->SetNormalIcon(wTemp, icon_idx); - } - else - { - if (IsEqualGUID(*riid, CLSID_MyComputer)) - initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_COMPUTER); - else if (IsEqualGUID(*riid, CLSID_MyDocuments)) - initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_DOCUMENTS); - else if (IsEqualGUID(*riid, CLSID_NetworkPlaces)) - initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_NETWORK_PLACES); - else - initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_FOLDER); - } - - return initIcon->QueryInterface(iid, ppvOut); -} - HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; 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] Fri Aug 12 12:21:13 2016 @@ -22,6 +22,88 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) +{ + CComPtr<IDefaultExtractIconInit> initIcon; + HRESULT hr; + GUID const * riid; + int icon_idx; + WCHAR wTemp[MAX_PATH]; + + hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); + if (FAILED(hr)) + return hr; + + if (_ILIsDesktop(pidl)) + { + initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_DESKTOP); + return initIcon->QueryInterface(iid, ppvOut); + } + + riid = _ILGetGUIDPointer(pidl); + if (!riid) + return E_FAIL; + + /* my computer and other shell extensions */ + static const WCHAR fmt[] = { 'C', 'L', 'S', 'I', 'D', '\\', + '{', '%', '0', '8', 'l', 'x', '-', '%', '0', '4', 'x', '-', '%', '0', '4', 'x', '-', + '%', '0', '2', 'x', '%', '0', '2', 'x', '-', '%', '0', '2', 'x', '%', '0', '2', 'x', + '%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '}', 0 + }; + WCHAR xriid[50]; + + swprintf(xriid, fmt, + riid->Data1, riid->Data2, riid->Data3, + riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], + riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + const WCHAR* iconname = NULL; + if (_ILIsBitBucket(pidl)) + { + static const WCHAR szFull[] = {'F','u','l','l',0}; + static const WCHAR szEmpty[] = {'E','m','p','t','y',0}; + CComPtr<IEnumIDList> EnumIDList; + CoInitialize(NULL); + + CComPtr<IShellFolder2> psfRecycleBin; + CComPtr<IShellFolder> psfDesktop; + hr = SHGetDesktopFolder(&psfDesktop); + + if (SUCCEEDED(hr)) + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder2, &psfRecycleBin)); + if (SUCCEEDED(hr)) + hr = psfRecycleBin->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &EnumIDList); + + ULONG itemcount; + LPITEMIDLIST pidl = NULL; + if (SUCCEEDED(hr) && (hr = EnumIDList->Next(1, &pidl, &itemcount)) == S_OK) + { + CoTaskMemFree(pidl); + iconname = szFull; + } else { + iconname = szEmpty; + } + } + + if (HCR_GetIconW(xriid, wTemp, iconname, MAX_PATH, &icon_idx)) + { + initIcon->SetNormalIcon(wTemp, icon_idx); + } + else + { + if (IsEqualGUID(*riid, CLSID_MyComputer)) + initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_COMPUTER); + else if (IsEqualGUID(*riid, CLSID_MyDocuments)) + initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_DOCUMENTS); + else if (IsEqualGUID(*riid, CLSID_NetworkPlaces)) + initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_NETWORK_PLACES); + else + initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_FOLDER); + } + + return initIcon->QueryInterface(iid, ppvOut); +} + class CRegFolder : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2 @@ -31,6 +113,7 @@ CAtlStringW m_rootPath; CComHeapPtr<ITEMIDLIST> m_pidlRoot; + HRESULT GetGuidItemAttributes (LPCITEMIDLIST pidl, LPDWORD pdwAttributes); public: CRegFolder(); ~CRegFolder(); @@ -90,10 +173,67 @@ return S_OK; } +HRESULT CRegFolder::GetGuidItemAttributes (LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +{ + /* First try to get them from the registry */ + if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) + { + return S_OK; + } + else + { + /* If we can't get it from the registry we have to query the child */ + CComPtr<IShellFolder> psf2; + if (SUCCEEDED(BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) + { + return psf2->GetAttributesOf(0, NULL, pdwAttributes); + } + } + + *pdwAttributes &= SFGAO_CANLINK; + return S_OK; +} + HRESULT WINAPI CRegFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes) { - return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + LPITEMIDLIST pidl; + + if (!lpszDisplayName || !ppidl) + return E_INVALIDARG; + + *ppidl = 0; + + if (pchEaten) + *pchEaten = 0; + + UINT cch = wcslen(lpszDisplayName); + if (cch < 39 || lpszDisplayName[0] != L':' || lpszDisplayName[1] != L':') + return E_FAIL; + + pidl = _ILCreateGuidFromStrW(lpszDisplayName + 2); + if (pidl == NULL) + return E_FAIL; + + if (cch < 41) + { + *ppidl = pidl; + if (pdwAttributes && *pdwAttributes) + { + GetGuidItemAttributes(*ppidl, pdwAttributes); + } + } + else + { + HRESULT hr = SHELL32_ParseNextElement(this, hwndOwner, pbc, &pidl, lpszDisplayName + 41, pchEaten, pdwAttributes); + if (SUCCEEDED(hr)) + { + *ppidl = pidl; + } + return hr; + } + + return S_OK; } HRESULT WINAPI CRegFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) @@ -103,7 +243,39 @@ HRESULT WINAPI CRegFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { - return SHELL32_BindToGuidItem(m_pidlRoot, pidl, pbcReserved, riid, ppvOut); + CComPtr<IPersistFolder> pFolder; + HRESULT hr; + + if (!ppvOut || !pidl || !pidl->mkid.cb) + return E_INVALIDARG; + + *ppvOut = NULL; + + GUID *pGUID = _ILGetGUIDPointer(pidl); + if (!pGUID) + { + ERR("CRegFolder::BindToObject called for non guid item!\n"); + return E_INVALIDARG; + } + + LPITEMIDLIST pidlChild = ILCloneFirst (pidl); + if (!pidlChild) + return E_OUTOFMEMORY; + + CComPtr<IShellFolder> psf; + hr = SHELL32_CoCreateInitSF(m_pidlRoot, NULL, pidlChild, pGUID, -1, IID_PPV_ARG(IShellFolder, &psf)); + ILFree(pidlChild); + if (FAILED(hr)) + return hr; + + if (_ILIsPidlSimple (pidl)) + { + return psf->QueryInterface(riid, ppvOut); + } + else + { + return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); + } } HRESULT WINAPI CRegFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -113,7 +285,27 @@ HRESULT WINAPI CRegFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - return SHELL32_CompareGuidItems(this, lParam, pidl1, pidl2); + if (!pidl1 || !pidl2 || pidl1->mkid.cb == 0 || pidl2->mkid.cb == 0) + { + ERR("Got an empty pidl!\n"); + return E_INVALIDARG; + } + + BOOL bIsGuidFolder1 = _ILIsSpecialFolder(pidl1); + BOOL bIsGuidFolder2 = _ILIsSpecialFolder(pidl2); + + if (!bIsGuidFolder1 && !bIsGuidFolder2) + { + ERR("Got no guid pidl!\n"); + return E_INVALIDARG; + } + else if (bIsGuidFolder1 && bIsGuidFolder2) + { + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); + } + + /* Guid folders come first compared to everything else */ + return MAKE_COMPARE_HRESULT(bIsGuidFolder1 ? -1 : 1); } HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) @@ -132,7 +324,7 @@ while(cidl > 0 && *apidl) { if (_ILIsSpecialFolder(*apidl)) - SHELL32_GetGuidItemAttributes(this, *apidl, rgfInOut); + GetGuidItemAttributes(*apidl, rgfInOut); else ERR("Got an unkown pidl here!\n"); apidl++; @@ -158,7 +350,7 @@ if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) { - hr = CGuidItemExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + hr = CGuidItemExtractIcon_CreateInstance(apidl[0], riid, &pObj); } else hr = E_NOINTERFACE; @@ -190,19 +382,118 @@ return S_OK; } - if (pidl->mkid.cb) - { - return SHELL32_GetDisplayNameOfGUIDItem(this, m_rootPath, pidl, dwFlags, strRet); - } - - return E_FAIL; + HRESULT hr; + GUID const *clsid = _ILGetGUIDPointer (pidl); + + /* First of all check if we need to query the name from the child item */ + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING && + GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) + { + int bWantsForParsing = FALSE; + + /* + * We can only get a filesystem path from a shellfolder if the + * value WantsFORPARSING in CLSID\\{...}\\shellfolder exists. + * + * Exception: The MyComputer folder doesn't have this key, + * but any other filesystem backed folder it needs it. + */ + if (IsEqualIID (*clsid, CLSID_MyComputer)) + { + bWantsForParsing = TRUE; + } + else + { + HKEY hkeyClass; + if (HCR_RegOpenClassIDKey(*clsid, &hkeyClass)) + { + LONG res = SHGetValueW(hkeyClass, L"Shellfolder", L"WantsForParsing", NULL, NULL, NULL); + bWantsForParsing = (res == ERROR_SUCCESS); + RegCloseKey(hkeyClass); + } + } + + if (bWantsForParsing) + { + /* + * we need the filesystem path to the destination folder. + * Only the folder itself can know it + */ + return SHELL32_GetDisplayNameOfChild (this, pidl, dwFlags, strRet); + } + } + + /* Allocate the buffer for the result */ + LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); + if (!pszPath) + return E_OUTOFMEMORY; + + hr = S_OK; + + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) + { + wcscpy(pszPath, m_rootPath); + PWCHAR pItemName = &pszPath[wcslen(pszPath)]; + + /* parsing name like ::{...} */ + pItemName[0] = ':'; + pItemName[1] = ':'; + SHELL32_GUIDToStringW (*clsid, &pItemName[2]); + } + else + { + /* user friendly name */ + if (!HCR_GetClassNameW (*clsid, pszPath, MAX_PATH)) + hr = E_FAIL; + } + + if (SUCCEEDED(hr)) + { + strRet->uType = STRRET_WSTR; + strRet->pOleStr = pszPath; + } + else + { + CoTaskMemFree(pszPath); + } + + return hr; } HRESULT WINAPI CRegFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { - return SHELL32_SetNameOfGuidItem(pidl, lpName, dwFlags, pPidlOut); -} + GUID const *clsid = _ILGetGUIDPointer (pidl); + LPOLESTR pStr; + HRESULT hr; + WCHAR szName[100]; + + if (!clsid) + { + ERR("Pidl is not reg item!\n"); + return E_FAIL; + } + + hr = StringFromCLSID(*clsid, &pStr); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + swprintf(szName, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\%s", pStr); + + DWORD cbData = (wcslen(lpName) + 1) * sizeof(WCHAR); + LONG res = SHSetValueW(HKEY_CURRENT_USER, szName, NULL, RRF_RT_REG_SZ, lpName, cbData); + + CoTaskMemFree(pStr); + + if (res == ERROR_SUCCESS) + { + *pPidlOut = ILClone(pidl); + return S_OK; + } + + return E_FAIL; +} + HRESULT WINAPI CRegFolder::GetDefaultSearchGUID(GUID *pguid) { @@ -242,7 +533,30 @@ if (!psd || iColumn >= 2) return E_INVALIDARG; - return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); + GUID const *clsid = _ILGetGUIDPointer (pidl); + + if (!clsid) + { + ERR("Pidl is not reg item!\n"); + return E_INVALIDARG; + } + + switch(iColumn) + { + case 0: /* name */ + return GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); + case 1: /* comment */ + HKEY hKey; + if (HCR_RegOpenClassIDKey(*clsid, &hKey)) + { + psd->str.cStr[0] = 0x00; + psd->str.uType = STRRET_CSTR; + RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); + RegCloseKey(hKey); + return S_OK; + } + } + return E_FAIL; } HRESULT WINAPI CRegFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) @@ -250,6 +564,7 @@ return E_NOTIMPL; } +/* In latest windows version this is exported but it takes different arguments! */ HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv) { return ShellObjectCreatorInit<CRegFolder>(pGuid, pidlRoot, lpszPath, riid, ppv); 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] Fri Aug 12 12:21:13 2016 @@ -49,33 +49,9 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); -HRESULT SHELL32_BindToGuidItem(LPCITEMIDLIST pidlRoot, - PCUIDLIST_RELATIVE pidl, - LPBC pbcReserved, - REFIID riid, - LPVOID *ppvOut); - -HRESULT SHELL32_GetGuidItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); - HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); -HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); - -HRESULT SHELL32_SetNameOfGuidItem(PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); - -HRESULT SHELL32_GetDetailsOfGuidItem(IShellFolder2* psf, PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); - -HRESULT SH_ParseGuidDisplayName(IShellFolder2 * pFolder, - HWND hwndOwner, - LPBC pbc, - LPOLESTR lpszDisplayName, - DWORD *pchEaten, - PIDLIST_RELATIVE *ppidl, - DWORD *pdwAttributes); - HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); - -HRESULT SHELL32_CompareGuidItems(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, const GUID* clsid, int csidl, REFIID riid, LPVOID *ppvOut); @@ -107,8 +83,6 @@ void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags); BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); -HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv); - #ifdef __cplusplus HRESULT inline SHSetStrRet(LPSTRRET pStrRet, DWORD resId) 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] Fri Aug 12 12:21:13 2016 @@ -287,47 +287,6 @@ return hr; } -HRESULT SHELL32_BindToGuidItem(LPCITEMIDLIST pidlRoot, - PCUIDLIST_RELATIVE pidl, - LPBC pbcReserved, - REFIID riid, - LPVOID *ppvOut) -{ - CComPtr<IPersistFolder> pFolder; - HRESULT hr; - - if (!pidlRoot || !ppvOut || !pidl || !pidl->mkid.cb) - return E_INVALIDARG; - - *ppvOut = NULL; - - GUID *pGUID = _ILGetGUIDPointer(pidl); - if (!pGUID) - { - ERR("SHELL32_BindToGuidItem called for non guid item!\n"); - return E_INVALIDARG; - } - - LPITEMIDLIST pidlChild = ILCloneFirst (pidl); - if (!pidlChild) - return E_OUTOFMEMORY; - - CComPtr<IShellFolder> psf; - hr = SHELL32_CoCreateInitSF(pidlRoot, NULL, pidlChild, pGUID, -1, IID_PPV_ARG(IShellFolder, &psf)); - ILFree(pidlChild); - if (FAILED(hr)) - return hr; - - if (_ILIsPidlSimple (pidl)) - { - return psf->QueryInterface(riid, ppvOut); - } - else - { - return psf->BindToObject(ILGetNext (pidl), pbcReserved, riid, ppvOut); - } -} - /*********************************************************************** * SHELL32_GetDisplayNameOfChild * @@ -369,89 +328,6 @@ return E_FAIL; return SHSetStrRet(strRet, wstrName); -} - -HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) -{ - HRESULT hr; - GUID const *clsid = _ILGetGUIDPointer (pidl); - - if (!strRet) - return E_INVALIDARG; - - /* First of all check if we need to query the name from the child item */ - if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING && - GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) - { - int bWantsForParsing = FALSE; - - /* - * We can only get a filesystem path from a shellfolder if the - * value WantsFORPARSING in CLSID\\{...}\\shellfolder exists. - * - * Exception: The MyComputer folder doesn't have this key, - * but any other filesystem backed folder it needs it. - */ - if (IsEqualIID (*clsid, CLSID_MyComputer)) - { - bWantsForParsing = TRUE; - } - else - { - HKEY hkeyClass; - if (HCR_RegOpenClassIDKey(*clsid, &hkeyClass)) - { - LONG res = SHGetValueW(hkeyClass, L"Shellfolder", L"WantsForParsing", NULL, NULL, NULL); - bWantsForParsing = (res == ERROR_SUCCESS); - RegCloseKey(hkeyClass); - } - } - - if (bWantsForParsing) - { - /* - * we need the filesystem path to the destination folder. - * Only the folder itself can know it - */ - return SHELL32_GetDisplayNameOfChild (psf, pidl, dwFlags, strRet); - } - } - - /* Allocate the buffer for the result */ - LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); - if (!pszPath) - return E_OUTOFMEMORY; - - hr = S_OK; - - if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) - { - wcscpy(pszPath, pszFolderPath); - PWCHAR pItemName = &pszPath[wcslen(pszPath)]; - - /* parsing name like ::{...} */ - pItemName[0] = ':'; - pItemName[1] = ':'; - SHELL32_GUIDToStringW (*clsid, &pItemName[2]); - } - else - { - /* user friendly name */ - if (!HCR_GetClassNameW (*clsid, pszPath, MAX_PATH)) - hr = E_FAIL; - } - - if (SUCCEEDED(hr)) - { - strRet->uType = STRRET_WSTR; - strRet->pOleStr = pszPath; - } - else - { - CoTaskMemFree(pszPath); - } - - return hr; } /*********************************************************************** @@ -490,40 +366,6 @@ SFGAO_FILESYSTEM | /*0x40000000 */ SFGAO_HASSUBFOLDER; /*0x80000000 */ -HRESULT SHELL32_GetGuidItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) -{ - if (!_ILIsSpecialFolder(pidl)) - { - ERR("Got wrong type of pidl!\n"); - *pdwAttributes &= SFGAO_CANLINK; - return S_OK; - } - - if (*pdwAttributes & ~dwSupportedAttr) - { - WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); - *pdwAttributes &= dwSupportedAttr; - } - - /* First try to get them from the registry */ - if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) - { - return S_OK; - } - else - { - /* If we can't get it from the registry we have to query the child */ - CComPtr<IShellFolder> psf2; - if (SUCCEEDED(psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) - { - return psf2->GetAttributesOf(0, NULL, pdwAttributes); - } - } - - *pdwAttributes &= SFGAO_CANLINK; - return S_OK; -} - HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) { DWORD dwFileAttributes, dwShellAttributes; @@ -607,139 +449,6 @@ return MAKE_COMPARE_HRESULT(ret); } -HRESULT SHELL32_CompareGuidItems(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) -{ - if (pidl1->mkid.cb == 0 || pidl2->mkid.cb == 0) - { - ERR("Got an empty pidl!\n"); - return E_INVALIDARG; - } - - BOOL bIsGuidFolder1 = _ILIsSpecialFolder(pidl1); - BOOL bIsGuidFolder2 = _ILIsSpecialFolder(pidl2); - - if (!bIsGuidFolder1 && !bIsGuidFolder2) - { - ERR("Got no guid pidl!\n"); - return E_INVALIDARG; - } - else if (bIsGuidFolder1 && bIsGuidFolder2) - { - return SHELL32_CompareDetails(isf, lParam, pidl1, pidl2); - } - - /* Guid folders come first compared to everything else */ - return MAKE_COMPARE_HRESULT(bIsGuidFolder1 ? -1 : 1); -} - -HRESULT SH_ParseGuidDisplayName(IShellFolder2 * pFolder, - HWND hwndOwner, - LPBC pbc, - LPOLESTR lpszDisplayName, - DWORD *pchEaten, - PIDLIST_RELATIVE *ppidl, - DWORD *pdwAttributes) -{ - LPITEMIDLIST pidl; - - if (!lpszDisplayName || !ppidl) - return E_INVALIDARG; - - *ppidl = 0; - - if (pchEaten) - *pchEaten = 0; - - UINT cch = wcslen(lpszDisplayName); - if (cch < 39 || lpszDisplayName[0] != L':' || lpszDisplayName[1] != L':') - return E_FAIL; - - pidl = _ILCreateGuidFromStrW(lpszDisplayName + 2); - if (pidl == NULL) - return E_FAIL; - - if (cch < 41) - { - *ppidl = pidl; - if (pdwAttributes && *pdwAttributes) - { - SHELL32_GetGuidItemAttributes(pFolder, *ppidl, pdwAttributes); - } - } - else - { - HRESULT hr = SHELL32_ParseNextElement(pFolder, hwndOwner, pbc, &pidl, lpszDisplayName + 41, pchEaten, pdwAttributes); - if (SUCCEEDED(hr)) - { - *ppidl = pidl; - } - return hr; - } - - return S_OK; -} - -HRESULT SHELL32_SetNameOfGuidItem(PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) -{ - GUID const *clsid = _ILGetGUIDPointer (pidl); - LPOLESTR pStr; - HRESULT hr; - WCHAR szName[100]; - - if (!clsid) - { - ERR("Pidl is not reg item!\n"); - return E_FAIL; - } - - hr = StringFromCLSID(*clsid, &pStr); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - swprintf(szName, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\%s", pStr); - - DWORD cbData = (wcslen(lpName) + 1) * sizeof(WCHAR); - LONG res = SHSetValueW(HKEY_CURRENT_USER, szName, NULL, RRF_RT_REG_SZ, lpName, cbData); - - CoTaskMemFree(pStr); - - if (res == ERROR_SUCCESS) - { - *pPidlOut = ILClone(pidl); - return S_OK; - } - - return E_FAIL; -} - -HRESULT SHELL32_GetDetailsOfGuidItem(IShellFolder2* psf, PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) -{ - GUID const *clsid = _ILGetGUIDPointer (pidl); - - if (!clsid) - { - ERR("Pidl is not reg item!\n"); - return E_FAIL; - } - - switch(iColumn) - { - case 0: /* name */ - return psf->GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); - case 1: /* comment */ - HKEY hKey; - if (HCR_RegOpenClassIDKey(*clsid, &hKey)) - { - psd->str.cStr[0] = 0x00; - psd->str.uType = STRRET_CSTR; - RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); - RegCloseKey(hKey); - return S_OK; - } - } - return E_FAIL; -} - /*********************************************************************** * 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] Fri Aug 12 12:21:13 2016 @@ -80,8 +80,9 @@ HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; -HRESULT CGuidItemExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut); HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut); + +HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv); /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \ [View Less]

8 years, 9 months

[hbelusca] 72207: [ADVAPI32_APITEST]: Add some supplemental tests for Winetests' Event Logging functions, testing different RPC limits related to the maximum size of the data buffer in events. CORE...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 12 12:15:24 2016 New Revision: 72207 URL: http://svn.reactos.org/svn/reactos?rev=72207&view=rev Log: [ADVAPI32_APITEST]: Add some supplemental tests for Winetests' Event Logging functions, testing different RPC limits related to the maximum size of the data buffer in events. CORE-11838 CORE-11839 Added: trunk/rostests/apitests/advapi32/eventlog.c (with props) Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt trunk/rostests/apitests/… [View More]advapi32/testlist.c Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] Fri Aug 12 12:15:24 2016 @@ -2,6 +2,7 @@ list(APPEND SOURCE CreateService.c DuplicateTokenEx.c + eventlog.c HKEY_CLASSES_ROOT.c IsTextUnicode.c LockDatabase.c Added: trunk/rostests/apitests/advapi32/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/eventlo… ============================================================================== --- trunk/rostests/apitests/advapi32/eventlog.c (added) +++ trunk/rostests/apitests/advapi32/eventlog.c [iso-8859-1] Fri Aug 12 12:15:24 2016 @@ -0,0 +1,91 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Supplemental tests for Winetests' Event Logging functions + * PROGRAMMER: Hermes Belusca-Maito + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <winbase.h> + +START_TEST(eventlog) +{ + static struct + { + /* Input */ + ULONG MaxDataSize; + + /* Output for Windows <= 2k3 / Windows Vista+ */ + struct + { + BOOL Success; + DWORD LastError; + } Result[2]; + } Tests[] = + { + /* + * Tests for the different RPC boundaries on Windows. + * See also the "ReportEvent" API on MSDN, section "Return value", at: + * https://msdn.microsoft.com/en-us/library/windows/desktop/aa363679(v=vs.85).… + * for more details. + */ + { 0xF000, { {TRUE, ERROR_SUCCESS}, {TRUE , ERROR_SUCCESS} } }, + { 0xF001, { {TRUE, ERROR_SUCCESS}, {FALSE, RPC_S_INVALID_BOUND} } }, + + { 0x3FF66, { {TRUE, ERROR_SUCCESS}, {FALSE, RPC_S_INVALID_BOUND} } }, + { 0x3FF67, { {TRUE, ERROR_SUCCESS}, {FALSE, RPC_S_INVALID_BOUND} } }, + { 0x3FF68, { {TRUE, ERROR_SUCCESS}, {FALSE, RPC_S_INVALID_BOUND} } }, + + /* Show that the maximum data size for an event can be as big as 0x3FFFF */ + { 0x3FFFE, { {TRUE, ERROR_SUCCESS /* or ERROR_INVALID_PARAMETER on Win2k3 */}, {FALSE, RPC_S_INVALID_BOUND} } }, + { 0x3FFFF, { {TRUE, ERROR_SUCCESS /* or ERROR_INVALID_PARAMETER on Win2k3 */}, {FALSE, RPC_S_INVALID_BOUND} } }, + { 0x40000, { {FALSE, RPC_X_BAD_STUB_DATA}, {FALSE, RPC_S_INVALID_BOUND} } }, + }; + + UINT i; + BOOL Success; + DWORD LastError; + HANDLE hEventLog; + PVOID Data; + + /* We use the "Application" log for the different tests! */ + hEventLog = OpenEventLogW(NULL, L"Application"); + ok(hEventLog != NULL, "OpenEventLogW(NULL, L\"Application\") failed with error %lu\n", GetLastError()); + if (!hEventLog) + return; + + for (i = 0; i < ARRAYSIZE(Tests); ++i) + { + Data = HeapAlloc(GetProcessHeap(), 0, Tests[i].MaxDataSize); + ok(Data != NULL, "Failed to allocate memory for data of size %lu\n", Tests[i].MaxDataSize); + if (Data) + { + RtlFillMemory(Data, Tests[i].MaxDataSize, 0xCA); + + ClearEventLog(hEventLog, NULL); + + SetLastError(ERROR_SUCCESS); + Success = ReportEventW(hEventLog, EVENTLOG_INFORMATION_TYPE, 1, 1, NULL, 0, Tests[i].MaxDataSize, NULL, Data); + LastError = GetLastError(); + /* Small adjustment */ + if (LastError == ERROR_ENVVAR_NOT_FOUND) + LastError = ERROR_SUCCESS; + + ok((LastError == Tests[i].Result[0].LastError) || + broken(LastError == ERROR_INVALID_PARAMETER /* For Win2k3, see above */) || + broken(LastError == Tests[i].Result[1].LastError /* For Vista+ */), + "ReportEventW(%u) last error was %lu, expected %lu\n", i, LastError, Tests[i].Result[0].LastError); + + ok((Success == Tests[i].Result[0].Success) || broken(Success == Tests[i].Result[1].Success /* For Vista+ */), + "ReportEventW(%u) returned 0x%x, expected %s\n", i, Success, (Tests[i].Result[0].Success ? "TRUE" : "FALSE")); + + HeapFree(GetProcessHeap(), 0, Data); + } + } + + ClearEventLog(hEventLog, NULL); + + CloseEventLog(hEventLog); +} Propchange: trunk/rostests/apitests/advapi32/eventlog.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Fri Aug 12 12:15:24 2016 @@ -5,6 +5,7 @@ extern void func_CreateService(void); extern void func_DuplicateTokenEx(void); +extern void func_eventlog(void); extern void func_HKEY_CLASSES_ROOT(void); extern void func_IsTextUnicode(void); extern void func_LockDatabase(void); @@ -18,6 +19,7 @@ { { "CreateService", func_CreateService }, { "DuplicateTokenEx", func_DuplicateTokenEx }, + { "eventlog", func_eventlog }, { "HKEY_CLASSES_ROOT", func_HKEY_CLASSES_ROOT }, { "IsTextUnicode" , func_IsTextUnicode }, { "LockDatabase" , func_LockDatabase }, [View Less]

8 years, 9 months

[gadamopoulos] 72206: [SHELL32] - Move CFSDropTarget to its own file.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 12 11:35:24 2016 New Revision: 72206 URL: http://svn.reactos.org/svn/reactos?rev=72206&view=rev Log: [SHELL32] - Move CFSDropTarget to its own file. Added: trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.cpp - copied, changed from r72166, trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.h - copied, changed from r72166, trunk/reactos/dll/win32/shell32/folders/… [View More]CFSFolder.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.h trunk/reactos/dll/win32/shell32/precomp.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Aug 12 11:35:24 2016 @@ -55,6 +55,7 @@ folders/CRecycleBin.cpp folders/CRegFolder.cpp droptargets/CexeDropHandler.cpp + droptargets/CFSDropTarget.cpp shlexec.cpp shlfileop.cpp shlfolder.cpp Copied: trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.cpp (from r72166, trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/droptarg… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.cpp [iso-8859-1] Fri Aug 12 11:35:24 2016 @@ -1,6 +1,6 @@ /* - * file system folder + * file system folder drop target * * Copyright 1997 Marcus Meissner * Copyright 1998, 1999, 2002 Juergen Schmied @@ -24,806 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); -/* -CFileSysEnum should do an initial FindFirstFile and do a FindNextFile as each file is -returned by Next. When the enumerator is created, it can do numerous additional operations -including formatting a drive, reconnecting a network share drive, and requesting a disk -be inserted in a removable drive. -*/ - -/*********************************************************************** -* IShellFolder implementation -*/ - -class CFileSysEnum : - public CEnumIDListBase -{ - private: - public: - CFileSysEnum(); - ~CFileSysEnum(); - HRESULT WINAPI Initialize(LPWSTR sPathTarget, DWORD dwFlags); - - BEGIN_COM_MAP(CFileSysEnum) - COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) - END_COM_MAP() -}; - -CFileSysEnum::CFileSysEnum() -{ -} - -CFileSysEnum::~CFileSysEnum() -{ -} - -HRESULT WINAPI CFileSysEnum::Initialize(LPWSTR sPathTarget, DWORD dwFlags) -{ - return CreateFolderEnumList(sPathTarget, dwFlags); -} - -CFSFolder::CFSFolder() -{ - pclsid = (CLSID *)&CLSID_ShellFSFolder; - sPathTarget = NULL; - pidlRoot = NULL; - m_bGroupPolicyActive = 0; -} - -CFSFolder::~CFSFolder() -{ - TRACE("-- destroying IShellFolder(%p)\n", this); - - SHFree(pidlRoot); - SHFree(sPathTarget); -} - - -static const shvheader GenericSFHeader[] = { - {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 15}, - {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, - {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10}, - {IDS_SHV_COLUMN4, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12}, - {IDS_SHV_COLUMN5, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 10} -}; - -#define GENERICSHELLVIEWCOLUMNS 5 - -/************************************************************************** - * SHELL32_CreatePidlFromBindCtx [internal] - * - * If the caller bound File System Bind Data, assume it is the - * find data for the path. - * This allows binding of paths that don't exist. - */ -LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) -{ - IFileSystemBindData *fsbd = NULL; - LPITEMIDLIST pidl = NULL; - IUnknown *param = NULL; - WIN32_FIND_DATAW wfd; - HRESULT r; - - TRACE("%p %s\n", pbc, debugstr_w(path)); - - if (!pbc) - return NULL; - - /* see if the caller bound File System Bind Data */ - r = pbc->GetObjectParam((LPOLESTR)STR_FILE_SYS_BIND_DATA, &param); - if (FAILED(r)) - return NULL; - - r = param->QueryInterface(IID_PPV_ARG(IFileSystemBindData,&fsbd)); - if (SUCCEEDED(r)) - { - r = fsbd->GetFindData(&wfd); - if (SUCCEEDED(r)) - { - lstrcpynW(&wfd.cFileName[0], path, MAX_PATH); - pidl = _ILCreateFromFindDataW(&wfd); - } - fsbd->Release(); - } - - return pidl; -} - -/************************************************************************** -* CFSFolder::ParseDisplayName {SHELL32} -* -* Parse a display name. -* -* PARAMS -* hwndOwner [in] Parent window for any message's -* pbc [in] optional FileSystemBindData context -* lpszDisplayName [in] Unicode displayname. -* pchEaten [out] (unicode) characters processed -* ppidl [out] complex pidl to item -* pdwAttributes [out] items attributes -* -* NOTES -* Every folder tries to parse only its own (the leftmost) pidl and creates a -* subfolder to evaluate the remaining parts. -* Now we can parse into namespaces implemented by shell extensions -* -* Behaviour on win98: lpszDisplayName=NULL -> crash -* lpszDisplayName="" -> returns mycoputer-pidl -* -* FIXME -* pdwAttributes is not set -* pchEaten is not set like in windows -*/ -HRESULT WINAPI CFSFolder::ParseDisplayName(HWND hwndOwner, - LPBC pbc, - LPOLESTR lpszDisplayName, - DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, - DWORD *pdwAttributes) -{ - HRESULT hr = E_INVALIDARG; - LPCWSTR szNext = NULL; - WCHAR szElement[MAX_PATH]; - WCHAR szPath[MAX_PATH]; - LPITEMIDLIST pidlTemp = NULL; - DWORD len; - - TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", - this, hwndOwner, pbc, lpszDisplayName, debugstr_w (lpszDisplayName), - pchEaten, ppidl, pdwAttributes); - - if (!ppidl) - return E_INVALIDARG; - - if (!lpszDisplayName) - { - *ppidl = NULL; - return E_INVALIDARG; - } - - *ppidl = NULL; - - if (pchEaten) - *pchEaten = 0; /* strange but like the original */ - - if (*lpszDisplayName) - { - /* get the next element */ - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - - pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, szElement); - if (pidlTemp != NULL) - { - /* We are creating an id list without ensuring that the items exist. - If we have a remaining path, this must be a folder. - We have to do it now because it is set as a file by default */ - if (szNext) - { - pidlTemp->mkid.abID[0] = PT_FOLDER; - } - hr = S_OK; - } - else - { - /* build the full pathname to the element */ - lstrcpynW(szPath, sPathTarget, MAX_PATH - 1); - PathAddBackslashW(szPath); - len = wcslen(szPath); - lstrcpynW(szPath + len, szElement, MAX_PATH - len); - - /* get the pidl */ - hr = _ILCreateFromPathW(szPath, &pidlTemp); - } - - if (SUCCEEDED(hr)) - { - if (szNext && *szNext) - { - /* try to analyse the next element */ - hr = SHELL32_ParseNextElement(this, hwndOwner, pbc, - &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); - } - else - { - /* it's the last element */ - if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetFSItemAttributes(this, pidlTemp, pdwAttributes); - } - } - } - - if (SUCCEEDED(hr)) - *ppidl = pidlTemp; - else - *ppidl = NULL; - - TRACE("(%p)->(-- pidl=%p ret=0x%08x)\n", this, ppidl ? *ppidl : 0, hr); - - return hr; -} - -/************************************************************************** -* CFSFolder::EnumObjects -* PARAMETERS -* HWND hwndOwner, //[in ] Parent Window -* DWORD grfFlags, //[in ] SHCONTF enumeration mask -* LPENUMIDLIST* ppenumIDList //[out] IEnumIDList interface -*/ -HRESULT WINAPI CFSFolder::EnumObjects( - HWND hwndOwner, - DWORD dwFlags, - LPENUMIDLIST *ppEnumIDList) -{ - return ShellObjectCreatorInit<CFileSysEnum>(sPathTarget, dwFlags, IID_IEnumIDList, ppEnumIDList); -} - -/************************************************************************** -* CFSFolder::BindToObject -* PARAMETERS -* LPCITEMIDLIST pidl, //[in ] relative pidl to open -* LPBC pbc, //[in ] optional FileSystemBindData context -* REFIID riid, //[in ] Initial Interface -* LPVOID* ppvObject //[out] Interface* -*/ -HRESULT WINAPI CFSFolder::BindToObject( - PCUIDLIST_RELATIVE pidl, - LPBC pbc, - REFIID riid, - LPVOID * ppvOut) -{ - TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbc, - shdebugstr_guid(&riid), ppvOut); - - return SHELL32_BindToFS(pidlRoot, sPathTarget, pidl, riid, ppvOut); -} - -/************************************************************************** -* CFSFolder::BindToStorage -* PARAMETERS -* LPCITEMIDLIST pidl, //[in ] complex pidl to store -* LPBC pbc, //[in ] reserved -* REFIID riid, //[in ] Initial storage interface -* LPVOID* ppvObject //[out] Interface* returned -*/ -HRESULT WINAPI CFSFolder::BindToStorage( - PCUIDLIST_RELATIVE pidl, - LPBC pbcReserved, - REFIID riid, - LPVOID *ppvOut) -{ - FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", this, pidl, pbcReserved, - shdebugstr_guid (&riid), ppvOut); - - *ppvOut = NULL; - return E_NOTIMPL; -} - -/************************************************************************** -* CFSFolder::CompareIDs -*/ - -HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, - PCUIDLIST_RELATIVE pidl1, - PCUIDLIST_RELATIVE pidl2) -{ - LPPIDLDATA pData1 = _ILGetDataPointer(pidl1); - LPPIDLDATA pData2 = _ILGetDataPointer(pidl2); - FileStructW* pDataW1 = _ILGetFileStructW(pidl1); - FileStructW* pDataW2 = _ILGetFileStructW(pidl2); - BOOL bIsFolder1 = _ILIsFolder(pidl1); - BOOL bIsFolder2 = _ILIsFolder(pidl2); - LPWSTR pExtension1, pExtension2; - - if (!pDataW1 || !pDataW2 || LOWORD(lParam) >= GENERICSHELLVIEWCOLUMNS) - return E_INVALIDARG; - - /* When sorting between a File and a Folder, the Folder gets sorted first */ - if (bIsFolder1 != bIsFolder2) - { - return MAKE_COMPARE_HRESULT(bIsFolder1 ? -1 : 1); - } - - int result; - switch (LOWORD(lParam)) - { - case 0: /* Name */ - result = wcsicmp(pDataW1->wszName, pDataW2->wszName); - break; - case 2: /* Type */ - pExtension1 = PathFindExtensionW(pDataW1->wszName); - pExtension2 = PathFindExtensionW(pDataW2->wszName); - result = wcsicmp(pExtension1, pExtension2); - break; - case 1: /* Size */ - result = pData1->u.file.dwFileSize - pData2->u.file.dwFileSize; - break; - case 3: /* Modified */ - result = pData1->u.file.uFileDate - pData2->u.file.uFileDate; - if (result == 0) - result = pData1->u.file.uFileTime - pData2->u.file.uFileTime; - break; - case 4: /* Attributes */ - return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); - } - return MAKE_COMPARE_HRESULT(result); -} - -/************************************************************************** -* CFSFolder::CreateViewObject -*/ -HRESULT WINAPI CFSFolder::CreateViewObject(HWND hwndOwner, - REFIID riid, LPVOID * ppvOut) -{ - CComPtr<IShellView> pShellView; - HRESULT hr = E_INVALIDARG; - - TRACE ("(%p)->(hwnd=%p,%s,%p)\n", this, hwndOwner, shdebugstr_guid (&riid), - ppvOut); - - if (ppvOut) - { - *ppvOut = NULL; - - if (IsEqualIID (riid, IID_IDropTarget)) - hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); - else if (IsEqualIID (riid, IID_IContextMenu)) - { - FIXME ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; - } - else if (IsEqualIID (riid, IID_IShellView)) - { - hr = CDefView_Constructor(this, riid, ppvOut); - } - } - TRACE("-- (%p)->(interface=%p)\n", this, ppvOut); - return hr; -} - -/************************************************************************** -* CFSFolder::GetAttributesOf -* -* PARAMETERS -* UINT cidl, //[in ] num elements in pidl array -* LPCITEMIDLIST* apidl, //[in ] simple pidl array -* ULONG* rgfInOut) //[out] result array -* -*/ -HRESULT WINAPI CFSFolder::GetAttributesOf(UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) -{ - HRESULT hr = S_OK; - - if (!rgfInOut) - return E_INVALIDARG; - if (cidl && !apidl) - return E_INVALIDARG; - - if (*rgfInOut == 0) - *rgfInOut = ~0; - - if(cidl == 0) - { - LPCITEMIDLIST rpidl = ILFindLastID(pidlRoot); - - if (_ILIsFolder(rpidl) || _ILIsValue(rpidl)) - { - SHELL32_GetFSItemAttributes(this, rpidl, rgfInOut); - } - else if (_ILIsDrive(rpidl)) - { - IShellFolder *psfParent = NULL; - hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), NULL); - if(SUCCEEDED(hr)) - { - hr = psfParent->GetAttributesOf(1, &rpidl, (SFGAOF*)rgfInOut); - psfParent->Release(); - } - } - else - { - ERR("Got and unknown pidl!\n"); - } - } - else - { - while (cidl > 0 && *apidl) - { - pdump(*apidl); - if(_ILIsFolder(*apidl) || _ILIsValue(*apidl)) - SHELL32_GetFSItemAttributes(this, *apidl, rgfInOut); - else - ERR("Got an unknown type of pidl!!!\n"); - apidl++; - cidl--; - } - } - /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ - *rgfInOut &= ~SFGAO_VALIDATE; - - TRACE("-- result=0x%08x\n", *rgfInOut); - - return hr; -} - -/************************************************************************** -* CFSFolder::GetUIObjectOf -* -* PARAMETERS -* HWND hwndOwner, //[in ] Parent window for any output -* UINT cidl, //[in ] array size -* LPCITEMIDLIST* apidl, //[in ] simple pidl array -* REFIID riid, //[in ] Requested Interface -* UINT* prgfInOut, //[ ] reserved -* LPVOID* ppvObject) //[out] Resulting Interface -* -* NOTES -* This function gets asked to return "view objects" for one or more (multiple -* select) items: -* The viewobject typically is an COM object with one of the following -* interfaces: -* IExtractIcon,IDataObject,IContextMenu -* In order to support icon positions in the default Listview your DataObject -* must implement the SetData method (in addition to GetData :) - the shell -* passes a barely documented "Icon positions" structure to SetData when the -* drag starts, and GetData's it if the drop is in another explorer window that -* needs the positions. -*/ -HRESULT WINAPI CFSFolder::GetUIObjectOf(HWND hwndOwner, - UINT cidl, PCUITEMID_CHILD_ARRAY apidl, - REFIID riid, UINT * prgfInOut, - LPVOID * ppvOut) -{ - LPVOID pObj = NULL; - HRESULT hr = E_INVALIDARG; - - TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", - this, hwndOwner, cidl, apidl, shdebugstr_guid (&riid), prgfInOut, ppvOut); - - if (ppvOut) - { - *ppvOut = NULL; - - 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); - pObj = pCm; - } - else if (IsEqualIID (riid, IID_IDataObject)) - { - if (cidl >= 1) - { - hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); - } - else - { - hr = IDataObject_Constructor (hwndOwner, pidlRoot, (LPCITEMIDLIST*)&pidlRoot, 1, (IDataObject **)&pObj); - } - } - else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) - { - hr = CFSExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); - } - else if (IsEqualIID (riid, IID_IDropTarget)) - { - /* only interested in attempting to bind to shell folders, not files (except exe), so if we fail, rebind to root */ - if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) - { - IDropTarget * pDt = NULL; - hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); - pObj = pDt; - } - } - else if ((IsEqualIID(riid, IID_IShellLinkW) || - IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) - { - hr = IShellLink_ConstructFromFile(this, apidl[0], riid, &pObj); - } - else - hr = E_NOINTERFACE; - - if (SUCCEEDED(hr) && !pObj) - hr = E_OUTOFMEMORY; - - *ppvOut = pObj; - } - TRACE("(%p)->hr=0x%08x\n", this, hr); - return hr; -} - -static const WCHAR AdvancedW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"; -static const WCHAR HideFileExtW[] = L"HideFileExt"; -static const WCHAR NeverShowExtW[] = L"NeverShowExt"; - -/****************************************************************************** - * SHELL_FS_HideExtension [Internal] - * - * Query the registry if the filename extension of a given path should be - * hidden. - * - * PARAMS - * szPath [I] Relative or absolute path of a file - * - * RETURNS - * TRUE, if the filename's extension should be hidden - * FALSE, otherwise. - */ -BOOL SHELL_FS_HideExtension(LPWSTR szPath) -{ - HKEY hKey; - DWORD dwData; - DWORD dwDataSize = sizeof (DWORD); - BOOL doHide = FALSE; /* The default value is FALSE (win98 at least) */ - - if (!RegCreateKeyExW(HKEY_CURRENT_USER, AdvancedW, 0, 0, 0, KEY_ALL_ACCESS, 0, &hKey, 0)) { - if (!RegQueryValueExW(hKey, HideFileExtW, 0, 0, (LPBYTE) &dwData, &dwDataSize)) - doHide = dwData; - RegCloseKey (hKey); - } - - if (!doHide) { - LPWSTR ext = PathFindExtensionW(szPath); - - if (*ext != '\0') { - WCHAR classname[MAX_PATH]; - LONG classlen = sizeof(classname); - - if (!RegQueryValueW(HKEY_CLASSES_ROOT, ext, classname, &classlen)) - if (!RegOpenKeyW(HKEY_CLASSES_ROOT, classname, &hKey)) { - if (!RegQueryValueExW(hKey, NeverShowExtW, 0, NULL, NULL, NULL)) - doHide = TRUE; - RegCloseKey(hKey); - } - } - } - return doHide; -} - -void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags) -{ - /*FIXME: MSDN also mentions SHGDN_FOREDITING which is not yet handled. */ - if (!(dwFlags & SHGDN_FORPARSING) && - ((dwFlags & SHGDN_INFOLDER) || (dwFlags == SHGDN_NORMAL))) { - if (SHELL_FS_HideExtension(szPath) && szPath[0] != '.') - PathRemoveExtensionW(szPath); - } -} - -/************************************************************************** -* CFSFolder::GetDisplayNameOf -* Retrieves the display name for the specified file object or subfolder -* -* PARAMETERS -* LPCITEMIDLIST pidl, //[in ] complex pidl to item -* DWORD dwFlags, //[in ] SHGNO formatting flags -* LPSTRRET lpName) //[out] Returned display name -* -* FIXME -* if the name is in the pidl the ret value should be a STRRET_OFFSET -*/ - -HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, - DWORD dwFlags, LPSTRRET strRet) -{ - if (!pidl || !strRet) - return E_INVALIDARG; - - /* If it is a complex pidl, let the child handle it */ - if (!_ILIsPidlSimple (pidl)) /* complex pidl */ - { - return SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, strRet); - } - else if (!pidl->mkid.cb) /* empty pidl */ - { - /* If it is an empty pidl return only the path of the folder */ - if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) && - (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER) && - sPathTarget) - { - return SHSetStrRet(strRet, sPathTarget); - } - return E_INVALIDARG; - } - - int len = 0; - LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); - if (!pszPath) - return E_OUTOFMEMORY; - - if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) && - (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER) && - sPathTarget) - { - lstrcpynW(pszPath, sPathTarget, MAX_PATH); - PathAddBackslashW(pszPath); - len = wcslen(pszPath); - } - _ILSimpleGetTextW(pidl, pszPath + len, MAX_PATH + 1 - len); - if (!_ILIsFolder(pidl)) SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); - - strRet->uType = STRRET_WSTR; - strRet->pOleStr = pszPath; - - TRACE ("-- (%p)->(%s)\n", this, strRet->uType == STRRET_CSTR ? strRet->cStr : debugstr_w(strRet->pOleStr)); - return S_OK; -} - -/************************************************************************** -* CFSFolder::SetNameOf -* Changes the name of a file object or subfolder, possibly changing its item -* identifier in the process. -* -* PARAMETERS -* HWND hwndOwner, //[in ] Owner window for output -* LPCITEMIDLIST pidl, //[in ] simple pidl of item to change -* LPCOLESTR lpszName, //[in ] the items new display name -* DWORD dwFlags, //[in ] SHGNO formatting flags -* LPITEMIDLIST* ppidlOut) //[out] simple pidl returned -*/ -HRESULT WINAPI CFSFolder::SetNameOf( - HWND hwndOwner, - PCUITEMID_CHILD pidl, - LPCOLESTR lpName, - DWORD dwFlags, - PITEMID_CHILD *pPidlOut) -{ - WCHAR szSrc[MAX_PATH + 1], szDest[MAX_PATH + 1]; - LPWSTR ptr; - BOOL bIsFolder = _ILIsFolder (ILFindLastID (pidl)); - - TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, hwndOwner, pidl, - debugstr_w (lpName), dwFlags, pPidlOut); - - /* build source path */ - lstrcpynW(szSrc, sPathTarget, MAX_PATH); - ptr = PathAddBackslashW (szSrc); - if (ptr) - _ILSimpleGetTextW (pidl, ptr, MAX_PATH + 1 - (ptr - szSrc)); - - /* build destination path */ - if (dwFlags == SHGDN_NORMAL || dwFlags & SHGDN_INFOLDER) { - lstrcpynW(szDest, sPathTarget, MAX_PATH); - ptr = PathAddBackslashW (szDest); - if (ptr) - lstrcpynW(ptr, lpName, MAX_PATH + 1 - (ptr - szDest)); - } else - lstrcpynW(szDest, lpName, MAX_PATH); - - if(!(dwFlags & SHGDN_FORPARSING) && SHELL_FS_HideExtension(szSrc)) { - WCHAR *ext = PathFindExtensionW(szSrc); - if(*ext != '\0') { - INT len = wcslen(szDest); - lstrcpynW(szDest + len, ext, MAX_PATH - len); - } - } - - TRACE ("src=%s dest=%s\n", debugstr_w(szSrc), debugstr_w(szDest)); - if (!memcmp(szSrc, szDest, (wcslen(szDest) + 1) * sizeof(WCHAR))) - { - /* src and destination is the same */ - HRESULT hr = S_OK; - if (pPidlOut) - hr = _ILCreateFromPathW(szDest, pPidlOut); - - return hr; - } - - - if (MoveFileW (szSrc, szDest)) - { - HRESULT hr = S_OK; - - if (pPidlOut) - hr = _ILCreateFromPathW(szDest, pPidlOut); - - SHChangeNotify (bIsFolder ? SHCNE_RENAMEFOLDER : SHCNE_RENAMEITEM, - SHCNF_PATHW, szSrc, szDest); - - return hr; - } - - return E_FAIL; -} - -HRESULT WINAPI CFSFolder::GetDefaultSearchGUID(GUID * pguid) -{ - FIXME ("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT WINAPI CFSFolder::EnumSearches(IEnumExtraSearch ** ppenum) -{ - FIXME ("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT WINAPI CFSFolder::GetDefaultColumn(DWORD dwRes, - ULONG * pSort, ULONG * pDisplay) -{ - TRACE ("(%p)\n", this); - - if (pSort) - *pSort = 0; - if (pDisplay) - *pDisplay = 0; - - return S_OK; -} - -HRESULT WINAPI CFSFolder::GetDefaultColumnState(UINT iColumn, - DWORD * pcsFlags) -{ - TRACE ("(%p)\n", this); - - if (!pcsFlags || iColumn >= GENERICSHELLVIEWCOLUMNS) - return E_INVALIDARG; - - *pcsFlags = GenericSFHeader[iColumn].pcsFlags; - - return S_OK; -} - -HRESULT WINAPI CFSFolder::GetDetailsEx(PCUITEMID_CHILD pidl, - const SHCOLUMNID * pscid, VARIANT * pv) -{ - FIXME ("(%p)\n", this); - - return E_NOTIMPL; -} - -HRESULT WINAPI CFSFolder::GetDetailsOf(PCUITEMID_CHILD pidl, - UINT iColumn, SHELLDETAILS * psd) -{ - HRESULT hr = E_FAIL; - - TRACE ("(%p)->(%p %i %p)\n", this, pidl, iColumn, psd); - - if (!psd || iColumn >= GENERICSHELLVIEWCOLUMNS) - return E_INVALIDARG; - - if (!pidl) - { - /* the header titles */ - psd->fmt = GenericSFHeader[iColumn].fmt; - psd->cxChar = GenericSFHeader[iColumn].cxChar; - return SHSetStrRet(&psd->str, GenericSFHeader[iColumn].colnameid); - } - else - { - hr = S_OK; - psd->str.uType = STRRET_CSTR; - /* the data from the pidl */ - switch (iColumn) - { - case 0: /* name */ - hr = GetDisplayNameOf (pidl, - SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); - break; - case 1: /* size */ - _ILGetFileSize(pidl, psd->str.cStr, MAX_PATH); - break; - case 2: /* type */ - _ILGetFileType(pidl, psd->str.cStr, MAX_PATH); - break; - case 3: /* date */ - _ILGetFileDate(pidl, psd->str.cStr, MAX_PATH); - break; - case 4: /* attributes */ - _ILGetFileAttributes(pidl, psd->str.cStr, MAX_PATH); - break; - } - } - - return hr; -} - -HRESULT WINAPI CFSFolder::MapColumnToSCID (UINT column, - SHCOLUMNID * pscid) -{ - FIXME ("(%p)\n", this); - return E_NOTIMPL; -} - /**************************************************************************** * BuildPathsList * @@ -977,149 +177,6 @@ return S_OK; } return E_FAIL; -} - -/************************************************************************ - * CFSFolder::GetClassID - */ -HRESULT WINAPI CFSFolder::GetClassID(CLSID * lpClassId) -{ - TRACE ("(%p)\n", this); - - if (!lpClassId) - return E_POINTER; - - *lpClassId = *pclsid; - - return S_OK; -} - -/************************************************************************ - * CFSFolder::Initialize - * - * NOTES - * sPathTarget is not set. Don't know how to handle in a non rooted environment. - */ -HRESULT WINAPI CFSFolder::Initialize(LPCITEMIDLIST pidl) -{ - WCHAR wszTemp[MAX_PATH]; - - TRACE ("(%p)->(%p)\n", this, pidl); - - SHFree (pidlRoot); /* free the old pidl */ - pidlRoot = ILClone (pidl); /* set my pidl */ - - SHFree (sPathTarget); - sPathTarget = NULL; - - /* set my path */ - if (SHGetPathFromIDListW (pidl, wszTemp)) - { - int len = wcslen(wszTemp); - sPathTarget = (WCHAR *)SHAlloc((len + 1) * sizeof(WCHAR)); - if (!sPathTarget) - return E_OUTOFMEMORY; - memcpy(sPathTarget, wszTemp, (len + 1) * sizeof(WCHAR)); - } - - TRACE ("--(%p)->(%s)\n", this, debugstr_w(sPathTarget)); - return S_OK; -} - -/************************************************************************** - * CFSFolder::GetCurFolder - */ -HRESULT WINAPI CFSFolder::GetCurFolder(LPITEMIDLIST * pidl) -{ - TRACE ("(%p)->(%p)\n", this, pidl); - - if (!pidl) - return E_POINTER; - - *pidl = ILClone(pidlRoot); - return S_OK; -} - -/************************************************************************** - * CFSFolder::InitializeEx - * - * FIXME: error handling - */ -HRESULT WINAPI CFSFolder::InitializeEx(IBindCtx * pbc, LPCITEMIDLIST pidlRootx, - const PERSIST_FOLDER_TARGET_INFO * ppfti) -{ - WCHAR wszTemp[MAX_PATH]; - - TRACE("(%p)->(%p,%p,%p)\n", this, pbc, pidlRootx, ppfti); - if (ppfti) - TRACE("--%p %s %s 0x%08x 0x%08x\n", - ppfti->pidlTargetFolder, debugstr_w (ppfti->szTargetParsingName), - debugstr_w (ppfti->szNetworkProvider), ppfti->dwAttributes, - ppfti->csidl); - - pdump (pidlRootx); - if (ppfti && ppfti->pidlTargetFolder) - pdump(ppfti->pidlTargetFolder); - - if (pidlRoot) - __SHFreeAndNil(&pidlRoot); /* free the old */ - if (sPathTarget) - __SHFreeAndNil(&sPathTarget); - - /* - * Root path and pidl - */ - pidlRoot = ILClone(pidlRootx); - - /* - * the target folder is spezified in csidl OR pidlTargetFolder OR - * szTargetParsingName - */ - if (ppfti) - { - if (ppfti->csidl != -1) - { - if (SHGetSpecialFolderPathW(0, wszTemp, ppfti->csidl, - ppfti->csidl & CSIDL_FLAG_CREATE)) { - int len = wcslen(wszTemp); - sPathTarget = (WCHAR *)SHAlloc((len + 1) * sizeof(WCHAR)); - if (!sPathTarget) - return E_OUTOFMEMORY; - memcpy(sPathTarget, wszTemp, (len + 1) * sizeof(WCHAR)); - } - } - else if (ppfti->szTargetParsingName[0]) - { - int len = wcslen(ppfti->szTargetParsingName); - sPathTarget = (WCHAR *)SHAlloc((len + 1) * sizeof(WCHAR)); - if (!sPathTarget) - return E_OUTOFMEMORY; - memcpy(sPathTarget, ppfti->szTargetParsingName, - (len + 1) * sizeof(WCHAR)); - } - else if (ppfti->pidlTargetFolder) - { - if (SHGetPathFromIDListW(ppfti->pidlTargetFolder, wszTemp)) - { - int len = wcslen(wszTemp); - sPathTarget = (WCHAR *)SHAlloc((len + 1) * sizeof(WCHAR)); - if (!sPathTarget) - return E_OUTOFMEMORY; - memcpy(sPathTarget, wszTemp, (len + 1) * sizeof(WCHAR)); - } - } - } - - TRACE("--(%p)->(target=%s)\n", this, debugstr_w(sPathTarget)); - pdump(pidlRoot); - return (sPathTarget) ? S_OK : E_FAIL; -} - -HRESULT WINAPI CFSFolder::GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO * ppfti) -{ - FIXME("(%p)->(%p)\n", this, ppfti); - ZeroMemory(ppfti, sizeof (*ppfti)); - return E_NOTIMPL; } CFSDropTarget::CFSDropTarget(): @@ -1537,118 +594,7 @@ return 0; } -HRESULT WINAPI CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { - HKEY hKey; - HRESULT hr; - - TRACE("CFSFolder::_GetDropTarget entered\n"); - - if (_ILIsFolder (pidl)) - { - CComPtr<IShellFolder> psfChild; - hr = this->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return psfChild->CreateViewObject(NULL, IID_IDropTarget, ppvOut); - } - - STRRET strFile; - hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); - if (hr == S_OK) - { - WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strFile, pidl, wszPath, _countof(wszPath)); - - if (hr == S_OK) - { - LPCWSTR pwszExt = PathFindExtensionW(wszPath); - if (pwszExt[0]) - { - /* enumerate dynamic/static for a given file class */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* load dynamic extensions from file extension key, for example .jpg */ - _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut); - RegCloseKey(hKey); - } - - WCHAR wszTemp[40]; - DWORD dwSize = sizeof(wszTemp); - if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, NULL, RRF_RT_REG_SZ, NULL, wszTemp, &dwSize) == ERROR_SUCCESS) - { - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTemp, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* load dynamic extensions from progid key, for example jpegfile */ - _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut); - RegCloseKey(hKey); - } - } - } - } - } - else - ERR("GetDisplayNameOf failed: %x\n", hr); - - return hr; -} - -HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut) -{ - TRACE("CFSFolder::_LoadDynamicDropTargetHandlerForKey entered\n"); - - WCHAR wszName[MAX_PATH], *pwszClsid; - DWORD dwSize = sizeof(wszName); - HRESULT hr; - - if (RegGetValueW(hRootKey, L"shellex\\DropHandler", NULL, RRF_RT_REG_SZ, NULL, wszName, &dwSize) == ERROR_SUCCESS) - { - CLSID clsid; - hr = CLSIDFromString(wszName, &clsid); - if (hr == S_OK) - pwszClsid = wszName; - - if (m_bGroupPolicyActive) - { - if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - pwszClsid, - RRF_RT_REG_SZ, - NULL, - NULL, - NULL) == ERROR_SUCCESS) - { - hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); - } - } - else - { - hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); - } - } - else - return E_FAIL; - return hr; -} - -HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut) -{ - TRACE("CFSFolder::_LoadDynamicDropTargetHandler entered\n"); - HRESULT hr; - - CComPtr<IPersistFile> pp; - hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IPersistFile, &pp)); - if (hr != S_OK) - { - ERR("SHCoCreateInstance failed %x\n", GetLastError()); - } - pp->Load(pwcsname, 0); - - hr = pp->QueryInterface(IID_PPV_ARG(IDropTarget, (IDropTarget**) ppvOut)); - if (hr != S_OK) - { - ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); - return hr; - } - return hr; +HRESULT CFSDropTarget_CreateInstance(LPWSTR sPathTarget, REFIID riid, LPVOID * ppvOut) +{ + return ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); } Copied: trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.h (from r72166, trunk/reactos/dll/win32/shell32/folders/CFSFolder.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/droptarg… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/droptargets/CFSDropTarget.h [iso-8859-1] Fri Aug 12 11:35:24 2016 @@ -1,5 +1,5 @@ /* - * file system folder + * file system folder drop target * * Copyright 1997 Marcus Meissner * Copyright 1998, 1999, 2002 Juergen Schmied @@ -20,82 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _CFSFOLDER_H_ -#define _CFSFOLDER_H_ +#ifndef _CFSDROPTARGET_H_ +#define _CFSDROPTARGET_H_ WCHAR *BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls); - -class CFSFolder : - public CComCoClass<CFSFolder, &CLSID_ShellFSFolder>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellFolder2, - public IPersistFolder3 -{ - private: - CLSID *pclsid; - - /* both paths are parsible from the desktop */ - LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ - - LPITEMIDLIST pidlRoot; /* absolute pidl */ - - DWORD m_bGroupPolicyActive; - 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); - - public: - CFSFolder(); - ~CFSFolder(); - - // IShellFolder - virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); - virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); - virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); - - /* ShellFolder2 */ - virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); - virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); - virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); - virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); - virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); - - // IPersist - virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); - - // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); - - // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); - - // IPersistFolder3 - virtual HRESULT WINAPI InitializeEx(IBindCtx *pbc, LPCITEMIDLIST pidlRoot, const PERSIST_FOLDER_TARGET_INFO *ppfti); - virtual HRESULT WINAPI GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO *ppfti); - - DECLARE_REGISTRY_RESOURCEID(IDR_SHELLFSFOLDER) - DECLARE_NOT_AGGREGATABLE(CFSFolder) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(CFSFolder) - COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) - COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) - COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) - COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) - COM_INTERFACE_ENTRY_IID(IID_IPersistFolder3, IPersistFolder3) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - END_COM_MAP() -}; class CFSDropTarget : public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -141,4 +69,6 @@ DWORD pdwEffect; }; +HRESULT CFSDropTarget_CreateInstance(LPWSTR sPathTarget, REFIID riid, LPVOID * ppvOut); + #endif /* _CFSFOLDER_H_ */ 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] Fri Aug 12 11:35:24 2016 @@ -364,7 +364,7 @@ *ppvOut = NULL; if (IsEqualIID (riid, IID_IDropTarget)) - hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); + hr = CFSDropTarget_CreateInstance(sPathTarget, riid, ppvOut); else if (IsEqualIID (riid, IID_IContextMenu)) { FIXME ("IContextMenu not implemented\n"); @@ -510,7 +510,7 @@ if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) { IDropTarget * pDt = NULL; - hr = ShellObjectCreatorInit<CFSDropTarget>(sPathTarget, riid, ppvOut); + hr = CFSDropTarget_CreateInstance(sPathTarget, riid, ppvOut); pObj = pDt; } } @@ -824,161 +824,6 @@ return E_NOTIMPL; } -/**************************************************************************** - * BuildPathsList - * - * Builds a list of paths like the one used in SHFileOperation from a table of - * PIDLs relative to the given base folder - */ -WCHAR * -BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) -{ - WCHAR *pwszPathsList; - WCHAR *pwszListPos; - int iPathLen, i; - - iPathLen = wcslen(wszBasePath); - pwszPathsList = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) * cidl + 1); - pwszListPos = pwszPathsList; - - for (i = 0; i < cidl; i++) - { - if (!_ILIsFolder(pidls[i]) && !_ILIsValue(pidls[i])) - continue; - - wcscpy(pwszListPos, wszBasePath); - pwszListPos += iPathLen; - /* FIXME: abort if path too long */ - _ILSimpleGetTextW(pidls[i], pwszListPos, MAX_PATH - iPathLen); - pwszListPos += wcslen(pwszListPos) + 1; - } - *pwszListPos = 0; - return pwszPathsList; -} - -/**************************************************************************** - * CFSDropTarget::CopyItems - * - * copies items to this folder - */ -HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, - LPCITEMIDLIST * apidl, BOOL bCopy) -{ - CComPtr<IPersistFolder2> ppf2 = NULL; - WCHAR szSrcPath[MAX_PATH]; - WCHAR szTargetPath[MAX_PATH]; - SHFILEOPSTRUCTW op; - LPITEMIDLIST pidl; - LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName; - int res, length; - HRESULT hr; - - TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); - - hr = pSFFrom->QueryInterface (IID_PPV_ARG(IPersistFolder2, &ppf2)); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&pidl); - if (FAILED(hr)) - { - return hr; - } - - hr = SHGetPathFromIDListW(pidl, szSrcPath); - SHFree(pidl); - - if (FAILED(hr)) - return hr; - - pszSrc = PathAddBackslashW(szSrcPath); - - wcscpy(szTargetPath, sPathTarget); - pszTarget = PathAddBackslashW(szTargetPath); - - pszSrcList = BuildPathsList(szSrcPath, cidl, apidl); - pszTargetList = BuildPathsList(szTargetPath, cidl, apidl); - - if (!pszSrcList || !pszTargetList) - { - if (pszSrcList) - HeapFree(GetProcessHeap(), 0, pszSrcList); - - if (pszTargetList) - HeapFree(GetProcessHeap(), 0, pszTargetList); - - SHFree(pidl); - return E_OUTOFMEMORY; - } - - ZeroMemory(&op, sizeof(op)); - if (!pszSrcList[0]) - { - /* remove trailing backslash */ - pszSrc--; - pszSrc[0] = L'\0'; - op.pFrom = szSrcPath; - } - else - { - op.pFrom = pszSrcList; - } - - if (!pszTargetList[0]) - { - /* remove trailing backslash */ - if (pszTarget - szTargetPath > 3) - { - pszTarget--; - pszTarget[0] = L'\0'; - } - else - { - pszTarget[1] = L'\0'; - } - - op.pTo = szTargetPath; - op.fFlags = 0; - } - else - { - op.pTo = pszTargetList; - op.fFlags = FOF_MULTIDESTFILES; - } - op.hwnd = GetActiveWindow(); - op.wFunc = bCopy ? FO_COPY : FO_MOVE; - op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; - - res = SHFileOperationW(&op); - - if (res == DE_SAMEFILE) - { - length = wcslen(szTargetPath); - - pszFileName = wcsrchr(pszSrcList, '\\'); - pszFileName++; - - if (LoadStringW(shell32_hInstance, IDS_COPY_OF, pszTarget, MAX_PATH - length)) - { - wcscat(szTargetPath, L" "); - } - - wcscat(szTargetPath, pszFileName); - op.pTo = szTargetPath; - - res = SHFileOperationW(&op); - } - - HeapFree(GetProcessHeap(), 0, pszSrcList); - HeapFree(GetProcessHeap(), 0, pszTargetList); - - if (res) - return E_FAIL; - else - return S_OK; - } - return E_FAIL; -} - /************************************************************************ * CFSFolder::GetClassID */ @@ -1120,421 +965,6 @@ FIXME("(%p)->(%p)\n", this, ppfti); ZeroMemory(ppfti, sizeof (*ppfti)); return E_NOTIMPL; -} - -CFSDropTarget::CFSDropTarget(): - cfShellIDList(0), - fAcceptFmt(FALSE), - sPathTarget(NULL) -{ -} - -HRESULT WINAPI CFSDropTarget::Initialize(LPWSTR PathTarget) -{ - cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); - if (!cfShellIDList) - return E_FAIL; - - sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); - if (!sPathTarget) - return E_OUTOFMEMORY; - wcscpy(sPathTarget, PathTarget); - - return S_OK; -} - -CFSDropTarget::~CFSDropTarget() -{ - SHFree(sPathTarget); -} - -BOOL -CFSDropTarget::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) -{ - WCHAR wszLink[40]; - - if (!bShortcut) - { - if (!LoadStringW(shell32_hInstance, IDS_LNK_FILE, wszLink, _countof(wszLink))) - wszLink[0] = L'\0'; - } - - if (!bShortcut) - swprintf(pwszTarget, L"%s%s%s", wszLink, pwszBasePath, pwszExt); - else - swprintf(pwszTarget, L"%s%s", pwszBasePath, pwszExt); - - for (UINT i = 2; PathFileExistsW(pwszTarget); ++i) - { - if (!bShortcut) - swprintf(pwszTarget, L"%s%s (%u)%s", wszLink, pwszBasePath, i, pwszExt); - else - swprintf(pwszTarget, L"%s (%u)%s", pwszBasePath, i, pwszExt); - } - - return TRUE; -} - -/**************************************************************************** - * IDropTarget implementation - */ -BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) -{ - /* TODO Windows does different drop effects if dragging across drives. - i.e., it will copy instead of move if the directories are on different disks. */ - - DWORD dwEffect = DROPEFFECT_MOVE; - - *pdwEffect = DROPEFFECT_NONE; - - if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - if (*pdwEffect == DROPEFFECT_NONE) - *pdwEffect = dwEffect; - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - -HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); - FORMATETC fmt; - FORMATETC fmt2; - fAcceptFmt = FALSE; - - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); - InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); - - if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) - fAcceptFmt = TRUE; - else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) - fAcceptFmt = TRUE; - - QueryDrop(dwKeyState, pdwEffect); - return S_OK; -} - -HRESULT WINAPI CFSDropTarget::DragOver(DWORD dwKeyState, POINTL pt, - DWORD *pdwEffect) -{ - TRACE("(%p)\n", this); - - if (!pdwEffect) - return E_INVALIDARG; - - QueryDrop(dwKeyState, pdwEffect); - - return S_OK; -} - -HRESULT WINAPI CFSDropTarget::DragLeave() -{ - TRACE("(%p)\n", this); - - fAcceptFmt = FALSE; - - return S_OK; -} - -HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect); - - if (!pdwEffect) - return E_INVALIDARG; - - QueryDrop(dwKeyState, pdwEffect); - - BOOL fIsOpAsync = FALSE; - CComPtr<IAsyncOperation> pAsyncOperation; - - if (SUCCEEDED(pDataObject->QueryInterface(IID_PPV_ARG(IAsyncOperation, &pAsyncOperation)))) - { - if (SUCCEEDED(pAsyncOperation->GetAsyncMode(&fIsOpAsync)) && fIsOpAsync) - { - _DoDropData *data = static_cast<_DoDropData*>(HeapAlloc(GetProcessHeap(), 0, sizeof(_DoDropData))); - data->This = this; - // Need to maintain this class in case the window is closed or the class exists temporarily (when dropping onto a folder). - pDataObject->AddRef(); - pAsyncOperation->StartOperation(NULL); - CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &data->pStream); - this->AddRef(); - data->dwKeyState = dwKeyState; - data->pt = pt; - // Need to dereference as pdweffect gets freed. - data->pdwEffect = *pdwEffect; - SHCreateThread(CFSDropTarget::_DoDropThreadProc, data, NULL, NULL); - return S_OK; - } - } - return this->_DoDrop(pDataObject, dwKeyState, pt, pdwEffect); -} - -HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) -{ - TRACE("(%p) performing drop, effect %u\n", this, *pdwEffect); - FORMATETC fmt; - FORMATETC fmt2; - STGMEDIUM medium; - - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); - InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); - - HRESULT hr; - bool bCopy = TRUE; - bool bLinking = FALSE; - - /* Figure out what drop operation we're doing */ - if (pdwEffect) - { - TRACE("Current drop effect flag %i\n", *pdwEffect); - if ((*pdwEffect & DROPEFFECT_MOVE) == DROPEFFECT_MOVE) - bCopy = FALSE; - if ((*pdwEffect & DROPEFFECT_LINK) == DROPEFFECT_LINK) - bLinking = TRUE; - } - - if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) - { - hr = pDataObject->GetData(&fmt, &medium); - TRACE("CFSTR_SHELLIDLIST.\n"); - - /* 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_FAIL; - } - - CComPtr<IShellFolder> psfDesktop; - CComPtr<IShellFolder> psfFrom = NULL; - - /* Grab the desktop shell folder */ - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - { - ERR("SHGetDesktopFolder failed\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* Find source folder, this is where the clipboard data was copied from */ - if (_ILIsDesktop(pidl)) - { - /* use desktop shell folder */ - psfFrom = psfDesktop; - } - else - { - hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); - if (FAILED(hr)) - { - ERR("no IShellFolder\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - } - - if (bLinking) - { - WCHAR wszTargetPath[MAX_PATH]; - WCHAR wszPath[MAX_PATH]; - WCHAR wszTarget[MAX_PATH]; - - wcscpy(wszTargetPath, sPathTarget); - - TRACE("target path = %s", debugstr_w(wszTargetPath)); - - /* We need to create a link for each pidl in the copied items, so step through the pidls from the clipboard */ - for (UINT i = 0; i < lpcida->cidl; i++) - { - //Find out which file we're copying - STRRET strFile; - hr = psfFrom->GetDisplayNameOf(apidl[i], SHGDN_FORPARSING, &strFile); - if (FAILED(hr)) - { - ERR("Error source obtaining path"); - break; - } - - hr = StrRetToBufW(&strFile, apidl[i], wszPath, _countof(wszPath)); - if (FAILED(hr)) - { - ERR("Error putting source path into buffer"); - break; - } - TRACE("source path = %s", debugstr_w(wszPath)); - - // Creating a buffer to hold the combined path - WCHAR buffer_1[MAX_PATH] = L""; - WCHAR *lpStr1; - lpStr1 = buffer_1; - - LPWSTR pwszFileName = PathFindFileNameW(wszPath); - LPWSTR pwszExt = PathFindExtensionW(wszPath); - LPWSTR placementPath = PathCombineW(lpStr1, sPathTarget, pwszFileName); - CComPtr<IPersistFile> ppf; - - //Check to see if it's already a link. - if (!wcsicmp(pwszExt, L".lnk")) - { - //It's a link so, we create a new one which copies the old. - if(!GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) - { - ERR("Error getting unique file name"); - hr = E_FAIL; - break; - } - hr = IShellLink_ConstructFromPath(wszPath, IID_PPV_ARG(IPersistFile, &ppf)); - if (FAILED(hr)) { - ERR("Error constructing link from file"); - break; - } - - hr = ppf->Save(wszTarget, FALSE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); - } - else - { - //It's not a link, so build a new link using the creator class and fill it in. - //Create a file name for the link - if (!GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) - { - ERR("Error creating unique file name"); - hr = E_FAIL; - break; - } - - CComPtr<IShellLinkW> pLink; - hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkW, &pLink)); - if (FAILED(hr)) { - ERR("Error instantiating IShellLinkW"); - break; - } - - WCHAR szDirPath[MAX_PATH], *pwszFile; - GetFullPathName(wszPath, MAX_PATH, szDirPath, &pwszFile); - if (pwszFile) pwszFile[0] = 0; - - hr = pLink->SetPath(wszPath); - if(FAILED(hr)) - break; - - hr = pLink->SetWorkingDirectory(szDirPath); - if(FAILED(hr)) - break; - - hr = pLink->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)); - if(FAILED(hr)) - break; - - hr = ppf->Save(wszTarget, TRUE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); - } - } - } - else - { - hr = this->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl, bCopy); - } - - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - } - else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) - { - FORMATETC fmt2; - InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); - if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/) - { - WCHAR wszTargetPath[MAX_PATH + 1]; - LPWSTR pszSrcList; - - wcscpy(wszTargetPath, sPathTarget); - //Double NULL terminate. - wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; - - LPDROPFILES lpdf = (LPDROPFILES) GlobalLock(medium.hGlobal); - if (!lpdf) - { - ERR("Error locking global\n"); - return E_FAIL; - } - pszSrcList = (LPWSTR) (((byte*) lpdf) + lpdf->pFiles); - TRACE("Source file (just the first) = %s\n", debugstr_w(pszSrcList)); - TRACE("Target path = %s\n", debugstr_w(wszTargetPath)); - - SHFILEOPSTRUCTW op; - ZeroMemory(&op, sizeof(op)); - op.pFrom = pszSrcList; - op.pTo = wszTargetPath; - op.hwnd = GetActiveWindow(); - op.wFunc = bCopy ? FO_COPY : FO_MOVE; - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; - hr = SHFileOperationW(&op); - return hr; - } - ERR("Error calling GetData\n"); - hr = E_FAIL; - } - else - { - ERR("No viable drop format.\n"); - hr = E_FAIL; - } - return hr; -} - -DWORD WINAPI CFSDropTarget::_DoDropThreadProc(LPVOID lpParameter) -{ - CoInitialize(NULL); - _DoDropData *data = static_cast<_DoDropData*>(lpParameter); - CComPtr<IDataObject> pDataObject; - HRESULT hr = CoGetInterfaceAndReleaseStream (data->pStream, IID_PPV_ARG(IDataObject, &pDataObject)); - - if (SUCCEEDED(hr)) - { - CComPtr<IAsyncOperation> pAsyncOperation; - hr = data->This->_DoDrop(pDataObject, data->dwKeyState, data->pt, &data->pdwEffect); - if (SUCCEEDED(pDataObject->QueryInterface(IID_PPV_ARG(IAsyncOperation, &pAsyncOperation)))) - { - pAsyncOperation->EndOperation(hr, NULL, data->pdwEffect); - } - } - //Release the CFSFolder and data object holds in the copying thread. - data->This->Release(); - //Release the parameter from the heap. - HeapFree(GetProcessHeap(), 0, data); - CoUninitialize(); - return 0; } HRESULT WINAPI CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { 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] Fri Aug 12 11:35:24 2016 @@ -22,8 +22,6 @@ #ifndef _CFSFOLDER_H_ #define _CFSFOLDER_H_ - -WCHAR *BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls); class CFSFolder : public CComCoClass<CFSFolder, &CLSID_ShellFSFolder>, @@ -97,48 +95,4 @@ END_COM_MAP() }; -class CFSDropTarget : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDropTarget -{ - private: - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ - LPWSTR sPathTarget; - - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); - virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); - BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); - static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); - - public: - CFSDropTarget(); - ~CFSDropTarget(); - HRESULT WINAPI Initialize(LPWSTR PathTarget); - - // IDropTarget - virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragLeave(); - virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - - DECLARE_NOT_AGGREGATABLE(CFSDropTarget) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(CFSDropTarget) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - END_COM_MAP() - -}; - -struct _DoDropData { - CFSDropTarget *This; - IStream *pStream; - DWORD dwKeyState; - POINTL pt; - DWORD pdwEffect; -}; - #endif /* _CFSFOLDER_H_ */ 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] Fri Aug 12 11:35:24 2016 @@ -68,6 +68,7 @@ #include "folders/CAdminToolsFolder.h" #include "folders/CRecycleBin.h" #include "droptargets/CexeDropHandler.h" +#include "droptargets/CFSDropTarget.h" #include "COpenWithMenu.h" #include "CNewMenu.h" #include "dialogs/filedefext.h" [View Less]

8 years, 9 months

[dreimer] 72205: [RAPPS} Fix structural errors, fix some dead links, fix wrong lang inclusions, fix trailing spaces etcetc Some entries are dead, like nirlauncher, watercolor, tahoma and audacity. ...

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Aug 12 11:00:21 2016 New Revision: 72205 URL: http://svn.reactos.org/svn/reactos?rev=72205&view=rev Log: [RAPPS} Fix structural errors, fix some dead links, fix wrong lang inclusions, fix trailing spaces etcetc Some entries are dead, like nirlauncher, watercolor, tahoma and audacity. Feel free to fix em. (@holiday till monday now, cya) Modified: trunk/reactos/media/rapps/7zip.txt trunk/reactos/media/rapps/abiword.txt trunk/reactos/media/rapps/… [View More]

8 years, 9 months

[jimtabor] 72204: [NtUser] - Get the right shift to pass through the keyboard subsystem. (WIP)

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Aug 12 00:54:44 2016 New Revision: 72204 URL: http://svn.reactos.org/svn/reactos?rev=72204&view=rev Log: [NtUser] - Get the right shift to pass through the keyboard subsystem. (WIP) Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- … [View More]

8 years, 9 months

[jimtabor] 72203: [NtUser] - Send Input Language Change System Character flag if font signature and system character is set.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 11 22:33:12 2016 New Revision: 72203 URL: http://svn.reactos.org/svn/reactos?rev=72203&view=rev Log: [NtUser] - Send Input Language Change System Character flag if font signature and system character is set. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… =========================================================… [View More]

8 years, 9 months

[jimtabor] 72202: [NtUser] - If focus window null use active.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 11 22:04:33 2016 New Revision: 72202 URL: http://svn.reactos.org/svn/reactos?rev=72202&view=rev Log: [NtUser] - If focus window null use active. Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/… [View More]

8 years, 9 months

[jimtabor] 72201: [NtUser] - Fix registry update when turning on/off keyboard layout hotkey and selecting. VK_RSHIFT (WIP).

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 11 21:36:55 2016 New Revision: 72201 URL: http://svn.reactos.org/svn/reactos?rev=72201&view=rev Log: [NtUser] - Fix registry update when turning on/off keyboard layout hotkey and selecting. VK_RSHIFT (WIP). Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/… [View More]

8 years, 9 months

[zhu] 72200: Rewrite of many address.c functions to simplify locking and resolve deadlocks, special attention paid to whether AFD and lwIP have pointers to my data or not. Added deadlock resolution...

by zhu＠svn.reactos.org

Author: zhu Date: Thu Aug 11 19:40:13 2016 New Revision: 72200 URL: http://svn.reactos.org/svn/reactos?rev=72200&view=rev Log: Rewrite of many address.c functions to simplify locking and resolve deadlocks, special attention paid to whether AFD and lwIP have pointers to my data or not. Added deadlock resolution to MTSerialMutex acquisition macros. Better organization of TCP functions in source code. Removed unnecessary helper functions. Reduced number of types of pending requests and the … [View More]

8 years, 9 months

[hbelusca] 72199: Remove extra ending semicolons in our C code base.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 11 16:50:41 2016 New Revision: 72199 URL: http://svn.reactos.org/svn/reactos?rev=72199&view=rev Log: Remove extra ending semicolons in our C code base. Modified: trunk/reactos/drivers/parallel/parport/fdo.c trunk/reactos/win32ss/user/ntuser/sysparams.c trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c trunk/rostests/apitests/msgina/ShellDimScreen.cpp trunk/rostests/apitests/ntdll/SystemInfo.c trunk/rostests/drivers/ntoskrnl/… [View More]IoEaTest.cpp Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -607,7 +607,7 @@ LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; PoStartNextPowerIrp(Irp); IoSkipCurrentIrpStackLocation(Irp); - return PoCallDriver(LowerDevice, Irp);; + return PoCallDriver(LowerDevice, Irp); } /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -1209,7 +1209,7 @@ } case SPI_SETLANGTOGGLE: - gdwLanguageToggleKey = UserGetLanguageToggle();; + gdwLanguageToggleKey = UserGetLanguageToggle(); return gdwLanguageToggleKey; break; Modified: trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/rosperf/gradient.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -36,7 +36,7 @@ vert[0].Green = 0; vert[0].Blue = 0; vert[0].Alpha = 0; - vert[1].x = PerfInfo->WndWidth;; + vert[1].x = PerfInfo->WndWidth; vert[1].y = 0; vert[1].Red = 0; vert[1].Green = 0xff00; Modified: trunk/rostests/apitests/msgina/ShellDimScreen.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msgina/ShellDimS… ============================================================================== --- trunk/rostests/apitests/msgina/ShellDimScreen.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/msgina/ShellDimScreen.cpp [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -50,7 +50,7 @@ ok(wnd != ((HWND)0xdeadbeef), "Expected a valid window ptr\n"); ok(IsWindow(wnd), "Expected a valid window\n"); ok(IsWindowVisible(wnd), "Expected the window to be visible\n"); - char classname[100] = {0};; + char classname[100] = {0}; int nRet = GetClassNameA(wnd, classname, 100); ok(nRet == 17, "Expected GetClassName to return 3 was %i\n", nRet); ok(!strcmp(classname, "DimmedWindowClass"), "Expected classname to be DimmedWindowClass, was %s\n", classname); Modified: trunk/rostests/apitests/ntdll/SystemInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo… ============================================================================== --- trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -259,7 +259,7 @@ /* Restore original values */ SetTimeInfo.TimeAdjustment = TimeInfoOrg.TimeAdjustment; - SetTimeInfo.Enable = TimeInfoOrg.Enable;; + SetTimeInfo.Enable = TimeInfoOrg.Enable; Status = NtSetSystemInformation(SystemTimeAdjustmentInformation, &SetTimeInfo, sizeof(SetTimeInfo)); Modified: trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/ntoskrnl/IoEaTest… ============================================================================== --- trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] (original) +++ trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] Thu Aug 11 16:50:41 2016 @@ -474,7 +474,7 @@ ROSEaBuffer->EaValueLength = (UCHAR)strlen(ROSEaBuffer->EaName); ulROSError = RANDOM_INIT_ERROR; ROSEaBuffer->Flags = TestEaBufferFlags; - ROSEaBuffer->NextEntryOffset = ((ROSEaBuffer->EaNameLength+ROSEaBuffer->EaNameLength+9)+3)&0xFFFFFFFC;; + ROSEaBuffer->NextEntryOffset = ((ROSEaBuffer->EaNameLength+ROSEaBuffer->EaNameLength+9)+3)&0xFFFFFFFC; ROSStatus = IoCheckEaBufferValidityROS(ROSEaBuffer,TestEaLength,&ulROSError); printf("%i-",ROSEaBuffer->NextEntryOffset); [View Less]

8 years, 9 months

← Newer
1
...
30
31
32
33
34
35
36
...
47
Older →

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 August 2016