Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[pschweitzer] 68835: [NTFS] It seems that our disk.sys returns "unknown" media type when performing IOCTL_DISK_GET_DRIVE_GEOMETRY on an extended partition. Not sure how Windows handles this (if any...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Aug 27 20:56:08 2015 New Revision: 68835 URL: http://svn.reactos.org/svn/reactos?rev=68835&view=rev Log: [NTFS] It seems that our disk.sys returns "unknown" media type when performing IOCTL_DISK_GET_DRIVE_GEOMETRY on an extended partition. Not sure how Windows handles this (if any volunteer for a test :-)), in the meantime, forcibly sector size to 512B to allow NTFS driver opening volumes on extended partitions Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Thu Aug 27 20:56:08 2015 @@ -89,6 +89,10 @@ return STATUS_UNRECOGNIZED_VOLUME; } } + else if (DiskGeometry.MediaType == Unknown) + { + DiskGeometry.BytesPerSector = 512; + } DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePoolWithTag(NonPagedPool,

10 years

[dquintana] 68834: [SHELL32] The desktop.ini file is only meant to be read if the folder has the R (read-only) or S (system) attributes. If this causes your favorite folder to stop showing the icon...

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Aug 27 16:37:13 2015 New Revision: 68834 URL: http://svn.reactos.org/svn/reactos?rev=68834&view=rev Log: [SHELL32] The desktop.ini file is only meant to be read if the folder has the R (read-only) or S (system) attributes. If this causes your favorite folder to stop showing the icon, use "attrib +r <foldername>" or edit it from the properties dialog. When we add the desktop.ini files, we will also need to add the R attribute to their respective folders. Followup to CORE-9002 Modified: trunk/reactos/dll/win32/shell32/folders.cpp 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] Thu Aug 27 16:37:13 2015 @@ -34,36 +34,40 @@ static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; static const WCHAR wszDesktopIni[] = { 'd','e','s','k','t','o','p','.','i','n','i',0 }; int icon_idx; - WCHAR wszFolderPath[MAX_PATH]; - - if (!SHGetPathFromIDListW(pidl, wszFolderPath)) - return FALSE; - - PathAppendW(wszFolderPath, wszDesktopIni); - - if (!(uFlags & GIL_DEFAULTICON) && PathFileExistsW(wszFolderPath)) - { - WCHAR wszPath[MAX_PATH]; - WCHAR wszCLSIDValue[CHARS_IN_GUID]; - - if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) - { - ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); - - *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; + + if (!(uFlags & GIL_DEFAULTICON) && (_ILGetFileAttributes(ILFindLastID(pidl), NULL, 0) & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0 ) + { + WCHAR wszFolderPath[MAX_PATH]; + + if (!SHGetPathFromIDListW(pidl, wszFolderPath)) + return FALSE; + + PathAppendW(wszFolderPath, wszDesktopIni); + + if (PathFileExistsW(wszFolderPath)) + { + WCHAR wszPath[MAX_PATH]; + WCHAR wszCLSIDValue[CHARS_IN_GUID]; + + if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) + { + ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); + + *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + return S_OK; + } } }

10 years

[dquintana] 68833: [NTOBJSHEX] * Fix comment headers.

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Aug 26 23:35:38 2015 New Revision: 68833 URL: http://svn.reactos.org/svn/reactos?rev=68833&view=rev Log: [NTOBJSHEX] * Fix comment headers. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjns.cpp + * FILE: dll\shellext\ntobjshex\ntobjfolder.cpp * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjns.h + * FILE: dll\shellext\ntobjshex\ntobjfolder.h * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjns.cpp + * FILE: dll\shellext\ntobjshex\regfolder.cpp * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ @@ -23,7 +23,6 @@ #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); - // {1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6} const GUID CLSID_RegistryFolder = { 0x1c6d6e08, 0x2332, 0x4a7b, { 0xa9, 0x4d, 0x64, 0x32, 0xdb, 0x2b, 0x5a, 0xe6 } }; Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,10 +1,9 @@ /* - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\stobject\stobject.cpp - * PURPOSE: Systray shell service object - * PROGRAMMERS: Robert Naumann - David Quintana <gigaherz(a)gmail.com> + * FILE: dll\shellext\ntobjshex\regfolder.h + * PURPOSE: NT Object Namespace shell extension + * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ #pragma once

10 years

[dquintana] 68832: [NTOBJSHEX] * Now that we use lazy enumeration instead of keeping a full list of all items, I was able to simplify a few things.

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Aug 26 23:30:47 2015 New Revision: 68832 URL: http://svn.reactos.org/svn/reactos?rev=68832&view=rev Log: [NTOBJSHEX] * Now that we use lazy enumeration instead of keeping a full list of all items, I was able to simplify a few things. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -131,28 +131,9 @@ }; -class CNtObjectPidlManager -{ -private: - PWSTR m_ntPath; - +class CNtObjectPidlHelper +{ public: - CNtObjectPidlManager() : - m_ntPath(NULL) - { - } - - ~CNtObjectPidlManager() - { - } - - HRESULT Initialize(PWSTR ntPath) - { - m_ntPath = ntPath; - - return S_OK; - } - static HRESULT CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second) { if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) @@ -285,7 +266,7 @@ return flags & mask; } - BOOL IsFolder(LPCITEMIDLIST pcidl) + static BOOL IsFolder(LPCITEMIDLIST pcidl) { NtPidlEntry * entry = (NtPidlEntry*) &(pcidl->mkid); if ((entry->cb < sizeof(NtPidlEntry)) || (entry->magic != NT_OBJECT_PIDL_MAGIC)) @@ -296,7 +277,7 @@ (entry->objectType == KEY_OBJECT); } - HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const NtPidlEntry ** pentry) + static HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const NtPidlEntry ** pentry) { NtPidlEntry * entry = (NtPidlEntry*) &(pcidl->mkid); @@ -321,7 +302,6 @@ // CNtObjectFolder CNtObjectFolder::CNtObjectFolder() : - m_PidlManager(NULL), m_shellPidl(NULL) { } @@ -330,8 +310,6 @@ { if (m_shellPidl) ILFree(m_shellPidl); - if (m_PidlManager) - delete m_PidlManager; } // IShellFolder @@ -370,7 +348,7 @@ if (hr != S_OK) break; - hr = m_PidlManager->GetInfoFromPidl(*ppidl, &info); + hr = CNtObjectPidlHelper::GetInfoFromPidl(*ppidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -389,7 +367,7 @@ *pchEaten = wcslen(info->entryName); if (pdwAttributes) - *pdwAttributes = m_PidlManager->ConvertAttributes(info, pdwAttributes); + *pdwAttributes = CNtObjectPidlHelper::ConvertAttributes(info, pdwAttributes); } return S_OK; @@ -413,7 +391,7 @@ if (IsEqualIID(riid, IID_IShellFolder)) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -514,7 +492,7 @@ { TRACE("CompareIDs\n"); - HRESULT hr = m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + HRESULT hr = CNtObjectPidlHelper::CompareIDs(lParam, pidl1, pidl2); if (hr != S_OK) return hr; @@ -581,12 +559,12 @@ { PCUITEMID_CHILD pidl = apidl[i]; - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; // Update attributes. - *rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut); + *rgfInOut = CNtObjectPidlHelper::ConvertAttributes(info, rgfInOut); } return S_OK; @@ -612,7 +590,7 @@ HKEY keys[1]; int nkeys = _countof(keys); - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CNtObjectPidlHelper::IsFolder(apidl[0])) { res = RegOpenKey(HKEY_CLASSES_ROOT, L"Folder", keys + 0); if (!NT_SUCCESS(res)) @@ -642,7 +620,7 @@ if (IsEqualIID(riid, IID_IQueryAssociations)) { - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CNtObjectPidlHelper::IsFolder(apidl[0])) { CComPtr<IQueryAssociations> pqa; HRESULT hr = AssocCreate(CLSID_QueryAssociations, IID_PPV_ARG(IQueryAssociations, &pqa)); @@ -669,7 +647,7 @@ TRACE("GetDisplayNameOf %p\n", pidl); - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -748,16 +726,9 @@ { m_shellPidl = ILClone(pidl); - PCWSTR ntPath = L"\\"; - - if (!m_PidlManager) - { - m_PidlManager = new CNtObjectPidlManager(); - - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - } - - return m_PidlManager->Initialize(m_NtPath); + StringCbCopy(m_NtPath, _countof(m_NtPath), L"\\"); + + return S_OK; } // Internal @@ -765,11 +736,9 @@ { m_shellPidl = ILClone(pidl); - if (!m_PidlManager) - m_PidlManager = new CNtObjectPidlManager(); - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - return m_PidlManager->Initialize(m_NtPath); + + return S_OK; } // IPersistFolder2 @@ -840,7 +809,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -907,7 +876,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -9,8 +9,6 @@ extern const GUID CLSID_NtObjectFolder; -class CNtObjectPidlManager; - class CNtObjectFolder : public CComCoClass<CNtObjectFolder, &CLSID_NtObjectFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -18,8 +16,6 @@ public IPersistFolder2, public IShellFolderViewCB { - CNtObjectPidlManager * m_PidlManager; - WCHAR m_NtPath[MAX_PATH]; LPITEMIDLIST m_shellPidl; @@ -28,8 +24,6 @@ CNtObjectFolder(); virtual ~CNtObjectFolder(); - - CNtObjectPidlManager& GetManager() { return *m_PidlManager; } // IShellFolder virtual HRESULT STDMETHODCALLTYPE ParseDisplayName( Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -125,44 +125,9 @@ }; -class CRegistryPidlManager -{ -private: - PWSTR m_ntPath; - HKEY m_hRoot; - - int DpaDeleteCallback(RegPidlEntry * info) - { - CoTaskMemFree(info); - return 0; - } - - static int CALLBACK s_DpaDeleteCallback(void *pItem, void *pData) - { - CRegistryPidlManager * mf = (CRegistryPidlManager*) pData; - RegPidlEntry * item = (RegPidlEntry*) pItem; - return mf->DpaDeleteCallback(item); - } - +class CRegistryPidlHelper +{ public: - CRegistryPidlManager() : - m_ntPath(NULL), - m_hRoot(NULL) - { - } - - ~CRegistryPidlManager() - { - } - - HRESULT Initialize(PWSTR ntPath, HKEY hRoot) - { - m_ntPath = ntPath; - m_hRoot = hRoot; - - return S_OK; - } - static HRESULT CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second) { if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) @@ -290,7 +255,7 @@ return flags & mask; } - BOOL IsFolder(LPCITEMIDLIST pcidl) + static BOOL IsFolder(LPCITEMIDLIST pcidl) { RegPidlEntry * entry = (RegPidlEntry*) &(pcidl->mkid); if ((entry->cb < sizeof(RegPidlEntry)) || (entry->magic != REGISTRY_PIDL_MAGIC)) @@ -300,7 +265,7 @@ (entry->entryType == REG_ENTRY_ROOT); } - HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const RegPidlEntry ** pentry) + static HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const RegPidlEntry ** pentry) { RegPidlEntry * entry = (RegPidlEntry*) &(pcidl->mkid); @@ -371,7 +336,7 @@ } } - HRESULT FormatContentsForDisplay(const RegPidlEntry * info, PCWSTR * strContents) + static HRESULT FormatContentsForDisplay(const RegPidlEntry * info, LPCWSTR ntPath, PCWSTR * strContents) { PVOID td = (((PBYTE) info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); @@ -386,7 +351,7 @@ { PVOID valueData; DWORD valueLength; - HRESULT hr = ReadRegistryValue(NULL, m_ntPath, info->entryName, &valueData, &valueLength); + HRESULT hr = ReadRegistryValue(NULL, ntPath, info->entryName, &valueData, &valueLength); if (FAILED_UNEXPECTEDLY(hr)) { PCWSTR strEmpty = L"(Error reading value)"; @@ -429,7 +394,6 @@ // CRegistryFolder CRegistryFolder::CRegistryFolder() : - m_PidlManager(NULL), m_shellPidl(NULL) { } @@ -438,8 +402,6 @@ { if (m_shellPidl) ILFree(m_shellPidl); - if (m_PidlManager) - delete m_PidlManager; } // IShellFolder @@ -480,7 +442,7 @@ if (hr != S_OK) break; - hr = m_PidlManager->GetInfoFromPidl(*ppidl, &info); + hr = CRegistryPidlHelper::GetInfoFromPidl(*ppidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -499,7 +461,7 @@ *pchEaten = wcslen(info->entryName); if (pdwAttributes) - *pdwAttributes = m_PidlManager->ConvertAttributes(info, pdwAttributes); + *pdwAttributes = CRegistryPidlHelper::ConvertAttributes(info, pdwAttributes); } return S_OK; @@ -530,7 +492,7 @@ if (IsEqualIID(riid, IID_IShellFolder)) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -586,7 +548,7 @@ { TRACE("CompareIDs\n"); - HRESULT hr = m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + HRESULT hr = CRegistryPidlHelper::CompareIDs(lParam, pidl1, pidl2); if (hr != S_OK) return hr; @@ -653,12 +615,12 @@ { PCUITEMID_CHILD pidl = apidl[i]; - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; // Update attributes. - *rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut); + *rgfInOut = CRegistryPidlHelper::ConvertAttributes(info, rgfInOut); } return S_OK; @@ -684,7 +646,7 @@ HKEY keys[1]; int nkeys = _countof(keys); - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CRegistryPidlHelper::IsFolder(apidl[0])) { res = RegOpenKey(HKEY_CLASSES_ROOT, L"Folder", keys + 0); if (!NT_SUCCESS(res)) @@ -714,7 +676,7 @@ if (IsEqualIID(riid, IID_IQueryAssociations)) { - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CRegistryPidlHelper::IsFolder(apidl[0])) { CComPtr<IQueryAssociations> pqa; HRESULT hr = AssocCreate(CLSID_QueryAssociations, IID_PPV_ARG(IQueryAssociations, &pqa)); @@ -741,7 +703,7 @@ TRACE("GetDisplayNameOf %p\n", pidl); - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -821,16 +783,8 @@ m_shellPidl = ILClone(pidl); m_hRoot = NULL; - PCWSTR ntPath = L""; - - if (!m_PidlManager) - { - m_PidlManager = new CRegistryPidlManager(); - - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - } - - return m_PidlManager->Initialize(m_NtPath, m_hRoot); + StringCbCopy(m_NtPath, _countof(m_NtPath), L""); + return S_OK; } // Internal @@ -839,11 +793,8 @@ m_shellPidl = ILClone(pidl); m_hRoot = hRoot; - if (!m_PidlManager) - m_PidlManager = new CRegistryPidlManager(); - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - return m_PidlManager->Initialize(m_NtPath, m_hRoot); + return S_OK; } // IPersistFolder2 @@ -914,7 +865,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -953,7 +904,7 @@ { PCWSTR strValueContents; - hr = m_PidlManager->FormatContentsForDisplay(info, &strValueContents); + hr = CRegistryPidlHelper::FormatContentsForDisplay(info, m_NtPath, &strValueContents); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -987,7 +938,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -1029,7 +980,7 @@ PCWSTR strValueContents; - hr = m_PidlManager->FormatContentsForDisplay(info, &strValueContents); + hr = CRegistryPidlHelper::FormatContentsForDisplay(info, m_NtPath, &strValueContents); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -10,8 +10,6 @@ extern const GUID CLSID_RegistryFolder; -class CRegistryPidlManager; - class CRegistryFolder : public CComCoClass<CRegistryFolder, &CLSID_RegistryFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -19,8 +17,6 @@ public IPersistFolder2, public IShellFolderViewCB { - CRegistryPidlManager * m_PidlManager; - HKEY m_hRoot; WCHAR m_NtPath[MAX_PATH]; @@ -30,8 +26,6 @@ CRegistryFolder(); virtual ~CRegistryFolder(); - - CRegistryPidlManager& GetManager() { return *m_PidlManager; } // IShellFolder virtual HRESULT STDMETHODCALLTYPE ParseDisplayName(

10 years

[hbelusca] 68831: [DISKPART] - Russian translation update by tower. - Fixup the other translations.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 26 22:53:20 2015 New Revision: 68831 URL: http://svn.reactos.org/svn/reactos?rev=68831&view=rev Log: [DISKPART] - Russian translation update by tower. - Fixup the other translations. Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/diskpart/lang/ru-RU.rc trunk/reactos/base/system/diskpart/lang/sq-AL.rc trunk/reactos/base/system/diskpart/lang/tr-TR.rc Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Wed Aug 26 22:53:20 2015 @@ -7,7 +7,7 @@ IDS_APP_USAGE "\nDisk Partitioning Interpreter.\n\n\ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ /S filename\tRuns the given script.\n\ -/T timeout\tTimeout in seconds to prevent diskpart usage overlap.\n\ +/T timeout\tTimeout in seconds to prevent DiskPart usage overlap.\n\ /?\t\tDisplay this help message.\n\n" IDS_APP_LICENSE "Licensed under the GNU GPLv2\n" IDS_APP_CURR_COMPUTER "On computer: %s\n\n" Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Wed Aug 26 22:53:20 2015 @@ -6,7 +6,8 @@ STRINGTABLE BEGIN IDS_APP_HEADER "ReactOS DiskPart" - IDS_APP_USAGE "Interpretor pentru partiÈionare discuri.\n\nUtilizare: DISKPART [/S numefiÈier] [/T timplimitÄ] [/?]\n\n\ + IDS_APP_USAGE "Interpretor pentru partiÈionare discuri.\n\n\ +Utilizare: DISKPART [/S numefiÈier] [/T timplimitÄ] [/?]\n\n\ /S numefiÈier\tExecutÄ scriptul din fiÈierul dat.\n\ /T timplimitÄ\tLimitÄ temporalÄ pentru prevenirea utilizÄrii concurente.\n\ /?\t\tAfiÈeazÄ acest manual.\n\n" Modified: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] Wed Aug 26 22:53:20 2015 @@ -1,4 +1,4 @@ -/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ +/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) + Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½ 2015 25 Ð°Ð²Ð³. tower(a)reactos.org */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -9,7 +9,7 @@ IDS_APP_USAGE "\nDisk Partitioning Interpreter.\n\n\ ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: DISKPART [/S <Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð°>] [/T <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>] [/?]\n\n\ /S <Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð°>\tÐÐ°Ð¿ÑÑÐºÐ°ÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐºÑÐ¸Ð¿Ñ.\n\ -/T <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>\tTimeout in seconds to prevent diskpart usage overlap.\n\ +/T <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>\tÐ¢Ð°Ð¹Ð¼-Ð°ÑÑ Ð² ÑÐµÐºÑÐ½Ð´Ð°Ñ, ÑÑÐ¾Ð±Ñ Ð¿ÑÐµÐ´Ð¾ÑÐ²ÑÐ°ÑÐ¸ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ DiskPart.\n\ /?\t\tÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÑÑ ÑÐ¿ÑÐ°Ð²ÐºÑ.\n\n" IDS_APP_LICENSE "Ð Ð°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð¿Ð¾Ð´ Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÐµÐ¹ GNU GPLv2\n" IDS_APP_CURR_COMPUTER "ÐÐ° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ: %s\n\n" @@ -26,7 +26,7 @@ IDS_DETAIL_INFO_PATH "ÐÑÑÑ" IDS_DETAIL_INFO_TARGET "Ð¦ÐµÐ»Ñ" IDS_DETAIL_INFO_LUN_ID "LUN ID" - IDS_DETAIL_INFO_LOC_PATH "Location Path" + IDS_DETAIL_INFO_LOC_PATH "ÐÑÑÑ Ðº Ð´Ð¸ÑÐºÑ" IDS_DETAIL_INFO_CURR_RO_STATE "Ð¢ÐµÐºÑÑÐµÐµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ""Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ""" IDS_DETAIL_INFO_RO "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ" IDS_DETAIL_INFO_BOOT_DSK "ÐÐ°Ð³ÑÑÐ·Ð¾ÑÐ½ÑÐ¹ Ð´Ð¸ÑÐº" @@ -42,32 +42,32 @@ IDS_LIST_DISK_HEAD "\n ÐÐ¸ÑÐº ### Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ Ð Ð°Ð·Ð¼ÐµÑ Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÐÐ¸Ð½ GPT\n" IDS_LIST_DISK_LINE " -------- ---------- ------- -------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_HEAD "\n Ð Ð°Ð·Ð¼ÐµÑÐºÐ° Ð¢Ð¸Ð¿ Ð Ð°Ð·Ð¼ÐµÑ ÐÑÑÑÑÐ¿\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" - IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" + IDS_LIST_PARTITION_NO_DISK "\nÐÐ¸ÑÐº Ñ ÑÐ°Ð·Ð¼ÐµÑÐºÐ¾Ð¹ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð² Ð½Ðµ Ð²ÑÐ±ÑÐ°Ð½.\nÐ£ÐºÐ°Ð¶Ð¸ÑÐµ Ð´Ð¸ÑÐº Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ.\n\n" IDS_LIST_VOLUME_HEAD "Ð¢Ð¾Ð¼ ###\tÐÐ¼Ñ\tÐÐµÑÐºÐ°\n" END /* RESCAN command string */ STRINGTABLE BEGIN - IDS_RESCAN_START "\nPlease wait while DiskPart scans your configuration...\n" - IDS_RESCAN_END "\nDiskPart has finished scanning your configuration.\n\n" + IDS_RESCAN_START "\nÐÐ¶Ð¸Ð´Ð°Ð¹ÑÐµ Ð¾ÐºÐ¾Ð½ÑÐ°Ð½Ð¸Ñ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð¾Ð¹ DiskPart ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸...\n" + IDS_RESCAN_END "\nDiskPart Ð·Ð°ÐºÐ¾Ð½ÑÐ¸Ð» Ð¿ÑÐ¾Ð²ÐµÑÐºÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸.\n\n" END /* SELECT command strings */ STRINGTABLE BEGIN - IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" - IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" - IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" - IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" - IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" - IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_NO_DISK "\nÐÐ¸ÑÐº Ð´Ð»Ñ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½.\nÐÑÐ±ÐµÑÐ¸ÑÐµ Ð´Ð¸ÑÐº Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ.\n\n" + IDS_SELECT_DISK "\nÐÐ¸ÑÐº %lu Ð²ÑÐ±ÑÐ°Ð½ ÑÐµÐºÑÑÐ¸Ð¼.\n\n" + IDS_SELECT_DISK_INVALID "\nÐÑÐ¸Ð±ÐºÐ° Ð´Ð¸ÑÐºÐ°.\n\n" + IDS_SELECT_NO_PARTITION "\nÐÐ¸ÑÐº Ñ ÑÐ°Ð·Ð¼ÐµÑÐºÐ¾Ð¹ Ð½Ðµ Ð²ÑÐ±ÑÐ°Ð½.\nÐÑÐ±ÐµÑÐ¸ÑÐµ Ð´Ð¸ÑÐº Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ.\n\n" + IDS_SELECT_PARTITION "\nÐÑÐ±ÑÐ°Ð½Ð° ÑÐ°Ð·Ð¼ÐµÑÐºÐ° Ð´Ð¸ÑÐºÐ° %lu ÑÐµÐºÑÑÐµÐ¹ ÑÐ°Ð·Ð¼ÐµÑÐºÐ¾Ð¹.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nÐÐ¸ÑÐº Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÑÐ°Ð·Ð¼ÐµÑÐºÐ¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½.\nÐÑÐ±ÐµÑÐ¸ÑÐµ Ð´Ð¸ÑÐº Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ.\n\n" + IDS_SELECT_PARTITION_INVALID "\nÐÑÐ¸Ð±ÐºÐ° Ð² ÑÐ°Ð·Ð¼ÐµÑÐºÐµ Ð´Ð¸ÑÐºÐ°.\n\n" + IDS_SELECT_NO_VOLUME "\nÐ¢Ð¾Ð¼ Ð½Ð° Ð´Ð¸ÑÐºÐµ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½.\nÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ¾Ð¼ Ð´Ð¸ÑÐºÐ° Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ.\n\n" + IDS_SELECT_VOLUME "\nÐÑÐ±ÑÐ°Ð½ ÑÐµÐºÑÑÐ¸Ð¼ %lu ÑÐ¾Ð¼ Ð´Ð¸ÑÐºÐ°.\n\n" END /* Disk Status */ @@ -92,7 +92,7 @@ /* Help Command Descripions */ STRINGTABLE BEGIN - IDS_HELP_CMD_DESC_ACTIVE "ACTIVE\t\t- ÐÐ¾Ð¼ÐµÑÐºÐ° Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð·Ð´ÐµÐ»Ð° ÐºÐ°Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¾Ð³Ð¾.\n" + IDS_HELP_CMD_DESC_ACTIVE "ACTIVE\t\t- ÐÐ°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ° Ð°ÐºÑÐ¸Ð²Ð½ÑÐ¼.\n" IDS_HELP_CMD_DESC_ADD "ADD\t\t- ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð·ÐµÑÐºÐ°Ð»Ð° Ðº Ð¿ÑÐ¾ÑÑÐ¾Ð¼Ñ ÑÐ¾Ð¼Ñ.\n" IDS_HELP_CMD_DESC_ASSIGN "ASSIGN\t\t- ÐÐ°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ½Ð¸ Ð¸Ð»Ð¸ ÑÐ¾ÑÐºÐ¸ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð¼Ñ ÑÐ¾Ð¼Ñ.\n" IDS_HELP_CMD_DESC_ATTACH "ATTACH\t\t- ÐÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½ÑÐµÑ ÑÐ°Ð¹Ð» Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°.\n" @@ -106,7 +106,7 @@ IDS_HELP_CMD_DESC_DELETE "DELETE\t\t- Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¾Ð±ÑÐµÐºÑ.\n" IDS_HELP_CMD_DESC_DETACH "DETACH\t\t- ÐÑÑÐ¾ÐµÐ´Ð¸Ð½ÑÐµÑ ÑÐ°Ð¹Ð» Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°.\n" IDS_HELP_CMD_DESC_DETAIL "DETAIL\t\t- ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¾Ð±ÑÐµÐºÑÐ°.\n" - IDS_HELP_CMD_DESC_EXIT "EXIT\t\t- ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑDiskPart.\n" + IDS_HELP_CMD_DESC_EXIT "EXIT\t\t- ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ DiskPart.\n" IDS_HELP_CMD_DESC_EXPAND "EXPAND\t\t- Ð£Ð²ÐµÐ»Ð¸ÑÐµÐ½Ð¸Ðµ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð° Ð½Ð° Ð²Ð¸ÑÑÑÐ°Ð»ÑÐ½Ð¾Ð¼\n\t\t Ð´Ð¸ÑÐºÐµ.\n" IDS_HELP_CMD_DESC_EXTEND "EXTEND\t\t- Ð Ð°ÑÑÐ¸ÑÐ¸ÑÑ ÑÐ¾Ð¼.\n" IDS_HELP_CMD_DESC_FS "FILESYSTEMS\t- ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐµÐºÑÑÐµÐ¹ Ð¸ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ ÑÐ°Ð¹Ð»Ð¾Ð²ÑÑ ÑÐ¸ÑÑÐµÐ¼ Ð´Ð»Ñ ÑÐ¾Ð¼Ð°.\n" @@ -137,7 +137,7 @@ BEGIN IDS_ERROR_MSG_NO_SCRIPT "ÐÑÐ¸Ð±ÐºÐ° Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÐºÑÐ¸Ð¿ÑÐ°: %s\n" IDS_ERROR_MSG_BAD_ARG "ÐÑÐ¸Ð±ÐºÐ° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²: %s\n" - IDS_ERROR_INVALID_ARGS "Invalid arguments\n" + IDS_ERROR_INVALID_ARGS "ÐÑÐ¸Ð±ÐºÐ° Ð² ÑÐºÐ°Ð·Ð°Ð½Ð¸Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] Wed Aug 26 22:53:20 2015 @@ -11,7 +11,7 @@ IDS_APP_USAGE "\nDisk Partitioning Interpreter.\n\n\ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ /S filename\tRuns the given script.\n\ -/T timeout\tTimeout in seconds to prevent diskpart usage overlap.\n\ +/T timeout\tTimeout in seconds to prevent DiskPart usage overlap.\n\ /?\t\tDisplay this help message.\n\n" IDS_APP_LICENSE, "LiÃ§ensuar mbi GNU GPLv2\n" IDS_APP_CURR_COMPUTER, "NÃ« kompjuter: %s\n\n" Modified: trunk/reactos/base/system/diskpart/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] Wed Aug 26 22:53:20 2015 @@ -6,7 +6,7 @@ STRINGTABLE BEGIN IDS_APP_HEADER "ReactOS DiskPart" - IDS_APP_USAGE "\nDisk BÃ¶lÃ¼mlendirme YorumlayÄ±cÄ±sÄ±\n\n\ + IDS_APP_USAGE "\nDisk BÃ¶lÃ¼mlendirme YorumlayÄ±cÄ±sÄ±.\n\n\ KullanÄ±m: DISKPART [/S kÃ¼tÃ¼k adÄ±] [/T sÃ¼re aÅÄ±mÄ±] [/?]\n\n\ /S kÃ¼tÃ¼k adÄ±\tVerilen betiÄi Ã§alÄ±ÅtÄ±rÄ±r.\n\ /T sÃ¼re aÅÄ±mÄ±\tDiskPart kullanÄ±m Ã¶rtÃ¼Åmesini Ã¶nlemeye sÃ¢niye olarak sÃ¼re aÅÄ±mÄ±.\n\

10 years

[pschweitzer] 68830: [NTFS] Fix two memory leaks

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Aug 26 18:55:53 2015 New Revision: 68830 URL: http://svn.reactos.org/svn/reactos?rev=68830&view=rev Log: [NTFS] Fix two memory leaks Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Wed Aug 26 18:55:53 2015 @@ -352,6 +352,11 @@ VolumeNameU = L"\0"; } + if (NT_SUCCESS(Status)) + { + ReleaseAttributeContext(AttrCtxt); + } + VolumeFcb = NtfsCreateFCB(VolumeNameU, NULL, DeviceExt); if (VolumeFcb == NULL) { @@ -380,6 +385,11 @@ NtfsInfo->MajorVersion = VolumeInfo->MajorVersion; NtfsInfo->MinorVersion = VolumeInfo->MinorVersion; NtfsInfo->Flags = VolumeInfo->Flags; + } + + if (NT_SUCCESS(Status)) + { + ReleaseAttributeContext(AttrCtxt); } ExFreePool(VolumeRecord);

10 years

[pschweitzer] 68829: [NTFS] Totally rewrite the way MFT records attributes are handled. Up to now, we were having really similar loops, only looking at the resident part of the attribute list, not ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Aug 26 18:20:04 2015 New Revision: 68829 URL: http://svn.reactos.org/svn/reactos?rev=68829&view=rev Log: [NTFS] Totally rewrite the way MFT records attributes are handled. Up to now, we were having really similar loops, only looking at the resident part of the attribute list, not really caring about how the loop was going. This was leading to some issues: - In case the attribute we were looking for was stored in the non-resident part of the attribute list, we would miss it (excepted in the case of FindAttribute() which was properly browsing the whole attribute list). - In the specific case of FindAttribute(), one would have been able to setup a broken MFT record with the resident attribute list pointing on the non resident attribute list which itself would point to the resident attribute list. In such case, the driver would loop forever caught on the loop, allocating tones of memory. It was possible to trigger this by user space, from a non-privileged user, just by browsing the right directory entry. - In the case of the other loops (non FindAttribute()), another issue (other than missing attributes) was present, one would have been able to setup a broken MFT record with an attribute of null-length. This would have caused the driver to loop forever on the attribute list. This could be triggered from usermode too. And could be triggered by a non-privileged user. This commit introduces a new set of functions for attributes browsing: FindFirstAttribute(), FindNextAttribute(), FindCloseAttribute(). It allows safely browsing attributes and handles broken cases. It also performs reading of the attribute list when present and makes sure there's only one read. This method should be the only one to use to browse the attributes. The whole NTFS code base has been converted to use this newly set of functions. This really simplifies the implementation of FindAttribute(), and prevent unsafe code duplication. CORE-10037 #resolve #comment Fixed with r68829 Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/finfo.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -23,6 +23,7 @@ * PROGRAMMERS: Eric Kohl * Valentin Verkhovsky * HervÃ© Poussineau (hpoussin(a)reactos.org) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -92,6 +93,207 @@ return TRUE; } +static +NTSTATUS +InternalReadNonResidentAttributes(PFIND_ATTR_CONTXT Context) +{ + ULONGLONG ListSize; + PNTFS_ATTR_RECORD Attribute; + PNTFS_ATTR_CONTEXT ListContext; + + DPRINT("InternalReadNonResidentAttributes(%p)\n", Context); + + Attribute = Context->CurrAttr; + ASSERT(Attribute->Type == AttributeAttributeList); + + if (Context->OnlyResident) + { + Context->NonResidentStart = NULL; + Context->NonResidentEnd = NULL; + return STATUS_SUCCESS; + } + + if (Context->NonResidentStart != NULL) + { + return STATUS_FILE_CORRUPT_ERROR; + } + + ListContext = PrepareAttributeContext(Attribute); + ListSize = AttributeDataLength(&ListContext->Record); + if (ListSize > 0xFFFFFFFF) + { + ReleaseAttributeContext(ListContext); + return STATUS_BUFFER_OVERFLOW; + } + + Context->NonResidentStart = ExAllocatePoolWithTag(NonPagedPool, (ULONG)ListSize, TAG_NTFS); + if (Context->NonResidentStart == NULL) + { + ReleaseAttributeContext(ListContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (ReadAttribute(Context->Vcb, ListContext, 0, (PCHAR)Context->NonResidentStart, (ULONG)ListSize) != ListSize) + { + ExFreePoolWithTag(Context->NonResidentStart, TAG_NTFS); + Context->NonResidentStart = NULL; + ReleaseAttributeContext(ListContext); + return STATUS_FILE_CORRUPT_ERROR; + } + + ReleaseAttributeContext(ListContext); + Context->NonResidentEnd = (PNTFS_ATTR_RECORD)((PCHAR)Context->NonResidentStart + ListSize); + return STATUS_SUCCESS; +} + +static +PNTFS_ATTR_RECORD +InternalGetNextAttribute(PFIND_ATTR_CONTXT Context) +{ + if (Context->CurrAttr == (PVOID)-1) + { + return NULL; + } + + if (Context->CurrAttr >= Context->FirstAttr && + Context->CurrAttr < Context->LastAttr) + { + if (Context->CurrAttr->Length == 0) + { + DPRINT1("Broken length!\n"); + Context->CurrAttr = (PVOID)-1; + return NULL; + } + + Context->CurrAttr = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); + if (Context->CurrAttr < Context->LastAttr && + Context->CurrAttr->Type != AttributeEnd) + { + return Context->CurrAttr; + } + } + + if (Context->NonResidentStart == NULL) + { + Context->CurrAttr = (PVOID)-1; + return NULL; + } + + if (Context->CurrAttr < Context->NonResidentStart || + Context->CurrAttr >= Context->NonResidentEnd) + { + Context->CurrAttr = Context->NonResidentStart; + } + else if (Context->CurrAttr->Length != 0) + { + Context->CurrAttr = (PNTFS_ATTR_RECORD)((ULONG_PTR)Context->CurrAttr + Context->CurrAttr->Length); + } + else + { + DPRINT1("Broken length!\n"); + Context->CurrAttr = (PVOID)-1; + return NULL; + } + + if (Context->CurrAttr < Context->NonResidentEnd && + Context->CurrAttr->Type != AttributeEnd) + { + return Context->CurrAttr; + } + + Context->CurrAttr = (PVOID)-1; + return NULL; +} + +NTSTATUS +FindFirstAttribute(PFIND_ATTR_CONTXT Context, + PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord, + BOOLEAN OnlyResident, + PNTFS_ATTR_RECORD * Attribute) +{ + NTSTATUS Status; + + DPRINT("FindFistAttribute(%p, %p, %p, %p, %u, %p)\n", Context, Vcb, FileRecord, OnlyResident, Attribute); + + Context->Vcb = Vcb; + Context->OnlyResident = OnlyResident; + Context->FirstAttr = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + Context->CurrAttr = Context->FirstAttr; + Context->LastAttr = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse); + Context->NonResidentStart = NULL; + Context->NonResidentEnd = NULL; + + if (Context->FirstAttr->Type == AttributeEnd) + { + Context->CurrAttr = (PVOID)-1; + return STATUS_END_OF_FILE; + } + else if (Context->FirstAttr->Type == AttributeAttributeList) + { + Status = InternalReadNonResidentAttributes(Context); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + *Attribute = InternalGetNextAttribute(Context); + if (*Attribute == NULL) + { + return STATUS_END_OF_FILE; + } + } + else + { + *Attribute = Context->CurrAttr; + } + + return STATUS_SUCCESS; +} + +NTSTATUS +FindNextAttribute(PFIND_ATTR_CONTXT Context, + PNTFS_ATTR_RECORD * Attribute) +{ + NTSTATUS Status; + + DPRINT("FindNextAttribute(%p, %p)\n", Context, Attribute); + + *Attribute = InternalGetNextAttribute(Context); + if (*Attribute == NULL) + { + return STATUS_END_OF_FILE; + } + + if (Context->CurrAttr->Type != AttributeAttributeList) + { + return STATUS_SUCCESS; + } + + Status = InternalReadNonResidentAttributes(Context); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + *Attribute = InternalGetNextAttribute(Context); + if (*Attribute == NULL) + { + return STATUS_END_OF_FILE; + } + + return STATUS_SUCCESS; +} + +VOID +FindCloseAttribute(PFIND_ATTR_CONTXT Context) +{ + if (Context->NonResidentStart != NULL) + { + ExFreePoolWithTag(Context->NonResidentStart, TAG_NTFS); + Context->NonResidentStart = NULL; + } +} static VOID @@ -341,27 +543,33 @@ NtfsDumpFileAttributes(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER FileRecord) { + NTSTATUS Status; + FIND_ATTR_CONTXT Context; PNTFS_ATTR_RECORD Attribute; - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); - while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->Type != AttributeEnd) + Status = FindFirstAttribute(&Context, Vcb, FileRecord, FALSE, &Attribute); + while (NT_SUCCESS(Status)) { NtfsDumpAttribute(Vcb, Attribute); - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); - } + Status = FindNextAttribute(&Context, &Attribute); + } + + FindCloseAttribute(&Context); } PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType) -{ +GetFileNameFromRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord, + UCHAR NameType) +{ + FIND_ATTR_CONTXT Context; PNTFS_ATTR_RECORD Attribute; PFILENAME_ATTRIBUTE Name; - - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); - while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->Type != AttributeEnd) + NTSTATUS Status; + + Status = FindFirstAttribute(&Context, Vcb, FileRecord, FALSE, &Attribute); + while (NT_SUCCESS(Status)) { if (Attribute->Type == AttributeFileName) { @@ -370,50 +578,57 @@ (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_WIN32) || (Name->NameType == NTFS_FILE_NAME_WIN32_AND_DOS && NameType == NTFS_FILE_NAME_DOS)) { + FindCloseAttribute(&Context); return Name; } } - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); - } - + Status = FindNextAttribute(&Context, &Attribute); + } + + FindCloseAttribute(&Context); return NULL; } PSTANDARD_INFORMATION -GetStandardInformationFromRecord(PFILE_RECORD_HEADER FileRecord) -{ +GetStandardInformationFromRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord) +{ + NTSTATUS Status; + FIND_ATTR_CONTXT Context; PNTFS_ATTR_RECORD Attribute; PSTANDARD_INFORMATION StdInfo; - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); - while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->Type != AttributeEnd) + Status = FindFirstAttribute(&Context, Vcb, FileRecord, FALSE, &Attribute); + while (NT_SUCCESS(Status)) { if (Attribute->Type == AttributeStandardInformation) { StdInfo = (PSTANDARD_INFORMATION)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + FindCloseAttribute(&Context); return StdInfo; } - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); - } - + Status = FindNextAttribute(&Context, &Attribute); + } + + FindCloseAttribute(&Context); return NULL; } PFILENAME_ATTRIBUTE -GetBestFileNameFromRecord(PFILE_RECORD_HEADER FileRecord) +GetBestFileNameFromRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord) { PFILENAME_ATTRIBUTE FileName; - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_POSIX); + FileName = GetFileNameFromRecord(Vcb, FileRecord, NTFS_FILE_NAME_POSIX); if (FileName == NULL) { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_WIN32); + FileName = GetFileNameFromRecord(Vcb, FileRecord, NTFS_FILE_NAME_WIN32); if (FileName == NULL) { - FileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); + FileName = GetFileNameFromRecord(Vcb, FileRecord, NTFS_FILE_NAME_DOS); } } Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -135,7 +135,7 @@ break; } - FileName = GetBestFileNameFromRecord(MftRecord); + FileName = GetBestFileNameFromRecord(DeviceExt, MftRecord); if (FileName == NULL) { DPRINT1("$FILE_NAME attribute not found for %I64x\n", Id); Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -73,7 +73,7 @@ DPRINT("NtfsGetNameInformation() called\n"); - FileName = GetBestFileNameFromRecord(FileRecord); + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); @@ -107,7 +107,7 @@ DPRINT("NtfsGetDirectoryInformation() called\n"); - FileName = GetBestFileNameFromRecord(FileRecord); + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); @@ -115,7 +115,7 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } - StdInfo = GetStandardInformationFromRecord(FileRecord); + StdInfo = GetStandardInformationFromRecord(DeviceExt, FileRecord); ASSERT(StdInfo != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -156,7 +156,7 @@ DPRINT("NtfsGetFullDirectoryInformation() called\n"); - FileName = GetBestFileNameFromRecord(FileRecord); + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); @@ -164,7 +164,7 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } - StdInfo = GetStandardInformationFromRecord(FileRecord); + StdInfo = GetStandardInformationFromRecord(DeviceExt, FileRecord); ASSERT(StdInfo != NULL); Length = FileName->NameLength * sizeof (WCHAR); @@ -206,16 +206,16 @@ DPRINT("NtfsGetBothDirectoryInformation() called\n"); - FileName = GetBestFileNameFromRecord(FileRecord); + FileName = GetBestFileNameFromRecord(DeviceExt, FileRecord); if (FileName == NULL) { DPRINT1("No name information for file ID: %#I64x\n", MFTIndex); NtfsDumpFileAttributes(DeviceExt, FileRecord); return STATUS_OBJECT_NAME_NOT_FOUND; } - ShortFileName = GetFileNameFromRecord(FileRecord, NTFS_FILE_NAME_DOS); - - StdInfo = GetStandardInformationFromRecord(FileRecord); + ShortFileName = GetFileNameFromRecord(DeviceExt, FileRecord, NTFS_FILE_NAME_DOS); + + StdInfo = GetStandardInformationFromRecord(DeviceExt, FileRecord); ASSERT(StdInfo != NULL); Length = FileName->NameLength * sizeof (WCHAR); Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -319,7 +319,7 @@ return NULL; } - FileName = GetFileNameFromRecord(MftRecord, NTFS_FILE_NAME_WIN32); + FileName = GetFileNameFromRecord(Vcb, MftRecord, NTFS_FILE_NAME_WIN32); if (!FileName) { ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -387,7 +387,7 @@ DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); - FileName = GetBestFileNameFromRecord(Record); + FileName = GetBestFileNameFromRecord(Vcb, Record); if (!FileName) { return STATUS_OBJECT_NAME_NOT_FOUND; // Not sure that's the best here @@ -428,7 +428,7 @@ rcFCB->RFCB.ValidDataLength.QuadPart = Size; rcFCB->RFCB.AllocationSize.QuadPart = AllocatedSize; - StdInfo = GetStandardInformationFromRecord(Record); + StdInfo = GetStandardInformationFromRecord(Vcb, Record); if (StdInfo != NULL) { rcFCB->Entry.FileAttributes |= StdInfo->FileAttribute; Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -22,6 +22,7 @@ * PURPOSE: NTFS filesystem driver * PROGRAMMERS: Eric Kohl * HervÃ© Poussineau (hpoussin(a)reactos.org) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -225,9 +226,10 @@ PFILE_STREAM_INFORMATION StreamInfo, PULONG BufferLength) { - NTSTATUS Status; ULONG CurrentSize; + FIND_ATTR_CONTXT Context; PNTFS_ATTR_RECORD Attribute; + NTSTATUS Status, BrowseStatus; PFILE_RECORD_HEADER FileRecord; PFILE_STREAM_INFORMATION CurrentInfo = StreamInfo, Previous = NULL; @@ -249,10 +251,8 @@ return Status; } - Status = STATUS_SUCCESS; - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); - while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->Type != AttributeEnd) + BrowseStatus = FindFirstAttribute(&Context, DeviceExt, FileRecord, FALSE, &Attribute); + while (NT_SUCCESS(BrowseStatus)) { if (Attribute->Type == AttributeData) { @@ -281,9 +281,10 @@ *BufferLength -= CurrentSize; } - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); - } - + BrowseStatus = FindNextAttribute(&Context, &Attribute); + } + + FindCloseAttribute(&Context); ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; } Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -570,6 +570,8 @@ PIO_STACK_LOCATION Stack; PNTFS_VOLUME_DATA_BUFFER DataBuffer; PNTFS_ATTR_RECORD Attribute; + FIND_ATTR_CONTXT Context; + NTSTATUS Status; DataBuffer = (PNTFS_VOLUME_DATA_BUFFER)Irp->AssociatedIrp.SystemBuffer; Stack = IoGetCurrentIrpStackLocation(Irp); @@ -595,9 +597,8 @@ DataBuffer->MftZoneStart.QuadPart = 0; // FIXME DataBuffer->MftZoneEnd.QuadPart = 0; // FIXME - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DeviceExt->MasterFileTable + DeviceExt->MasterFileTable->AttributeOffset); - while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)DeviceExt->MasterFileTable + DeviceExt->MasterFileTable->BytesInUse) && - Attribute->Type != AttributeEnd) + Status = FindFirstAttribute(&Context, DeviceExt, DeviceExt->MasterFileTable, FALSE, &Attribute); + while (NT_SUCCESS(Status)) { if (Attribute->Type == AttributeData) { @@ -607,8 +608,9 @@ break; } - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); - } + Status = FindNextAttribute(&Context, &Attribute); + } + FindCloseAttribute(&Context); Irp->IoStatus.Information = sizeof(NTFS_VOLUME_DATA_BUFFER); Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -79,95 +79,6 @@ } -PNTFS_ATTR_CONTEXT -FindAttributeHelper(PDEVICE_EXTENSION Vcb, - PNTFS_ATTR_RECORD AttrRecord, - PNTFS_ATTR_RECORD AttrRecordEnd, - ULONG Type, - PCWSTR Name, - ULONG NameLength) -{ - DPRINT("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); - - while (AttrRecord < AttrRecordEnd) - { - DPRINT("AttrRecord->Type = 0x%x\n", AttrRecord->Type); - - if (AttrRecord->Type == AttributeEnd) - break; - - if (AttrRecord->Type == AttributeAttributeList) - { - PNTFS_ATTR_CONTEXT Context; - PNTFS_ATTR_CONTEXT ListContext; - PVOID ListBuffer; - ULONGLONG ListSize; - PNTFS_ATTR_RECORD ListAttrRecord; - PNTFS_ATTR_RECORD ListAttrRecordEnd; - - ListContext = PrepareAttributeContext(AttrRecord); - - ListSize = AttributeDataLength(&ListContext->Record); - if(ListSize <= 0xFFFFFFFF) - ListBuffer = ExAllocatePoolWithTag(NonPagedPool, (ULONG)ListSize, TAG_NTFS); - else - ListBuffer = NULL; - - if(!ListBuffer) - { - DPRINT("Failed to allocate memory: %x\n", (ULONG)ListSize); - continue; - } - - ListAttrRecord = (PNTFS_ATTR_RECORD)ListBuffer; - ListAttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)ListBuffer + ListSize); - - if (ReadAttribute(Vcb, ListContext, 0, ListBuffer, (ULONG)ListSize) == ListSize) - { - Context = FindAttributeHelper(Vcb, ListAttrRecord, ListAttrRecordEnd, - Type, Name, NameLength); - - ReleaseAttributeContext(ListContext); - ExFreePoolWithTag(ListBuffer, TAG_NTFS); - - if (Context != NULL) - { - if (AttrRecord->IsNonResident) DPRINT("Found context = %p\n", Context); - return Context; - } - } - } - - if (AttrRecord->Type == Type) - { - if (AttrRecord->NameLength == NameLength) - { - PWCHAR AttrName; - - AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); - DPRINT("%.*S, %.*S\n", AttrRecord->NameLength, AttrName, NameLength, Name); - if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) - { - /* Found it, fill up the context and return. */ - DPRINT("Found context\n"); - return PrepareAttributeContext(AttrRecord); - } - } - } - - if (AttrRecord->Length == 0) - { - DPRINT("Null length attribute record\n"); - return NULL; - } - AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)AttrRecord + AttrRecord->Length); - } - - DPRINT("Ended\n"); - return NULL; -} - - NTSTATUS FindAttribute(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, @@ -176,21 +87,36 @@ ULONG NameLength, PNTFS_ATTR_CONTEXT * AttrCtx) { - PNTFS_ATTR_RECORD AttrRecord; - PNTFS_ATTR_RECORD AttrRecordEnd; + NTSTATUS Status; + FIND_ATTR_CONTXT Context; + PNTFS_ATTR_RECORD Attribute; DPRINT("FindAttribute(%p, %p, 0x%x, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); - AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributeOffset); - AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Vcb->NtfsInfo.BytesPerFileRecord); - - *AttrCtx = FindAttributeHelper(Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); - if (*AttrCtx == NULL) - { - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - return STATUS_SUCCESS; + Status = FindFirstAttribute(&Context, Vcb, MftRecord, FALSE, &Attribute); + while (NT_SUCCESS(Status)) + { + if (Attribute->Type == Type && Attribute->NameLength == NameLength) + { + PWCHAR AttrName; + + AttrName = (PWCHAR)((PCHAR)Attribute + Attribute->NameOffset); + DPRINT("%.*S, %.*S\n", Attribute->NameLength, AttrName, NameLength, Name); + if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) + { + /* Found it, fill up the context and return. */ + DPRINT("Found context\n"); + *AttrCtx = PrepareAttributeContext(Attribute); + FindCloseAttribute(&Context); + return STATUS_SUCCESS; + } + } + + Status = FindNextAttribute(&Context, &Attribute); + } + + FindCloseAttribute(&Context); + return STATUS_OBJECT_NAME_NOT_FOUND; } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -462,6 +462,17 @@ } NTFS_FCB, *PNTFS_FCB; +typedef struct _FIND_ATTR_CONTXT +{ + PDEVICE_EXTENSION Vcb; + BOOLEAN OnlyResident; + PNTFS_ATTR_RECORD FirstAttr; + PNTFS_ATTR_RECORD CurrAttr; + PNTFS_ATTR_RECORD LastAttr; + PNTFS_ATTR_RECORD NonResidentStart; + PNTFS_ATTR_RECORD NonResidentEnd; +} FIND_ATTR_CONTXT, *PFIND_ATTR_CONTXT; + extern PNTFS_GLOBAL_DATA NtfsGlobalData; FORCEINLINE @@ -487,16 +498,35 @@ ULONGLONG *DataRunLength); VOID -NtfsDumpFileAttributes(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER FileRecord); +NtfsDumpFileAttributes(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord); PSTANDARD_INFORMATION -GetStandardInformationFromRecord(PFILE_RECORD_HEADER FileRecord); +GetStandardInformationFromRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord); PFILENAME_ATTRIBUTE -GetFileNameFromRecord(PFILE_RECORD_HEADER FileRecord, UCHAR NameType); +GetFileNameFromRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord, + UCHAR NameType); PFILENAME_ATTRIBUTE -GetBestFileNameFromRecord(PFILE_RECORD_HEADER FileRecord); +GetBestFileNameFromRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord); + +NTSTATUS +FindFirstAttribute(PFIND_ATTR_CONTXT Context, + PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord, + BOOLEAN OnlyResident, + PNTFS_ATTR_RECORD * Attribute); + +NTSTATUS +FindNextAttribute(PFIND_ATTR_CONTXT Context, + PNTFS_ATTR_RECORD * Attribute); + +VOID +FindCloseAttribute(PFIND_ATTR_CONTXT Context); /* blockdev.c */ Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Wed Aug 26 18:20:04 2015 @@ -98,13 +98,14 @@ Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Fcb->Stream, wcslen(Fcb->Stream), &DataContext); if (!NT_SUCCESS(Status)) { + NTSTATUS BrowseStatus; + FIND_ATTR_CONTXT Context; PNTFS_ATTR_RECORD Attribute; DPRINT1("No '%S' data stream associated with file!\n", Fcb->Stream); - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); - while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->Type != AttributeEnd) + BrowseStatus = FindFirstAttribute(&Context, DeviceExt, FileRecord, FALSE, &Attribute); + while (NT_SUCCESS(BrowseStatus)) { if (Attribute->Type == AttributeData) { @@ -116,8 +117,9 @@ DPRINT1("Data stream: '%wZ' available\n", &Name); } - Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); - } + BrowseStatus = FindNextAttribute(&Context, &Attribute); + } + FindCloseAttribute(&Context); ReleaseAttributeContext(DataContext); ExFreePoolWithTag(FileRecord, TAG_NTFS);

10 years

[dquintana] 68828: [SHELL32] * Fix loading icon info from dekstop.ini. Also took the chance to remove some unnecessary convolution. The old code tried to load the info, but didn't actually make use...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Aug 26 17:31:42 2015 New Revision: 68828 URL: http://svn.reactos.org/svn/reactos?rev=68828&view=rev Log: [SHELL32] * Fix loading icon info from dekstop.ini. Also took the chance to remove some unnecessary convolution. The old code tried to load the info, but didn't actually make use of the returned string at all. CORE-9002 #resolve #comment Icon loading should work now. Adding the default desktop.ini files in the right folders will be a followup issue. Modified: trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp 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] Wed Aug 26 17:31:42 2015 @@ -27,64 +27,58 @@ static HRESULT getIconLocationForFolder(LPCITEMIDLIST pidl, UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { - int icon_idx; - bool cont=TRUE; - WCHAR wszPath[MAX_PATH]; - WCHAR wszCLSIDValue[CHARS_IN_GUID]; static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; static const WCHAR iconFile[] = { 'I', 'c', 'o', 'n', 'F', 'i', 'l', 'e', 0 }; static const WCHAR clsid[] = { 'C', 'L', 'S', 'I', 'D', 0 }; static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I', 'D', '2', 0 }; static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; - - /* - Optimisation. GetCustomFolderAttribute has a critical lock on it, and isn't fast. - Test the water (i.e., see if the attribute exists) before questioning it three times - when most folders don't use it at all. - */ - WCHAR wszBigToe[3]; - if (!(uFlags & GIL_DEFAULTICON) && SHELL32_GetCustomFolderAttributes(pidl, shellClassInfo, - wszBigToe, 3)) - { - if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile, - wszPath, MAX_PATH)) - { - WCHAR wszIconIndex[10]; - SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex, - wszIconIndex, 10); - *piIndex = _wtoi(wszIconIndex); - cont=FALSE; - } - else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid, - wszCLSIDValue, CHARS_IN_GUID) && + static const WCHAR wszDesktopIni[] = { 'd','e','s','k','t','o','p','.','i','n','i',0 }; + int icon_idx; + WCHAR wszFolderPath[MAX_PATH]; + + if (!SHGetPathFromIDListW(pidl, wszFolderPath)) + return FALSE; + + PathAppendW(wszFolderPath, wszDesktopIni); + + if (!(uFlags & GIL_DEFAULTICON) && PathFileExistsW(wszFolderPath)) + { + WCHAR wszPath[MAX_PATH]; + WCHAR wszCLSIDValue[CHARS_IN_GUID]; + + if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) + { + ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); + + *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) { *piIndex = icon_idx; - cont=FALSE; - } - else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2, - wszCLSIDValue, CHARS_IN_GUID) && + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) { *piIndex = icon_idx; - cont=FALSE; - } - } - if (cont) - { - static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; - - if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, &icon_idx)) - { - lstrcpynW(szIconFile, swShell32Name, cchMax); - icon_idx = -IDI_SHELL_FOLDER; - } - - if (uFlags & GIL_OPENICON) - *piIndex = icon_idx < 0 ? icon_idx - 1 : icon_idx + 1; - else - *piIndex = icon_idx; - } + return S_OK; + } + } + + static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; + + if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, &icon_idx)) + { + lstrcpynW(szIconFile, swShell32Name, cchMax); + icon_idx = -IDI_SHELL_FOLDER; + } + + if (uFlags & GIL_OPENICON) + *piIndex = icon_idx < 0 ? icon_idx - 1 : icon_idx + 1; + else + *piIndex = icon_idx; return S_OK; } 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] Wed Aug 26 17:31:42 2015 @@ -35,9 +35,6 @@ #define GET_SHGDN_FOR(dwFlags) ((DWORD)dwFlags & (DWORD)0x0000FF00) #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) - -BOOL SHELL32_GetCustomFolderAttribute (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPCWSTR pwszAttribute, LPWSTR pwszValue, DWORD cchValue); -BOOL SHELL32_GetCustomFolderAttributes (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPWSTR pwszValue, DWORD cchValue); LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut); HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, 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] Wed Aug 26 17:31:42 2015 @@ -25,16 +25,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -static const WCHAR wszDotShellClassInfo[] = { - '.','S','h','e','l','l','C','l','a','s','s','I','n','f','o',0}; - /*************************************************************************** - * SHELL32_GetCustomFolderAttribute (internal function) + * SHELL32_GetCustomFolderAttributeFromPath (internal function) * * Gets a value from the folder's desktop.ini file, if one exists. * * PARAMETERS - * pidl [I] Folder containing the desktop.ini file. + * pwszFolderPath[I] Folder containing the desktop.ini file. * pwszHeading [I] Heading in .ini file. * pwszAttribute [I] Attribute in .ini file. * pwszValue [O] Buffer to store value into. @@ -58,54 +55,6 @@ return GetPrivateProfileStringW(pwszHeading, pwszAttribute, wszDefault, pwszValue, cchValue, pwszFolderPath); } - -BOOL SHELL32_GetCustomFolderAttribute( - LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPCWSTR pwszAttribute, - LPWSTR pwszValue, DWORD cchValue) -{ - DWORD dwAttrib = FILE_ATTRIBUTE_SYSTEM; - WCHAR wszFolderPath[MAX_PATH]; - - /* Hack around not having system attribute on non-Windows file systems */ - if (0) - dwAttrib = _ILGetFileAttributes(pidl, NULL, 0); - - if (dwAttrib & FILE_ATTRIBUTE_SYSTEM) - { - if (!SHGetPathFromIDListW(pidl, wszFolderPath)) - return FALSE; - - return SHELL32_GetCustomFolderAttributeFromPath(wszFolderPath, pwszHeading, - pwszAttribute, pwszValue, cchValue); - } - return FALSE; -} - -BOOL SHELL32_GetCustomFolderAttributes( - LPCITEMIDLIST pidl, LPCWSTR pwszHeading, - LPWSTR pwszValue, DWORD cchValue) -{ - DWORD dwAttrib = FILE_ATTRIBUTE_SYSTEM; - WCHAR wszFolderPath[MAX_PATH]; - - /* Hack around not having system attribute on non-Windows file systems */ - dwAttrib = _ILGetFileAttributes(pidl, NULL, 0); - - if (dwAttrib & FILE_ATTRIBUTE_SYSTEM) - { - if (!SHGetPathFromIDListW(pidl, wszFolderPath)) - return FALSE; - - static const WCHAR wszDesktopIni[] = - {'d','e','s','k','t','o','p','.','i','n','i',0}; - - PathAddBackslashW(wszFolderPath); - PathAppendW(wszFolderPath, wszDesktopIni); - return GetPrivateProfileSectionW(pwszHeading, pwszValue, cchValue, wszFolderPath); - } - return FALSE; -} - /*************************************************************************** * GetNextElement (internal function) @@ -276,6 +225,9 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut) { + static const WCHAR wszDotShellClassInfo[] = { + '.','S','h','e','l','l','C','l','a','s','s','I','n','f','o',0 }; + GUID const *clsid; CComPtr<IShellFolder> pSF; HRESULT hr;

10 years

[hbelusca] 68827: [NTVDM] - Towards a complete fix of VGA console attach/detach: a lot of progress is made but few little things need to be checked/adjusted. - Fix text scroll (at least in text mod...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 26 01:26:33 2015 New Revision: 68827 URL: http://svn.reactos.org/svn/reactos?rev=68827&view=rev Log: [NTVDM] - Towards a complete fix of VGA console attach/detach: a lot of progress is made but few little things need to be checked/adjusted. - Fix text scroll (at least in text modes) by doing guest-to-guest moves, using the EmulatorCopyMemory function introduced in r68826. - Fix the computation of the screen rows/columns values stored in the BDA, in graphics modes (in addition to the change of r68090), by dividing the graphics resolution by the character heights & widths. Correct values are indeed needed by some programs, eg. QBasic (I also add a CharacterWidth; normally it should be computable using the CRTC registers, and is always == 8 or 9, but still...). Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Wed Aug 26 01:26:33 2015 @@ -1937,32 +1937,33 @@ { PVGA_REGISTERS VgaRegisters; WORD PageSize; + WORD CharacterWidth; WORD CharacterHeight; // PCOLORREF Palette; } VGA_MODE, *PVGA_MODE; static CONST VGA_MODE VideoModes[BIOS_MAX_VIDEO_MODE + 1] = { - {&VideoMode_40x25_text, 0x0800, 16}, /* Mode 00h - 16 color (mono) */ - {&VideoMode_40x25_text, 0x0800, 16}, /* Mode 01h - 16 color */ - {&VideoMode_80x25_text, 0x1000, 16}, /* Mode 02h - 16 color (mono) */ - {&VideoMode_80x25_text, 0x1000, 16}, /* Mode 03h - 16 color */ - {&VideoMode_320x200_4color, 0x4000, 8}, /* Mode 04h - CGA 4 color */ - {&VideoMode_320x200_4color, 0x4000, 8}, /* Mode 05h - CGA same (m) (uses 3rd CGA palette) */ - {&VideoMode_640x200_2color, 0x4000, 8}, /* Mode 06h - CGA 640*200 2 color */ - {NULL, 0x1000, 0}, /* Mode 07h - MDA monochrome text 80*25 */ - {NULL, 0x0000, 0}, /* Mode 08h - PCjr */ - {NULL, 0x0000, 0}, /* Mode 09h - PCjr */ - {NULL, 0x0000, 0}, /* Mode 0Ah - PCjr */ - {NULL, 0x0000, 0}, /* Mode 0Bh - Reserved */ - {NULL, 0x0000, 0}, /* Mode 0Ch - Reserved */ - {&VideoMode_320x200_16color, 0x2000, 8}, /* Mode 0Dh - EGA 320*200 16 color */ - {&VideoMode_640x200_16color, 0x4000, 8}, /* Mode 0Eh - EGA 640*200 16 color */ - {NULL, 0x8000, 0}, /* Mode 0Fh - EGA 640*350 mono */ - {&VideoMode_640x350_16color, 0x8000, 14}, /* Mode 10h - EGA 640*350 HiRes 16 color */ - {&VideoMode_640x480_2color, 0xA000, 16}, /* Mode 11h - VGA 640*480 mono */ - {&VideoMode_640x480_16color, 0xA000, 16}, /* Mode 12h - VGA */ - {&VideoMode_320x200_256color, 0x2000, 8}, /* Mode 13h - VGA */ + {&VideoMode_40x25_text, 0x0800, 9, 16}, /* Mode 00h - 16 color (mono) */ + {&VideoMode_40x25_text, 0x0800, 9, 16}, /* Mode 01h - 16 color */ + {&VideoMode_80x25_text, 0x1000, 9, 16}, /* Mode 02h - 16 color (mono) */ + {&VideoMode_80x25_text, 0x1000, 9, 16}, /* Mode 03h - 16 color */ + {&VideoMode_320x200_4color, 0x4000, 8, 8}, /* Mode 04h - CGA 4 color */ + {&VideoMode_320x200_4color, 0x4000, 8, 8}, /* Mode 05h - CGA same (m) (uses 3rd CGA palette) */ + {&VideoMode_640x200_2color, 0x4000, 8, 8}, /* Mode 06h - CGA 640*200 2 color */ + {NULL, 0x1000, 1, 1}, /* Mode 07h - MDA monochrome text 80*25 */ + {NULL, 0x0000, 1, 1}, /* Mode 08h - PCjr */ + {NULL, 0x0000, 1, 1}, /* Mode 09h - PCjr */ + {NULL, 0x0000, 1, 1}, /* Mode 0Ah - PCjr */ + {NULL, 0x0000, 1, 1}, /* Mode 0Bh - Reserved */ + {NULL, 0x0000, 1, 1}, /* Mode 0Ch - Reserved */ + {&VideoMode_320x200_16color, 0x2000, 8, 8}, /* Mode 0Dh - EGA 320*200 16 color */ + {&VideoMode_640x200_16color, 0x4000, 8, 8}, /* Mode 0Eh - EGA 640*200 16 color */ + {NULL, 0x8000, 1, 1}, /* Mode 0Fh - EGA 640*350 mono */ + {&VideoMode_640x350_16color, 0x8000, 8, 14}, /* Mode 10h - EGA 640*350 HiRes 16 color */ + {&VideoMode_640x480_2color, 0xA000, 8, 16}, /* Mode 11h - VGA 640*480 mono */ + {&VideoMode_640x480_16color, 0xA000, 8, 16}, /* Mode 12h - VGA */ + {&VideoMode_320x200_256color, 0x2000, 8, 8}, /* Mode 13h - VGA */ }; #define IS_TEXT_MODE(ModeNumber) \ @@ -2021,10 +2022,10 @@ /* Move text lines up */ for (i = Rectangle.Top + Amount; i <= Rectangle.Bottom; i++) { - EmulatorWriteMemory(&EmulatorContext, - VideoAddress + ((i - Amount) * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD), - REAL_TO_PHYS(VideoAddress + ( i * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD)), - (Rectangle.Right - Rectangle.Left + 1) * sizeof(WORD)); + EmulatorCopyMemory(&EmulatorContext, + VideoAddress + ((i - Amount) * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD), + VideoAddress + ( i * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD), + (Rectangle.Right - Rectangle.Left + 1) * sizeof(WORD)); } /* Fill the bottom of the rectangle */ @@ -2049,10 +2050,10 @@ /* Move text lines down */ for (i = Rectangle.Bottom - Amount; i >= Rectangle.Top; i--) { - EmulatorWriteMemory(&EmulatorContext, - VideoAddress + ((i + Amount) * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD), - REAL_TO_PHYS(VideoAddress + ( i * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD)), - (Rectangle.Right - Rectangle.Left + 1) * sizeof(WORD)); + EmulatorCopyMemory(&EmulatorContext, + VideoAddress + ((i + Amount) * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD), + VideoAddress + ( i * Bda->ScreenColumns + Rectangle.Left) * sizeof(WORD), + (Rectangle.Right - Rectangle.Left + 1) * sizeof(WORD)); } /* Fill the top of the rectangle */ @@ -2076,10 +2077,10 @@ /* Move text lines left */ for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) { - EmulatorWriteMemory(&EmulatorContext, - VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left ) * sizeof(WORD), - REAL_TO_PHYS(VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left + Amount) * sizeof(WORD)), - (Rectangle.Right - Rectangle.Left - Amount + 1) * sizeof(WORD)); + EmulatorCopyMemory(&EmulatorContext, + VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left ) * sizeof(WORD), + VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left + Amount) * sizeof(WORD), + (Rectangle.Right - Rectangle.Left - Amount + 1) * sizeof(WORD)); } /* Fill the right of the rectangle */ @@ -2099,19 +2100,21 @@ case SCROLL_RIGHT: { + INT Right; + /* Move text lines right */ for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) { - EmulatorWriteMemory(&EmulatorContext, - VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left + Amount) * sizeof(WORD), - REAL_TO_PHYS(VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left ) * sizeof(WORD)), - (Rectangle.Right - Rectangle.Left - Amount + 1) * sizeof(WORD)); + EmulatorCopyMemory(&EmulatorContext, + VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left + Amount) * sizeof(WORD), + VideoAddress + (i * Bda->ScreenColumns + Rectangle.Left ) * sizeof(WORD), + (Rectangle.Right - Rectangle.Left - Amount + 1) * sizeof(WORD)); } /* Fill the left of the rectangle */ + Right = Rectangle.Left + Amount - 1; for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) { - INT Right = Rectangle.Left + Amount - 1; for (j = Rectangle.Left; j <= Right; j++) { EmulatorWriteMemory(&EmulatorContext, @@ -2372,11 +2375,11 @@ IOWriteB(VGA_CRTC_DATA , LOBYTE(CursorStartEnd)); } -VOID VidBiosSyncCursorPosition(VOID) +static VOID VidBiosSyncCursorPosition(VOID) { BYTE Row, Column; BYTE Low, High; - SHORT ScreenColumns = VgaGetDisplayResolution().X; + SHORT ScreenColumns = Bda->ScreenColumns; WORD Offset; /* Get the cursor position */ @@ -2493,11 +2496,15 @@ /* Update the screen size */ Resolution = VgaGetDisplayResolution(); + // This could be simplified if the VGA helper always returned the resolution + // in number of pixels, instead of in number of cells for text-modes only... + if (!IS_TEXT_MODE(ModeNumber)) + { + Resolution.X /= VideoModes[ModeNumber].CharacterWidth ; + Resolution.Y /= VideoModes[ModeNumber].CharacterHeight; + } Bda->ScreenColumns = Resolution.X; Bda->ScreenRows = Resolution.Y - 1; - - /* Adjust the number of columns for graphics modes */ - if (!IS_TEXT_MODE(ModeNumber)) Bda->ScreenColumns >>= 3; /* Update the current font */ Bda->CharacterHeight = VideoModes[ModeNumber].CharacterHeight; @@ -2592,7 +2599,7 @@ * but we update the cursor position on the VGA side). */ VidBiosGetCursorPosition(&Row, &Column, PageNumber); - VidBiosSetCursorPosition(Row, Column, PageNumber); + VidBiosSetCursorPosition( Row, Column, PageNumber); return TRUE; } @@ -2814,11 +2821,11 @@ WORD i, j; PUCHAR Font = (PUCHAR)FAR_POINTER(((PULONG)BaseAddress)[0x43]); PUCHAR Glyph = &Font[LOBYTE(CharData) * Bda->CharacterHeight]; - BYTE PixelBuffer[8]; + BYTE PixelBuffer[8]; // 8 == CharacterWidth for (i = 0; i < Bda->CharacterHeight; i++) { - for (j = 0; j < 8; j++) + for (j = 0; j < ARRAYSIZE(PixelBuffer); j++) { PixelBuffer[j] = (Glyph[i] & (1 << (7 - j))) ? HIBYTE(CharData) : 0; } @@ -2826,7 +2833,7 @@ EmulatorWriteMemory(&EmulatorContext, TO_LINEAR(GRAPHICS_VIDEO_SEG, ((Row * Bda->CharacterHeight + i) - * Bda->ScreenColumns + Column) << 3), + * Bda->ScreenColumns + Column) * 8), (LPVOID)PixelBuffer, sizeof(PixelBuffer)); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] Wed Aug 26 01:26:33 2015 @@ -104,8 +104,6 @@ /* FUNCTIONS ******************************************************************/ -VOID VidBiosSyncCursorPosition(VOID); - VOID WINAPI VidBiosVideoService(LPWORD Stack); VOID VidBiosDetachFromConsole(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Wed Aug 26 01:26:33 2015 @@ -455,7 +455,6 @@ VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_LOW_REG] = LOBYTE(Offset); VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_HIGH_REG] = HIBYTE(Offset); - // VidBiosSyncCursorPosition(); VgaUpdateTextCursor(); } @@ -519,13 +518,14 @@ ASSERT(CharBuff); #endif - /* - * Resize the console - */ + /* Retrieve the latest console information */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); + + /* Resize the console */ ConRect.Left = 0; - ConRect.Top = ConsoleInfo.srWindow.Top; ConRect.Right = ConRect.Left + Resolution->X - 1; - ConRect.Bottom = ConRect.Top + Resolution->Y - 1; + ConRect.Bottom = max(ConsoleInfo.dwCursorPosition.Y, Resolution->Y - 1); + ConRect.Top = ConRect.Bottom - Resolution->Y + 1; /* * Use this trick to effectively resize the console buffer and window, * because: @@ -534,9 +534,13 @@ * - SetConsoleWindowInfo fails if the new console window size is larger * than the current console screen buffer size. */ - SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); - SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); - SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + DPRINT1("(attach) SetConsoleScreenBufferSize(1) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + DPRINT1("(attach) SetConsoleWindowInfo %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + DPRINT1("(attach) SetConsoleScreenBufferSize(2) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + /* Update the saved console information */ GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); @@ -544,14 +548,11 @@ * Copy console data into VGA memory */ - /* Get the data */ - AddressSize = VgaGetAddressSize(); + /* Read the data from the console into the framebuffer... */ ConRect.Left = ConRect.Top = 0; ConRect.Right = TextResolution.X; ConRect.Bottom = TextResolution.Y; - ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; - - /* Read the data from the console into the framebuffer... */ + ReadConsoleOutputA(TextConsoleBuffer, CharBuff, TextResolution, @@ -559,6 +560,8 @@ &ConRect); /* ... and copy the framebuffer into the VGA memory */ + AddressSize = VgaGetAddressSize(); + ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; /* Loop through the scanlines */ for (i = 0; i < TextResolution.Y; i++) @@ -1058,6 +1061,7 @@ static BOOL VgaEnterTextMode(PCOORD Resolution) { /* Switch to the text buffer */ + // FIXME: Wouldn't it be preferrable to switch to it AFTER we reset everything?? VgaSetActiveScreenBuffer(TextConsoleBuffer); /* Adjust the text framebuffer if we changed the resolution */ @@ -1067,8 +1071,8 @@ VgaDetachFromConsoleInternal(); /* - * VgaAttachToConsoleInternal sets TextResolution to the - * new resolution and updates ConsoleInfo. + * VgaAttachToConsoleInternal sets TextResolution + * to the new resolution and updates ConsoleInfo. */ if (!VgaAttachToConsoleInternal(Resolution)) { @@ -1126,6 +1130,9 @@ { goto Quit; } + + // FIXME: Wouldn't it be preferrable to switch to the new console SB + // *ONLY* if we succeeded in setting the new mode?? /* Leave the current video mode */ if (ScreenMode == GRAPHICS_MODE) @@ -1495,7 +1502,7 @@ { /* Hidden cursor */ CursorInfo.bVisible = FALSE; - CursorInfo.dwSize = 1; // The size needs to be non-null in order SetConsoleCursorInfo to succeed. + CursorInfo.dwSize = 1; // The size needs to be non-zero for SetConsoleCursorInfo to succeed. } /* Add the cursor skew to the location */ @@ -2315,8 +2322,8 @@ // VgaDetachFromConsoleInternal(); /* - * VgaAttachToConsoleInternal sets TextResolution to the - * new resolution and updates ConsoleInfo. + * VgaAttachToConsoleInternal sets TextResolution + * to the new resolution and updates ConsoleInfo. */ if (!VgaAttachToConsoleInternal(&TextResolution)) { @@ -2347,6 +2354,8 @@ VOID VgaDetachFromConsole(VOID) { + BOOL Success; + SMALL_RECT ConRect; VgaDetachFromConsoleInternal(); @@ -2361,23 +2370,33 @@ OldConsoleFramebuffer = ConsoleFramebuffer; ConsoleFramebuffer = NULL; + /* Restore the original console size */ + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; + ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; + /* See the following trick explanation in VgaAttachToConsoleInternal */ + Success = SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); + DPRINT1("(detach) SetConsoleScreenBufferSize(1) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + DPRINT1("(detach) SetConsoleWindowInfo %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + Success = SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); + DPRINT1("(detach) SetConsoleScreenBufferSize(2) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + + /* Restore the original cursor shape */ + SetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo); + + // FIXME: Should we copy back the screen data to the screen buffer?? + // WriteConsoleOutputA(...); + + // FIXME: Should we change cursor POSITION?? + // VgaUpdateTextCursor(); + + ///* Update the physical cursor */ + //SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo); + //SetConsoleCursorPosition(TextConsoleBuffer, Position /*OrgConsoleBufferInfo.dwCursorPosition*/); + /* Restore the old text-mode screen buffer */ VgaSetActiveScreenBuffer(TextConsoleBuffer); - - /* Restore the original console size */ - ConRect.Left = 0; - ConRect.Top = 0; - ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; - ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; - /* - * See the following trick explanation in VgaAttachToConsoleInternal. - */ - SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); - SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - - /* Restore the original cursor shape */ - SetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo); } BOOLEAN VgaInitialize(HANDLE TextHandle) @@ -2395,10 +2414,10 @@ ConsoleInfo = OrgConsoleBufferInfo; /* Clear the SEQ, GC, CRTC and AC registers */ - RtlZeroMemory(VgaSeqRegisters, sizeof(VgaSeqRegisters)); - RtlZeroMemory(VgaGcRegisters, sizeof(VgaGcRegisters)); + RtlZeroMemory(VgaSeqRegisters , sizeof(VgaSeqRegisters )); + RtlZeroMemory(VgaGcRegisters , sizeof(VgaGcRegisters )); RtlZeroMemory(VgaCrtcRegisters, sizeof(VgaCrtcRegisters)); - RtlZeroMemory(VgaAcRegisters, sizeof(VgaAcRegisters)); + RtlZeroMemory(VgaAcRegisters , sizeof(VgaAcRegisters )); /* Initialize the VGA palette and fail if it isn't successfully created */ if (!VgaInitializePalette()) return FALSE;

10 years

[hbelusca] 68826: [NTVDM] Introduce a function for doing guest-to-guest memory copies (given here in a temporary implementation until a proper one is developed). It will be used in my next commit.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 26 00:37:50 2015 New Revision: 68826 URL: http://svn.reactos.org/svn/reactos?rev=68826&view=rev Log: [NTVDM] Introduce a function for doing guest-to-guest memory copies (given here in a temporary implementation until a proper one is developed). It will be used in my next commit. Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Wed Aug 26 00:37:50 2015 @@ -109,9 +109,7 @@ #endif } -static -inline -VOID +static inline VOID ReadPage(PMEM_HOOK Hook, ULONG Address, PVOID Buffer, ULONG Size) { if (Hook && !Hook->hVdd && Hook->FastReadHandler) @@ -122,9 +120,7 @@ MemFastMoveMemory(Buffer, REAL_TO_PHYS(Address), Size); } -static -inline -VOID +static inline VOID WritePage(PMEM_HOOK Hook, ULONG Address, PVOID Buffer, ULONG Size) { if (!Hook @@ -213,6 +209,62 @@ Buffer = (PVOID)((ULONG_PTR)Buffer + Length); } } +} + +VOID FASTCALL EmulatorCopyMemory(PFAST486_STATE State, ULONG DestAddress, ULONG SrcAddress, ULONG Size) +{ + /* + * Guest-to-guest memory copy + */ + + // FIXME: This is a temporary implementation of a more useful functionality + // which should be a merge of EmulatorReadMemory & EmulatorWriteMemory without + // any local external buffer. + // NOTE: Process heap is by default serialized (unless one specifies it shouldn't). + static BYTE StaticBuffer[8192]; // Smallest static buffer we can use. + static PVOID HeapBuffer = NULL; // Always-growing heap buffer. Use it in case StaticBuffer is too small. + static ULONG HeapBufferSize = 0; + PVOID LocalBuffer; // Points to either StaticBuffer or HeapBuffer + + if (Size <= sizeof(StaticBuffer)) + { + /* Use the static buffer */ + LocalBuffer = StaticBuffer; + } + else if (/* sizeof(StaticBuffer) <= Size && */ Size <= HeapBufferSize) + { + /* Use the heap buffer */ + ASSERT(HeapBufferSize > 0 && HeapBuffer != NULL); + LocalBuffer = HeapBuffer; + } + else // if (Size > HeapBufferSize) + { + /* Enlarge the heap buffer and use it */ + + if (HeapBuffer == NULL) + { + /* First allocation */ + LocalBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + } + else + { + /* Reallocation */ + LocalBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), 0 /* HEAP_GENERATE_EXCEPTIONS */, HeapBuffer, Size); + } + ASSERT(LocalBuffer != NULL); // We must succeed! TODO: Handle it more properly. + HeapBuffer = LocalBuffer; // HeapBuffer is now reallocated. + HeapBufferSize = Size; + } + + /* Perform memory copy */ + EmulatorReadMemory( State, SrcAddress , LocalBuffer, Size); + EmulatorWriteMemory(State, DestAddress, LocalBuffer, Size); + + // if (LocalBuffer != StaticBuffer) + // RtlFreeHeap(RtlGetProcessHeap(), 0, LocalBuffer); + + // Note that we don't free HeapBuffer since it's an always-growing buffer. + // It is freed when NTVDM termiantes. } VOID EmulatorSetA20(BOOLEAN Enabled) Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Wed Aug 26 00:37:50 2015 @@ -55,6 +55,16 @@ ULONG Size ); +VOID +FASTCALL +EmulatorCopyMemory +( + PFAST486_STATE State, + ULONG DestAddress, + ULONG SrcAddress, + ULONG Size +); + VOID EmulatorSetA20(BOOLEAN Enabled); BOOLEAN EmulatorGetA20(VOID);

10 years

← Newer
1
2
3
4
5
6
7
8
9
...
31
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 2015