Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[gedmurphy] 68344: [DEVMGR] - Implement very basic uninstall functionality - Move device action code into the DeviceView class

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Jul 5 08:49:54 2015 New Revision: 68344 URL: http://svn.reactos.org/svn/reactos?rev=68344&view=rev Log: [DEVMGR] - Implement very basic uninstall functionality - Move device action code into the DeviceView class Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -344,6 +344,40 @@ return true; } +bool +CDeviceNode::UninstallDevice() +{ + + if (CanUninstall() == false) + return false; + + SP_REMOVEDEVICE_PARAMS RemoveDevParams; + RemoveDevParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + RemoveDevParams.ClassInstallHeader.InstallFunction = DIF_REMOVE; + RemoveDevParams.Scope = DI_REMOVEDEVICE_GLOBAL; + RemoveDevParams.HwProfile = 0; + + // + // We probably need to walk all the siblings of this + // device and ask if they're happy with the uninstall + // + + + // Remove it + SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &RemoveDevParams.ClassInstallHeader, + sizeof(SP_REMOVEDEVICE_PARAMS)); + SetupDiCallClassInstaller(DIF_REMOVE, m_hDevInfo, &m_DevinfoData); + + // Clear the install params + SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + NULL, + 0); + +} + /* PRIVATE METHODS ******************************************************/ void Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -38,6 +38,9 @@ _Out_ bool &NeedsReboot ); + bool UninstallDevice( + ); + private: void Cleanup( ); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -229,6 +229,68 @@ if (hThread) CloseHandle(hThread); } +LRESULT +CDeviceView::OnAction( + _In_ UINT Action +) +{ + switch (Action) + { + case IDC_PROPERTIES: + { + DisplayPropertySheet(); + break; + } + + case IDC_SCAN_HARDWARE: + { + Refresh(GetCurrentView(), + true, + true, + NULL); + break; + } + + case IDC_ENABLE_DRV: + { + bool NeedsReboot; + if (EnableSelectedDevice(true, NeedsReboot) && + NeedsReboot) + { + MessageBox(m_hMainWnd, L"Rebooting", L"Enable", MB_OK); + } + break; + } + + case IDC_DISABLE_DRV: + { + bool NeedsReboot; + EnableSelectedDevice(false, NeedsReboot); + break; + } + + case IDC_UPDATE_DRV: + { + MessageBox(m_hMainWnd, L"Not yet implemented", L"Update Driver", MB_OK); + break; + } + + case IDC_UNINSTALL_DRV: + { + UninstallSelectedDevice(); + break; + } + + case IDC_ADD_HARDWARE: + { + MessageBox(m_hMainWnd, L"Not yet implemented", L"Add Hardware", MB_OK); + break; + } + } + + return 0; +} + void CDeviceView::DisplayPropertySheet() { @@ -286,77 +348,14 @@ return false; } -bool -CDeviceView::HasProperties( - _In_ LPTV_ITEMW TvItem - ) -{ - CNode *Node = GetNode(TvItem); - if (Node) - { - return Node->HasProperties(); - } - return false; -} - -bool -CDeviceView::IsDisabled( - _In_ LPTV_ITEMW TvItem - ) -{ - CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetNode(TvItem)); - if (Node) - { - return Node->IsDisabled(); - } - return false; -} - -bool -CDeviceView::CanDisable( - _In_ LPTV_ITEMW TvItem - ) -{ - CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetNode(TvItem)); - if (Node) - { - return Node->CanDisable(); - } - return false; -} - -bool -CDeviceView::EnableSelectedDevice( - _In_ bool Enable, - _Out_ bool &NeedsReboot - ) -{ - CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); - if (Node == nullptr) return false; - - if (Enable == false) - { - CAtlStringW str; - if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) - { - if (MessageBoxW(m_hMainWnd, - str, - Node->GetDisplayName(), - MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) - { - return false; - } - } - } - - if (Node->EnableDevice(Enable, NeedsReboot)) - { - Refresh(m_ViewType, true, true, Node->GetDeviceId()); - return true; - } - - return false; -} +CNode* +CDeviceView::GetSelectedNode() +{ + TV_ITEM TvItem; + TvItem.hItem = TreeView_GetSelection(m_hTreeView); + return GetNode(&TvItem); +} + // PRIVATE METHODS *******************************************/ @@ -710,6 +709,49 @@ } bool +CDeviceView::EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ) +{ + CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); + if (Node == nullptr) return false; + + if (Enable == false) + { + CAtlStringW str; + if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) + { + if (MessageBoxW(m_hMainWnd, + str, + Node->GetDisplayName(), + MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) + { + return false; + } + } + } + + if (Node->EnableDevice(Enable, NeedsReboot)) + { + Refresh(m_ViewType, true, true, Node->GetDeviceId()); + return true; + } + + return false; +} + +bool +CDeviceView::UninstallSelectedDevice( + ) +{ + CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); + if (Node == nullptr) return false; + + return Node->UninstallDevice(); +} + +bool CDeviceView::GetChildDevice( _In_ DEVINST ParentDevInst, _Out_ PDEVINST DevInst @@ -1034,13 +1076,6 @@ return NULL; } -CNode* CDeviceView::GetSelectedNode() -{ - TV_ITEM TvItem; - TvItem.hItem = TreeView_GetSelection(m_hTreeView); - return GetNode(&TvItem); -} - void CDeviceView::EmptyLists() { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -51,6 +51,10 @@ _In_ LPARAM lParam ); + LRESULT OnAction( + UINT Action + ); + VOID Refresh( _In_ ViewType Type, _In_ bool ScanForChanges, @@ -73,20 +77,7 @@ _In_ bool MainMenu ); - bool HasProperties( - _In_ LPTV_ITEMW TvItem - ); - //bool SelDeviceIsHidden(); - bool CanDisable( - _In_ LPTV_ITEMW TvItem - ); - bool IsDisabled( - _In_ LPTV_ITEMW TvItem - ); - - bool EnableSelectedDevice( - _In_ bool Enable, - _Out_ bool &NeedsReboot + CNode* GetSelectedNode( ); bool SelDeviceIsStarted(); @@ -115,6 +106,14 @@ bool RecurseChildDevices( _In_ DEVINST ParentDevice, _In_ HTREEITEM hParentTreeItem + ); + + bool EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ); + + bool UninstallSelectedDevice( ); bool GetChildDevice( @@ -153,7 +152,6 @@ CNode* GetNode( _In_ LPTV_ITEMW TvItem ); - CNode* GetSelectedNode(); CClassNode* GetClassNode( _In_ LPGUID ClassGuid Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -235,17 +235,6 @@ } bool -CMainWindow::ScanForHardwareChanges() -{ - // Refresh the cache and and display - m_DeviceView->Refresh(m_DeviceView->GetCurrentView(), - true, - true, - NULL); - return true; -} - -bool CMainWindow::CreateToolBar() { TBADDBITMAP TbAddBitmap; @@ -323,12 +312,14 @@ return bRet; } -void CMainWindow::UpdateUiContext(_In_ LPTV_ITEMW TvItem) +void CMainWindow::UpdateToolbar(_In_ LPTV_ITEMW TvItem) { WORD State; + CNode *Node = m_DeviceView->GetSelectedNode(); + // properties button - if (m_DeviceView->HasProperties(TvItem)) + if (Node->HasProperties()) { State = TBSTATE_ENABLED; } @@ -340,8 +331,11 @@ SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UPDATE_DRV, MAKELPARAM(State, 0)); //hack SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UNINSTALL_DRV, MAKELPARAM(State, 0)); // hack + + // enable driver button - if (m_DeviceView->IsDisabled(TvItem)) + if (Node->GetNodeType() == DeviceNode && + dynamic_cast<CDeviceNode *>(Node)->IsDisabled()) { State = TBSTATE_ENABLED; } @@ -352,7 +346,9 @@ SendMessageW(m_hToolBar, TB_SETSTATE, IDC_ENABLE_DRV, MAKELPARAM(State, 0)); // disable driver button - if (m_DeviceView->CanDisable(TvItem) && !m_DeviceView->IsDisabled(TvItem)) + if (Node->GetNodeType() == DeviceNode && + dynamic_cast<CDeviceNode *>(Node)->CanDisable() && + !dynamic_cast<CDeviceNode *>(Node)->IsDisabled()) { State = TBSTATE_ENABLED; } @@ -411,7 +407,10 @@ if (m_DeviceView->Initialize()) { // Do the initial scan - ScanForHardwareChanges(); + m_DeviceView->Refresh(m_DeviceView->GetCurrentView(), + true, + true, + NULL); // Display the window according to the user request ShowWindow(hwnd, m_CmdShow); @@ -468,7 +467,7 @@ case TVN_SELCHANGED: { LPNMTREEVIEW NmTreeView = (LPNMTREEVIEW)lParam; - UpdateUiContext(&NmTreeView->itemNew); + UpdateToolbar(&NmTreeView->itemNew); break; } @@ -543,50 +542,14 @@ switch (Msg) { case IDC_PROPERTIES: - { - m_DeviceView->DisplayPropertySheet(); - break; - } - case IDC_SCAN_HARDWARE: - { - ScanForHardwareChanges(); - break; - } - case IDC_ENABLE_DRV: - { - bool NeedsReboot; - if (m_DeviceView->EnableSelectedDevice(true, NeedsReboot) && - NeedsReboot) - { - MessageBox(m_hMainWnd, L"Rebooting", L"Enable", MB_OK); - } - break; - } - case IDC_DISABLE_DRV: - { - bool NeedsReboot; - m_DeviceView->EnableSelectedDevice(false, NeedsReboot); - break; - } - case IDC_UPDATE_DRV: - { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Update Driver", MB_OK); - break; - } - case IDC_UNINSTALL_DRV: - { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Uninstall Driver", MB_OK); - break; - } - case IDC_ADD_HARDWARE: { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Add Hardware", MB_OK); + m_DeviceView->OnAction(Msg); break; } Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Sun Jul 5 08:49:54 2015 @@ -45,7 +45,9 @@ bool CreateToolBar(); bool CreateStatusBar(); - void UpdateUiContext(_In_ LPTV_ITEMW TvItem); + void UpdateToolbar( + _In_ LPTV_ITEMW TvItem + ); bool StatusBarLoadString( HWND hStatusBar, @@ -68,8 +70,5 @@ bool RefreshView( ViewType Type ); - - bool ScanForHardwareChanges( - ); };

9 years, 2 months

[gedmurphy] 68343: [DEVMGR] Add the 'add hardware' option for the maun menu or if the root node is selected

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Jul 4 21:31:19 2015 New Revision: 68343 URL: http://svn.reactos.org/svn/reactos?rev=68343&view=rev Log: [DEVMGR] Add the 'add hardware' option for the maun menu or if the root node is selected Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jul 4 21:31:19 2015 @@ -168,7 +168,7 @@ HMENU hContextMenu = CreatePopupMenu(); // Add the actions for this node - BuildActionMenuForNode(hContextMenu, Node); + BuildActionMenuForNode(hContextMenu, Node, false); INT xPos = GET_X_LPARAM(lParam); INT yPos = GET_Y_LPARAM(lParam); @@ -279,7 +279,7 @@ CNode *Node = GetSelectedNode(); if (Node) { - BuildActionMenuForNode(OwnerMenu, Node); + BuildActionMenuForNode(OwnerMenu, Node, MainMenu); return true; } @@ -774,7 +774,8 @@ void CDeviceView::BuildActionMenuForNode( _In_ HMENU OwnerMenu, - _In_ CNode *Node + _In_ CNode *Node, + _In_ bool MainMenu ) { // Create a seperator structure @@ -842,6 +843,15 @@ MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; + + if ((Node->GetNodeType() == RootNode) || (MainMenu == true)) + { + String.LoadStringW(g_hInstance, IDS_MENU_ADD); + MenuItemInfo.wID = IDC_ADD_HARDWARE; + MenuItemInfo.dwTypeData = String.GetBuffer(); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); + i++; + } if (Node->HasProperties()) { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Sat Jul 4 21:31:19 2015 @@ -134,7 +134,8 @@ void BuildActionMenuForNode( _In_ HMENU OwnerMenu, - _In_ CNode *Node + _In_ CNode *Node, + _In_ bool MainMenu ); HTREEITEM RecurseFindDevice( Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jul 4 21:31:19 2015 @@ -596,9 +596,9 @@ HMENU hMenu = CreatePopupMenu(); m_DeviceView->CreateActionMenu(hMenu, true); + // Calculate where to put the menu RECT rc; GetMenuItemRect(m_hMainWnd, m_hMenu, 1, &rc); - LONG Height = rc.bottom - rc.top; // Display the menu

9 years, 2 months

[gedmurphy] 68342: [DEVMGR] - Add a separate class for the root node - Move creating the action menu items to a generic function so we can use it for both the context menu and the main menu - Creat...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Jul 4 21:12:06 2015 New Revision: 68342 URL: http://svn.reactos.org/svn/reactos?rev=68342&view=rev Log: [DEVMGR] - Add a separate class for the root node - Move creating the action menu items to a generic function so we can use it for both the context menu and the main menu - Create the main action menu as a dynamic popup menu. It doesn't work quite the same as the menus via the resources, so if any menu expects know how to fix this, be my guest Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp (with props) trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h (with props) Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -51,8 +51,7 @@ m_hMenu(NULL), m_ViewType(DevicesByType), m_ShowHidden(FALSE), - m_RootClassImage(-1), - m_RootDevInst(0) + m_RootNode(NULL) { ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA)); } @@ -162,14 +161,27 @@ ScreenToClient(m_hTreeView, &pt) && PtInRect(&rc, pt)) { - - INT xPos = GET_X_LPARAM(lParam); - INT yPos = GET_Y_LPARAM(lParam); - CNode *Node = GetSelectedNode(); if (Node) { - BuildContextMenuForNode(Node, xPos, yPos); + // Create the context menu + HMENU hContextMenu = CreatePopupMenu(); + + // Add the actions for this node + BuildActionMenuForNode(hContextMenu, Node); + + INT xPos = GET_X_LPARAM(lParam); + INT yPos = GET_Y_LPARAM(lParam); + + // Display the menu + TrackPopupMenuEx(hContextMenu, + TPM_RIGHTBUTTON, + xPos, + yPos, + m_hMainWnd, + NULL); + + DestroyMenu(hContextMenu); } } } @@ -259,6 +271,22 @@ } bool +CDeviceView::CreateActionMenu( + _In_ HMENU OwnerMenu, + _In_ bool MainMenu + ) +{ + CNode *Node = GetSelectedNode(); + if (Node) + { + BuildActionMenuForNode(OwnerMenu, Node); + return true; + } + + return false; +} + +bool CDeviceView::HasProperties( _In_ LPTV_ITEMW TvItem ) @@ -336,54 +364,8 @@ bool CDeviceView::AddRootDevice() { - // Check whether we've loaded the root bitmap into the imagelist (done on first run) - if (m_RootClassImage == -1) - { - // Load the bitmap we'll be using as the root image - HBITMAP hRootImage; - hRootImage = LoadBitmapW(g_hInstance, - MAKEINTRESOURCEW(IDB_ROOT_IMAGE)); - if (hRootImage == NULL) return FALSE; - - // Add this bitmap to the device image list. This is a bit hacky, but it's safe - m_RootClassImage = ImageList_Add(m_ImageListData.ImageList, - hRootImage, - NULL); - DeleteObject(hRootImage); - } - - // Get the root instance - CONFIGRET cr; - cr = CM_Locate_DevNodeW(&m_RootDevInst, - NULL, - CM_LOCATE_DEVNODE_NORMAL); - if (cr != CR_SUCCESS) - { - return false; - } - - // The root name is the computer name - WCHAR RootDeviceName[ROOT_NAME_SIZE]; - DWORD Size = ROOT_NAME_SIZE; - if (GetComputerNameW(RootDeviceName, &Size)) - _wcslwr_s(RootDeviceName); - - TV_ITEMW tvi; - TV_INSERTSTRUCT tvins; - ZeroMemory(&tvi, sizeof(tvi)); - ZeroMemory(&tvins, sizeof(tvins)); - - // Insert the root / parent item into our treeview - tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE; - tvi.pszText = RootDeviceName; - tvi.cchTextMax = wcslen(RootDeviceName); - tvi.iImage = m_RootClassImage; - tvi.iSelectedImage = m_RootClassImage; - tvins.item = tvi; - m_hTreeRoot = TreeView_InsertItem(m_hTreeView, &tvins); - + m_hTreeRoot = InsertIntoTreeView(NULL, m_RootNode); return (m_hTreeRoot != NULL); - } bool @@ -622,7 +604,7 @@ if (bSuccess == false) return false; // Walk the device tree and add all the devices - (void)RecurseChildDevices(m_RootDevInst, m_hTreeRoot); + (void)RecurseChildDevices(m_RootNode->GetDeviceInst(), m_hTreeRoot); // Expand the root item (void)TreeView_Expand(m_hTreeView, @@ -755,11 +737,10 @@ HTREEITEM CDeviceView::InsertIntoTreeView( - _In_ HTREEITEM hParent, + _In_opt_ HTREEITEM hParent, _In_ CNode *Node ) { - LPWSTR lpLabel; lpLabel = Node->GetDisplayName(); @@ -791,15 +772,11 @@ } void -CDeviceView::BuildContextMenuForNode( - _In_ CNode *Node, - _In_ INT xPos, - _In_ INT yPos - ) -{ - // Create the context menu - HMENU hContextMenu = CreatePopupMenu(); - +CDeviceView::BuildActionMenuForNode( + _In_ HMENU OwnerMenu, + _In_ CNode *Node + ) +{ // Create a seperator structure MENUITEMINFOW MenuSeperator = { 0 }; MenuSeperator.cbSize = sizeof(MENUITEMINFOW); @@ -824,7 +801,7 @@ String.LoadStringW(g_hInstance, IDS_MENU_UPDATE); MenuItemInfo.wID = IDC_UPDATE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } @@ -833,7 +810,7 @@ String.LoadStringW(g_hInstance, IDS_MENU_ENABLE); MenuItemInfo.wID = IDC_ENABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } @@ -842,7 +819,7 @@ String.LoadStringW(g_hInstance, IDS_MENU_DISABLE); MenuItemInfo.wID = IDC_DISABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } @@ -851,11 +828,11 @@ String.LoadStringW(g_hInstance, IDS_MENU_UNINSTALL); MenuItemInfo.wID = IDC_UNINSTALL_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; } - InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator); i++; } @@ -863,32 +840,22 @@ String.LoadStringW(g_hInstance, IDS_MENU_SCAN); MenuItemInfo.wID = IDC_SCAN_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; if (Node->HasProperties()) { - InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator); i++; String.LoadStringW(g_hInstance, IDS_MENU_PROPERTIES); MenuItemInfo.wID = IDC_PROPERTIES; MenuItemInfo.dwTypeData = String.GetBuffer(); - InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); + InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; - SetMenuDefaultItem(hContextMenu, IDC_PROPERTIES, FALSE); - } - - // Display the menu - TrackPopupMenuEx(hContextMenu, - TPM_RIGHTBUTTON, - xPos, - yPos, - m_hMainWnd, - NULL); - - DestroyMenu(hContextMenu); + SetMenuDefaultItem(OwnerMenu, IDC_PROPERTIES, FALSE); + } } HTREEITEM @@ -1097,6 +1064,9 @@ EmptyLists(); + if (m_RootNode) delete m_RootNode; + m_RootNode = new CRootNode(&m_ImageListData); + m_RootNode->SetupNode(); // Loop through all the classes do { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -1,6 +1,7 @@ #pragma once #include "DeviceNode.h" #include "ClassNode.h" +#include "RootNode.h" enum ViewType { @@ -13,6 +14,7 @@ class CDeviceView { + CRootNode *m_RootNode; CAtlList<CClassNode *> m_ClassNodeList; CAtlList<CDeviceNode *> m_DeviceNodeList; SP_CLASSIMAGELIST_DATA m_ImageListData; @@ -22,9 +24,7 @@ HMENU m_hMenu; ViewType m_ViewType; HTREEITEM m_hTreeRoot; - DEVINST m_RootDevInst; bool m_ShowHidden; - int m_RootClassImage; public: CDeviceView( @@ -67,6 +67,11 @@ } ViewType GetCurrentView() { return m_ViewType; } + + bool CreateActionMenu( + _In_ HMENU OwnerMenu, + _In_ bool MainMenu + ); bool HasProperties( _In_ LPTV_ITEMW TvItem @@ -123,14 +128,13 @@ ); HTREEITEM InsertIntoTreeView( - _In_ HTREEITEM hParent, + _In_opt_ HTREEITEM hParent, _In_ CNode *Node ); - void BuildContextMenuForNode( - _In_ CNode *Node, - _In_ INT xPos, - _In_ INT yPos + void BuildActionMenuForNode( + _In_ HMENU OwnerMenu, + _In_ CNode *Node ); HTREEITEM RecurseFindDevice( Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -590,6 +590,29 @@ break; } + case IDC_ACTIONMENU: + { + // Create a popup menu with all the actions for the selected node + HMENU hMenu = CreatePopupMenu(); + m_DeviceView->CreateActionMenu(hMenu, true); + + RECT rc; + GetMenuItemRect(m_hMainWnd, m_hMenu, 1, &rc); + + LONG Height = rc.bottom - rc.top; + + // Display the menu + TrackPopupMenuEx(hMenu, + TPM_RIGHTBUTTON, + rc.left, + rc.top + Height, + m_hMainWnd, + NULL); + + DestroyMenu(hMenu); + break; + } + case IDC_DEVBYTYPE: { RefreshView(DevicesByType); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -16,6 +16,7 @@ HWND m_hToolBar; HIMAGELIST m_ToolbarhImageList; HMENU m_hMenu; + HMENU m_hActionMenu; int m_CmdShow; public: Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -22,6 +22,7 @@ m_ClassImage(0) { m_DisplayName[0] = UNICODE_NULL; + m_ClassGuid = GUID_NULL; } CNode::~CNode() Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -21,8 +21,12 @@ #define IDC_UPDATE_DRV 104 #define IDC_UNINSTALL_DRV 105 #define IDC_ADD_HARDWARE 106 -#define IDC_ABOUT 107 -#define IDC_EXIT 108 + +/* Menu items */ +#define IDC_ACTIONMENU 150 +#define IDC_ABOUT 151 +#define IDC_EXIT 152 + /* view menu */ #define IDC_DEVBYTYPE 200 Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp (added) +++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -0,0 +1,61 @@ +/* +* PROJECT: ReactOS Device Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll/win32/devmgr/devmgr/RootNode.cpp +* PURPOSE: Root object for +* COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org> +* +*/ + +#include "stdafx.h" +#include "devmgmt.h" +#include "RootNode.h" + + +CRootNode::CRootNode(_In_ PSP_CLASSIMAGELIST_DATA ImageListData) : + CNode(RootNode, ImageListData) +{ +} + + +CRootNode::~CRootNode() +{ +} + + +bool +CRootNode::SetupNode() +{ + + // Load the bitmap we'll be using as the root image + HBITMAP hRootImage; + hRootImage = LoadBitmapW(g_hInstance, + MAKEINTRESOURCEW(IDB_ROOT_IMAGE)); + if (hRootImage == NULL) return FALSE; + + // Add this bitmap to the device image list. This is a bit hacky, but it's safe + m_ClassImage = ImageList_Add(m_ImageListData->ImageList, + hRootImage, + NULL); + DeleteObject(hRootImage); + + + // Get the root instance + CONFIGRET cr; + cr = CM_Locate_DevNodeW(&m_DevInst, + NULL, + CM_LOCATE_DEVNODE_NORMAL); + if (cr != CR_SUCCESS) + { + return false; + } + + // The root name is the computer name + DWORD Size = DISPLAY_NAME_LEN; + if (GetComputerNameW(m_DisplayName, &Size)) + _wcslwr_s(m_DisplayName); + + return true; + + +} Propchange: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h (added) +++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -0,0 +1,17 @@ +#pragma once +#include "Node.h" + +class CRootNode : public CNode +{ +private: + DEVINST m_DevInst; + +public: + CRootNode(_In_ PSP_CLASSIMAGELIST_DATA ImageListData); + ~CRootNode(); + + virtual bool SetupNode(); + + DEVINST GetDeviceInst() { return m_DevInst; } +}; + Propchange: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] Sat Jul 4 21:12:06 2015 @@ -6,18 +6,7 @@ BEGIN MENUITEM "E&xit", IDC_EXIT END - POPUP "Action" - BEGIN - MENUITEM "Update driver software..." IDC_UPDATE_DRV - MENUITEM "Enable" IDC_ENABLE_DRV - MENUITEM "Disable" IDC_DISABLE_DRV - MENUITEM "Uninstall" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "Scan for hardware changes" IDC_SCAN_HARDWARE - MENUITEM "Add hardware" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties", IDC_PROPERTIES - END + MENUITEM "Action" IDC_ACTIONMENU POPUP "View" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE

9 years, 2 months

[pschweitzer] 68341: [NTFS] Complete BrowseIndexEntries() implementation and simplify NtfsFindMftRecord() implementation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jul 4 19:52:31 2015 New Revision: 68341 URL: http://svn.reactos.org/svn/reactos?rev=68341&view=rev Log: [NTFS] Complete BrowseIndexEntries() implementation and simplify NtfsFindMftRecord() implementation Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c 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] Sat Jul 4 19:52:31 2015 @@ -502,7 +502,11 @@ } NTSTATUS -BrowseIndexEntries(PINDEX_ENTRY_ATTRIBUTE FirstEntry, +BrowseIndexEntries(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER MftRecord, + PCHAR IndexRecord, + ULONG IndexBlockSize, + PINDEX_ENTRY_ATTRIBUTE FirstEntry, PINDEX_ENTRY_ATTRIBUTE LastEntry, PUNICODE_STRING FileName, PULONG StartEntry, @@ -510,17 +514,19 @@ BOOLEAN DirSearch, ULONGLONG *OutMFTIndex) { + NTSTATUS Status; + ULONG RecordOffset; PINDEX_ENTRY_ATTRIBUTE IndexEntry; + PNTFS_ATTR_CONTEXT IndexAllocationCtx; + ULONGLONG IndexAllocationSize; + PINDEX_BUFFER IndexBuffer; + + DPRINT("BrowseIndexEntries(%p, %p, %p, %u, %p, %p, %wZ, %u, %u, %u, %p)\n", Vcb, MftRecord, IndexRecord, IndexBlockSize, FirstEntry, LastEntry, FileName, *StartEntry, *CurrentEntry, DirSearch, OutMFTIndex); IndexEntry = FirstEntry; while (IndexEntry < LastEntry && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - UNICODE_STRING EntryName; - EntryName.Buffer = IndexEntry->FileName.Name; - EntryName.Length = - EntryName.MaximumLength = IndexEntry->FileName.NameLength * sizeof(WCHAR); - if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && *CurrentEntry >= *StartEntry && CompareFileName(FileName, IndexEntry, DirSearch)) @@ -535,13 +541,52 @@ IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } + /* If we're already browsing a subnode */ + if (IndexRecord == NULL) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + + /* If there's no subnode */ if (!(IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE)) { return STATUS_OBJECT_PATH_NOT_FOUND; } - UNIMPLEMENTED; - return STATUS_OBJECT_PATH_NOT_FOUND; + Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx); + if (!NT_SUCCESS(Status)) + { + DPRINT("Corrupted filesystem!\n"); + return Status; + } + + IndexAllocationSize = AttributeDataLength(&IndexAllocationCtx->Record); + Status = STATUS_OBJECT_PATH_NOT_FOUND; + for (RecordOffset = 0; RecordOffset < IndexAllocationSize; RecordOffset += IndexBlockSize) + { + ReadAttribute(Vcb, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); + Status = FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs); + if (!NT_SUCCESS(Status)) + { + break; + } + + IndexBuffer = (PINDEX_BUFFER)IndexRecord; + ASSERT(IndexBuffer->Ntfs.Type == NRH_INDX_TYPE); + ASSERT(IndexBuffer->Header.AllocatedSize + FIELD_OFFSET(INDEX_BUFFER, Header) == IndexBlockSize); + FirstEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); + LastEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); + ASSERT(LastEntry <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); + + Status = BrowseIndexEntries(NULL, NULL, NULL, 0, FirstEntry, LastEntry, FileName, StartEntry, CurrentEntry, DirSearch, OutMFTIndex); + if (NT_SUCCESS(Status)) + { + break; + } + } + + ReleaseAttributeContext(IndexAllocationCtx); + return Status; } NTSTATUS @@ -554,21 +599,13 @@ { PFILE_RECORD_HEADER MftRecord; PNTFS_ATTR_CONTEXT IndexRootCtx; - PNTFS_ATTR_CONTEXT IndexBitmapCtx; - PNTFS_ATTR_CONTEXT IndexAllocationCtx; PINDEX_ROOT_ATTRIBUTE IndexRoot; - PINDEX_BUFFER IndexBuffer; - ULONGLONG BitmapDataSize; - ULONGLONG IndexAllocationSize; - PCHAR BitmapData; PCHAR IndexRecord; PINDEX_ENTRY_ATTRIBUTE IndexEntry, IndexEntryEnd; - ULONG RecordOffset; - ULONG IndexBlockSize; NTSTATUS Status; ULONG CurrentEntry = 0; - DPRINT("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); + DPRINT("NtfsFindMftRecord(%p, %I64d, %wZ, %u, %u, %p)\n", Vcb, MFTIndex, FileName, *FirstEntry, DirSearch, OutMFTIndex); MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, @@ -578,140 +615,44 @@ return STATUS_INSUFFICIENT_RESOURCES; } - if (NT_SUCCESS(ReadFileRecord(Vcb, MFTIndex, MftRecord))) - { - ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); - - Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(MftRecord, TAG_NTFS); - return Status; - } - - IndexRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerIndexRecord, TAG_NTFS); - if (IndexRecord == NULL) - { - ExFreePoolWithTag(MftRecord, TAG_NTFS); - return STATUS_INSUFFICIENT_RESOURCES; - } - - ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, Vcb->NtfsInfo.BytesPerIndexRecord); - IndexRoot = (PINDEX_ROOT_ATTRIBUTE)IndexRecord; - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)&IndexRoot->Header + IndexRoot->Header.FirstEntryOffset); - /* Index root is always resident. */ - IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexRoot->Header.TotalSizeOfEntries); + Status = ReadFileRecord(Vcb, MFTIndex, MftRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + + ASSERT(MftRecord->Ntfs.Type == NRH_FILE_TYPE); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + + IndexRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerIndexRecord, TAG_NTFS); + if (IndexRecord == NULL) + { ReleaseAttributeContext(IndexRootCtx); - - DPRINT("IndexRecordSize: %x IndexBlockSize: %x\n", Vcb->NtfsInfo.BytesPerIndexRecord, IndexRoot->SizeOfEntry); - - Status = BrowseIndexEntries(IndexEntry, IndexEntryEnd, FileName, FirstEntry, &CurrentEntry, DirSearch, OutMFTIndex); - if (NT_SUCCESS(Status)) - { - ExFreePoolWithTag(IndexRecord, TAG_NTFS); - ExFreePoolWithTag(MftRecord, TAG_NTFS); - return Status; - } - - if (IndexRoot->Header.Flags & INDEX_ROOT_LARGE) - { - DPRINT("Large Index!\n"); - - IndexBlockSize = IndexRoot->SizeOfEntry; - - Status = FindAttribute(Vcb, MftRecord, AttributeBitmap, L"$I30", 4, &IndexBitmapCtx); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Corrupted filesystem!\n"); - ExFreePoolWithTag(MftRecord, TAG_NTFS); - return Status; - } - BitmapDataSize = AttributeDataLength(&IndexBitmapCtx->Record); - DPRINT("BitmapDataSize: %x\n", (ULONG)BitmapDataSize); - if(BitmapDataSize <= 0xFFFFFFFF) - BitmapData = ExAllocatePoolWithTag(NonPagedPool, (ULONG)BitmapDataSize, TAG_NTFS); - else - BitmapData = NULL; - - if (BitmapData == NULL) - { - ExFreePoolWithTag(IndexRecord, TAG_NTFS); - ExFreePoolWithTag(MftRecord, TAG_NTFS); - return STATUS_INSUFFICIENT_RESOURCES; - } - ReadAttribute(Vcb, IndexBitmapCtx, 0, BitmapData, (ULONG)BitmapDataSize); - ReleaseAttributeContext(IndexBitmapCtx); - - Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx); - if (!NT_SUCCESS(Status)) - { - DPRINT("Corrupted filesystem!\n"); - ExFreePoolWithTag(BitmapData, TAG_NTFS); - ExFreePoolWithTag(IndexRecord, TAG_NTFS); - ExFreePoolWithTag(MftRecord, TAG_NTFS); - return Status; - } - IndexAllocationSize = AttributeDataLength(&IndexAllocationCtx->Record); - - RecordOffset = 0; - - for (;;) - { - DPRINT("RecordOffset: %x IndexAllocationSize: %x\n", RecordOffset, IndexAllocationSize); - for (; RecordOffset < IndexAllocationSize;) - { - UCHAR Bit = 1 << ((RecordOffset / IndexBlockSize) & 7); - ULONG Byte = (RecordOffset / IndexBlockSize) >> 3; - if ((BitmapData[Byte] & Bit)) - break; - RecordOffset += IndexBlockSize; - } - - if (RecordOffset >= IndexAllocationSize) - { - break; - } - - ReadAttribute(Vcb, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); - - if (!NT_SUCCESS(FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs))) - { - break; - } - - IndexBuffer = (PINDEX_BUFFER)IndexRecord; - ASSERT(IndexBuffer->Ntfs.Type == NRH_INDX_TYPE); - ASSERT(IndexBuffer->Header.AllocatedSize + FIELD_OFFSET(INDEX_BUFFER, Header) == IndexBlockSize); - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); - IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); - ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); - - Status = BrowseIndexEntries(IndexEntry, IndexEntryEnd, FileName, FirstEntry, &CurrentEntry, DirSearch, OutMFTIndex); - if (NT_SUCCESS(Status)) - { - ExFreePoolWithTag(BitmapData, TAG_NTFS); - ExFreePoolWithTag(IndexRecord, TAG_NTFS); - ExFreePoolWithTag(MftRecord, TAG_NTFS); - ReleaseAttributeContext(IndexAllocationCtx); - return Status; - } - - RecordOffset += IndexBlockSize; - } - - ReleaseAttributeContext(IndexAllocationCtx); - ExFreePoolWithTag(BitmapData, TAG_NTFS); - } - - ExFreePoolWithTag(IndexRecord, TAG_NTFS); - } - else - { - DPRINT("Can't read MFT record\n"); - } + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + ReadAttribute(Vcb, IndexRootCtx, 0, IndexRecord, Vcb->NtfsInfo.BytesPerIndexRecord); + IndexRoot = (PINDEX_ROOT_ATTRIBUTE)IndexRecord; + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)&IndexRoot->Header + IndexRoot->Header.FirstEntryOffset); + /* Index root is always resident. */ + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexRoot->Header.TotalSizeOfEntries); + ReleaseAttributeContext(IndexRootCtx); + + DPRINT("IndexRecordSize: %x IndexBlockSize: %x\n", Vcb->NtfsInfo.BytesPerIndexRecord, IndexRoot->SizeOfEntry); + + Status = BrowseIndexEntries(Vcb, MftRecord, IndexRecord, IndexRoot->SizeOfEntry, IndexEntry, IndexEntryEnd, FileName, FirstEntry, &CurrentEntry, DirSearch, OutMFTIndex); + + ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(MftRecord, TAG_NTFS); - return STATUS_OBJECT_PATH_NOT_FOUND; + return Status; } NTSTATUS

9 years, 2 months

[ekohl] 68340: [USETUP] Assign the HiddenSectors values properly.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 4 16:10:50 2015 New Revision: 68340 URL: http://svn.reactos.org/svn/reactos?rev=68340&view=rev Log: [USETUP] Assign the HiddenSectors values properly. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jul 4 16:10:50 2015 @@ -2327,6 +2327,7 @@ PPARTITION_INFORMATION LinkInfo = NULL; PLIST_ENTRY ListEntry; PPARTENTRY PartEntry; + LARGE_INTEGER HiddenSectors64; ULONG Index; ULONG PartitionNumber = 1; @@ -2356,7 +2357,7 @@ PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PartitionInfo->HiddenSectors = (ULONG)PartEntry->StartSector.QuadPart; + PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart; PartitionInfo->PartitionNumber = (!IsContainerPartition(PartEntry->PartitionType)) ? PartitionNumber : 0; PartitionInfo->PartitionType = PartEntry->PartitionType; PartitionInfo->BootIndicator = PartEntry->BootIndicator; @@ -2406,7 +2407,8 @@ { LinkInfo->StartingOffset.QuadPart = (PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; LinkInfo->PartitionLength.QuadPart = (PartEntry->StartSector.QuadPart + DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; - LinkInfo->HiddenSectors = (ULONG)(PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment - DiskEntry->ExtendedPartition->StartSector.QuadPart); + HiddenSectors64.QuadPart = PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment - DiskEntry->ExtendedPartition->StartSector.QuadPart; + LinkInfo->HiddenSectors = HiddenSectors64.LowPart; LinkInfo->PartitionNumber = 0; LinkInfo->PartitionType = PARTITION_EXTENDED; LinkInfo->BootIndicator = FALSE;

9 years, 2 months

[ekohl] 68339: [USETUP] - Add description of the 'L' key to the partition selection page. - Make the 'ENTER' key work for logical partitions too. Selected unpartitioned space will be converted to a...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 4 16:04:09 2015 New Revision: 68339 URL: http://svn.reactos.org/svn/reactos?rev=68339&view=rev Log: [USETUP] - Add description of the 'L' key to the partition selection page. - Make the 'ENTER' key work for logical partitions too. Selected unpartitioned space will be converted to a logical partition. Patch by Gerhard Gruber (sparhawk). CORE-9641 #resolve Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -1454,7 +1454,7 @@ if (PartitionList == NULL) { PartitionList = CreatePartitionList(2, - 21, + 23, xScreen - 3, yScreen - 3); if (PartitionList == NULL) @@ -1477,9 +1477,18 @@ { if (AutoPartition) { - CreatePrimaryPartition(PartitionList, - PartitionList->CurrentPartition->SectorCount.QuadPart, - TRUE); + if (PartitionList->CurrentPartition->LogicalPartition) + { + CreateLogicalPartition(PartitionList, + PartitionList->CurrentPartition->SectorCount.QuadPart, + TRUE); + } + else + { + CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition->SectorCount.QuadPart, + TRUE); + } if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { @@ -1579,9 +1588,18 @@ if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->IsPartitioned == FALSE) { - CreatePrimaryPartition(PartitionList, - 0ULL, - TRUE); + if (PartitionList->CurrentPartition->LogicalPartition) + { + CreateLogicalPartition(PartitionList, + 0ULL, + TRUE); + } + else + { + CreatePrimaryPartition(PartitionList, + 0ULL, + TRUE); + } } if (!IsDiskSizeValid(PartitionList->CurrentPartition)) @@ -2203,7 +2221,8 @@ DPRINT("Partition size: %I64u bytes\n", PartSize); CreateLogicalPartition(PartitionList, - SectorCount); + SectorCount, + FALSE); return SELECT_PARTITION_PAGE; } Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -811,6 +811,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 â¨á¥â¥ D § ¨§âà¨¢ ¥ áêé¥áâ¢ã¢ é ¤ï«.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -801,6 +801,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -809,6 +809,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Stisknut¡m D umo§n¡te smaz n¡ existuj¡c¡ho odd¡lu.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -796,6 +796,12 @@ { 8, 19, + "\x07 L erstellt eine logische Partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 D lscht eine vorhandene Partition.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -814,6 +814,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 «ã©« D ¤ ¨á¯« â¤ ¬§á¨®¦¤ £â¨ ©£.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -801,6 +801,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -809,6 +809,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Presione D para borrar una partici¢n existente.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -802,6 +802,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Vajuta D, et kustutada olemasolev partitsioon.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -814,6 +814,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Appuyer sur D pour effacer une partition.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -802,6 +802,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -809,6 +809,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Premere D per cancellare una partizione esistente.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -803,6 +803,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 ·¿ÝÉ Êß°Ã¨¼®Ý¦ »¸¼Þ® ½ÙÆÊ D ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -811,6 +811,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -831,6 +831,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Druk op D om een bestaande partitie te verwijderen.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -811,6 +811,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Nacinij D, by skasowa istniej¥c¥ partycj©.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -821,6 +821,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Para excluir a partiÆo selecionada, pressione D.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -857,6 +857,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Tastaîi D pentru a terge o partiîie existentÇ.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -802,6 +802,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 ¦¬¨â¥ D ¤«ï ã¤ «¥¨ï áãé¥áâ¢ãîé¥£® à §¤¥« .", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -810,6 +810,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Stlate D pre vymazanie existuj£cej oblasti.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -806,6 +806,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Kliko D pr t fshir nj particion ekzistues.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -809,6 +809,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Tryck D fr att ta bort en befintlig partititon.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -795,6 +795,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 Var olan bir blm silmek iin D'ye basnz.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -808,6 +808,12 @@ { 8, 19, + "\x07 Press L to create a logical partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, "\x07 â¨áiâì D é®¡ ¢¨¤ «¨â¨ iáãîç¨© à®§¤i«.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -2762,7 +2762,8 @@ VOID CreateLogicalPartition( PPARTLIST List, - ULONGLONG SectorCount) + ULONGLONG SectorCount, + BOOLEAN AutoCreate) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2783,7 +2784,8 @@ DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); - if (Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + if (AutoCreate == TRUE || + Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) { DPRINT1("Convert existing partition entry\n"); Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sat Jul 4 16:04:09 2015 @@ -253,7 +253,8 @@ VOID CreateLogicalPartition( PPARTLIST List, - ULONGLONG SectorCount); + ULONGLONG SectorCount, + BOOLEAN AutoCreate); VOID DeleteCurrentPartition(

9 years, 2 months

[gedmurphy] 68338: [DEVMGR] Replace hard coded strings with resources

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Jul 4 13:40:17 2015 New Revision: 68338 URL: http://svn.reactos.org/svn/reactos?rev=68338&view=rev Log: [DEVMGR] Replace hard coded strings with resources Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jul 4 13:40:17 2015 @@ -811,6 +811,7 @@ MenuItemInfo.fMask = MIIM_ID | MIIM_STRING | MIIM_DATA | MIIM_SUBMENU; MenuItemInfo.fType = MFT_STRING; + CAtlStringW String; int i = 0; // Device nodes have extra data @@ -820,32 +821,36 @@ if (DeviceNode->CanUpdate()) { + String.LoadStringW(g_hInstance, IDS_MENU_UPDATE); MenuItemInfo.wID = IDC_UPDATE_DRV; - MenuItemInfo.dwTypeData = L"Update driver software..."; + MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); i++; } if (DeviceNode->IsDisabled()) { + String.LoadStringW(g_hInstance, IDS_MENU_ENABLE); MenuItemInfo.wID = IDC_ENABLE_DRV; - MenuItemInfo.dwTypeData = L"Enable"; + MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); i++; } if (DeviceNode->CanDisable() && !DeviceNode->IsDisabled()) { + String.LoadStringW(g_hInstance, IDS_MENU_DISABLE); MenuItemInfo.wID = IDC_DISABLE_DRV; - MenuItemInfo.dwTypeData = L"Disable"; + MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); i++; } if (DeviceNode->CanUninstall()) { + String.LoadStringW(g_hInstance, IDS_MENU_UNINSTALL); MenuItemInfo.wID = IDC_UNINSTALL_DRV; - MenuItemInfo.dwTypeData = L"Uninstall"; + MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); i++; } @@ -855,8 +860,9 @@ } // All nodes have the scan option + String.LoadStringW(g_hInstance, IDS_MENU_SCAN); MenuItemInfo.wID = IDC_SCAN_HARDWARE; - MenuItemInfo.dwTypeData = L"Scan for hardware changes"; + MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); i++; @@ -865,8 +871,9 @@ InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator); i++; + String.LoadStringW(g_hInstance, IDS_MENU_PROPERTIES); MenuItemInfo.wID = IDC_PROPERTIES; - MenuItemInfo.dwTypeData = L"Properties"; + MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo); i++; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] Sat Jul 4 13:40:17 2015 @@ -43,6 +43,16 @@ /* General strings */ #define IDS_CONFIRM_DISABLE 400 +/* Menu strings */ +#define IDS_MENU_UPDATE 500 +#define IDS_MENU_ENABLE 501 +#define IDS_MENU_DISABLE 502 +#define IDS_MENU_UNINSTALL 503 +#define IDS_MENU_SCAN 504 +#define IDS_MENU_ADD 505 +#define IDS_MENU_PROPERTIES 506 + + /* menu hints */ #define IDS_HINT_BLANK 1000 #define IDS_HINT_PROPERTIES 1001 Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] Sat Jul 4 13:40:17 2015 @@ -33,27 +33,20 @@ END END -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Update driver software..." IDC_UPDATE_DRV - MENUITEM "Enable" IDC_ENABLE_DRV - MENUITEM "Disable" IDC_DISABLE_DRV - MENUITEM "Uninstall" IDC_UNINSTALL_DRV - MENUITEM SEPARATOR - MENUITEM "Scan for hardware changes" IDC_SCAN_HARDWARE - MENUITEM "Add hardware" IDC_ADD_HARDWARE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties", IDC_PROPERTIES - END -END - - STRINGTABLE DISCARDABLE BEGIN IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" +END +STRINGTABLE DISCARDABLE +BEGIN + IDS_MENU_UPDATE "Update driver software..." + IDS_MENU_ENABLE "Enable" + IDS_MENU_DISABLE "Disable" + IDS_MENU_UNINSTALL "Uninstall" + IDS_MENU_SCAN "Scan for hardware changes" + IDS_MENU_ADD "Add hardware" + IDS_MENU_PROPERTIES "Properties" END STRINGTABLE DISCARDABLE

9 years, 2 months

[akhaldi] 68337: [SHELL32] Add an icon to Network Connections in Start menu. By Jared Smudde. CORE-9009

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jul 3 18:43:46 2015 New Revision: 68337 URL: http://svn.reactos.org/svn/reactos?rev=68337&view=rev Log: [SHELL32] Add an icon to Network Connections in Start menu. By Jared Smudde. CORE-9009 Added: trunk/reactos/dll/win32/shell32/res/icons/175.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/257.ico (with props) Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Fri Jul 3 18:43:46 2015 @@ -71,7 +71,8 @@ IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" IDI_SHELL_FAVORITES2 ICON "res/icons/173.ico" IDI_SHELL_EXTENDED_PROPERTIES ICON "res/icons/174.ico" -/* TODO: 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +IDI_SHELL_NETWORK_CONNECTIONS ICON "res/icons/175.ico" +/* TODO: 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ /* Folder Options, General dialog */ IDI_SHELL_SHOW_COMMON_TASKS ICON "res/icons/182.ico" @@ -81,10 +82,10 @@ IDI_SHELL_SINGLE_CLICK_TO_OPEN ICON "res/icons/186.ico" IDI_SHELL_DOUBLE_CLICK_TO_OPEN ICON "res/icons/187.ico" -/* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +/* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN1 ICON "res/icons/191.ico" IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico" -/* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ + IDI_SHELL_FOLDER_OPTIONS ICON "res/icons/210.ico" IDI_SHELL_USERS2 ICON "res/icons/220.ico" IDI_SHELL_TURN_OFF ICON "res/icons/221.ico" @@ -116,7 +117,8 @@ /* TODO: 253.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN3 ICON "res/icons/254.ico" IDI_SHELL_ICON_255 ICON "res/icons/255.ico" -/* TODO: 256.ico, 257.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ +IDI_SHELL_NETWORK_CONNECTIONS2 ICON "res/icons/257.ico" +/* TODO: 256.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ IDI_SHELL_HELP1 ICON "res/icons/263.ico" /* TODO: 264.ico */ IDI_SHELL_SENDMAIL ICON "res/icons/265.ico" Added: trunk/reactos/dll/win32/shell32/res/icons/175.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/175.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/257.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/257.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Jul 3 18:43:46 2015 @@ -386,7 +386,9 @@ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES2 173 #define IDI_SHELL_EXTENDED_PROPERTIES 174 -/* TODO: 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ +#define IDI_SHELL_NETWORK_CONNECTIONS 175 + +/* TODO: 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ #define IDI_SHELL_EMPTY_RECYCLE_BIN1 191 #define IDI_SHELL_FULL_RECYCLE_BIN1 192 /* TODO: 193.ico, 194.ico, 196.ico, 197.ico, 198.ico, 199.ico, 200.ico */ @@ -421,7 +423,8 @@ /* TODO: 253.ico */ #define IDI_SHELL_EMPTY_RECYCLE_BIN3 254 #define IDI_SHELL_ICON_255 255 -/* TODO: 256.ico, 257.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ +#define IDI_SHELL_NETWORK_CONNECTIONS2 257 +/* TODO: 256.ico, 258.ico, 259.ico, 260.ico, 261.ico, 262.ico */ #define IDI_SHELL_HELP1 263 /* TODO: 264.ico */ #define IDI_SHELL_SENDMAIL 265

9 years, 2 months

[akhaldi] 68336: [TASKMGR] Fix some multi-threaded drawing issues. Brought to you by Joachim Henze. CORE-9868

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jul 3 17:17:56 2015 New Revision: 68336 URL: http://svn.reactos.org/svn/reactos?rev=68336&view=rev Log: [TASKMGR] Fix some multi-threaded drawing issues. Brought to you by Joachim Henze. CORE-9868 Modified: trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Fri Jul 3 17:17:56 2015 @@ -22,6 +22,8 @@ #include "precomp.h" #include <shlwapi.h> + +extern BOOL bInMenuLoop; /* Tells us if we are in the menu loop - from taskmgr.c */ TGraphCtrl PerformancePageCpuUsageHistoryGraph; TGraphCtrl PerformancePageMemUsageHistoryGraph; @@ -331,12 +333,14 @@ ULONG TotalThreads; ULONG TotalProcesses; + MSG msg; + WCHAR Text[260]; - WCHAR szMemUsage[256]; - - MSG msg; - + WCHAR szMemUsage[256], szCpuUsage[256], szProcesses[256]; + + LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256); + LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); while (1) { @@ -373,10 +377,12 @@ szChargeLimitFormat, sizeof(szChargeLimitFormat)); - wsprintfW(Text, szMemUsage, szChargeTotalFormat, szChargeLimitFormat, - (CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0)); - - SendMessageW(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); + if (!bInMenuLoop) + { + wsprintfW(Text, szMemUsage, szChargeTotalFormat, szChargeLimitFormat, + (CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0)); + SendMessageW(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); + } /* * Update the kernel memory info @@ -416,6 +422,11 @@ SetWindowTextW(hPerformancePageTotalsThreadCountEdit, Text); _ultow(TotalProcesses, Text, 10); SetWindowTextW(hPerformancePageTotalsProcessCountEdit, Text); + if (!bInMenuLoop) + { + wsprintfW(Text, szProcesses, TotalProcesses); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)Text); + } /* * Redraw the graphs @@ -429,6 +440,12 @@ CpuUsage = PerfDataGetProcessorUsage(); if (CpuUsage <= 0 ) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; + + if (!bInMenuLoop) + { + wsprintfW(Text, szCpuUsage, CpuUsage); + SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)Text); + } if (TaskManagerSettings.ShowKernelTimes) { Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Fri Jul 3 17:17:56 2015 @@ -419,13 +419,7 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) { - ULONG OldProcessorUsage = 0; - ULONG OldProcessCount = 0; - WCHAR szCpuUsage[256], szProcesses[256]; MSG msg; - - LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); - LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); while (1) { /* Wait for an the event or application close */ @@ -433,23 +427,11 @@ return 0; if (msg.message == WM_TIMER) { - WCHAR text[260]; UpdateProcesses(); if (IsWindowVisible(hProcessPage)) InvalidateRect(hProcessPageListCtrl, NULL, FALSE); - - if (OldProcessorUsage != PerfDataGetProcessorUsage()) { - OldProcessorUsage = PerfDataGetProcessorUsage(); - wsprintfW(text, szCpuUsage, OldProcessorUsage); - SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); - } - if (OldProcessCount != PerfDataGetProcessCount()) { - OldProcessCount = PerfDataGetProcessCount(); - wsprintfW(text, szProcesses, OldProcessCount); - SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); - } ProcessPageUpdate(); } Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Fri Jul 3 17:17:56 2015 @@ -952,24 +952,18 @@ { RECT rc; int nParts[3]; - WCHAR text[260]; - WCHAR szCpuUsage[256], szProcesses[256]; - - LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); - LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); bInMenuLoop = FALSE; + /* Update the status bar pane sizes */ GetClientRect(hWnd, &rc); nParts[0] = STATUS_SIZE1; nParts[1] = STATUS_SIZE2; nParts[2] = rc.right; SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); - SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)L""); - wsprintfW(text, szCpuUsage, PerfDataGetProcessorUsage()); - SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); - wsprintfW(text, szProcesses, PerfDataGetProcessCount()); - SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); + + /* trigger update of status bar columns and performance page asynchronously */ + RefreshPerformancePage(); } void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu)

9 years, 2 months

[cfinck] 68335: [LOCALSPL, WINPRINT] Bugfix: All functions returning multiple elements must only set *pcReturned to the element count on success! Currently, this was also done when querying the nee...

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jul 3 09:06:35 2015 New Revision: 68335 URL: http://svn.reactos.org/svn/reactos?rev=68335&view=rev Log: [LOCALSPL, WINPRINT] Bugfix: All functions returning multiple elements must only set *pcReturned to the element count on success! Currently, this was also done when querying the needed buffer size. But for this case, *pcReturned just has to be zeroed. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Fri Jul 3 09:06:35 2015 @@ -107,6 +107,7 @@ EnumPrintProcessorDatatypesW(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { DWORD cbDatatype; + DWORD dwDatatypeCount = 0; DWORD dwErrorCode; DWORD dwOffsets[_countof(_pwszDatatypes)]; PCWSTR* pCurrentDatatype; @@ -129,9 +130,9 @@ *pcbNeeded += sizeof(DATATYPES_INFO_1W) + cbDatatype; // Also calculate the offset in the output buffer of the pointer to this datatype string. - *pCurrentOffset = *pcReturned * sizeof(DATATYPES_INFO_1W) + FIELD_OFFSET(DATATYPES_INFO_1W, pName); - - (*pcReturned)++; + *pCurrentOffset = dwDatatypeCount * sizeof(DATATYPES_INFO_1W) + FIELD_OFFSET(DATATYPES_INFO_1W, pName); + + dwDatatypeCount++; pCurrentOffset++; } @@ -153,6 +154,7 @@ *pCurrentOffset = MAXDWORD; PackStrings(_pwszDatatypes, pDatatypes, dwOffsets, &pDatatypes[*pcbNeeded]); + *pcReturned = dwDatatypeCount; dwErrorCode = ERROR_SUCCESS; Cleanup: Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Fri Jul 3 09:06:35 2015 @@ -898,6 +898,7 @@ LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { DWORD dwErrorCode; + DWORD i; PBYTE pEnd = &pStart[cbBuf]; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; @@ -930,9 +931,10 @@ pFirstJobNode = LookupNodeByIndexSkiplist(&pPrinterHandle->pPrinter->JobList, FirstJob); // Count the required buffer size and the number of jobs. + i = 0; pNode = pFirstJobNode; - while (*pcReturned < NoJobs && pNode) + while (i < NoJobs && pNode) { pJob = (PLOCAL_JOB)pNode->Element; @@ -943,7 +945,7 @@ _LocalGetJobLevel2(pPrinterHandle, pJob, NULL, NULL, 0, pcbNeeded); // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. - (*pcReturned)++; + i++; pNode = pNode->Next[0]; } @@ -956,13 +958,13 @@ // Begin counting again and also empty the given buffer. *pcbNeeded = 0; - *pcReturned = 0; ZeroMemory(pStart, cbBuf); // Now call the same functions again to copy the actual data for each job into the buffer. + i = 0; pNode = pFirstJobNode; - while (*pcReturned < NoJobs && pNode) + while (i < NoJobs && pNode) { pJob = (PLOCAL_JOB)pNode->Element; @@ -976,10 +978,11 @@ goto Cleanup; // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. - (*pcReturned)++; + i++; pNode = pNode->Next[0]; } + *pcReturned = i; dwErrorCode = ERROR_SUCCESS; Cleanup: Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Fri Jul 3 09:06:35 2015 @@ -317,8 +317,6 @@ for (i = 0; i < 3; i++) *pcbNeeded += (wcslen(wszPrintProviderInfo[i]) + 1) * sizeof(WCHAR); - *pcReturned = 1; - // Check if the supplied buffer is large enough. if (cbBuf < *pcbNeeded) { @@ -329,12 +327,15 @@ // Copy over the print processor information. ((PPRINTER_INFO_1W)pPrinterEnum)->Flags = 0; PackStrings(wszPrintProviderInfo, pPrinterEnum, dwOffsets, &pPrinterEnum[*pcbNeeded]); + *pcReturned = 1; dwErrorCode = ERROR_SUCCESS; goto Cleanup; } } // Count the required buffer size and the number of printers. + i = 0; + for (pNode = PrinterList.Head.Next[0]; pNode; pNode = pNode->Next[0]) { pPrinter = (PLOCAL_PRINTER)pNode->Element; @@ -347,7 +348,7 @@ cbDescription = cchComputerName * sizeof(WCHAR) + cbName + cbComment + sizeof(WCHAR); *pcbNeeded += sizeof(PRINTER_INFO_1W) + cchComputerName * sizeof(WCHAR) + cbName + cbComment + cbDescription; - (*pcReturned)++; + i++; } // Check if the supplied buffer is large enough. @@ -360,7 +361,7 @@ // Put the strings right after the last PRINTER_INFO_1W structure. // Due to all the required string processing, we can't just use PackStrings here :( pPrinterInfo = pPrinterEnum; - pPrinterString = pPrinterEnum + *pcReturned * sizeof(PRINTER_INFO_1W); + pPrinterString = pPrinterEnum + i * sizeof(PRINTER_INFO_1W); // Copy over the printer information. for (pNode = PrinterList.Head.Next[0]; pNode; pNode = pNode->Next[0]) @@ -402,6 +403,7 @@ pPrinterInfo += sizeof(PRINTER_INFO_1W); } + *pcReturned = i; dwErrorCode = ERROR_SUCCESS; Cleanup: Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Fri Jul 3 09:06:35 2015 @@ -438,6 +438,7 @@ DWORD cchMaxSubKey; DWORD cchPrintProcessor; DWORD dwErrorCode; + DWORD dwPrintProcessorCount; DWORD i; HKEY hKey = NULL; HKEY hSubKey = NULL; @@ -475,7 +476,7 @@ } // Get the number of Print Processors and maximum sub key length. - dwErrorCode = (DWORD)RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, pcReturned, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); + dwErrorCode = (DWORD)RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwPrintProcessorCount, &cchMaxSubKey, NULL, NULL, NULL, NULL, NULL, NULL); if (dwErrorCode != ERROR_SUCCESS) { ERR("RegQueryInfoKeyW failed with status %lu!\n", dwErrorCode); @@ -494,7 +495,7 @@ // Determine the required size of the output buffer. *pcbNeeded = 0; - for (i = 0; i < *pcReturned; i++) + for (i = 0; i < dwPrintProcessorCount; i++) { // RegEnumKeyExW sucks! Unlike similar API functions, it only returns the actual numbers of characters copied when you supply a buffer large enough. // So use pwszTemp with its size cchMaxSubKey for this. @@ -518,10 +519,10 @@ // Put the Print Processor strings right after the last PRINTPROCESSOR_INFO_1W structure. pCurrentOutputPrintProcessorInfo = pPrintProcessorInfo; - pCurrentOutputPrintProcessor = pPrintProcessorInfo + *pcReturned * sizeof(PRINTPROCESSOR_INFO_1W); + pCurrentOutputPrintProcessor = pPrintProcessorInfo + dwPrintProcessorCount * sizeof(PRINTPROCESSOR_INFO_1W); // Copy over all Print Processors. - for (i = 0; i < *pcReturned; i++) + for (i = 0; i < dwPrintProcessorCount; i++) { // This isn't really correct, but doesn't cause any harm, because we've extensively checked the size of the supplied buffer above. cchPrintProcessor = cchMaxSubKey + 1; @@ -544,6 +545,7 @@ } // We've finished successfully! + *pcReturned = dwPrintProcessorCount; dwErrorCode = ERROR_SUCCESS; Cleanup:

9 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 July 2015