Ros-diffs

ros-diffs@reactos.org

81390 discussions

[apriyadarshi] 71511: - Added all HwStor Initialization Required Functions - Driver loaded successfully - Added Debug stubs
by apriyadarshi＠svn.reactos.org 04 Jun '16

04 Jun '16

Author: apriyadarshi Date: Sat Jun 4 12:52:38 2016 New Revision: 71511 URL: http://svn.reactos.org/svn/reactos?rev=71511&view=rev Log: - Added all HwStor Initialization Required Functions - Driver loaded successfully - Added Debug stubs Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Sat Jun 4 12:52:38 2016 @@ -8,12 +8,12 @@ #include "storahci.h" BOOLEAN AhciAdapterReset( - __in PAHCI_ADAPTER_EXTENSION adapterExtension + __in PAHCI_ADAPTER_EXTENSION adapterExtension ); VOID AhciZeroMemory( - __in PCHAR buffer, - __in ULONG bufferSize + __in PCHAR buffer, + __in ULONG bufferSize ); /** @@ -28,7 +28,7 @@ * Return true if intialization was successful */ BOOLEAN AhciPortInitialize( - __in PAHCI_PORT_EXTENSION portExtension + __in PAHCI_PORT_EXTENSION portExtension ) { ULONG mappedLength; @@ -36,17 +36,23 @@ PAHCI_ADAPTER_EXTENSION adapterExtension; STOR_PHYSICAL_ADDRESS commandListPhysical, receivedFISPhysical; + StorPortDebugPrint(0, "AhciPortInitialize()\n"); + adapterExtension = portExtension->AdapterExtension; abar = adapterExtension->ABAR_Address; portExtension->Port = &abar->PortList[portExtension->PortNumber]; commandListPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->CommandList, &mappedLength); - if (mappedLength == 0 || (commandListPhysical.LowPart % 1024) != 0) + if (mappedLength == 0 || (commandListPhysical.LowPart % 1024) != 0){ + StorPortDebugPrint(0, "\tcommandListPhysical mappedLength:%d\n", mappedLength); return FALSE; + } receivedFISPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->ReceivedFIS, &mappedLength); - if (mappedLength == 0 || (commandListPhysical.LowPart % 256) != 0) + if (mappedLength == 0 || (receivedFISPhysical.LowPart % 256) != 0){ + StorPortDebugPrint(0, "\treceivedFISPhysical mappedLength:%d\n", mappedLength); return FALSE; + } // 10.1.2 For each implemented port, system software shall allocate memory for and program: // ï· PxCLB and PxCLBU (if CAP.S64A is set to â1â) @@ -71,13 +77,15 @@ * return TRUE if allocation was successful */ BOOLEAN AhciAllocateResourceForAdapter( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in PPORT_CONFIGURATION_INFORMATION ConfigInfo + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PPORT_CONFIGURATION_INFORMATION ConfigInfo ) { PVOID portsExtension = NULL; PCHAR nonCachedExtension; ULONG portCount, portImplemented, status, index, NCS, AlignedNCS, nonCachedExtensionSize, currentCount; + + StorPortDebugPrint(0, "AhciAllocateResourceForAdapter()\n"); // 3.1.1 NCS = CAP[12:08] -> Align NCS = (adapterExtension->CAP & 0xF00) >> 8; @@ -99,8 +107,10 @@ nonCachedExtensionSize *= portCount; adapterExtension->NonCachedExtension = StorPortGetUncachedExtension(adapterExtension, ConfigInfo, nonCachedExtensionSize); - if (adapterExtension->NonCachedExtension == NULL) + if (adapterExtension->NonCachedExtension == NULL) { + StorPortDebugPrint(0, "\tadapterExtension->NonCachedExtension == NULL\n"); return FALSE; + } nonCachedExtension = (PCHAR)adapterExtension->NonCachedExtension; @@ -114,8 +124,10 @@ AHCI_POOL_TAG, (PVOID*)&portsExtension); - if (status != STOR_STATUS_SUCCESS) + if (status != STOR_STATUS_SUCCESS){ + StorPortDebugPrint(0, "\tstatus != STOR_STATUS_SUCCESS\n"); return FALSE; + } AhciZeroMemory((PCHAR)portsExtension, portCount * sizeof(AHCI_PORT_EXTENSION)); @@ -139,7 +151,113 @@ }// -- AhciAllocateResourceForAdapter(); /** - * @name AhciFindAdapter + * @name AhciHwInitialize + * @implemented + * + * initializes the HBA and finds all devices that are of interest to the miniport driver. + * + * @param adapterExtension + * + * @return + * return TRUE if intialization was successful + */ +BOOLEAN AhciHwInitialize( + __in PVOID AdapterExtension +) +{ + PAHCI_ADAPTER_EXTENSION adapterExtension; + + StorPortDebugPrint(0, "AhciHwInitialize()\n"); + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + + return TRUE; +}// -- AhciHwInitialize(); + +/** + * @name AhciHwInterrupt + * @implemented + * + * The Storport driver calls the HwStorInterrupt routine after the HBA generates an interrupt request. + * + * @param adapterExtension + * + * @return + * return TRUE Indicates that an interrupt was pending on adapter. + * return FALSE Indicates the interrupt was not ours. + */ +BOOLEAN AhciHwInterrupt( + __in PVOID AdapterExtension +) +{ + PAHCI_ADAPTER_EXTENSION adapterExtension; + + StorPortDebugPrint(0, "AhciHwInterrupt()\n"); + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + + return TRUE; +}// -- AhciHwInterrupt(); + +/** + * @name AhciHwStartIo + * @implemented + * + * The Storport driver calls the HwStorStartIo routine one time for each incoming I/O request. + * + * @param adapterExtension + * @param Srb + * + * @return + * return TRUE if the request was accepted + * return FALSE if the request must be submitted later + */ +BOOLEAN AhciHwStartIo( + __in PVOID AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb + +) +{ + UCHAR function; + PAHCI_ADAPTER_EXTENSION adapterExtension; + + StorPortDebugPrint(0, "AhciHwStartIo()\n"); + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + function = Srb->Function; + + return TRUE; +}// -- AhciHwStartIo(); + +/** + * @name AhciHwResetBus + * @implemented + * + * The HwStorResetBus routine is called by the port driver to clear error conditions. + * + * @param adapterExtension + * @param PathId + * + * @return + * return TRUE if bus was successfully reset + */ +BOOLEAN AhciHwResetBus( + __in PVOID AdapterExtension, + __in ULONG PathId + +) +{ + PAHCI_ADAPTER_EXTENSION adapterExtension; + + StorPortDebugPrint(0, "AhciHwResetBus()\n"); + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + + return TRUE; +}// -- AhciHwResetBus(); + +/** + * @name AhciHwFindAdapter * @implemented * * The HwStorFindAdapter routine uses the supplied configuration to determine whether a specific @@ -170,13 +288,13 @@ * * @remarks Called by Storport. */ -ULONG AhciFindAdapter( - IN PVOID DeviceExtension, - __in PVOID HwContext, - __in PVOID BusInformation, - __in IN PVOID ArgumentString, - __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, - __in PBOOLEAN Reserved3 +ULONG AhciHwFindAdapter( + __in PVOID AdapterExtension, + __in PVOID HwContext, + __in PVOID BusInformation, + __in PVOID ArgumentString, + __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, + __in PBOOLEAN Reserved3 ) { ULONG ghc; @@ -189,7 +307,9 @@ PPCI_COMMON_CONFIG pciConfigData; PAHCI_ADAPTER_EXTENSION adapterExtension; - adapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; + StorPortDebugPrint(0, "AhciHwFindAdapter()\n"); + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; adapterExtension->SlotNumber = ConfigInfo->SlotNumber; adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; @@ -202,8 +322,10 @@ (PVOID)pci_cfg_buf, (ULONG)0x30); - if (pci_cfg_len != 0x30) + if (pci_cfg_len != 0x30){ + StorPortDebugPrint(0, "\tpci_cfg_len != 0x30 :: %d", pci_cfg_len); return SP_RETURN_ERROR;//Not a valid device at the given bus number + } pciConfigData = (PPCI_COMMON_CONFIG)pci_cfg_buf; adapterExtension->VendorID = pciConfigData->VendorID; @@ -211,6 +333,8 @@ adapterExtension->RevisionID = pciConfigData->RevisionID; // The last PCI base address register (BAR[5], header offset 0x24) points to the AHCI base memory, itâs called ABAR (AHCI Base Memory Register). adapterExtension->AhciBaseAddress = pciConfigData->u.type0.BaseAddresses[5] & (0xFFFFFFF0); + + StorPortDebugPrint(0, "\tVendorID:%d DeviceID:%d RevisionID:%d\n", adapterExtension->VendorID, adapterExtension->DeviceID, adapterExtension->RevisionID); // 2.1.11 abar = NULL; @@ -232,8 +356,10 @@ } } - if (abar == NULL) + if (abar == NULL){ + StorPortDebugPrint(0, "\tabar == NULL\n"); return SP_RETURN_ERROR; // corrupted information supplied + } adapterExtension->ABAR_Address = abar; adapterExtension->CAP = StorPortReadRegisterUlong(adapterExtension, &abar->CAP); @@ -248,9 +374,11 @@ if ((ghc & (0x1<<31)) == 1)//Hmm, controller was already in power state { // reset controller to have it in know state - DebugPrint("AhciFindAdapter -> AE Already set, Reset()\n"); - if (!AhciAdapterReset(adapterExtension)) + StorPortDebugPrint(0, "\tAE Already set, Reset()\n"); + if (!AhciAdapterReset(adapterExtension)){ + StorPortDebugPrint(0, "\tReset Failed!\n"); return SP_RETURN_ERROR;// reset failed + } } ghc = 0x1<<31;// only AE=1 @@ -259,8 +387,10 @@ adapterExtension->IS = abar->IS; adapterExtension->PortImplemented = StorPortReadRegisterUlong(adapterExtension, &abar->PI); - if (adapterExtension->PortImplemented == 0) + if (adapterExtension->PortImplemented == 0){ + StorPortDebugPrint(0, "\tadapterExtension->PortImplemented == 0\n"); return SP_RETURN_ERROR; + } ConfigInfo->MaximumTransferLength = 128 * 1024;//128 KB ConfigInfo->NumberOfPhysicalBreaks = 0x21; @@ -272,8 +402,10 @@ ConfigInfo->ScatterGather = TRUE; // allocate necessary resource for each port - if (!AhciAllocateResourceForAdapter(adapterExtension, ConfigInfo)) + if (!AhciAllocateResourceForAdapter(adapterExtension, ConfigInfo)){ + StorPortDebugPrint(0, "\tAhciAllocateResourceForAdapter() == FALSE\n"); return SP_RETURN_ERROR; + } for (index = 0; index < 32; index++) { @@ -286,7 +418,7 @@ StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); return SP_RETURN_FOUND; -}// -- AhciFindAdapter(); +}// -- AhciHwFindAdapter(); /** * @name DriverEntry @@ -301,14 +433,14 @@ * NT_STATUS in case of driver loaded successfully. */ ULONG DriverEntry( - IN PVOID DriverObject, - IN PVOID RegistryPath + __in PVOID DriverObject, + __in PVOID RegistryPath ) { HW_INITIALIZATION_DATA hwInitializationData; ULONG i, status; - DebugPrint("Storahci -> DriverEntry()\n"); + StorPortDebugPrint(0, "Storahci Loaded 10023\n"); // initialize the hardware data structure AhciZeroMemory((PCHAR)&hwInitializationData, sizeof(HW_INITIALIZATION_DATA)); @@ -317,7 +449,11 @@ hwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA); // identity required miniport entry point routines - hwInitializationData.HwFindAdapter = AhciFindAdapter; + hwInitializationData.HwStartIo = AhciHwStartIo; + hwInitializationData.HwResetBus = AhciHwResetBus; + hwInitializationData.HwInterrupt = AhciHwInterrupt; + hwInitializationData.HwInitialize = AhciHwInitialize; + hwInitializationData.HwFindAdapter = AhciHwFindAdapter; // adapter specific information hwInitializationData.NeedPhysicalAddresses = TRUE; @@ -339,7 +475,7 @@ RegistryPath, &hwInitializationData, NULL); - + StorPortDebugPrint(0, "\tstatus:%d\n", status); return status; }// -- DriverEntry(); @@ -363,29 +499,32 @@ * TRUE in case AHCI Controller RESTARTED successfully. i.e GHC.HR == 0 */ BOOLEAN AhciAdapterReset( - PAHCI_ADAPTER_EXTENSION adapterExtension -) -{ - ULONG ghc, ticks; - PAHCI_MEMORY_REGISTERS abar = NULL; - - abar = adapterExtension->ABAR_Address; - - if (abar == NULL) // basic sanity + __in PAHCI_ADAPTER_EXTENSION adapterExtension +) +{ + ULONG ghc, ticks; + PAHCI_MEMORY_REGISTERS abar = NULL; + + StorPortDebugPrint(0, "AhciAdapterReset()\n"); + + abar = adapterExtension->ABAR_Address; + if (abar == NULL) // basic sanity return FALSE; - // HR -- Very first bit (lowest significant) - ghc = 1; - StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - - for (ticks = 0; (ticks < 50) && - (StorPortReadRegisterUlong(adapterExtension, &abar->GHC) == 1); - StorPortStallExecution(20000), ticks++); - - if (ticks == 50)//1 second + // HR -- Very first bit (lowest significant) + ghc = 1; + StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); + + for (ticks = 0; (ticks < 50) && + (StorPortReadRegisterUlong(adapterExtension, &abar->GHC) == 1); + StorPortStallExecution(20000), ticks++); + + if (ticks == 50) { //1 second + StorPortDebugPrint(0, "\tDevice Timeout\n"); return FALSE; - - return TRUE; + } + + return TRUE; }// -- AhciAdapterReset(); /** @@ -397,8 +536,8 @@ * @param buffer */ VOID AhciZeroMemory( - __in PCHAR buffer, - __in ULONG bufferSize + __in PCHAR buffer, + __in ULONG bufferSize ) { ULONG i; Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Sat Jun 4 12:52:38 2016 @@ -210,5 +210,5 @@ typedef struct _AHCI_SRB_EXTENSION { - ULONG AdapterNumber; + ULONG Reserved[4]; } AHCI_SRB_EXTENSION;

1 0

[gadamopoulos] 71510: [BROWSEUI] - CExplorerBand: Navigate to the selected item when the selection changes. - Part of the work submitted by Sylvain Deverre. CORE-10838
by gadamopoulos＠svn.reactos.org 03 Jun '16

03 Jun '16

Author: gadamopoulos Date: Fri Jun 3 21:25:34 2016 New Revision: 71510 URL: http://svn.reactos.org/svn/reactos?rev=71510&view=rev Log: [BROWSEUI] - CExplorerBand: Navigate to the selected item when the selection changes. - Part of the work submitted by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Fri Jun 3 21:25:34 2016 @@ -142,6 +142,22 @@ return reinterpret_cast<NodeInfo*>(tvItem.lParam); } +HRESULT CExplorerBand::UpdateBrowser(LPITEMIDLIST pidlGoto) +{ + CComPtr<IShellBrowser> pBrowserService; + HRESULT hr; + + hr = IUnknown_QueryService(pSite, SID_STopLevelBrowser, IID_PPV_ARG(IShellBrowser, &pBrowserService)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pBrowserService->BrowseObject(pidlGoto, SBSP_SAMEBROWSER | SBSP_ABSOLUTE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return hr; +} + // *** notifications handling *** BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv) { @@ -177,6 +193,16 @@ return FALSE; } +void CExplorerBand::OnSelectionChanged(LPNMTREEVIEW pnmtv) +{ + NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); + + UpdateBrowser(pNodeInfo->absolutePidl); + SetFocus(); + // Expand the node + //TreeView_Expand(m_hWnd, pnmtv->itemNew.hItem, TVE_EXPAND); +} + // *** Helper functions *** HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort) { @@ -558,6 +584,9 @@ case TVN_ITEMEXPANDING: *theResult = OnTreeItemExpanding((LPNMTREEVIEW)lParam); break; + case TVN_SELCHANGED: + OnSelectionChanged((LPNMTREEVIEW)lParam); + break; default: break; } Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Fri Jun 3 21:25:34 2016 @@ -69,9 +69,11 @@ void DestroyExplorerBand(); BOOL OnTreeItemExpanding(LPNMTREEVIEW pnmtv); + void OnSelectionChanged(LPNMTREEVIEW pnmtv); // *** Helper functions *** NodeInfo* GetNodeInfo(HTREEITEM hItem); + HRESULT UpdateBrowser(LPITEMIDLIST pidlGoto); HTREEITEM InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort); BOOL InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo);

1 0

[gadamopoulos] 71509: [SHELL32] - HCR_GetClassName is not supposed to be specific for CLSID_MyDocuments CORE-11363
by gadamopoulos＠svn.reactos.org 03 Jun '16

03 Jun '16

Author: gadamopoulos Date: Fri Jun 3 21:00:59 2016 New Revision: 71509 URL: http://svn.reactos.org/svn/reactos?rev=71509&view=rev Log: [SHELL32] - HCR_GetClassName is not supposed to be specific for CLSID_MyDocuments CORE-11363 Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Fri Jun 3 21:00:59 2016 @@ -380,7 +380,7 @@ { BOOL bRet; WCHAR wstrName[MAX_PATH+1]; - bRet = HCR_GetClassNameW(CLSID_MyDocuments, wstrName, MAX_PATH); + bRet = HCR_GetClassNameW(riid, wstrName, MAX_PATH); if (!bRet) return E_FAIL;

1 0

[gadamopoulos] 71508: [BROWSEUI] - CExplorerBand: Implement populating the treeview. You can navigate the shell namespace but clicking on an item doesn't do anything yet. - Part of the work submitt...
by gadamopoulos＠svn.reactos.org 03 Jun '16

03 Jun '16

Author: gadamopoulos Date: Fri Jun 3 19:35:33 2016 New Revision: 71508 URL: http://svn.reactos.org/svn/reactos?rev=71508&view=rev Log: [BROWSEUI] - CExplorerBand: Implement populating the treeview. You can navigate the shell namespace but clicking on an item doesn't do anything yet. - Part of the work submitted by Sylvain Deverre. CExplorerBand::InsertItem was rewritten by me to be efficient. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Fri Jun 3 19:35:33 2016 @@ -1,4 +1,26 @@ +/* + * ReactOS Explorer + * + * Copyright 2016 Sylvain Deverre <deverre dot sylv at gmail dot com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include "precomp.h" +#include <commoncontrols.h> +#include <undocshell.h> #if 1 #undef UNIMPLEMENTED @@ -23,12 +45,267 @@ void CExplorerBand::InitializeExplorerBand() { - + // Init the treeview here + HRESULT hr; + LPITEMIDLIST pidl; + CComPtr<IWebBrowser2> browserService; + SHChangeNotifyEntry shcne; + + hr = SHGetDesktopFolder(&pDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + hr = SHGetFolderLocation(m_hWnd, CSIDL_DESKTOP, NULL, 0, &pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + IImageList * piml; + hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + TreeView_SetImageList(m_hWnd, (HIMAGELIST)piml, TVSIL_NORMAL); + + // Insert the root node + HTREEITEM hItem = InsertItem(0, pDesktop, pidl, pidl, FALSE); + if (!hItem) + { + ERR("Failed to create root item\n"); + return; + } + + NodeInfo* pNodeInfo = GetNodeInfo(hItem); + + // Insert child nodes + InsertSubitems(hItem, pNodeInfo); + TreeView_Expand(m_hWnd, hItem, TVE_EXPAND); + + // Navigate to current folder position + //NavigateToCurrentFolder(); + + // Register shell notification + shcne.pidl = pidl; + shcne.fRecursive = TRUE; + shellRegID = SHChangeNotifyRegister( + m_hWnd, + SHCNRF_ShellLevel | SHCNRF_InterruptLevel | SHCNRF_RecursiveInterrupt, + SHCNE_DISKEVENTS | SHCNE_RENAMEFOLDER | SHCNE_RMDIR | SHCNE_MKDIR, + WM_USER_SHELLEVENT, + 1, + &shcne); + if (!shellRegID) + { + ERR("Something went wrong, error %08x\n", GetLastError()); + } + // Register browser connection endpoint + hr = IUnknown_QueryService(pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + hr = AtlAdvise(browserService, dynamic_cast<IDispatch*>(this), DIID_DWebBrowserEvents, &adviseCookie); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + ILFree(pidl); } void CExplorerBand::DestroyExplorerBand() { - + HRESULT hr; + CComPtr <IWebBrowser2> browserService; + + TRACE("Cleaning up explorer band ...\n"); + + hr = IUnknown_QueryService(pSite, SID_SWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &browserService)); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + hr = AtlUnadvise(browserService, DIID_DWebBrowserEvents, adviseCookie); + /* Remove all items of the treeview */ + RevokeDragDrop(m_hWnd); + TreeView_DeleteAllItems(m_hWnd); + pDesktop = NULL; + hRoot = NULL; + TRACE("Cleanup done !\n"); +} + +CExplorerBand::NodeInfo* CExplorerBand::GetNodeInfo(HTREEITEM hItem) +{ + TVITEM tvItem; + + tvItem.mask = TVIF_PARAM; + tvItem.hItem = hItem; + + if (!TreeView_GetItem(m_hWnd, &tvItem)) + return 0; + + return reinterpret_cast<NodeInfo*>(tvItem.lParam); +} + +// *** notifications handling *** +BOOL CExplorerBand::OnTreeItemExpanding(LPNMTREEVIEW pnmtv) +{ + NodeInfo *pNodeInfo; + + if (pnmtv->action == TVE_COLLAPSE) { + if (pnmtv->itemNew.hItem == hRoot) + { + // Prenvent root from collapsing + pnmtv->itemNew.mask |= TVIF_STATE; + pnmtv->itemNew.stateMask |= TVIS_EXPANDED; + pnmtv->itemNew.state &= ~TVIS_EXPANDED; + pnmtv->action = TVE_EXPAND; + return TRUE; + } + } + if (pnmtv->action == TVE_EXPAND) { + // Grab our directory PIDL + pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); + // We have it, let's try + if (pNodeInfo && !pNodeInfo->expanded) + if (!InsertSubitems(pnmtv->itemNew.hItem, pNodeInfo)) { + // remove subitem "+" since we failed to add subitems + TV_ITEM tvItem; + + tvItem.mask = TVIF_CHILDREN; + tvItem.hItem = pnmtv->itemNew.hItem; + tvItem.cChildren = 0; + + TreeView_SetItem(m_hWnd, &tvItem); + } + } + return FALSE; +} + +// *** Helper functions *** +HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort) +{ + TV_INSERTSTRUCT tvInsert; + HTREEITEM htiCreated; + + /* Get the attributes of the node */ + SFGAOF attrs = SFGAO_STREAM | SFGAO_HASSUBFOLDER; + HRESULT hr = psfParent->GetAttributesOf(1, &pEltRelative, &attrs); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL; + + /* Ignore streams */ + if ((attrs & SFGAO_STREAM)) + { + TRACE("Ignoring stream\n"); + return NULL; + } + + /* Get the name of the node */ + WCHAR wszDisplayName[MAX_PATH]; + if (!ILGetDisplayNameEx(psfParent, pEltRelative, wszDisplayName, ILGDN_INFOLDER)) + { + ERR("Failed to get node name\n"); + return NULL; + } + + /* Get the icon of the node */ + INT iIcon = SHMapPIDLToSystemImageListIndex(psfParent, pEltRelative, NULL); + + NodeInfo* pChildInfo = new NodeInfo; + if (!pChildInfo) + { + ERR("Failed to allocate NodeInfo\n"); + return FALSE; + } + + // Store our node info + pChildInfo->absolutePidl = ILClone(pElt); + pChildInfo->relativePidl = ILClone(pEltRelative); + pChildInfo->expanded = FALSE; + + // Set up our treeview template + tvInsert.hParent = hParent; + tvInsert.hInsertAfter = TVI_LAST; + tvInsert.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN; + tvInsert.item.cchTextMax = MAX_PATH; + tvInsert.item.pszText = wszDisplayName; + tvInsert.item.iImage = tvInsert.item.iSelectedImage = iIcon; + tvInsert.item.cChildren = (attrs & SFGAO_HASSUBFOLDER) ? 1 : 0; + tvInsert.item.lParam = (LPARAM)pChildInfo; + + htiCreated = TreeView_InsertItem(m_hWnd, &tvInsert); + + return htiCreated; +} + +BOOL CExplorerBand::InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo) +{ + CComPtr<IEnumIDList> pEnumIDList; + LPITEMIDLIST pidlSub; + LPITEMIDLIST entry; + SHCONTF EnumFlags; + HRESULT hr; + ULONG fetched; + ULONG uItemCount; + CComPtr<IShellFolder> pFolder; + + entry = pNodeInfo->absolutePidl; + fetched = 1; + uItemCount = 0; + EnumFlags = SHCONTF_FOLDERS; + + hr = SHGetFolderLocation(m_hWnd, CSIDL_DESKTOP, NULL, 0, &pidlSub); + if (!SUCCEEDED(hr)) + { + ERR("Can't get desktop PIDL !\n"); + return FALSE; + } + + if (!pDesktop->CompareIDs(NULL, pidlSub, entry)) + { + // We are the desktop, so use pDesktop as pFolder + pFolder = pDesktop; + } + else + { + // Get an IShellFolder of our pidl + hr = pDesktop->BindToObject(entry, NULL, IID_PPV_ARG(IShellFolder, &pFolder)); + if (!SUCCEEDED(hr)) + { + ILFree(pidlSub); + ERR("Can't bind folder to desktop !\n"); + return FALSE; + } + } + ILFree(pidlSub); + + // TODO: handle hidden folders according to settings ! + EnumFlags |= SHCONTF_INCLUDEHIDDEN; + + // Enum through objects + hr = pFolder->EnumObjects(NULL,EnumFlags,&pEnumIDList); + + // avoid broken IShellFolder implementations that return null pointer with success + if (!SUCCEEDED(hr) || !pEnumIDList) + { + ERR("Can't enum the folder !\n"); + return FALSE; + } + + /* Don't redraw while we add stuff into the tree */ + SendMessage(WM_SETREDRAW, FALSE, 0); + while(SUCCEEDED(pEnumIDList->Next(1, &pidlSub, &fetched)) && pidlSub && fetched) + { + LPITEMIDLIST pidlSubComplete; + pidlSubComplete = ILCombine(entry, pidlSub); + + if (InsertItem(hItem, pFolder, pidlSubComplete, pidlSub, FALSE)) + uItemCount++; + ILFree(pidlSubComplete); + ILFree(pidlSub); + } + pNodeInfo->expanded = TRUE; + + /* Now we can redraw */ + SendMessage(WM_SETREDRAW, TRUE, 0); + + return (uItemCount > 0) ? TRUE : FALSE; } // *** IOleWindow methods *** @@ -273,8 +550,19 @@ // *** IWinEventHandler methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (uMsg == WM_NOTIFY) + { + NMHDR *pNotifyHeader = (NMHDR*)lParam; + switch (pNotifyHeader->code) + { + case TVN_ITEMEXPANDING: + *theResult = OnTreeItemExpanding((LPNMTREEVIEW)lParam); + break; + default: + break; + } + } + return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::IsWindowOwner(HWND hWnd) Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Fri Jun 3 19:35:33 2016 @@ -1,3 +1,23 @@ +/* + * ReactOS Explorer + * + * Copyright 2016 Sylvain Deverre <deverre dot sylv at gmail dot com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #pragma once #define WM_USER_SHELLEVENT WM_USER+88 @@ -32,14 +52,28 @@ // *** BaseBarSite information *** CComPtr<IUnknown> pSite; - + CComPtr<IShellFolder> pDesktop; + // *** tree explorer band stuff *** BOOL fVisible; BOOL bFocused; DWORD dwBandID; - + HIMAGELIST hImageList; + HTREEITEM hRoot; + + // *** notification cookies *** + DWORD adviseCookie; + ULONG shellRegID; + void InitializeExplorerBand(); void DestroyExplorerBand(); + + BOOL OnTreeItemExpanding(LPNMTREEVIEW pnmtv); + + // *** Helper functions *** + NodeInfo* GetNodeInfo(HTREEITEM hItem); + HTREEITEM InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort); + BOOL InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo); public: CExplorerBand();

1 0

[hbelusca] 71507: [NTDLL] - In LdrpLoadImportModule, check for import module extension, and append it if not found. - Fix LdrpLoadImportModule prototype. CORE-11360
by hbelusca＠svn.reactos.org 03 Jun '16

03 Jun '16

Author: hbelusca Date: Fri Jun 3 19:02:46 2016 New Revision: 71507 URL: http://svn.reactos.org/svn/reactos?rev=71507&view=rev Log: [NTDLL] - In LdrpLoadImportModule, check for import module extension, and append it if not found. - Fix LdrpLoadImportModule prototype. CORE-11360 Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrpe.c Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Fri Jun 3 19:02:46 2016 @@ -155,7 +155,6 @@ NTAPI LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, IN LPSTR ImportName, - IN PVOID DllBase, OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry, OUT PBOOLEAN Existing); Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Fri Jun 3 19:02:46 2016 @@ -297,7 +297,6 @@ /* Load the module for this entry */ Status = LdrpLoadImportModule(DllPath, BoundImportName, - LdrEntry->DllBase, &DllLdrEntry, &AlreadyLoaded); if (!NT_SUCCESS(Status)) @@ -371,7 +370,6 @@ /* Load the module */ Status = LdrpLoadImportModule(DllPath, ForwarderName, - LdrEntry->DllBase, &ForwarderLdrEntry, &AlreadyLoaded); if (NT_SUCCESS(Status)) @@ -558,7 +556,6 @@ /* Load the module associated to it */ Status = LdrpLoadImportModule(DllPath, ImportName, - LdrEntry->DllBase, &DllLdrEntry, &AlreadyLoaded); if (!NT_SUCCESS(Status)) @@ -818,28 +815,73 @@ return Status; } -/* FIXME: This function is missing SxS support and has wrong prototype */ +/* FIXME: This function is missing SxS support */ NTSTATUS NTAPI LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, IN LPSTR ImportName, - IN PVOID DllBase, OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry, OUT PBOOLEAN Existing) { ANSI_STRING AnsiString; PUNICODE_STRING ImpDescName; + const WCHAR *p; + BOOLEAN GotExtension; + WCHAR c; NTSTATUS Status; PPEB Peb = RtlGetCurrentPeb(); PTEB Teb = NtCurrentTeb(); - DPRINT("LdrpLoadImportModule('%s' %p %p %p '%S')\n", ImportName, DllBase, DataTableEntry, Existing, DllPath); + DPRINT("LdrpLoadImportModule('%S' '%s' %p %p)\n", DllPath, ImportName, DataTableEntry, Existing); /* Convert import descriptor name to unicode string */ ImpDescName = &Teb->StaticUnicodeString; RtlInitAnsiString(&AnsiString, ImportName); Status = RtlAnsiStringToUnicodeString(ImpDescName, &AnsiString, FALSE); if (!NT_SUCCESS(Status)) return Status; + + /* Find the extension, if present */ + p = ImpDescName->Buffer + ImpDescName->Length / sizeof(WCHAR) - 1; + GotExtension = FALSE; + while (p >= ImpDescName->Buffer) + { + c = *p--; + if (c == L'.') + { + GotExtension = TRUE; + break; + } + else if (c == L'\\') + { + break; + } + } + + /* If no extension was found, add the default extension */ + if (!GotExtension) + { + /* Check that we have space to add one */ + if ((ImpDescName->Length + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL)) >= + sizeof(Teb->StaticUnicodeBuffer)) + { + /* No space to add the extension */ + DbgPrintEx(DPFLTR_LDR_ID, + DPFLTR_ERROR_LEVEL, + "LDR: %s - Dll name missing extension; with extension " + "added the name is too long\n" + " ImpDescName: (@ %p) \"%wZ\"\n" + " ImpDescName->Length: %u\n", + __FUNCTION__, + ImpDescName, + ImpDescName, + ImpDescName->Length); + return STATUS_NAME_TOO_LONG; + } + + /* Add it. Needs to be null terminated, thus the length check above */ + (VOID)RtlAppendUnicodeStringToString(ImpDescName, + &LdrApiDefaultExtension); + } /* Check if it's loaded */ if (LdrpCheckForLoadedDll(DllPath,

1 0

[apriyadarshi] 71506: AhciFindAdapter Completed - Added AhciZeroMemory - Added AhciAllocateResourceForAdapter - Added AhciPortInitialize Compile Status : OK
by apriyadarshi＠svn.reactos.org 03 Jun '16

03 Jun '16

Author: apriyadarshi Date: Fri Jun 3 15:54:21 2016 New Revision: 71506 URL: http://svn.reactos.org/svn/reactos?rev=71506&view=rev Log: AhciFindAdapter Completed - Added AhciZeroMemory - Added AhciAllocateResourceForAdapter - Added AhciPortInitialize Compile Status : OK Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Fri Jun 3 15:54:21 2016 @@ -8,8 +8,135 @@ #include "storahci.h" BOOLEAN AhciAdapterReset( - __in PAHCI_ADAPTER_EXTENSION adapterExtension + __in PAHCI_ADAPTER_EXTENSION adapterExtension ); + +VOID AhciZeroMemory( + __in PCHAR buffer, + __in ULONG bufferSize +); + +/** + * @name AhciPortInitialize + * @implemented + * + * Initialize port by setting up PxCLB & PxFB Registers + * + * @param portExtension + * + * @return + * Return true if intialization was successful + */ +BOOLEAN AhciPortInitialize( + __in PAHCI_PORT_EXTENSION portExtension +) +{ + ULONG mappedLength; + PAHCI_MEMORY_REGISTERS abar; + PAHCI_ADAPTER_EXTENSION adapterExtension; + STOR_PHYSICAL_ADDRESS commandListPhysical, receivedFISPhysical; + + adapterExtension = portExtension->AdapterExtension; + abar = adapterExtension->ABAR_Address; + portExtension->Port = &abar->PortList[portExtension->PortNumber]; + + commandListPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->CommandList, &mappedLength); + if (mappedLength == 0 || (commandListPhysical.LowPart % 1024) != 0) + return FALSE; + + receivedFISPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->ReceivedFIS, &mappedLength); + if (mappedLength == 0 || (commandListPhysical.LowPart % 256) != 0) + return FALSE; + + // 10.1.2 For each implemented port, system software shall allocate memory for and program: + // ï· PxCLB and PxCLBU (if CAP.S64A is set to â1â) + // ï· PxFB and PxFBU (if CAP.S64A is set to â1â) + //Note: Assuming 32bit support only + StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->CLB, commandListPhysical.LowPart); + StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->FB, receivedFISPhysical.LowPart); + + return TRUE; +}// -- AhciPortInitialize(); + +/** + * @name AhciAllocateResourceForAdapter + * @implemented + * + * Allocate memory from poll for required pointers + * + * @param adapterExtension + * @param ConfigInfo + * + * @return + * return TRUE if allocation was successful + */ +BOOLEAN AhciAllocateResourceForAdapter( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PPORT_CONFIGURATION_INFORMATION ConfigInfo +) +{ + PVOID portsExtension = NULL; + PCHAR nonCachedExtension; + ULONG portCount, portImplemented, status, index, NCS, AlignedNCS, nonCachedExtensionSize, currentCount; + + // 3.1.1 NCS = CAP[12:08] -> Align + NCS = (adapterExtension->CAP & 0xF00) >> 8; + AlignedNCS = ((NCS/8) + 1) * 8; + + // get port count -- Number of set bits in `adapterExtension->PortImplemented` + portCount = 0; + portImplemented = adapterExtension->PortImplemented; + while(portImplemented > 0) + { + portCount++; + portImplemented &= (portImplemented-1); + } + + nonCachedExtensionSize = sizeof(AHCI_COMMAND_HEADER) * AlignedNCS + //should be 1K aligned + sizeof(AHCI_RECEIVED_FIS); + //align nonCachedExtensionSize to 1K + nonCachedExtensionSize = (((nonCachedExtensionSize - 1) / 0x400) + 1) * 0x400; + nonCachedExtensionSize *= portCount; + + adapterExtension->NonCachedExtension = StorPortGetUncachedExtension(adapterExtension, ConfigInfo, nonCachedExtensionSize); + if (adapterExtension->NonCachedExtension == NULL) + return FALSE; + + nonCachedExtension = (PCHAR)adapterExtension->NonCachedExtension; + + AhciZeroMemory(nonCachedExtension, nonCachedExtensionSize); + + + // allocate memory for port extension + status = StorPortAllocatePool( + adapterExtension, + portCount * sizeof(AHCI_PORT_EXTENSION), + AHCI_POOL_TAG, + (PVOID*)&portsExtension); + + if (status != STOR_STATUS_SUCCESS) + return FALSE; + + AhciZeroMemory((PCHAR)portsExtension, portCount * sizeof(AHCI_PORT_EXTENSION)); + + nonCachedExtensionSize /= portCount; + currentCount = 0; + for (index = 0; index < 32; index++) + { + if ((adapterExtension->PortImplemented & (1<<index)) != 0) + { + adapterExtension->PortExtension[index] = (PAHCI_PORT_EXTENSION)((PCHAR)portsExtension + sizeof(AHCI_PORT_EXTENSION) * currentCount); + + adapterExtension->PortExtension[index]->PortNumber = index; + adapterExtension->PortExtension[index]->AdapterExtension = adapterExtension; + adapterExtension->PortExtension[index]->CommandList = (PAHCI_COMMAND_HEADER)(nonCachedExtension + (currentCount*nonCachedExtensionSize)); + adapterExtension->PortExtension[index]->ReceivedFIS = (PAHCI_RECEIVED_FIS)((PCHAR)adapterExtension->PortExtension[index]->CommandList + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); + currentCount++; + } + } + + return TRUE; +}// -- AhciAllocateResourceForAdapter(); /** * @name AhciFindAdapter @@ -53,6 +180,7 @@ ) { ULONG ghc; + ULONG index; ULONG portCount, portImplemented; ULONG pci_cfg_len; UCHAR pci_cfg_buf[0x30]; @@ -88,18 +216,17 @@ abar = NULL; if (ConfigInfo->NumberOfAccessRanges > 0) { - ULONG accessIndex; - for (accessIndex = 0; accessIndex < ConfigInfo->NumberOfAccessRanges; accessIndex++) + for (index = 0; index < ConfigInfo->NumberOfAccessRanges; index++) { - if ((*(ConfigInfo->AccessRanges))[accessIndex].RangeStart.QuadPart == adapterExtension->AhciBaseAddress) + if ((*(ConfigInfo->AccessRanges))[index].RangeStart.QuadPart == adapterExtension->AhciBaseAddress) { abar = (PAHCI_MEMORY_REGISTERS)StorPortGetDeviceBase( adapterExtension, ConfigInfo->AdapterInterfaceType, ConfigInfo->SystemIoBusNumber, - (*(ConfigInfo->AccessRanges))[accessIndex].RangeStart, - (*(ConfigInfo->AccessRanges))[accessIndex].RangeLength, - (BOOLEAN)!(*(ConfigInfo->AccessRanges))[accessIndex].RangeInMemory); + (*(ConfigInfo->AccessRanges))[index].RangeStart, + (*(ConfigInfo->AccessRanges))[index].RangeLength, + (BOOLEAN)!(*(ConfigInfo->AccessRanges))[index].RangeInMemory); break; } } @@ -115,6 +242,7 @@ // 10.1.2 // 1. Indicate that system software is AHCI aware by setting GHC.AE to â1â. + // 3.1.2 -- AE bit is read-write only if CAP.SAM is '0' ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); // AE := Highest Significant bit of GHC if ((ghc & (0x1<<31)) == 1)//Hmm, controller was already in power state @@ -134,15 +262,6 @@ if (adapterExtension->PortImplemented == 0) return SP_RETURN_ERROR; - // get port count -- Number of set bits in `adapterExtension->PortImplemented` - portCount = 0; - portImplemented = adapterExtension->PortImplemented; - while(portImplemented > 0) - { - portCount++; - portImplemented &= (portImplemented - 1);// i love playing with bits :D - } - ConfigInfo->MaximumTransferLength = 128 * 1024;//128 KB ConfigInfo->NumberOfPhysicalBreaks = 0x21; ConfigInfo->MaximumNumberOfTargets = 1; @@ -152,12 +271,20 @@ ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex; ConfigInfo->ScatterGather = TRUE; + // allocate necessary resource for each port + if (!AhciAllocateResourceForAdapter(adapterExtension, ConfigInfo)) + return SP_RETURN_ERROR; + + for (index = 0; index < 32; index++) + { + if ((adapterExtension->PortImplemented & (1<<index)) != 0) + AhciPortInitialize(adapterExtension->PortExtension[index]); + } + // Turn IE -- Interrupt Enabled ghc |= 0x2; StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - - return SP_RETURN_FOUND; }// -- AhciFindAdapter(); @@ -184,8 +311,7 @@ DebugPrint("Storahci -> DriverEntry()\n"); // initialize the hardware data structure - for (i = 0; i < sizeof(HW_INITIALIZATION_DATA); i++) - ((PUCHAR)&hwInitializationData)[i] = 0; + AhciZeroMemory((PCHAR)&hwInitializationData, sizeof(HW_INITIALIZATION_DATA)); // set size of hardware initialization structure hwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA); @@ -261,3 +387,21 @@ return TRUE; }// -- AhciAdapterReset(); + +/** + * @name AhciZeroMemory + * @implemented + * + * Clear buffer by filling zeros + * + * @param buffer + */ +VOID AhciZeroMemory( + __in PCHAR buffer, + __in ULONG bufferSize +) +{ + ULONG i; + for (i = 0; i < bufferSize; i++) + buffer[i] = 0; +}// -- AhciZeroMemory(); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Fri Jun 3 15:54:21 2016 @@ -1,5 +1,130 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * PURPOSE: To Implement AHCI Miniport driver targeting storport NT 5.2 + * PROGRAMMERS: Aman Priyadarshi (aman.eureka(a)gmail.com) + */ + #include "miniport.h" #include "storport.h" + +#define AHCI_POOL_TAG 'ahci' + +typedef struct _AHCI_FIS_DMA_SETUP +{ + ULONG ULONG0_1; // FIS_TYPE_DMA_SETUP + // Port multiplier + // Reserved + // Data transfer direction, 1 - device to host + // Interrupt bit + // Auto-activate. Specifies if DMA Activate FIS is needed + UCHAR Reserved[2]; // Reserved + ULONG DmaBufferLow; // DMA Buffer Identifier. Used to Identify DMA buffer in host memory. SATA Spec says host specific and not in Spec. Trying AHCI spec might work. + ULONG DmaBufferHigh; + ULONG Reserved2; //More reserved + ULONG DmaBufferOffset; //Byte offset into buffer. First 2 bits must be 0 + ULONG TranferCount; //Number of bytes to transfer. Bit 0 must be 0 + ULONG Reserved3; //Reserved +} AHCI_FIS_DMA_SETUP; + +typedef struct _AHCI_PIO_SETUP_FIS +{ + UCHAR FisType; //0x5F + UCHAR Reserved1 :5; + UCHAR D :1; // 1 is write (device to host) + UCHAR I :1; + UCHAR Reserved2 :1; + UCHAR Status; + UCHAR Error; + + UCHAR SectorNumber; + UCHAR CylLow; + UCHAR CylHigh; + UCHAR Dev_Head; + + UCHAR SectorNumb_Exp; + UCHAR CylLow_Exp; + UCHAR CylHigh_Exp; + UCHAR Reserved3; + + UCHAR SectorCount; + UCHAR SectorCount_Exp; + UCHAR Reserved4; + UCHAR E_Status; + + USHORT TransferCount; + UCHAR Reserved5[2]; + +} AHCI_PIO_SETUP_FIS; + +typedef struct _AHCI_D2H_REGISTER_FIS +{ + UCHAR FisType; // 0x34 + UCHAR Reserved1 :6; + UCHAR I:1; + UCHAR Reserved2 :1; + UCHAR Status; + UCHAR Error; + + UCHAR SectorNumber; + UCHAR CylLow; + UCHAR CylHigh; + UCHAR Dev_Head; + + UCHAR SectorNum_Exp; + UCHAR CylLow_Exp; + UCHAR CylHigh_Exp; + UCHAR Reserved; + + UCHAR SectorCount; + UCHAR SectorCount_Exp; + UCHAR Reserved3[2]; + + UCHAR Reserved4[4]; +} AHCI_D2H_REGISTER_FIS; + +typedef struct _AHCI_SET_DEVICE_BITS_FIS { + + UCHAR FisType; //0xA1 + + UCHAR PMPort: 4; + UCHAR Reserved1 :2; + UCHAR I :1; + UCHAR N :1; + + UCHAR Status_Lo :3; + UCHAR Reserved2 :1; + UCHAR Status_Hi :3; + UCHAR Reserved3 :1; + + UCHAR Error; + + UCHAR Reserved5[4]; +} AHCI_SET_DEVICE_BITS_FIS; + +// 4.2.2 +typedef struct _AHCI_COMMAND_HEADER +{ + ULONG HEADER_DESCRIPTION; // DW 0 + ULONG PRDBC; // DW 1 + ULONG CTBA0; // DW 2 + ULONG CTBA_U0; // DW 3 + ULONG Reserved[4]; // DW 4-7 +} AHCI_COMMAND_HEADER, *PAHCI_COMMAND_HEADER; + +// Received FIS +typedef struct _AHCI_RECEIVED_FIS +{ + AHCI_FIS_DMA_SETUP DmaSetupFIS; // 0x00 -- DMA Setup FIS + ULONG pad0; // 4 BYTE padding + AHCI_PIO_SETUP_FIS PioSetupFIS; // 0x20 -- PIO Setup FIS + ULONG pad1[3]; // 12 BYTE padding + AHCI_D2H_REGISTER_FIS RegisterFIS; // 0x40 -- Register â Device to Host FIS + ULONG pad2; // 4 BYTE padding + AHCI_SET_DEVICE_BITS_FIS SetDeviceFIS; // 0x58 -- Set Device Bit FIS + ULONG UnknowFIS[16]; // 0x60 -- Unknown FIS + ULONG Reserved[24]; // 0xA0 -- Reserved +} AHCI_RECEIVED_FIS, *PAHCI_RECEIVED_FIS; typedef struct _AHCI_PORT { @@ -22,7 +147,7 @@ ULONG FBS; // 0x40, FIS-based switch control ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific -} AHCI_PORT; +} AHCI_PORT, *PAHCI_PORT; typedef struct _AHCI_MEMORY_REGISTERS { @@ -49,6 +174,17 @@ } AHCI_MEMORY_REGISTERS, *PAHCI_MEMORY_REGISTERS; +struct _AHCI_ADAPTER_EXTENSION; + +typedef struct _AHCI_PORT_EXTENSION +{ + ULONG PortNumber; + struct _AHCI_ADAPTER_EXTENSION* AdapterExtension; + PAHCI_COMMAND_HEADER CommandList; + PAHCI_RECEIVED_FIS ReceivedFIS; + PAHCI_PORT Port; +} AHCI_PORT_EXTENSION, *PAHCI_PORT_EXTENSION; + typedef struct _AHCI_ADAPTER_EXTENSION { ULONG AdapterNumber; @@ -65,7 +201,11 @@ ULONG Version; ULONG CAP; ULONG CAP2; + + PVOID NonCachedExtension; + PAHCI_MEMORY_REGISTERS ABAR_Address; + PAHCI_PORT_EXTENSION PortExtension[32]; } AHCI_ADAPTER_EXTENSION, *PAHCI_ADAPTER_EXTENSION; typedef struct _AHCI_SRB_EXTENSION

1 0

[rnaumann] 71505: [DEVMGMT]Remove a self assignment. CORE-11183
by rnaumann＠svn.reactos.org 03 Jun '16

03 Jun '16

Author: rnaumann Date: Fri Jun 3 08:47:03 2016 New Revision: 71505 URL: http://svn.reactos.org/svn/reactos?rev=71505&view=rev Log: [DEVMGMT]Remove a self assignment. CORE-11183 Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp 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] Fri Jun 3 08:47:03 2016 @@ -543,7 +543,6 @@ lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UNINSTALL); break; } - idButton = idButton; break; } }

1 0

[hbelusca] 71504: [WIN32K][BUILDNO] Add the compiler ID and version to the ROS version desktop watermark. Idea of encoded & learn_more, thanks :) [BOOTDATA] Enable the ROS version desktop watermark...
by hbelusca＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: hbelusca Date: Thu Jun 2 22:28:36 2016 New Revision: 71504 URL: http://svn.reactos.org/svn/reactos?rev=71504&view=rev Log: [WIN32K][BUILDNO] Add the compiler ID and version to the ROS version desktop watermark. Idea of encoded & learn_more, thanks :) [BOOTDATA] Enable the ROS version desktop watermark on our daily builds. CORE-11349 Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/sdk/include/reactos/buildno.h.cmake trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu Jun 2 22:28:36 2016 @@ -1388,6 +1388,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","AppInit_DLLs",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DeviceNotSelectedTimeout",0x00000000,"15" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DisplayVersion",0x00010001,0x1 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","GDIProcessHandleQuota",0x00010001,0x2710 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Spooler",0x00000000,"yes" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","swapdisk",0x00000000,"" Modified: trunk/reactos/sdk/include/reactos/buildno.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/buildn… ============================================================================== --- trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] Thu Jun 2 22:28:36 2016 @@ -14,5 +14,8 @@ #define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0" #define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@" +#define REACTOS_COMPILER_NAME "@CMAKE_C_COMPILER_ID@" +#define REACTOS_COMPILER_VERSION "@CMAKE_C_COMPILER_VERSION@" + #endif /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Thu Jun 2 22:28:36 2016 @@ -343,9 +343,11 @@ /* String for Safe Mode */ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, - L"ReactOS Version %S %S (NT %u.%u Build %u%s)\n", + L"ReactOS Version %S %S.%S_%S (NT %u.%u Build %u%s)\n", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + REACTOS_COMPILER_NAME, + REACTOS_COMPILER_VERSION, SharedUserData->NtMajorVersion, SharedUserData->NtMinorVersion, (VerInfo.dwBuildNumber & 0xFFFF), @@ -384,10 +386,12 @@ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, L"ReactOS Version %S\n" - L"Build %S\n" + L"Build %S.%S_%S\n" L"Reporting NT %u.%u (Build %u%s)\n", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + REACTOS_COMPILER_NAME, + REACTOS_COMPILER_VERSION, SharedUserData->NtMajorVersion, SharedUserData->NtMinorVersion, (VerInfo.dwBuildNumber & 0xFFFF), @@ -416,9 +420,11 @@ /* Fall-back string */ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, - L"ReactOS Version %S %S\n", + L"ReactOS Version %S %S.%S_%S\n", KERNEL_VERSION_STR, - KERNEL_VERSION_BUILD_STR); + KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry + REACTOS_COMPILER_NAME, + REACTOS_COMPILER_VERSION); if (!NT_SUCCESS(Status)) { /* General failure, NULL-terminate the string */

1 0

[hbelusca] 71503: [SNDREC32]: Use a sunken edge for the waveform viewer.
by hbelusca＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: hbelusca Date: Thu Jun 2 21:38:47 2016 New Revision: 71503 URL: http://svn.reactos.org/svn/reactos?rev=71503&view=rev Log: [SNDREC32]: Use a sunken edge for the waveform viewer. Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Thu Jun 2 21:38:47 2016 @@ -317,17 +317,18 @@ hInst = hInstance; - hWnd = CreateWindow(TEXT("sndrec32_wave"), - TEXT(""), - WS_DLGFRAME | WS_VISIBLE | WS_CHILD, - WAVEBAR_X, - WAVEBAR_Y, - WAVEBAR_CX, - WAVEBAR_CY, - f, - (HMENU)8, - hInstance, - 0); + hWnd = CreateWindowEx(WS_EX_STATICEDGE, + TEXT("sndrec32_wave"), + TEXT(""), + WS_VISIBLE | WS_CHILD, + WAVEBAR_X, + WAVEBAR_Y, + WAVEBAR_CX, + WAVEBAR_CY, + f, + (HMENU)8, + hInstance, + 0); if (!hWnd ) { @@ -363,6 +364,7 @@ case WM_CREATE: GetClientRect(hWnd, &cli); break; + case WM_PAINT: /* Initialize hdc objects */ hdc = BeginPaint(hWnd, &ps); @@ -420,6 +422,7 @@ case WM_USER: break; + default: return DefWindowProc(hWnd, message, wParam, lParam); }

1 0

[spetreolle] 71502: [HIVES] Fix paths passed to the hive maker.
by spetreolle＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: spetreolle Date: Thu Jun 2 20:21:46 2016 New Revision: 71502 URL: http://svn.reactos.org/svn/reactos?rev=71502&view=rev Log: [HIVES] Fix paths passed to the hive maker. Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Thu Jun 2 20:21:46 2016 @@ -764,7 +764,7 @@ ${CMAKE_BINARY_DIR}/boot/bootdata/security ${CMAKE_BINARY_DIR}/boot/bootdata/software ${CMAKE_BINARY_DIR}/boot/bootdata/system - COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${_livecd_inf_files} + COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} DEPENDS native-mkhive ${_livecd_inf_files}) add_custom_target(livecd_hives @@ -787,7 +787,7 @@ # BCD Hive add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD - COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf + COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf) add_custom_target(bcd_hive

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs