Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[ssawant] 75231: [QCKLNCH] -Created menu resource in qcklnch.rc -Added resource.h to manage menu resources and all. -Added IContextMenu. -Implemented QueryContextMenu and stubbed other methods. -Ha...

by ssawant＠svn.reactos.org

Author: ssawant Date: Thu Jun 29 12:23:13 2017 New Revision: 75231 URL: http://svn.reactos.org/svn/reactos?rev=75231&view=rev Log: [QCKLNCH] -Created menu resource in qcklnch.rc -Added resource.h to manage menu resources and all. -Added IContextMenu. -Implemented QueryContextMenu and stubbed other methods. -Handled WM_RBUTTONUP for folder context menus. -Minor code corrections. -Tested working of some menu functions in winXP VM, though further testing is required. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h (with props) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Thu Jun 29 12:23:13 2017 @@ -41,6 +41,54 @@ return 0; } +LRESULT CISFBand::OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + HRESULT hr; + CComPtr<IContextMenu> picm; + HMENU fmenu = CreatePopupMenu(); + TBBUTTON tb; + POINT pt; + DWORD pos = GetMessagePos(); + pt.x = GET_X_LPARAM(pos); + pt.y = GET_Y_LPARAM(pos); + ScreenToClient(&pt); + + int index = SendMessage(m_hWndTb, TB_HITTEST, 0, (LPARAM)&pt); + bool chk = SendMessage(m_hWndTb, TB_GETBUTTON, abs(index), (LPARAM)&tb); + LPITEMIDLIST pidl = (LPITEMIDLIST)tb.dwData; + + if (chk) + { + ClientToScreen(&pt); + hr = m_pISF->GetUIObjectOf(m_hWndTb, 1, &pidl, IID_IContextMenu, NULL, (void**)&picm); + hr = picm->QueryContextMenu(fmenu, 0, 1, 0x7FFF, CMF_DEFAULTONLY); + int id = TrackPopupMenuEx(fmenu, TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RETURNCMD, pt.x, pt.y, m_hWndTb, 0); + if (id > 0) + { + CMINVOKECOMMANDINFOEX info = { 0 }; + info.cbSize = sizeof(info); + info.fMask = CMIC_MASK_UNICODE | CMIC_MASK_PTINVOKE; + if (GetKeyState(VK_CONTROL) < 0) + { + info.fMask |= CMIC_MASK_CONTROL_DOWN; + } + if (GetKeyState(VK_SHIFT) < 0) + { + info.fMask |= CMIC_MASK_SHIFT_DOWN; + } + info.hwnd = m_hWndTb; + info.lpVerb = MAKEINTRESOURCEA(id - 1); + info.lpVerbW = MAKEINTRESOURCEW(id - 0x7FFF); + info.nShow = SW_SHOWNORMAL; + info.ptInvoke = pt; + picm->InvokeCommand((LPCMINVOKECOMMANDINFO)&info); + } + } + + DestroyMenu(fmenu); + return 0; +} + //ToolbarTest HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst) { @@ -49,41 +97,38 @@ // Create the toolbar. HWND hWndToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, - WS_CHILD | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NORESIZE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, + WS_CHILD | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NORESIZE | CCS_NODIVIDER, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWndParent, NULL, hInst, NULL); if (hWndToolbar == NULL) return NULL; // Set the image list. HIMAGELIST* piml; - HRESULT hr1 = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); + if (FAILED_UNEXPECTEDLY(hr)) return NULL; SendMessage(hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)piml); //Enumerate objects - CComPtr<IEnumIDList> pedl; - HRESULT hr2 = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pedl); + CComPtr<IEnumIDList> pedl; LPITEMIDLIST pidl = NULL; - STRRET stret; - - if (SUCCEEDED(hr1) && SUCCEEDED(hr2)) - { - ULONG count = 0; - for (int i=0; pedl->Next(MAX_PATH, &pidl, 0) != S_FALSE; i++, count++) - { - WCHAR sz[MAX_PATH]; - int index = SHMapPIDLToSystemImageListIndex(m_pISF, pidl, NULL); - m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret); - StrRetToBuf(&stret, pidl, sz, sizeof(sz)); - - TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)pidl, (INT_PTR)sz }; - SendMessage(hWndToolbar, TB_INSERTBUTTONW, 0, (LPARAM)&tb); - } - } - else return NULL; + STRRET stret; + ULONG count = 0; + hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pedl); + if (FAILED_UNEXPECTEDLY(hr)) return NULL; + + for (int i=0; pedl->Next(1, &pidl, 0) != S_FALSE; i++, count++) + { + WCHAR sz[MAX_PATH]; + int index = SHMapPIDLToSystemImageListIndex(m_pISF, pidl, NULL); + m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret); + StrRetToBuf(&stret, pidl, sz, sizeof(sz)); + + TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)pidl, (INT_PTR)sz }; + SendMessage(hWndToolbar, TB_INSERTBUTTONW, 0, (LPARAM)&tb); + } // Resize the toolbar, and then show it. - SendMessage(hWndToolbar, TB_AUTOSIZE, 0, 0); - ::ShowWindow(hWndToolbar, TRUE); + SendMessage(hWndToolbar, TB_AUTOSIZE, 0, 0); CoTaskMemFree((void*)pidl); return hWndToolbar; @@ -94,21 +139,22 @@ // *** IObjectWithSite *** HRESULT STDMETHODCALLTYPE CISFBand::SetSite(IUnknown *pUnkSite) { - HRESULT hRet; + HRESULT hr; HWND hwndParent; TRACE("CISFBand::SetSite(0x%p)\n", pUnkSite); - hRet = IUnknown_GetWindow(pUnkSite, &hwndParent); - if (FAILED(hRet)) - { - TRACE("Querying site window failed: 0x%x\n", hRet); - return hRet; + hr = IUnknown_GetWindow(pUnkSite, &hwndParent); + if (FAILED(hr)) + { + TRACE("Querying site window failed: 0x%x\n", hr); + return hr; } m_Site = pUnkSite; m_hWndTb = CreateSimpleToolbar(hwndParent, m_hInstance); - SubclassWindow(m_hWndTb); + hr = SubclassWindow(m_hWndTb); + if (FAILED_UNEXPECTEDLY(hr)) return hr; return S_OK; } @@ -415,6 +461,117 @@ } /*****************************************************************************/ +// *** IContextMenu *** + HRESULT STDMETHODCALLTYPE CISFBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) + { + /*HRESULT hr = E_INVALIDARG; + + if (idCmd == IDM_DISPLAY) + { + switch (uFlags) + { + case GCS_HELPTEXTW: + // Only useful for pre-Vista versions of Windows that + // have a Status bar. + hr = StringCchCopyW(reinterpret_cast<PWSTR>(pszName), + cchMax, + L"Display File Name"); + break; + + case GCS_VERBW: + // GCS_VERBW is an optional feature that enables a caller + // to discover the canonical name for the verb that is passed in + // through idCommand. + hr = StringCchCopyW(reinterpret_cast<PWSTR>(pszName), + cchMax, + L"DisplayFileName"); + break; + } + } + return hr; */ + + return S_OK; + } + + HRESULT STDMETHODCALLTYPE CISFBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) + { + /* BOOL fEx = FALSE; + BOOL fUnicode = FALSE; + + if (pici->cbSize == sizeof(CMINVOKECOMMANDINFOEX)) + { + fEx = TRUE; + if ((pici->fMask & CMIC_MASK_UNICODE)) + { + fUnicode = TRUE; + } + } + + if (!fUnicode && HIWORD(pici->lpVerb)) + { + if (StrCmpIA(pici->lpVerb, m_pszVerb)) + { + return E_FAIL; + } + } + + else if (fUnicode && HIWORD(((CMINVOKECOMMANDINFOEX *)pici)->lpVerbW)) + { + if (StrCmpIW(((CMINVOKECOMMANDINFOEX *)pici)->lpVerbW, m_pwszVerb)) + { + return E_FAIL; + } + } + + else if (LOWORD(pici->lpVerb) != IDM_DISPLAY) + { + return E_FAIL; + } + + else + { + ::MessageBox(pici->hwnd, + L"The File Name", + L"File Name", + MB_OK | MB_ICONINFORMATION); + }*/ + + if (!HIWORD(pici->lpVerb)) + { + switch (LOWORD(pici->lpVerb) /*- m_idCmdFirst*/) + { + case IDM_LARGE_ICONS: + { + ::MessageBox(0, L"IDM_LARGE_ICONS", L"Test", MB_OK | MB_ICONINFORMATION); + break; + } + case IDM_SMALL_ICONS: + { + ::MessageBox(0, L"IDM_SMALL_ICONS", L"Test", MB_OK | MB_ICONINFORMATION); + break; + } + case IDM_SHOW_TEXT: + { + ::MessageBox(0, L"IDM_SHOW_TEXT", L"Test", MB_OK | MB_ICONINFORMATION); + break; + } + } + } + + return S_OK; + } + + HRESULT STDMETHODCALLTYPE CISFBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) + { + m_idCmdFirst = idCmdFirst; + m_qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDR_POPUPMENU)); + m_qMenu = GetSubMenu(m_qMenu, 0); + UINT idMax = Shell_MergeMenus(hmenu, m_qMenu, indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(idMax - idCmdFirst +1)); + } + +/*****************************************************************************/ //C Constructor extern "C" HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Thu Jun 29 12:23:13 2017 @@ -18,14 +18,22 @@ public IPersistStream, public IWinEventHandler, public IOleCommandTarget, - public IShellFolderBand + public IShellFolderBand, + public IContextMenu { + //band + DWORD m_BandID; + CComPtr<IUnknown> m_Site; + + //Toolbar + HWND m_hWndTb; HINSTANCE m_hInstance; - CComPtr<IUnknown> m_Site; CComPtr<IShellFolder> m_pISF; - PCIDLIST_ABSOLUTE m_pidl; - HWND m_hWndTb; - DWORD m_BandID; + PCIDLIST_ABSOLUTE m_pidl; + + //Menu + HMENU m_qMenu; + UINT m_idCmdFirst; public: @@ -35,6 +43,7 @@ //Personal Methods HWND CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst); LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); //IObjectWithSite @@ -168,10 +177,32 @@ virtual HRESULT STDMETHODCALLTYPE SetBandInfoSFB( PBANDINFOSFB pbi ); + +//IContextMenu + virtual HRESULT STDMETHODCALLTYPE GetCommandString( + UINT_PTR idCmd, + UINT uFlags, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax + ); + + virtual HRESULT STDMETHODCALLTYPE InvokeCommand( + LPCMINVOKECOMMANDINFO pici + ); + + virtual HRESULT STDMETHODCALLTYPE QueryContextMenu( + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags + ); //***************************************************************************************************** - BEGIN_MSG_MAP(CStartButton) + BEGIN_MSG_MAP(CISFBand) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) + MESSAGE_HANDLER(WM_RBUTTONUP, OnRButtonUp) END_MSG_MAP() DECLARE_NOT_AGGREGATABLE(CISFBand) @@ -186,6 +217,7 @@ COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) COM_INTERFACE_ENTRY_IID(IID_IShellFolderBand, IShellFolderBand) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) END_COM_MAP() }; Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Thu Jun 29 12:23:13 2017 @@ -73,22 +73,20 @@ HRESULT CQuickLaunchBand::FinalConstruct() { HRESULT hr = CISFBand_CreateInstance(IID_IUnknown, (void**) &m_punkISFB); - if (SUCCEEDED(hr)) - { - CComPtr<IShellFolderBand> pISFB; - hr = m_punkISFB->QueryInterface(IID_IShellFolderBand, (void**) &pISFB); - if (SUCCEEDED(hr)) - { - CComPtr<IShellFolder> pISF; - hr = SHGetDesktopFolder(&pISF); - if (SUCCEEDED(hr)) - { - LPITEMIDLIST pidl = PidlBrowse(m_hWndBro, CSIDL_DESKTOP); - if (pidl == NULL) return E_FAIL; - pISFB->InitializeSFB(pISF, pidl); - } - } - } + if (FAILED_UNEXPECTEDLY(hr)) return hr; + + CComPtr<IShellFolderBand> pISFB; + hr = m_punkISFB->QueryInterface(IID_IShellFolderBand, (void**) &pISFB); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + + CComPtr<IShellFolder> pISF; + hr = SHGetDesktopFolder(&pISF); + if (FAILED_UNEXPECTEDLY(hr)) return hr; + + LPITEMIDLIST pidl = PidlBrowse(m_hWndBro, CSIDL_DESKTOP); + if (pidl == NULL) return E_FAIL; + + pISFB->InitializeSFB(pISF, pidl); return hr; } @@ -359,3 +357,34 @@ return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); } +/*****************************************************************************/ +// *** IContextMenu *** + HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax) + { + //Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM); + if (FAILED(hr)) return hr; + + return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); + } + + HRESULT STDMETHODCALLTYPE CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici) + { + //Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM); + if (FAILED(hr)) return hr; + + return pICM->InvokeCommand(pici); + } + + HRESULT STDMETHODCALLTYPE CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) + { + //Internal CISFBand Calls + CComPtr<IContextMenu> pICM; + HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM); + if (FAILED(hr)) return hr; + + return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + } Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Thu Jun 29 12:23:13 2017 @@ -22,7 +22,8 @@ public IDeskBar, public IPersistStream, public IWinEventHandler, - public IOleCommandTarget + public IOleCommandTarget, + public IContextMenu { HWND m_hWndBro; CComPtr<IUnknown> m_punkISFB; @@ -155,9 +156,30 @@ /*[in, out]*/ OLECMDTEXT *pCmdText ); +//IContextMenu + virtual HRESULT STDMETHODCALLTYPE GetCommandString( + UINT_PTR idCmd, + UINT uFlags, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax + ); + + virtual HRESULT STDMETHODCALLTYPE InvokeCommand( + LPCMINVOKECOMMANDINFO pici + ); + + virtual HRESULT STDMETHODCALLTYPE QueryContextMenu( + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags + ); + //***************************************************************************************************** - DECLARE_REGISTRY_RESOURCEID(1001) + DECLARE_REGISTRY_RESOURCEID(IDR_QCKLNCH) DECLARE_NOT_AGGREGATABLE(CQuickLaunchBand) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -169,5 +191,6 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) END_COM_MAP() }; Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] Thu Jun 29 12:23:13 2017 @@ -35,6 +35,8 @@ #include <wine/debug.h> #include <wine/unicode.h> +#include "resource.h" + #undef DbgPrint #include "CQuickLaunchBand.h" Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc [iso-8859-1] Thu Jun 29 12:23:13 2017 @@ -1,10 +1,24 @@ #include <windef.h> #include <winuser.h> #include <commctrl.h> +#include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -1001 REGISTRY "rgs/qcklnch.rgs" +IDR_QCKLNCH REGISTRY "rgs/qcklnch.rgs" + +IDR_POPUPMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&View", IDM_VIEW_MENU + BEGIN + MENUITEM "&Large Icons", IDM_LARGE_ICONS + MENUITEM "&Small Icons", IDM_SMALL_ICONS + END + MENUITEM "&Show Text", IDM_SHOW_TEXT + END +END #include <reactos/manifest_dll.rc> Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h [iso-8859-1] Thu Jun 29 12:23:13 2017 @@ -0,0 +1,8 @@ +#pragma once + +#define IDR_QCKLNCH 1001 +#define IDR_POPUPMENU 2000 +#define IDM_LARGE_ICONS 1 +#define IDM_SMALL_ICONS 2 +#define IDM_SHOW_TEXT 3 +#define IDM_VIEW_MENU 4 Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

7 years, 2 months

[gadamopoulos] 75230: [BROWSEUI] -CBandSite: Remove the Close item menu if the band is undeletable. Remove the Show caption menu item if the band doesn't have a caption. Implement showing or hiding...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Jun 29 09:41:00 2017 New Revision: 75230 URL: http://svn.reactos.org/svn/reactos?rev=75230&view=rev Log: [BROWSEUI] -CBandSite: Remove the Close item menu if the band is undeletable. Remove the Show caption menu item if the band doesn't have a caption. Implement showing or hiding the band caption. Modified: trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp trunk/reactos/dll/win32/browseui/shellbars/CBandSite.h Modified: trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellba… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] Thu Jun 29 09:41:00 2017 @@ -143,6 +143,12 @@ prbi->fStyle |= RBBS_GRIPPERALWAYS; } + if (Band->bHiddenTitle) + { + prbi->fMask |= RBBIM_STYLE; + prbi->fStyle |= RBBS_HIDETITLE; + } + if ((Band->dbi.dwMask & (DBIM_BKCOLOR | DBIM_MODEFLAGS)) == (DBIM_BKCOLOR | DBIM_MODEFLAGS) && (Band->dbi.dwModeFlags & DBIMF_BKCOLOR)) { @@ -219,6 +225,23 @@ return E_FAIL; return UpdateSingleBand(Band); +} + +HRESULT CBandSiteBase::_IsBandDeletable(DWORD dwBandID) +{ + CComPtr<IBandSite> pbs; + + /* Use QueryInterface so that we get the outer object in case we have one */ + HRESULT hr = this->QueryInterface(IID_PPV_ARG(IBandSite, &pbs)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + DWORD dwState; + hr = pbs->QueryBand(dwBandID, NULL, &dwState, NULL, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return ((dwState & BSSF_UNDELETEABLE) != 0) ? S_FALSE : S_OK; } HRESULT CBandSiteBase::OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult) @@ -265,11 +288,26 @@ /* Load the static part of the menu */ HMENU hMenuStatic = LoadMenuW(GetModuleHandleW(L"browseui.dll"), MAKEINTRESOURCEW(IDM_BAND_MENU)); + if (hMenuStatic) + { Shell_MergeMenus(hMenu, hMenuStatic, UINT_MAX, 0, UINT_MAX, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS); - EnableMenuItem(hMenu, IDM_BAND_TITLE, MF_GRAYED); - /* TODO: Show IDM_BAND_TITLE as checked if the band title is shown */ + ::DestroyMenu(hMenuStatic); + + hr = _IsBandDeletable(dwBandID); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + /* Remove the close item if it is not deletable */ + if (hr == S_FALSE || (Band->dbi.dwModeFlags & DBIMF_UNDELETEABLE) != 0) + DeleteMenu(hMenu, IDM_BAND_CLOSE, MF_BYCOMMAND); + + if ((Band->dbi.dwMask & DBIM_TITLE) == 0) + DeleteMenu(hMenu, IDM_BAND_TITLE, MF_BYCOMMAND); + else + CheckMenuItem(hMenu, IDM_BAND_TITLE, Band->bHiddenTitle ? MF_UNCHECKED : MF_CHECKED); + } /* TODO: Query the menu of our site */ @@ -285,7 +323,11 @@ { if (uCommand == IDM_BAND_TITLE) { - /* TODO: Implement showing or hiding the title */ + Band->bHiddenTitle = !Band->bHiddenTitle; + + hr = UpdateBand(dwBandID); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; } else if(uCommand == IDM_BAND_CLOSE) { Modified: trunk/reactos/dll/win32/browseui/shellbars/CBandSite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellba… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbars/CBandSite.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbars/CBandSite.h [iso-8859-1] Thu Jun 29 09:41:00 2017 @@ -41,6 +41,7 @@ IOleWindow *OleWindow; IWinEventHandler *WndEvtHandler; DESKBANDINFO dbi; + BOOL bHiddenTitle; }; LONG fBandsCount; @@ -120,6 +121,7 @@ HRESULT UpdateAllBands(); HRESULT UpdateBand(DWORD dwBandID); struct BandObject *GetBandFromHwnd(HWND hwnd); + HRESULT _IsBandDeletable(DWORD dwBandID); HRESULT OnContextMenu(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult); BEGIN_COM_MAP(CBandSiteBase)

7 years, 2 months

[tfaber] 75229: [PSDK] - Add USB_HUB_CHANGE and USB_HUB_STATUS_AND_CHANGE

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 29 08:09:44 2017 New Revision: 75229 URL: http://svn.reactos.org/svn/reactos?rev=75229&view=rev Log: [PSDK] - Add USB_HUB_CHANGE and USB_HUB_STATUS_AND_CHANGE Modified: trunk/reactos/sdk/include/psdk/usb200.h Modified: trunk/reactos/sdk/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/usb200.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] Thu Jun 29 08:09:44 2017 @@ -195,6 +195,27 @@ } USB_HUB_STATUS, *PUSB_HUB_STATUS; C_ASSERT(sizeof(USB_HUB_STATUS) == sizeof(USHORT)); + +typedef union _USB_HUB_CHANGE { + USHORT AsUshort16; + struct { + USHORT LocalPowerChange:1; + USHORT OverCurrentChange:1; + USHORT Reserved:14; + }; +} USB_HUB_CHANGE, *PUSB_HUB_CHANGE; + +C_ASSERT(sizeof(USB_HUB_CHANGE) == sizeof(USHORT)); + +typedef union _USB_HUB_STATUS_AND_CHANGE { + ULONG AsUlong32; + struct { + USB_HUB_STATUS HubStatus; + USB_HUB_CHANGE HubChange; + }; +} USB_HUB_STATUS_AND_CHANGE, *PUSB_HUB_STATUS_AND_CHANGE; + +C_ASSERT(sizeof(USB_HUB_STATUS_AND_CHANGE) == sizeof(ULONG)); #define USB_DEVICE_CLASS_RESERVED 0x00 #define USB_DEVICE_CLASS_AUDIO 0x01

7 years, 2 months

[tthompson] 75228: [NTFS] - Fix gcc build. Fix CompareTreeKeys(): Don't consider Key1 a possible dummy key. Don't assume filenames are the same length.

by tthompson＠svn.reactos.org

Author: tthompson Date: Thu Jun 29 02:36:00 2017 New Revision: 75228 URL: http://svn.reactos.org/svn/reactos?rev=75228&view=rev Log: [NTFS] - Fix gcc build. Fix CompareTreeKeys(): Don't consider Key1 a possible dummy key. Don't assume filenames are the same length. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] Thu Jun 29 02:36:00 2017 @@ -54,21 +54,18 @@ * > 0 if key1 is greater than key2 * * @remarks -* Any other key is always less than the final (dummy) key in a node. +* Any other key is always less than the final (dummy) key in a node. Key1 must not be the dummy node. */ LONG CompareTreeKeys(PB_TREE_KEY Key1, PB_TREE_KEY Key2, BOOLEAN CaseSensitive) { UNICODE_STRING Key1Name, Key2Name; + LONG Comparison; // If Key2 is the "dummy key", key 1 will always come first if (Key2->NextKey == NULL) return -1; - // If Key1 is the "dummy key", key 2 will always come first - if (Key1->NextKey == NULL) - return 1; - Key1Name.Buffer = Key1->IndexEntry->FileName.Name; Key1Name.Length = Key1Name.MaximumLength = Key1->IndexEntry->FileName.NameLength * sizeof(WCHAR); @@ -77,7 +74,38 @@ Key2Name.Length = Key2Name.MaximumLength = Key2->IndexEntry->FileName.NameLength * sizeof(WCHAR); - return RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + // Are the two keys the same length? + if(Key1Name.Length == Key2Name.Length) + return RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + + // Is Key1 shorter? + if (Key1Name.Length < Key2Name.Length) + { + // Truncate KeyName2 to be the same length as KeyName1 + Key2Name.Length = Key1Name.Length; + + // Compare the names of the same length + Comparison = RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + + // If the truncated files are the same length, the shorter one comes first + if (Comparison == 0) + return -1; + } + else + { + // Key2 is shorter + // Truncate KeyName1 to be the same length as KeyName2 + Key1Name.Length = Key2Name.Length; + + // Compare the names of the same length + Comparison = RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); + + // If the truncated files are the same length, the shorter one comes first + if (Comparison == 0) + return 1; + } + + return Comparison; } /** @@ -241,6 +269,8 @@ PINDEX_ROOT_ATTRIBUTE *IndexRoot, ULONG *Length) { + int i; + PB_TREE_KEY CurrentKey; PINDEX_ENTRY_ATTRIBUTE CurrentNodeEntry; PINDEX_ROOT_ATTRIBUTE NewIndexRoot = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, @@ -274,11 +304,11 @@ NewIndexRoot->Header.TotalSizeOfEntries = NewIndexRoot->Header.FirstEntryOffset; // Setup each Node Entry - PB_TREE_KEY CurrentKey = Tree->RootNode->FirstKey; + CurrentKey = Tree->RootNode->FirstKey; CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)NewIndexRoot + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + NewIndexRoot->Header.FirstEntryOffset); - for (int i = 0; i < Tree->RootNode->KeyCount; i++) + for (i = 0; i < Tree->RootNode->KeyCount; i++) { // Would adding the current entry to the index increase the index size beyond the limit we've set? ULONG IndexSize = FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) @@ -335,7 +365,8 @@ { PB_TREE_KEY NextKey; PB_TREE_KEY CurrentKey = Node->FirstKey; - for (int i = 0; i < Node->KeyCount; i++) + int i; + for (i = 0; i < Node->KeyCount; i++) { NT_ASSERT(CurrentKey); NextKey = CurrentKey->NextKey; @@ -370,7 +401,8 @@ VOID DumpBTreeKey(PB_TREE_KEY Key, int Number, int Depth) { - for (int i = 0; i < Depth; i++) + int i; + for (i = 0; i < Depth; i++) DbgPrint(" "); DbgPrint(" Key #%d", Number); @@ -386,14 +418,17 @@ DbgPrint(" (Dummy Key)\n"); } +VOID DumpBTreeNode(PB_TREE_FILENAME_NODE Node, int Number, int Depth) { - for (int i = 0; i < Depth; i++) + PB_TREE_KEY CurrentKey; + int i; + for (i = 0; i < Depth; i++) DbgPrint(" "); DbgPrint("Node #%d, Depth %d\n", Number, Depth); - PB_TREE_KEY CurrentKey = Node->FirstKey; - for (int i = 0; i < Node->KeyCount; i++) + CurrentKey = Node->FirstKey; + for (i = 0; i < Node->KeyCount; i++) { DumpBTreeKey(CurrentKey, i, Depth); CurrentKey = CurrentKey->NextKey; @@ -451,6 +486,8 @@ ULONG AttributeSize = GetFileNameAttributeLength(FileNameAttribute); ULONG EntrySize = ALIGN_UP_BY(AttributeSize + FIELD_OFFSET(INDEX_ENTRY_ATTRIBUTE, FileName), 8); PINDEX_ENTRY_ATTRIBUTE NewEntry; + PB_TREE_KEY NewKey, CurrentKey, PreviousKey; + int i; DPRINT1("NtfsInsertKey(0x%02I64, %p, %p, %s)\n", FileReference, @@ -476,14 +513,14 @@ RtlCopyMemory(&NewEntry->FileName, FileNameAttribute, AttributeSize); // Setup the New Key - PB_TREE_KEY NewKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + NewKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); NewKey->IndexEntry = NewEntry; NewKey->NextKey = NULL; // Find where to insert the key - PB_TREE_KEY CurrentKey = Node->FirstKey; - PB_TREE_KEY PreviousKey = NULL; - for (int i = 0; i < Node->KeyCount; i++) + CurrentKey = Node->FirstKey; + PreviousKey = NULL; + for (i = 0; i < Node->KeyCount; i++) { // Should the New Key go before the current key? LONG Comparison = CompareTreeKeys(NewKey, CurrentKey, CaseSensitive);

7 years, 2 months

[akhaldi] 75227: [USBHUB_NEW] Bring-in the USB Hub driver created by Vadim Galyant. GitHub PR #29. As usual, I thank the code reviewers, especially Thomas for contributing most of the reviews, impr...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 28 23:23:01 2017 New Revision: 75227 URL: http://svn.reactos.org/svn/reactos?rev=75227&view=rev Log: [USBHUB_NEW] Bring-in the USB Hub driver created by Vadim Galyant. GitHub PR #29. As usual, I thank the code reviewers, especially Thomas for contributing most of the reviews, improvements and fix suggestions. Added: trunk/reactos/drivers/usb/usbhub_new/ trunk/reactos/drivers/usb/usbhub_new/CMakeLists.txt (with props) trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h (with props) trunk/reactos/drivers/usb/usbhub_new/debug.c (with props) trunk/reactos/drivers/usb/usbhub_new/guid.c (with props) trunk/reactos/drivers/usb/usbhub_new/ioctl.c (with props) trunk/reactos/drivers/usb/usbhub_new/pnp.c (with props) trunk/reactos/drivers/usb/usbhub_new/power.c (with props) trunk/reactos/drivers/usb/usbhub_new/usbhub.c (with props) trunk/reactos/drivers/usb/usbhub_new/usbhub.h (with props) trunk/reactos/drivers/usb/usbhub_new/usbhub.rc (with props) Modified: trunk/reactos/drivers/usb/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… Added: trunk/reactos/drivers/usb/usbhub_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/CMa… Added: trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/dbg… Added: trunk/reactos/drivers/usb/usbhub_new/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/deb… Added: trunk/reactos/drivers/usb/usbhub_new/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/gui… Added: trunk/reactos/drivers/usb/usbhub_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/ioc… Added: trunk/reactos/drivers/usb/usbhub_new/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/pnp… Added: trunk/reactos/drivers/usb/usbhub_new/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/pow… Added: trunk/reactos/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb… Added: trunk/reactos/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb… Added: trunk/reactos/drivers/usb/usbhub_new/usbhub.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb…

7 years, 2 months

[hbelusca] 75226: [BOOTDATA]: Experiment with registry upgrade. [USETUP]: Fix the name of the txtsetup.sif section to look for when performing a registry upgrade.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 28 22:40:07 2017 New Revision: 75226 URL: http://svn.reactos.org/svn/reactos?rev=75226&view=rev Log: [BOOTDATA]: Experiment with registry upgrade. [USETUP]: Fix the name of the txtsetup.sif section to look for when performing a registry upgrade. Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/boot/bootdata/txtsetup.sif Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Jun 28 22:40:07 2017 @@ -4128,7 +4128,7 @@ * we only update the hives. */ - Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Update", NULL, &InfContext); + Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Upgrade", NULL, &InfContext); if (!Success) { /* Nothing to do for update! */ Modified: branches/setup_improvements/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… ============================================================================== --- branches/setup_improvements/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/setup_improvements/boot/bootdata/txtsetup.sif [iso-8859-1] Wed Jun 28 22:40:07 2017 @@ -523,6 +523,11 @@ 00000455 = kbdbur.dll [HiveInfs.Install] -AddReg=registry.inf,AddReg +; Called "HiveInfs.Fresh" on Windows +AddReg = registry.inf,AddReg + +[HiveInfs.Upgrade] +DelReg = registry.inf,DelReg +AddReg = registry.inf,AddReg ; EOF

7 years, 2 months

[hbelusca] 75225: [BOOTDATA]: Sprinkle few FLG_ADDREG_NOCLOBBER (0x00000002) flags for registry keys/values that need to remain the same across ReactOS upgrades. This also includes the "Session Man...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 28 22:17:53 2017 New Revision: 75225 URL: http://svn.reactos.org/svn/reactos?rev=75225&view=rev Log: [BOOTDATA]: Sprinkle few FLG_ADDREG_NOCLOBBER (0x00000002) flags for registry keys/values that need to remain the same across ReactOS upgrades. This also includes the "Session Manager\DOS Devices" as well as the "Session Manager\Environment" values! Also, fix the default LastKnownGood value to the 'Current'/'Default' one. These values should also not be touched across upgrades (well, they can be touched manually by the (u)setup program, but they must not when updating the registry in bulk). Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Jun 28 22:17:53 2017 @@ -61,13 +61,13 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",2,"5000" HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"0" HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" -HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" +HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",2,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" HKCU,"Control Panel\Desktop","Pattern",2,"(None)" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000002,"" HKCU,"Control Panel\Desktop","TileWallpaper",2,"0" HKCU,"Control Panel\Desktop","WallpaperStyle",2,"2" -HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" +HKCU,"Control Panel\Desktop","FontSmoothing",2,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","ForegroundFlashCount",0x00010003,0x00000003 @@ -95,27 +95,27 @@ HKCU,"Control Panel\Desktop\WindowMetrics","Shell Icon Size",2,"32" HKCU,"Control Panel\Desktop\WindowMetrics","IconSpacing",2,"75" HKCU,"Control Panel\Desktop\WindowMetrics","IconVerticalspacing",2,"75" -HKCU, "Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000001,f5,ff,ff,ff,00,00,00,\ +HKCU, "Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000003,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,\ 00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ +HKCU, "Control Panel\Desktop\WindowMetrics","IconFont",0x00000003,f5,ff,ff,ff,00,00,00,00,\ 00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,\ 61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKCU, "Control Panel\Desktop\WindowMetrics","MenuFont",0x00000001,f5,ff,ff,ff,00,00,00,00,\ +HKCU, "Control Panel\Desktop\WindowMetrics","MenuFont",0x00000003,f5,ff,ff,ff,00,00,00,00,\ 00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,\ 61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKCU, "Control Panel\Desktop\WindowMetrics","MessageFont",0x00000001,f5,ff,ff,ff,00,00,00,\ +HKCU, "Control Panel\Desktop\WindowMetrics","MessageFont",0x00000003,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,\ 00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKCU, "Control Panel\Desktop\WindowMetrics","SmCaptionFont",0x00000001,f5,ff,ff,ff,00,00,\ +HKCU, "Control Panel\Desktop\WindowMetrics","SmCaptionFont",0x00000003,f5,ff,ff,ff,00,00,\ 00,00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,\ 6d,00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKCU, "Control Panel\Desktop\WindowMetrics","StatusFont",0x00000001,f5,ff,ff,ff,00,00,00,\ +HKCU, "Control Panel\Desktop\WindowMetrics","StatusFont",0x00000003,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,01,00,00,00,00,54,00,61,00,68,00,6f,00,6d,\ 00,61,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -1792,8 +1792,8 @@ ; ReactOS Calculator HKCU,"SOFTWARE\Microsoft\Calc",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Calc","layout",0x00010001,0x00000001 -HKCU,"SOFTWARE\Microsoft\Calc","UseSep",0x00010001,0x00000001 +HKCU,"SOFTWARE\Microsoft\Calc","layout",0x00010003,0x00000001 +HKCU,"SOFTWARE\Microsoft\Calc","UseSep",0x00010003,0x00000001 ; DirectX version report as DirectX 9.0 HKCU,"SOFTWARE\Microsoft\DirectX","Debug",0x00010001,0x00000000 @@ -1817,9 +1817,9 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu","{208D2C60-3AEA-1069-A2D7-08002B30309D}",0x00010001,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShadow",0x00010001,0x00000001 -HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010001,0x00000000 -HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010001,0x00000001 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShadow",0x00010003,0x00000001 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010003,0x00000000 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010003,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 ; default shell @@ -1832,7 +1832,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000012 ; Keyboard layout switcher -;HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch.exe",0x00020000,"%SystemRoot%\system32\kbswitch.exe" +;HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch.exe",0x00020002,"%SystemRoot%\system32\kbswitch.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch.exe",2,"kbswitch.exe" HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Jun 28 22:17:53 2017 @@ -1402,21 +1402,21 @@ "\RPC Control" ; DOS devices -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PRN",0x00000000,"\DosDevices\LPT1" -;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000000,"\Device\Mup" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000002,"\DosDevices\COM1" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000002,"\Device\MailSlot" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000002,"\Device\Null" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000002,"\Device\NamedPipe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PRN",0x00000002,"\DosDevices\LPT1" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x00000002,"\Device\Mup" ; System environment settings -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000000,".COM;.EXE;.BAT;.CMD" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000000,"$P$G$I" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemRoot%\TEMP" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemRoot%\TEMP" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020002,"%SystemRoot%\system32\cmd.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020002,"%SystemRoot%\bin;%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00000002,".COM;.EXE;.BAT;.CMD" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROMPT",0x00000002,"$P$G$I" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020002,"%SystemRoot%\TEMP" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020002,"%SystemRoot%\TEMP" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020002,"%SystemRoot%" ; Known DLLs @@ -1447,7 +1447,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management",,0x00000012 ; SubSystems -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Debug",0x00020002,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" @@ -1462,7 +1462,7 @@ fe,0f,dc,ba,00,00,00,00 ; WOW Support -HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\WOW",,0x00000012 ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" @@ -2105,10 +2105,10 @@ HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","Type",0x00010001,0x00000002 ; ControlSet selection settings -HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 -HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001 -HKLM,"SYSTEM\Select","Failed",0x00010001,0x00000000 -HKLM,"SYSTEM\Select","LastKnownGood",0x00010001,0x00000000 +HKLM,"SYSTEM\Select","Current",0x00010003,0x00000001 +HKLM,"SYSTEM\Select","Default",0x00010003,0x00000001 +HKLM,"SYSTEM\Select","Failed",0x00010003,0x00000000 +HKLM,"SYSTEM\Select","LastKnownGood",0x00010003,0x00000001 ; System setup settings HKLM,"SYSTEM\Setup","CmdLine",0x00000000,"setup -newsetup"

7 years, 2 months

[tthompson] 75224: [NTFS] - Fix a couple of issues spotted by Thomas: Maintain alphabetical ordering of CMakeLists.txt, fix casts to BOOLEAN with BooleanFlagOn macro.

by tthompson＠svn.reactos.org

Author: tthompson Date: Wed Jun 28 18:22:42 2017 New Revision: 75224 URL: http://svn.reactos.org/svn/reactos?rev=75224&view=rev Log: [NTFS] - Fix a couple of issues spotted by Thomas: Maintain alphabetical ordering of CMakeLists.txt, fix casts to BOOLEAN with BooleanFlagOn macro. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Wed Jun 28 18:22:42 2017 @@ -1,8 +1,8 @@ list(APPEND SOURCE attrib.c + blockdev.c btree.c - blockdev.c cleanup.c close.c create.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Wed Jun 28 18:22:42 2017 @@ -419,7 +419,7 @@ Status = NtfsOpenFile(DeviceExt, FileObject, ((RequestedOptions & FILE_OPEN_BY_FILE_ID) ? FullPath.Buffer : FileObject->FileName.Buffer), - (Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE), &Fcb); if (RequestedOptions & FILE_OPEN_BY_FILE_ID) Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Wed Jun 28 18:22:42 2017 @@ -621,7 +621,7 @@ &FileRecord, &MFTRecord, Fcb->MFTIndex, - (Stack->Flags & SL_CASE_SENSITIVE)); + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE)); if (NT_SUCCESS(Status)) { Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Wed Jun 28 18:22:42 2017 @@ -635,7 +635,7 @@ FileObject, DeviceExt, Irp->Flags, - (Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(Stack->Flags, SL_CASE_SENSITIVE), &EndOfFileInfo->EndOfFile); break; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Wed Jun 28 18:22:42 2017 @@ -686,7 +686,7 @@ Length, ByteOffset.LowPart, Irp->Flags, - (IrpContext->Stack->Flags & SL_CASE_SENSITIVE), + BooleanFlagOn(IrpContext->Stack->Flags, SL_CASE_SENSITIVE), &ReturnedWriteLength); IrpContext->Irp->IoStatus.Status = Status;

7 years, 2 months

[tthompson] 75223: [NTFS] - Begin to implement B-Trees. Allow for creating several new files in a directory. NtfsAddFilenameToDirectory() - Add CaseSensitive parameter. Update to use new B-Tree cod...

by tthompson＠svn.reactos.org

Author: tthompson Date: Wed Jun 28 03:45:52 2017 New Revision: 75223 URL: http://svn.reactos.org/svn/reactos?rev=75223&view=rev Log: [NTFS] - Begin to implement B-Trees. Allow for creating several new files in a directory. NtfsAddFilenameToDirectory() - Add CaseSensitive parameter. Update to use new B-Tree code: First, the index is read and converted to a B-Tree in memory. Next, a key for the new file is inserted into the tree. Finally, the tree is converted back to an index root attribute which is written to disk. +btree.c - Includes functions related to B-Trees (AKA B*Trees). ntfs.h - Added several structures for representing B-Trees in memory. Known limitations: For simplicity, only trees with a depth of one are currently supported (i.e. an ordered list of filenames). Directories that have or will require an index allocation to store all their filenames are still TODO. As a consequence, the user will only be able to create about 6 files in a directory. Added: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c (with props) Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Wed Jun 28 03:45:52 2017 @@ -1,6 +1,7 @@ list(APPEND SOURCE attrib.c + btree.c blockdev.c cleanup.c close.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Wed Jun 28 03:45:52 2017 @@ -1566,6 +1566,12 @@ return NULL; } +ULONG GetFileNameAttributeLength(PFILENAME_ATTRIBUTE FileNameAttribute) +{ + ULONG Length = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + (FileNameAttribute->NameLength * sizeof(WCHAR)); + return Length; +} + PFILENAME_ATTRIBUTE GetBestFileNameFromRecord(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER FileRecord) Added: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c (added) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c [iso-8859-1] Wed Jun 28 03:45:52 2017 @@ -0,0 +1,520 @@ +/* +* ReactOS kernel +* Copyright (C) 2002, 2017 ReactOS Team +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS kernel +* FILE: drivers/filesystem/ntfs/btree.c +* PURPOSE: NTFS filesystem driver +* PROGRAMMERS: Trevor Thompson +*/ + +/* INCLUDES *****************************************************************/ + +#include "ntfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +/** +* @name CompareTreeKeys +* @implemented +* +* Compare two B_TREE_KEY's to determine their order in the tree. +* +* @param Key1 +* Pointer to a B_TREE_KEY that will be compared. +* +* @param Key2 +* Pointer to the other B_TREE_KEY that will be compared. +* +* @param CaseSensitive +* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE +* if an application created the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* +* @returns +* 0 if the two keys are equal. +* < 0 if key1 is less thank key2 +* > 0 if key1 is greater than key2 +* +* @remarks +* Any other key is always less than the final (dummy) key in a node. +*/ +LONG +CompareTreeKeys(PB_TREE_KEY Key1, PB_TREE_KEY Key2, BOOLEAN CaseSensitive) +{ + UNICODE_STRING Key1Name, Key2Name; + + // If Key2 is the "dummy key", key 1 will always come first + if (Key2->NextKey == NULL) + return -1; + + // If Key1 is the "dummy key", key 2 will always come first + if (Key1->NextKey == NULL) + return 1; + + Key1Name.Buffer = Key1->IndexEntry->FileName.Name; + Key1Name.Length = Key1Name.MaximumLength + = Key1->IndexEntry->FileName.NameLength * sizeof(WCHAR); + + Key2Name.Buffer = Key2->IndexEntry->FileName.Name; + Key2Name.Length = Key2Name.MaximumLength + = Key2->IndexEntry->FileName.NameLength * sizeof(WCHAR); + + return RtlCompareUnicodeString(&Key1Name, &Key2Name, !CaseSensitive); +} + +/** +* @name CreateBTreeFromIndex +* @implemented +* +* Parse an index and create a B-Tree in memory from it. +* +* @param IndexRootContext +* Pointer to an NTFS_ATTR_CONTEXT that describes the location of the index root attribute. +* +* @param NewTree +* Pointer to a PB_TREE that will receive the pointer to a newly-created B-Tree. +* +* @returns +* STATUS_SUCCESS on success. +* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. +* +* @remarks +* Allocates memory for the entire tree. Caller is responsible for destroying the tree with DestroyBTree(). +*/ +NTSTATUS +CreateBTreeFromIndex(PNTFS_ATTR_CONTEXT IndexRootContext, + PINDEX_ROOT_ATTRIBUTE IndexRoot, + PB_TREE *NewTree) +{ + PINDEX_ENTRY_ATTRIBUTE CurrentNodeEntry; + PB_TREE Tree = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE), TAG_NTFS); + PB_TREE_FILENAME_NODE RootNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_FILENAME_NODE), TAG_NTFS); + PB_TREE_KEY CurrentKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + + DPRINT1("CreateBTreeFromIndex(%p, %p, %p)\n", IndexRootContext, IndexRoot, NewTree); + + if (!Tree || !RootNode || !CurrentKey) + { + DPRINT1("Couldn't allocate enough memory for B-Tree!\n"); + if (Tree) + ExFreePoolWithTag(Tree, TAG_NTFS); + if (CurrentKey) + ExFreePoolWithTag(CurrentKey, TAG_NTFS); + if (RootNode) + ExFreePoolWithTag(RootNode, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(Tree, sizeof(B_TREE)); + RtlZeroMemory(RootNode, sizeof(B_TREE_FILENAME_NODE)); + RtlZeroMemory(CurrentKey, sizeof(B_TREE_KEY)); + + // Setup the Tree + RootNode->FirstKey = CurrentKey; + Tree->RootNode = RootNode; + + // Create a key for each entry in the node + CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexRoot + + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + + IndexRoot->Header.FirstEntryOffset); + while (TRUE) + { + // Allocate memory for the current entry + CurrentKey->IndexEntry = ExAllocatePoolWithTag(NonPagedPool, CurrentNodeEntry->Length, TAG_NTFS); + if (!CurrentKey->IndexEntry) + { + DPRINT1("ERROR: Couldn't allocate memory for next key!\n"); + DestroyBTree(Tree); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RootNode->KeyCount++; + + // If this isn't the last entry + if (!(CurrentNodeEntry->Flags & NTFS_INDEX_ENTRY_END)) + { + // Create the next key + PB_TREE_KEY NextKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(PB_TREE_KEY), TAG_NTFS); + if (!NextKey) + { + DPRINT1("ERROR: Couldn't allocate memory for next key!\n"); + DestroyBTree(Tree); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(NextKey, sizeof(PB_TREE_KEY)); + + // Add NextKey to the end of the list + CurrentKey->NextKey = NextKey; + + // Copy the current entry to its key + RtlCopyMemory(CurrentKey->IndexEntry, CurrentNodeEntry, CurrentNodeEntry->Length); + + // Make sure this B-Tree is only one level deep (flat list) + if (CurrentKey->IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + { + DPRINT1("TODO: Only directories with single-level B-Trees are supported right now!\n"); + DestroyBTree(Tree); + return STATUS_NOT_IMPLEMENTED; + } + + // Advance to the next entry + CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)CurrentNodeEntry + CurrentNodeEntry->Length); + CurrentKey = NextKey; + } + else + { + // Copy the final entry to its key + RtlCopyMemory(CurrentKey->IndexEntry, CurrentNodeEntry, CurrentNodeEntry->Length); + CurrentKey->NextKey = NULL; + + // Make sure this B-Tree is only one level deep (flat list) + if (CurrentKey->IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) + { + DPRINT1("TODO: Only directories with single-level B-Trees are supported right now!\n"); + DestroyBTree(Tree); + return STATUS_NOT_IMPLEMENTED; + } + + break; + } + } + + *NewTree = Tree; + + return STATUS_SUCCESS; +} + +/** +* @name CreateIndexRootFromBTree +* @implemented +* +* Parse a B-Tree in memory and convert it into an index that can be written to disk. +* +* @param DeviceExt +* Pointer to the DEVICE_EXTENSION of the target drive. +* +* @param Tree +* Pointer to a B_TREE that describes the index to be written. +* +* @param MaxIndexSize +* Describes how large the index can be before it will take too much space in the file record. +* After reaching MaxIndexSize, an index can no longer be represented with just an index root +* attribute, and will require an index allocation and $I30 bitmap (TODO). +* +* @param IndexRoot +* Pointer to a PINDEX_ROOT_ATTRIBUTE that will receive a pointer to the newly-created index. +* +* @param Length +* Pointer to a ULONG which will receive the length of the new index root. +* +* @returns +* STATUS_SUCCESS on success. +* STATUS_INSUFFICIENT_RESOURCES if an allocation fails. +* STATUS_NOT_IMPLEMENTED if the new index can't fit within MaxIndexSize. +* +* @remarks +* If the function succeeds, it's the caller's responsibility to free IndexRoot with ExFreePoolWithTag(). +*/ +NTSTATUS +CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, + PB_TREE Tree, + ULONG MaxIndexSize, + PINDEX_ROOT_ATTRIBUTE *IndexRoot, + ULONG *Length) +{ + PINDEX_ENTRY_ATTRIBUTE CurrentNodeEntry; + PINDEX_ROOT_ATTRIBUTE NewIndexRoot = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + + DPRINT1("CreateIndexRootFromBTree(%p, %p, 0x%lx, %p, %p)\n", DeviceExt, Tree, MaxIndexSize, IndexRoot, Length); + + if (!NewIndexRoot) + { + DPRINT1("Failed to allocate memory for Index Root!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Setup the new index root + RtlZeroMemory(NewIndexRoot, DeviceExt->NtfsInfo.BytesPerFileRecord); + + NewIndexRoot->AttributeType = AttributeFileName; + NewIndexRoot->CollationRule = COLLATION_FILE_NAME; + NewIndexRoot->SizeOfEntry = DeviceExt->NtfsInfo.BytesPerIndexRecord; + // If Bytes per index record is less than cluster size, clusters per index record becomes sectors per index + if (NewIndexRoot->SizeOfEntry < DeviceExt->NtfsInfo.BytesPerCluster) + NewIndexRoot->ClustersPerIndexRecord = NewIndexRoot->SizeOfEntry / DeviceExt->NtfsInfo.BytesPerSector; + else + NewIndexRoot->ClustersPerIndexRecord = NewIndexRoot->SizeOfEntry / DeviceExt->NtfsInfo.BytesPerCluster; + + // Setup the Index node header + NewIndexRoot->Header.FirstEntryOffset = sizeof(INDEX_HEADER_ATTRIBUTE); + NewIndexRoot->Header.Flags = INDEX_ROOT_SMALL; + + // Start summing the total size of this node's entries + NewIndexRoot->Header.TotalSizeOfEntries = NewIndexRoot->Header.FirstEntryOffset; + + // Setup each Node Entry + PB_TREE_KEY CurrentKey = Tree->RootNode->FirstKey; + CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)NewIndexRoot + + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + + NewIndexRoot->Header.FirstEntryOffset); + for (int i = 0; i < Tree->RootNode->KeyCount; i++) + { + // Would adding the current entry to the index increase the index size beyond the limit we've set? + ULONG IndexSize = FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + + NewIndexRoot->Header.FirstEntryOffset + + NewIndexRoot->Header.TotalSizeOfEntries + + CurrentNodeEntry->Length; + if (IndexSize > MaxIndexSize) + { + DPRINT1("TODO: Adding file would require creating an index allocation!\n"); + ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + return STATUS_NOT_IMPLEMENTED; + } + + // Copy the index entry + if (CurrentKey->IndexEntry->Length > 0) + RtlCopyMemory(CurrentNodeEntry, CurrentKey->IndexEntry, CurrentKey->IndexEntry->Length); + else + DPRINT1("DRIVER ERROR: CurrentKey->IndexEntry->Length <= 0 !\n"); + + DPRINT1("Index Node Entry Stream Length: %u\nIndex Node Entry Length: %u\n", + CurrentNodeEntry->KeyLength, + CurrentNodeEntry->Length); + + // Add Length of Current Entry to Total Size of Entries + NewIndexRoot->Header.TotalSizeOfEntries += CurrentNodeEntry->Length; + + // Go to the next node + CurrentNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)CurrentNodeEntry + CurrentNodeEntry->Length); + + CurrentKey = CurrentKey->NextKey; + } + + NewIndexRoot->Header.AllocatedSize = NewIndexRoot->Header.TotalSizeOfEntries; + + *IndexRoot = NewIndexRoot; + *Length = NewIndexRoot->Header.AllocatedSize + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header); + + return STATUS_SUCCESS; +} + +VOID +DestroyBTreeKey(PB_TREE_KEY Key) +{ + if (Key->IndexEntry) + ExFreePoolWithTag(Key->IndexEntry, TAG_NTFS); + + // We'll destroy Key->LesserChild here after we start using it + + ExFreePoolWithTag(Key, TAG_NTFS); +} + +VOID +DestroyBTreeNode(PB_TREE_FILENAME_NODE Node) +{ + PB_TREE_KEY NextKey; + PB_TREE_KEY CurrentKey = Node->FirstKey; + for (int i = 0; i < Node->KeyCount; i++) + { + NT_ASSERT(CurrentKey); + NextKey = CurrentKey->NextKey; + DestroyBTreeKey(CurrentKey); + CurrentKey = NextKey; + } + + NT_ASSERT(NextKey == NULL); + + ExFreePoolWithTag(Node, TAG_NTFS); +} + +/** +* @name DestroyBTree +* @implemented +* +* Destroys a B-Tree. +* +* @param Tree +* Pointer to the B_TREE which will be destroyed. +* +* @remarks +* Destroys every bit of data stored in the tree. +*/ +VOID +DestroyBTree(PB_TREE Tree) +{ + DestroyBTreeNode(Tree->RootNode); + ExFreePoolWithTag(Tree, TAG_NTFS); +} + +VOID +DumpBTreeKey(PB_TREE_KEY Key, int Number, int Depth) +{ + for (int i = 0; i < Depth; i++) + DbgPrint(" "); + DbgPrint(" Key #%d", Number); + + if (!(Key->IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) + { + UNICODE_STRING FileName; + FileName.Length = Key->IndexEntry->FileName.NameLength * 2; + FileName.MaximumLength = FileName.Length; + FileName.Buffer = Key->IndexEntry->FileName.Name; + DbgPrint(" '%wZ'\n", &FileName); + } + else + DbgPrint(" (Dummy Key)\n"); +} + +DumpBTreeNode(PB_TREE_FILENAME_NODE Node, int Number, int Depth) +{ + for (int i = 0; i < Depth; i++) + DbgPrint(" "); + DbgPrint("Node #%d, Depth %d\n", Number, Depth); + + PB_TREE_KEY CurrentKey = Node->FirstKey; + for (int i = 0; i < Node->KeyCount; i++) + { + DumpBTreeKey(CurrentKey, i, Depth); + CurrentKey = CurrentKey->NextKey; + } +} + +/** +* @name DumpBTree +* @implemented +* +* Displays a B-Tree. +* +* @param Tree +* Pointer to the B_TREE which will be displayed. +* +* @remarks +* Displays a diagnostic summary of a B_TREE. +*/ +VOID +DumpBTree(PB_TREE Tree) +{ + DbgPrint("B_TREE @ %p\n", Tree); + DumpBTreeNode(Tree->RootNode, 0, 0); +} + +/** +* @name NtfsInsertKey +* @implemented +* +* Inserts a FILENAME_ATTRIBUTE into a B-Tree node. +* +* @param FileReference +* Reference number to the file being added. This will be a combination of the MFT index and update sequence number. +* +* @param FileNameAttribute +* Pointer to a FILENAME_ATTRIBUTE which is the data for the key that will be added to the tree. A copy will be made. +* +* @param Node +* Pointer to a B_TREE_FILENAME_NODE into which a new key will be inserted, in order. +* +* @param CaseSensitive +* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE +* if an application created the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* +* @remarks +* A node is always sorted, with the least comparable filename stored first and a dummy key to mark the end. +*/ +NTSTATUS +NtfsInsertKey(ULONGLONG FileReference, + PFILENAME_ATTRIBUTE FileNameAttribute, + PB_TREE_FILENAME_NODE Node, + BOOLEAN CaseSensitive) +{ + // Calculate size of Attribute and Index Entry + ULONG AttributeSize = GetFileNameAttributeLength(FileNameAttribute); + ULONG EntrySize = ALIGN_UP_BY(AttributeSize + FIELD_OFFSET(INDEX_ENTRY_ATTRIBUTE, FileName), 8); + PINDEX_ENTRY_ATTRIBUTE NewEntry; + + DPRINT1("NtfsInsertKey(0x%02I64, %p, %p, %s)\n", + FileReference, + FileNameAttribute, + Node, + CaseSensitive ? "TRUE" : "FALSE"); + + // Create a new Index Entry for the file + NewEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_NTFS); + if (!NewEntry) + { + DPRINT1("ERROR: Failed to allocate memory for Index Entry!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Setup the Index Entry + RtlZeroMemory(NewEntry, EntrySize); + NewEntry->Data.Directory.IndexedFile = FileReference; + NewEntry->Length = EntrySize; + NewEntry->KeyLength = AttributeSize; + + // Copy the FileNameAttribute + RtlCopyMemory(&NewEntry->FileName, FileNameAttribute, AttributeSize); + + // Setup the New Key + PB_TREE_KEY NewKey = ExAllocatePoolWithTag(NonPagedPool, sizeof(B_TREE_KEY), TAG_NTFS); + NewKey->IndexEntry = NewEntry; + NewKey->NextKey = NULL; + + // Find where to insert the key + PB_TREE_KEY CurrentKey = Node->FirstKey; + PB_TREE_KEY PreviousKey = NULL; + for (int i = 0; i < Node->KeyCount; i++) + { + // Should the New Key go before the current key? + LONG Comparison = CompareTreeKeys(NewKey, CurrentKey, CaseSensitive); + if (Comparison == 0) + { + DPRINT1("DRIVER ERROR: Asked to insert key into tree that already has it!\n"); + ExFreePoolWithTag(NewKey, TAG_NTFS); + ExFreePoolWithTag(NewEntry, TAG_NTFS); + return STATUS_INVALID_PARAMETER; + } + if (Comparison < 0) + { + // NewKey is < CurrentKey + // Insert New Key before Current Key + NewKey->NextKey = CurrentKey; + + // was CurrentKey the first key? + if (CurrentKey == Node->FirstKey) + Node->FirstKey = NewKey; + else + PreviousKey->NextKey = NewKey; + break; + } + + PreviousKey = CurrentKey; + CurrentKey = CurrentKey->NextKey; + } + + Node->KeyCount++; + + // NewEntry and NewKey will be destroyed later by DestroyBTree() + + return STATUS_SUCCESS; +} Propchange: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/btree.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Wed Jun 28 03:45:52 2017 @@ -747,7 +747,8 @@ Status = NtfsAddFilenameToDirectory(DeviceExt, ParentMftIndex, FileMftIndex, - FilenameAttribute); + FilenameAttribute, + CaseSensitive); } ExFreePoolWithTag(FileRecord, TAG_NTFS); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Wed Jun 28 03:45:52 2017 @@ -53,13 +53,17 @@ * @param FilenameAttribute * Pointer to the FILENAME_ATTRIBUTE of the file being added to the directory. * +* @param CaseSensitive +* Boolean indicating if the function should operate in case-sensitive mode. This will be TRUE +* if an application created the file with the FILE_FLAG_POSIX_SEMANTICS flag. +* * @return * STATUS_SUCCESS on success. * STATUS_INSUFFICIENT_RESOURCES if an allocation fails. * STATUS_NOT_IMPLEMENTED if target address isn't at the end of the given file record. * * @remarks -* WIP - Can only support an empty directory. +* WIP - Can only support a few files in a directory. * One FILENAME_ATTRIBUTE is added to the directory's index for each link to that file. So, each * file which contains one FILENAME_ATTRIBUTE for a long name and another for the 8.3 name, will * get both attributes added to its parent directory. @@ -68,7 +72,8 @@ NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, ULONGLONG DirectoryMftIndex, ULONGLONG FileReferenceNumber, - PFILENAME_ATTRIBUTE FilenameAttribute) + PFILENAME_ATTRIBUTE FilenameAttribute, + BOOLEAN CaseSensitive) { NTSTATUS Status = STATUS_SUCCESS; PFILE_RECORD_HEADER ParentFileRecord; @@ -76,12 +81,14 @@ PINDEX_ROOT_ATTRIBUTE I30IndexRoot; ULONG IndexRootOffset; ULONGLONG I30IndexRootLength; - PINDEX_ENTRY_ATTRIBUTE IndexNodeEntry; ULONG LengthWritten; PNTFS_ATTR_RECORD DestinationAttribute; PINDEX_ROOT_ATTRIBUTE NewIndexRoot; ULONG AttributeLength; PNTFS_ATTR_RECORD NextAttribute; + PB_TREE NewTree; + ULONG BtreeIndexLength; + ULONG MaxIndexSize; // Allocate memory for the parent directory ParentFileRecord = ExAllocatePoolWithTag(NonPagedPool, @@ -122,9 +129,15 @@ return Status; } + // Find the maximum index size given what the file record can hold + MaxIndexSize = DeviceExt->NtfsInfo.BytesPerFileRecord + - IndexRootOffset + - IndexRootContext->Record.Resident.ValueOffset + - FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header) + - (sizeof(ULONG) * 2); + + // Allocate memory for the index root data I30IndexRootLength = AttributeDataLength(&IndexRootContext->Record); - - // Allocate memory for the index root data I30IndexRoot = (PINDEX_ROOT_ATTRIBUTE)ExAllocatePoolWithTag(NonPagedPool, I30IndexRootLength, TAG_NTFS); if (!I30IndexRoot) { @@ -144,82 +157,59 @@ return Status; } - // Make sure it's empty (temporarily) - IndexNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)I30IndexRoot + I30IndexRoot->Header.FirstEntryOffset + 0x10); - if (IndexNodeEntry->Data.Directory.IndexedFile != 0 || IndexNodeEntry->Flags != 2) - { - DPRINT1("FIXME: File-creation is only supported in empty directories right now! Be patient! :)\n"); + // Convert the index to a B*Tree + Status = CreateBTreeFromIndex(IndexRootContext, I30IndexRoot, &NewTree); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to create B-Tree from Index!\n"); ReleaseAttributeContext(IndexRootContext); ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return STATUS_NOT_IMPLEMENTED; - } - - // Now we need to setup a new index root attribute to replace the old one - NewIndexRoot = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerIndexRecord, TAG_NTFS); - if (!NewIndexRoot) - { - DPRINT1("ERROR: Unable to allocate memory for new index root attribute!\n"); + return Status; + } + + DumpBTree(NewTree); + + // Insert the key for the file we're adding + Status = NtfsInsertKey(FileReferenceNumber, FilenameAttribute, NewTree->RootNode, CaseSensitive); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to insert key into B-Tree!\n"); + DestroyBTree(NewTree); ReleaseAttributeContext(IndexRootContext); ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); - return STATUS_INSUFFICIENT_RESOURCES; - } + return Status; + } + + DumpBTree(NewTree); - // Setup the new index record - RtlZeroMemory(NewIndexRoot, DeviceExt->NtfsInfo.BytesPerIndexRecord); // shouldn't be necessary but aids in debugging - - NewIndexRoot->AttributeType = AttributeFileName; - NewIndexRoot->CollationRule = COLLATION_FILE_NAME; - NewIndexRoot->SizeOfEntry = DeviceExt->NtfsInfo.BytesPerIndexRecord; - // If Bytes per index record is less than cluster size, clusters per index record becomes sectors per index - if(NewIndexRoot->SizeOfEntry < DeviceExt->NtfsInfo.BytesPerCluster) - NewIndexRoot->ClustersPerIndexRecord = NewIndexRoot->SizeOfEntry / DeviceExt->NtfsInfo.BytesPerSector; - else - NewIndexRoot->ClustersPerIndexRecord = NewIndexRoot->SizeOfEntry / DeviceExt->NtfsInfo.BytesPerCluster; - - // Setup the Index node header - NewIndexRoot->Header.FirstEntryOffset = 0x10; - NewIndexRoot->Header.Flags = INDEX_ROOT_SMALL; - // still need to calculate sizes - - // The first index node entry will be for the filename we're adding - IndexNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)NewIndexRoot + NewIndexRoot->Header.FirstEntryOffset + 0x10); - IndexNodeEntry->Data.Directory.IndexedFile = FileReferenceNumber; - IndexNodeEntry->Flags = INDEX_ROOT_SMALL; - IndexNodeEntry->KeyLength = FIELD_OFFSET(FILENAME_ATTRIBUTE, Name) + (2 * FilenameAttribute->NameLength); - IndexNodeEntry->Length = ALIGN_UP_BY(IndexNodeEntry->KeyLength, 8) + FIELD_OFFSET(INDEX_ENTRY_ATTRIBUTE, FileName); - - // Now we can calculate the Node length (temp logic) - NewIndexRoot->Header.TotalSizeOfEntries = NewIndexRoot->Header.FirstEntryOffset + IndexNodeEntry->Length + 0x10; - NewIndexRoot->Header.AllocatedSize = NewIndexRoot->Header.TotalSizeOfEntries; - - DPRINT1("New Index Node Entry Stream Length: %u\nNew Inde Node Entry Length: %u\n", - IndexNodeEntry->KeyLength, - IndexNodeEntry->Length); - - // copy over the attribute proper - RtlCopyMemory(&IndexNodeEntry->FileName, FilenameAttribute, IndexNodeEntry->KeyLength); - - // Now setup the dummy key - IndexNodeEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexNodeEntry + IndexNodeEntry->Length); - - IndexNodeEntry->Data.Directory.IndexedFile = 0; - IndexNodeEntry->Length = 0x10; - IndexNodeEntry->KeyLength = 0; - IndexNodeEntry->Flags = NTFS_INDEX_ENTRY_END; - - // This is when we'd normally setup the length (already done above) + // Convert B*Tree back to Index Root + Status = CreateIndexRootFromBTree(DeviceExt, NewTree, MaxIndexSize, &NewIndexRoot, &BtreeIndexLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERROR: Failed to create Index root from B-Tree!\n"); + DestroyBTree(NewTree); + ReleaseAttributeContext(IndexRootContext); + ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); + ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); + return Status; + } + + // We're done with the B-Tree now + DestroyBTree(NewTree); // Write back the new index root attribute to the parent directory file record - // First, we need to make sure the attribute is large enough. + // First, we need to resize the attribute. + // CreateIndexRootFromBTree() should have verified that the index root fits within MaxIndexSize. // We can't set the size as we normally would, because if we extend past the file record, // we must create an index allocation and index bitmap (TODO). Also TODO: support file records with // $ATTRIBUTE_LIST's. AttributeLength = NewIndexRoot->Header.AllocatedSize + FIELD_OFFSET(INDEX_ROOT_ATTRIBUTE, Header); DestinationAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)ParentFileRecord + IndexRootOffset); + // Find the attribute (or attribute-end marker) after the index root NextAttribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)DestinationAttribute + DestinationAttribute->Length); if (NextAttribute->Type != AttributeEnd) { @@ -230,24 +220,27 @@ ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); return STATUS_NOT_IMPLEMENTED; } - + // Update the length of the attribute in the file record of the parent directory InternalSetResidentAttributeLength(IndexRootContext, ParentFileRecord, IndexRootOffset, AttributeLength); + NT_ASSERT(ParentFileRecord->BytesInUse <= DeviceExt->NtfsInfo.BytesPerFileRecord); + Status = UpdateFileRecord(DeviceExt, DirectoryMftIndex, ParentFileRecord); if (!NT_SUCCESS(Status)) { DPRINT1("ERROR: Failed to update file record of directory with index: %llx\n", DirectoryMftIndex); ExFreePoolWithTag(ParentFileRecord, TAG_NTFS); ExFreePoolWithTag(NewIndexRoot, TAG_NTFS); + ReleaseAttributeContext(IndexRootContext); ExFreePoolWithTag(I30IndexRoot, TAG_NTFS); return Status; } - // Update the parent directory with the new index root + // Write the new index root to disk Status = WriteAttribute(DeviceExt, IndexRootContext, 0, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Jun 28 03:45:52 2017 @@ -395,6 +395,28 @@ FILENAME_ATTRIBUTE FileName; } INDEX_ENTRY_ATTRIBUTE, *PINDEX_ENTRY_ATTRIBUTE; +// Keys are arranged in nodes as an ordered, linked list +typedef struct _B_TREE_KEY +{ + struct _B_TREE_KEY *NextKey; + // PB_TREE_FILENAME_NODE LesserChild; // we aren't worried about multi-level trees yet + PINDEX_ENTRY_ATTRIBUTE IndexEntry; // must be last member for FIELD_OFFSET +}B_TREE_KEY, *PB_TREE_KEY; + +// Every Node is just an ordered list of keys. +// Sub-nodes can be found attached to a key (if they exist). +// A key's sub-node precedes that key in the ordered list. +typedef struct +{ + int KeyCount; + PB_TREE_KEY FirstKey; +} B_TREE_FILENAME_NODE, *PB_TREE_FILENAME_NODE; + +typedef struct +{ + PB_TREE_FILENAME_NODE RootNode; +} B_TREE, *PB_TREE; + typedef struct { ULONGLONG Unknown1; @@ -559,6 +581,8 @@ LONGLONG *DataRunOffset, ULONGLONG *DataRunLength); +ULONG GetFileNameAttributeLength(PFILENAME_ATTRIBUTE FileNameAttribute); + VOID NtfsDumpDataRuns(PVOID StartOfRun, ULONGLONG CurrentLCN); @@ -645,6 +669,38 @@ IN BOOLEAN Override); +/* btree.c */ + +LONG +CompareTreeKeys(PB_TREE_KEY Key1, + PB_TREE_KEY Key2, + BOOLEAN CaseSensitive); + +NTSTATUS +CreateBTreeFromIndex(/*PDEVICE_EXTENSION Vcb,*/ + PNTFS_ATTR_CONTEXT IndexRootContext, + PINDEX_ROOT_ATTRIBUTE IndexRoot, + PB_TREE *NewTree); + +NTSTATUS +CreateIndexRootFromBTree(PDEVICE_EXTENSION DeviceExt, + PB_TREE Tree, + ULONG MaxIndexSize, + PINDEX_ROOT_ATTRIBUTE *IndexRoot, + ULONG *Length); + +VOID +DestroyBTree(PB_TREE Tree); + +VOID +DumpBTree(PB_TREE Tree); + +NTSTATUS +NtfsInsertKey(ULONGLONG FileReference, + PFILENAME_ATTRIBUTE FileNameAttribute, + PB_TREE_FILENAME_NODE Node, + BOOLEAN CaseSensitive); + /* close.c */ NTSTATUS @@ -683,8 +739,9 @@ NTSTATUS NtfsAddFilenameToDirectory(PDEVICE_EXTENSION DeviceExt, ULONGLONG DirectoryMftIndex, - ULONGLONG FileMftIndex, - PFILENAME_ATTRIBUTE FilenameAttribute); + ULONGLONG FileReferenceNumber, + PFILENAME_ATTRIBUTE FilenameAttribute, + BOOLEAN CaseSensitive); ULONGLONG NtfsGetFileSize(PDEVICE_EXTENSION DeviceExt,

7 years, 2 months

[hbelusca] 75222: [CMLIB]: Addendum to r63495: Fix the CmpCopyKeyValueList() helper to make it what it is supposed to do: copy the list of values of a given key: this means, also copying the values...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 28 00:04:13 2017 New Revision: 75222 URL: http://svn.reactos.org/svn/reactos?rev=75222&view=rev Log: [CMLIB]: Addendum to r63495: Fix the CmpCopyKeyValueList() helper to make it what it is supposed to do: copy the list of values of a given key: this means, also copying the values themselves!! For that aim I also introduce a CmpCopyValue() helper that allows copying the value data of a given registry value, taking into account whether the value is "small", normal or "big" (we don't support "big values" yet). This function allocates and copies the necessary hive cells corresponding to the given value. Only then, we add a new entry into the registry key value list that is grown dynamically. Cleanup is performed in case of failure. Now we can export registry sub-trees as registry hives, and successfully re-mount them in the registry. CORE-13476 CORE-8259 CORE-10793 Modified: trunk/reactos/sdk/lib/cmlib/cmvalue.c Modified: trunk/reactos/sdk/lib/cmlib/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/cmlib/cmvalue.c?re… ============================================================================== --- trunk/reactos/sdk/lib/cmlib/cmvalue.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/cmlib/cmvalue.c [iso-8859-1] Wed Jun 28 00:04:13 2017 @@ -190,7 +190,7 @@ return NULL; } - /* This should never happen!*/ + /* This should never happen! */ if (BufferAllocated) { /* Free the buffer and bugcheck */ @@ -379,6 +379,7 @@ PCELL_DATA DestinationData = NULL; HCELL_INDEX DestinationCell = HCELL_NIL; LONG DataSize; + PAGED_CODE(); /* Get the data and the size of the source cell */ @@ -401,11 +402,115 @@ Cleanup: /* Release the cells */ + if (DestinationData) HvReleaseCell(DestinationHive, DestinationCell); if (SourceData) HvReleaseCell(SourceHive, SourceCell); - if (DestinationData) HvReleaseCell(DestinationHive, DestinationCell); /* Return the destination cell index */ return DestinationCell; +} + +HCELL_INDEX +NTAPI +CmpCopyValue(IN PHHIVE SourceHive, + IN HCELL_INDEX SourceValueCell, + IN PHHIVE DestinationHive, + IN HSTORAGE_TYPE StorageType) +{ + PCM_KEY_VALUE Value, NewValue; + HCELL_INDEX NewValueCell, NewDataCell; + PCELL_DATA CellData; + ULONG SmallData; + ULONG DataSize; + BOOLEAN IsSmall; + + PAGED_CODE(); + + /* Get the actual source data */ + Value = (PCM_KEY_VALUE)HvGetCell(SourceHive, SourceValueCell); + if (!Value) ASSERT(FALSE); + + /* Copy the value cell body */ + NewValueCell = CmpCopyCell(SourceHive, + SourceValueCell, + DestinationHive, + StorageType); + if (NewValueCell == HCELL_NIL) + { + /* Not enough storage space */ + goto Quit; + } + + /* Copy the value data */ + IsSmall = CmpIsKeyValueSmall(&DataSize, Value->DataLength); + if (DataSize == 0) + { + /* Nothing to copy */ + + NewValue = (PCM_KEY_VALUE)HvGetCell(DestinationHive, NewValueCell); + ASSERT(NewValue); + NewValue->DataLength = 0; + NewValue->Data = HCELL_NIL; + HvReleaseCell(DestinationHive, NewValueCell); + + goto Quit; + } + + if (DataSize <= CM_KEY_VALUE_SMALL) + { + if (IsSmall) + { + /* Small value, copy directly */ + SmallData = Value->Data; + } + else + { + /* The value is small, but was stored in a regular cell. Get the data from it. */ + CellData = HvGetCell(SourceHive, Value->Data); + ASSERT(CellData); + SmallData = *(PULONG)CellData; + HvReleaseCell(SourceHive, Value->Data); + } + + /* This is a small key, set the data directly inside */ + NewValue = (PCM_KEY_VALUE)HvGetCell(DestinationHive, NewValueCell); + ASSERT(NewValue); + NewValue->DataLength = DataSize + CM_KEY_VALUE_SPECIAL_SIZE; + NewValue->Data = SmallData; + HvReleaseCell(DestinationHive, NewValueCell); + } + else + { + /* Big keys are currently unsupported */ + ASSERT_VALUE_BIG(SourceHive, DataSize); + // Should use CmpGetValueData and CmpSetValueDataNew for big values! + + /* Regular value */ + + /* Copy the data cell */ + NewDataCell = CmpCopyCell(SourceHive, + Value->Data, + DestinationHive, + StorageType); + if (NewDataCell == HCELL_NIL) + { + /* Not enough storage space */ + HvFreeCell(DestinationHive, NewValueCell); + NewValueCell = HCELL_NIL; + goto Quit; + } + + NewValue = (PCM_KEY_VALUE)HvGetCell(DestinationHive, NewValueCell); + ASSERT(NewValue); + NewValue->DataLength = DataSize; + NewValue->Data = NewDataCell; + HvReleaseCell(DestinationHive, NewValueCell); + } + +Quit: + HvReleaseCell(SourceHive, SourceValueCell); + + /* Return the copied value body cell index */ + return NewValueCell; } NTSTATUS @@ -417,51 +522,82 @@ IN HSTORAGE_TYPE StorageType) { NTSTATUS Status = STATUS_SUCCESS; - HCELL_INDEX CellIndex = HCELL_NIL; + PCELL_DATA SrcListData = NULL, DestListData = NULL; + HCELL_INDEX NewValue; ULONG Index; - PCELL_DATA SrcListData = NULL; - PCELL_DATA DestListData = NULL; - - PAGED_CODE(); - - /* Set the count */ - DestValueList->Count = SrcValueList->Count; + + PAGED_CODE(); + + /* Reset the destination value list */ + DestValueList->Count = 0; + DestValueList->List = HCELL_NIL; /* Check if the list is empty */ - if (!DestValueList->Count) - { - DestValueList->List = HCELL_NIL; + if (!SrcValueList->Count) return STATUS_SUCCESS; - } - - /* Create a simple copy of the list */ - CellIndex = CmpCopyCell(SourceHive, - SrcValueList->List, - DestinationHive, - StorageType); - if (CellIndex == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; - - /* Get the source and the destination value list */ + + /* Get the source value list */ SrcListData = HvGetCell(SourceHive, SrcValueList->List); - DestListData = HvGetCell(DestinationHive, CellIndex); + ASSERT(SrcListData); /* Copy the actual values */ for (Index = 0; Index < SrcValueList->Count; Index++) { - DestListData->u.KeyList[Index] = CmpCopyCell(SourceHive, - SrcListData->u.KeyList[Index], - DestinationHive, - StorageType); - if (DestListData->u.KeyList[Index] == HCELL_NIL) - { + NewValue = CmpCopyValue(SourceHive, + SrcListData->u.KeyList[Index], + DestinationHive, + StorageType); + if (NewValue == HCELL_NIL) + { + /* Not enough storage space, stop there and cleanup afterwards */ Status = STATUS_INSUFFICIENT_RESOURCES; break; } + + /* Add this value cell to the child list */ + Status = CmpAddValueToList(DestinationHive, + NewValue, + Index, + StorageType, + DestValueList); + if (!NT_SUCCESS(Status)) + { + /* Not enough storage space, stop there */ + + /* Cleanup the newly-created value here, the other ones will be cleaned up afterwards */ + if (!CmpFreeValue(DestinationHive, NewValue)) + HvFreeCell(DestinationHive, NewValue); + break; + } + } + + /* Revert-cleanup if failure */ + if (!NT_SUCCESS(Status) && (DestValueList->List != HCELL_NIL)) + { + /* Do not use CmpRemoveValueFromList but directly delete the data */ + + /* Get the destination value list */ + DestListData = HvGetCell(DestinationHive, DestValueList->List); + ASSERT(DestListData); + + /* Delete each copied value */ + while (Index--) + { + NewValue = DestListData->u.KeyList[Index]; + if (!CmpFreeValue(DestinationHive, NewValue)) + HvFreeCell(DestinationHive, NewValue); + } + + /* Release and free the list */ + HvReleaseCell(DestinationHive, DestValueList->List); + HvFreeCell(DestinationHive, DestValueList->List); + + DestValueList->Count = 0; + DestValueList->List = HCELL_NIL; } /* Release the cells */ - if (SrcListData) HvReleaseCell(SourceHive, SrcValueList->List); - if (DestListData) HvReleaseCell(DestinationHive, CellIndex); + HvReleaseCell(SourceHive, SrcValueList->List); return Status; }

7 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017