Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 71501: [APPHELP_APITEST][APPHELP] Add new tests showing that SdbWriteStringTag and SdbEndWriteListTag are incorrect, fix SdbEndWriteListTag CORE-10367 SdbWriteStringTag requires the datab...
by mjansen＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: mjansen Date: Thu Jun 2 18:59:04 2016 New Revision: 71501 URL: http://svn.reactos.org/svn/reactos?rev=71501&view=rev Log: [APPHELP_APITEST][APPHELP] Add new tests showing that SdbWriteStringTag and SdbEndWriteListTag are incorrect, fix SdbEndWriteListTag CORE-10367 SdbWriteStringTag requires the database to keep track of written strings, and append a stringtable to a database. Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbpapi.h trunk/reactos/dll/appcompat/apphelp/sdbwrite.c trunk/rostests/apitests/apphelp/db.c Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -259,12 +259,17 @@ DWORD SdbpStrlen(PCWSTR string) { - return (lstrlenW(string) + 1) * sizeof(WCHAR); + return lstrlenW(string); +} + +DWORD SdbpStrsize(PCWSTR string) +{ + return (SdbpStrlen(string) + 1) * sizeof(WCHAR); } PWSTR SdbpStrDup(LPCWSTR string) { - PWSTR ret = SdbpAlloc(SdbpStrlen(string)); + PWSTR ret = SdbpAlloc(SdbpStrsize(string)); lstrcpyW(ret, string); return ret; } Modified: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbp… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -65,7 +65,8 @@ PDB WINAPI SdbpCreate(LPCWSTR path, PATH_TYPE type, BOOL write); void WINAPI SdbpFlush(PDB db); -DWORD SdbpStrlen(LPCWSTR string); +DWORD SdbpStrlen(PCWSTR string); +DWORD SdbpStrsize(PCWSTR string); #ifdef __cplusplus Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -36,6 +36,10 @@ #include "sdbtagid.h" #endif + +BOOL WINAPI SdbWriteStringRefTag(PDB db, TAG tag, TAGID tagid); +TAGID WINAPI SdbBeginWriteListTag(PDB db, TAG tag); +BOOL WINAPI SdbEndWriteListTag(PDB db, TAGID tagid); static void WINAPI SdbpWrite(PDB db, const void* data, DWORD size) @@ -51,6 +55,23 @@ db->write_iter += size; } +static BOOL WINAPI SdbpGetOrAddStringRef(PDB db, LPCWSTR string, TAGID* tagid) +{ + /* TODO: + - Insert or find in stringtable + - return TAGID + */ + + return FALSE; +} + +static void WINAPI SdbpWriteStringtable(PDB db) +{ + TAGID table = SdbBeginWriteListTag(db, TAG_STRINGTABLE); + /* TODO: Write out all strings*/ + SdbEndWriteListTag(db, table); +} + /** * Creates new shim database file * @@ -90,6 +111,7 @@ */ void WINAPI SdbCloseDatabaseWrite(PDB db) { + SdbpWriteStringtable(db); SdbpFlush(db); SdbCloseDatabase(db); } @@ -181,10 +203,19 @@ { DWORD size; + if (SdbpCheckTagType(tag, TAG_TYPE_STRINGREF)) + { + TAGID tagid = 0; + if (!SdbpGetOrAddStringRef(db, string, &tagid)) + return FALSE; + + return SdbWriteStringRefTag(db, tag, tagid); + } + if (!SdbpCheckTagType(tag, TAG_TYPE_STRING)) return FALSE; - size = SdbpStrlen(string); + size = SdbpStrsize(string); SdbpWrite(db, &tag, sizeof(TAG)); SdbpWrite(db, &size, sizeof(size)); SdbpWrite(db, string, size); @@ -297,7 +328,7 @@ return FALSE; /* Write size of list to list tag header */ - *(DWORD*)&db->data[tagid + sizeof(TAG)] = db->write_iter - tagid - sizeof(TAG); - return TRUE; -} - + *(DWORD*)&db->data[tagid + sizeof(TAG)] = db->write_iter - tagid - sizeof(TAG) - sizeof(TAGID); + return TRUE; +} + Modified: trunk/rostests/apitests/apphelp/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/db.c?rev… ============================================================================== --- trunk/rostests/apitests/apphelp/db.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/db.c [iso-8859-1] Thu Jun 2 18:59:04 2016 @@ -312,6 +312,91 @@ } DeleteFileW(path1); } + +/* + - Show that a stringtable is automatically generated, + - validate multiple lists (for the length) +*/ +static void test_write_ex(void) +{ + WCHAR path1[] = {'t','e','s','t','.','s','d','b',0}; + WCHAR test1[] = {'T','E','S','T',0}; + WCHAR test2[] = {'t','e','s','t',0}; + PDB pdb; + TAGID tagdb, tagstr; + TAG tag; + DWORD size; + BOOL ret; + + /* Write a small database */ + pdb = pSdbCreateDatabase(path1, DOS_PATH); + ok(pdb != NULL, "Expected a valid database\n"); + if (!pdb) + return; + tagdb = pSdbBeginWriteListTag(pdb, TAG_DATABASE); + ok(tagdb == 12, "Expected tag to be 12, was %u\n", tagdb); + ret = pSdbWriteStringTag(pdb, TAG_NAME, test1); + ok(ret, "Expected SdbWriteStringTag to succeed\n"); + ret = pSdbEndWriteListTag(pdb, tagdb); + ok(ret, "Expected SdbEndWriteListTag to succeed\n"); + + tagdb = pSdbBeginWriteListTag(pdb, TAG_DATABASE); + ok(tagdb == 24, "Expected tag to be 24, was %u\n", tagdb); + ret = pSdbWriteStringTag(pdb, TAG_NAME, test2); + ok(ret, "Expected SdbWriteStringTag to succeed\n"); + ret = pSdbEndWriteListTag(pdb, tagdb); + ok(ret, "Expected SdbEndWriteListTag to succeed\n"); + + pSdbCloseDatabaseWrite(pdb); + + /* Now validate it's contents */ + pdb = pSdbOpenDatabase(path1, DOS_PATH); + ok(pdb != NULL, "Expected a valid database\n"); + if (!pdb) + return; + tagdb = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_DATABASE); + ok(tagdb == 12, "Expected tag to be 12, was %u\n", tagdb); + size = pSdbGetTagDataSize(pdb, tagdb); + ok(size == 6, "Expected size to be 6, was %u\n", size); + tagstr = pSdbFindFirstTag(pdb, tagdb, TAG_NAME); + ok(tagstr == 18, "Expected string tag to be 18, was %u\n", tagstr); + tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_NAME, "Expected tag to be TAG_NAME, was 0x%x\n", (DWORD)tag); + size = pSdbGetTagDataSize(pdb, tagstr); + ok(size == 4, "Expected size to be 4, was 0x%x\n", size); + + tagdb = pSdbFindNextTag(pdb, TAGID_ROOT, tagdb); + ok(tagdb == 24, "Expected tag to be 24, was %u\n", tagdb); + size = pSdbGetTagDataSize(pdb, tagdb); + ok(size == 6, "Expected size to be 6, was %u\n", size); + tagstr = pSdbFindFirstTag(pdb, tagdb, TAG_NAME); + ok(tagstr == 30, "Expected string tag to be 30, was %u\n", tagstr); + tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_NAME, "Expected tag to be TAG_NAME, was 0x%x\n", (DWORD)tag); + size = pSdbGetTagDataSize(pdb, tagstr); + ok(size == 4, "Expected size to be 4, was %u\n", size); + + tagdb = pSdbFindFirstTag(pdb, TAGID_ROOT, TAG_STRINGTABLE); + ok(tagdb == 36, "Expected tag to be 36, was %u\n", tagdb); + size = pSdbGetTagDataSize(pdb, tagdb); + ok(size == 32, "Expected size to be 32, was %u\n", size); + tagstr = pSdbGetFirstChild(pdb, tagdb); + ok(tagstr == 42, "Expected string tag to be 42, was %u\n", tagstr); + tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_STRINGTABLE_ITEM, "Expected tag to be TAG_STRINGTABLE_ITEM, was 0x%x\n", (DWORD)tag); + size = pSdbGetTagDataSize(pdb, tagstr); + ok(size == 10, "Expected size to be 10, was %u\n", size); + + tagstr = pSdbGetNextChild(pdb, tagdb, tagstr); + ok(tagstr == 58, "Expected string tag to be 58, was %u\n", tagstr); + tag = pSdbGetTagFromTagID(pdb, tagstr); + ok(tag == TAG_STRINGTABLE_ITEM, "Expected tag to be TAG_STRINGTABLE_ITEM, was 0x%x\n", (DWORD)tag); + size = pSdbGetTagDataSize(pdb, tagstr); + ok(size == 10, "Expected size to be 10, was %u\n", size); + + pSdbCloseDatabase(pdb); +} + static void match_str_attr_imp(PDB pdb, TAGID parent, TAG find, const char* compare) { @@ -790,5 +875,6 @@ pSdbGUIDToString = (void *) GetProcAddress(hdll, "SdbGUIDToString"); test_Sdb(); + test_write_ex(); test_CheckDatabaseManually(); }

1 0

[apriyadarshi] 71500: Required changes to meet community coding style.
by apriyadarshi＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: apriyadarshi Date: Thu Jun 2 14:43:56 2016 New Revision: 71500 URL: http://svn.reactos.org/svn/reactos?rev=71500&view=rev Log: Required changes to meet community coding style. Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources 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/sources URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] Thu Jun 2 14:43:56 2016 @@ -2,7 +2,7 @@ TARGETTYPE = MINIPORT TARGETLIBS=$(DDK_LIB_PATH)\storport.lib - + INCLUDES = %BUILD%\inc LIBS = %BUILD%\lib SOURCES = storahci.c 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] Thu Jun 2 14:43:56 2016 @@ -1,231 +1,263 @@ +/* + * 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 "storahci.h" BOOLEAN AhciAdapterReset( - __in PAHCI_ADAPTER_EXTENSION adapterExtension + __in PAHCI_ADAPTER_EXTENSION adapterExtension ); +/** + * @name AhciFindAdapter + * @implemented + * + * The HwStorFindAdapter routine uses the supplied configuration to determine whether a specific + * HBA is supported and, if it is, to return configuration information about that adapter. + * + * 10.1 Platform Communication + * http://www.intel.in/content/dam/www/public/us/en/documents/technical-specif… + + * @param DeviceExtension + * @param HwContext + * @param BusInformation + * @param ArgumentString + * @param ConfigInfo + * @param Reserved3 + * + * @return + * SP_RETURN_FOUND + * Indicates that a supported HBA was found and that the HBA-relevant configuration information was successfully determined and set in the PORT_CONFIGURATION_INFORMATION structure. + * + * SP_RETURN_ERROR + * Indicates that an HBA was found but there was an error obtaining the configuration information. If possible, such an error should be logged with StorPortLogError. + * + * SP_RETURN_BAD_CONFIG + * Indicates that the supplied configuration information was invalid for the adapter. + * + * SP_RETURN_NOT_FOUND + * Indicates that no supported HBA was found for the supplied configuration information. + * + * @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 + IN PVOID DeviceExtension, + __in PVOID HwContext, + __in PVOID BusInformation, + __in IN PVOID ArgumentString, + __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, + __in PBOOLEAN Reserved3 ) { - /* Description : - * The HwStorFindAdapter routine uses the supplied configuration to determine whether a specific - * HBA is supported and, if it is, to return configuration information about that adapter. - * - * Refernce: - * 10.1 Platform Communication - * http://www.intel.in/content/dam/www/public/us/en/documents/technical-specif… - * - * Return Value: - * SP_RETURN_FOUND - * Indicates that a supported HBA was found and that the HBA-relevant configuration information was successfully determined and set in the PORT_CONFIGURATION_INFORMATION structure. - * - * SP_RETURN_ERROR - * Indicates that an HBA was found but there was an error obtaining the configuration information. If possible, such an error should be logged with StorPortLogError. - * - * SP_RETURN_BAD_CONFIG - * Indicates that the supplied configuration information was invalid for the adapter. - * - * SP_RETURN_NOT_FOUND - * Indicates that no supported HBA was found for the supplied configuration information. - */ - - ULONG ghc; - ULONG portCount, portImplemented; - ULONG pci_cfg_len; - UCHAR pci_cfg_buf[0x30]; - - PAHCI_MEMORY_REGISTERS abar; - PPCI_COMMON_CONFIG pciConfigData; - PAHCI_ADAPTER_EXTENSION adapterExtension; - - adapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; - adapterExtension->SlotNumber = ConfigInfo->SlotNumber; - adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; - - // get PCI configuration header - pci_cfg_len = StorPortGetBusData( - adapterExtension, - PCIConfiguration, - adapterExtension->SystemIoBusNumber, - adapterExtension->SlotNumber, - (PVOID)pci_cfg_buf, - (ULONG)0x30); - - if (pci_cfg_len != 0x30) - return SP_RETURN_ERROR;//Not a valid device at the given bus number - - pciConfigData = (PPCI_COMMON_CONFIG)pci_cfg_buf; - adapterExtension->VendorID = pciConfigData->VendorID; - adapterExtension->DeviceID = pciConfigData->DeviceID; - 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); - - // 2.1.11 - abar = NULL; - if (ConfigInfo->NumberOfAccessRanges > 0) - { - ULONG accessIndex; - for (accessIndex = 0; accessIndex < ConfigInfo->NumberOfAccessRanges; accessIndex++) - { - if ((*(ConfigInfo->AccessRanges))[accessIndex].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); - break; - } - } - } - - if (abar == NULL) - return SP_RETURN_ERROR; // corrupted information supplied - - adapterExtension->ABAR_Address = abar; - adapterExtension->CAP = StorPortReadRegisterUlong(adapterExtension, &abar->CAP); - adapterExtension->CAP2 = StorPortReadRegisterUlong(adapterExtension, &abar->CAP2); - adapterExtension->Version = StorPortReadRegisterUlong(adapterExtension, &abar->VS); - - // 10.1.2 - // 1. Indicate that system software is AHCI aware by setting GHC.AE to â1â. - ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); - // AE := Highest Significant bit of GHC - 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)) - return SP_RETURN_ERROR;// reset failed - } - - ghc = 0x1<<31;// only AE=1 - StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - - adapterExtension->IS = abar->IS; - adapterExtension->PortImplemented = StorPortReadRegisterUlong(adapterExtension, &abar->PI); - - 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; - ConfigInfo->MaximumNumberOfLogicalUnits = 1; - ConfigInfo->ResetTargetSupported = TRUE; - ConfigInfo->NumberOfBuses = 32; - ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex; - ConfigInfo->ScatterGather = TRUE; - - // Turn IE -- Interrupt Enabled - ghc |= 0x2; - StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); - - - - return SP_RETURN_FOUND; -}// -- AhciFindAdapter(); - + ULONG ghc; + ULONG portCount, portImplemented; + ULONG pci_cfg_len; + UCHAR pci_cfg_buf[0x30]; + + PAHCI_MEMORY_REGISTERS abar; + PPCI_COMMON_CONFIG pciConfigData; + PAHCI_ADAPTER_EXTENSION adapterExtension; + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; + adapterExtension->SlotNumber = ConfigInfo->SlotNumber; + adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; + + // get PCI configuration header + pci_cfg_len = StorPortGetBusData( + adapterExtension, + PCIConfiguration, + adapterExtension->SystemIoBusNumber, + adapterExtension->SlotNumber, + (PVOID)pci_cfg_buf, + (ULONG)0x30); + + if (pci_cfg_len != 0x30) + return SP_RETURN_ERROR;//Not a valid device at the given bus number + + pciConfigData = (PPCI_COMMON_CONFIG)pci_cfg_buf; + adapterExtension->VendorID = pciConfigData->VendorID; + adapterExtension->DeviceID = pciConfigData->DeviceID; + 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); + + // 2.1.11 + abar = NULL; + if (ConfigInfo->NumberOfAccessRanges > 0) + { + ULONG accessIndex; + for (accessIndex = 0; accessIndex < ConfigInfo->NumberOfAccessRanges; accessIndex++) + { + if ((*(ConfigInfo->AccessRanges))[accessIndex].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); + break; + } + } + } + + if (abar == NULL) + return SP_RETURN_ERROR; // corrupted information supplied + + adapterExtension->ABAR_Address = abar; + adapterExtension->CAP = StorPortReadRegisterUlong(adapterExtension, &abar->CAP); + adapterExtension->CAP2 = StorPortReadRegisterUlong(adapterExtension, &abar->CAP2); + adapterExtension->Version = StorPortReadRegisterUlong(adapterExtension, &abar->VS); + + // 10.1.2 + // 1. Indicate that system software is AHCI aware by setting GHC.AE to â1â. + ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); + // AE := Highest Significant bit of GHC + 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)) + return SP_RETURN_ERROR;// reset failed + } + + ghc = 0x1<<31;// only AE=1 + StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); + + adapterExtension->IS = abar->IS; + adapterExtension->PortImplemented = StorPortReadRegisterUlong(adapterExtension, &abar->PI); + + 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; + ConfigInfo->MaximumNumberOfLogicalUnits = 1; + ConfigInfo->ResetTargetSupported = TRUE; + ConfigInfo->NumberOfBuses = 32; + ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex; + ConfigInfo->ScatterGather = TRUE; + + // Turn IE -- Interrupt Enabled + ghc |= 0x2; + StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); + + + + return SP_RETURN_FOUND; +}// -- AhciFindAdapter(); + +/** + * @name DriverEntry + * @implemented + * + * Initial Entrypoint for storahci miniport driver + * + * @param DriverObject + * @param RegistryPath + * + * @return + * NT_STATUS in case of driver loaded successfully. + */ ULONG DriverEntry( - IN PVOID DriverObject, - IN PVOID RegistryPath + IN PVOID DriverObject, + IN PVOID RegistryPath ) { - /* - * Description : - * Initial Entrypoint for storahci miniport driver - */ - - HW_INITIALIZATION_DATA hwInitializationData; - ULONG i, status; - - DebugPrint("Storahci -> DriverEntry()\n"); - - // initialize the hardware data structure - for (i = 0; i < sizeof(HW_INITIALIZATION_DATA); i++) - ((PUCHAR)&hwInitializationData)[i] = 0; - - // set size of hardware initialization structure - hwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA); - - // identity required miniport entry point routines - hwInitializationData.HwFindAdapter = AhciFindAdapter; - - // adapter specific information - hwInitializationData.NeedPhysicalAddresses = TRUE; - hwInitializationData.TaggedQueuing = TRUE; - hwInitializationData.AutoRequestSense = TRUE; - hwInitializationData.MultipleRequestPerLu = TRUE; - - hwInitializationData.NumberOfAccessRanges = 6; - hwInitializationData.AdapterInterfaceType = PCIBus; - hwInitializationData.MapBuffers = STOR_MAP_NON_READ_WRITE_BUFFERS; - - // set required extension sizes - hwInitializationData.SrbExtensionSize = sizeof(AHCI_SRB_EXTENSION); - hwInitializationData.DeviceExtensionSize = sizeof(AHCI_ADAPTER_EXTENSION); + HW_INITIALIZATION_DATA hwInitializationData; + ULONG i, status; + + DebugPrint("Storahci -> DriverEntry()\n"); + + // initialize the hardware data structure + for (i = 0; i < sizeof(HW_INITIALIZATION_DATA); i++) + ((PUCHAR)&hwInitializationData)[i] = 0; + + // set size of hardware initialization structure + hwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA); + + // identity required miniport entry point routines + hwInitializationData.HwFindAdapter = AhciFindAdapter; + + // adapter specific information + hwInitializationData.NeedPhysicalAddresses = TRUE; + hwInitializationData.TaggedQueuing = TRUE; + hwInitializationData.AutoRequestSense = TRUE; + hwInitializationData.MultipleRequestPerLu = TRUE; + + hwInitializationData.NumberOfAccessRanges = 6; + hwInitializationData.AdapterInterfaceType = PCIBus; + hwInitializationData.MapBuffers = STOR_MAP_NON_READ_WRITE_BUFFERS; + + // set required extension sizes + hwInitializationData.SrbExtensionSize = sizeof(AHCI_SRB_EXTENSION); + hwInitializationData.DeviceExtensionSize = sizeof(AHCI_ADAPTER_EXTENSION); - // register our hw init data - status = StorPortInitialize( - DriverObject, - RegistryPath, - &hwInitializationData, - NULL); + // register our hw init data + status = StorPortInitialize( + DriverObject, + RegistryPath, + &hwInitializationData, + NULL); return status; }// -- DriverEntry(); +/** + * @name AhciAdapterReset + * @implemented + * + * 10.4.3 HBA Reset + * If the HBA becomes unusable for multiple ports, and a software reset or port reset does not correct the + * problem, software may reset the entire HBA by setting GHC.HR to â1â. When software sets the GHC.HR + * bit to â1â, the HBA shall perform an internal reset action. The bit shall be cleared to â0â by the HBA when + * the reset is complete. A software write of â0â to GHC.HR shall have no effect. To perform the HBA reset, + * software sets GHC.HR to â1â and may poll until this bit is read to be â0â, at which point software knows that + * the HBA reset has completed. + * If the HBA has not cleared GHC.HR to â0â within 1 second of software setting GHC.HR to â1â, the HBA is in + * a hung or locked state. + * + * @param adapterExtension + * + * @return + * TRUE in case AHCI Controller RESTARTED successfully. i.e GHC.HR == 0 + */ BOOLEAN AhciAdapterReset( - PAHCI_ADAPTER_EXTENSION adapterExtension + PAHCI_ADAPTER_EXTENSION adapterExtension ) { - /* - * 10.4.3 HBA Reset - * If the HBA becomes unusable for multiple ports, and a software reset or port reset does not correct the - * problem, software may reset the entire HBA by setting GHC.HR to â1â. When software sets the GHC.HR - * bit to â1â, the HBA shall perform an internal reset action. The bit shall be cleared to â0â by the HBA when - * the reset is complete. A software write of â0â to GHC.HR shall have no effect. To perform the HBA reset, - * software sets GHC.HR to â1â and may poll until this bit is read to be â0â, at which point software knows that - * the HBA reset has completed. - * If the HBA has not cleared GHC.HR to â0â within 1 second of software setting GHC.HR to â1â, the HBA is in - * a hung or locked state. - */ - ULONG ghc, ticks; - PAHCI_MEMORY_REGISTERS abar = NULL; - - 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 - return FALSE; - - return TRUE; + ULONG ghc, ticks; + PAHCI_MEMORY_REGISTERS abar = NULL; + + 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 + return FALSE; + + return TRUE; }// -- AhciAdapterReset(); 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] Thu Jun 2 14:43:56 2016 @@ -3,72 +3,72 @@ typedef struct _AHCI_PORT { - ULONG CLB; // 0x00, command list base address, 1K-byte aligned - ULONG CLBU; // 0x04, command list base address upper 32 bits - ULONG FB; // 0x08, FIS base address, 256-byte aligned - ULONG FBU; // 0x0C, FIS base address upper 32 bits - ULONG IS; // 0x10, interrupt status - ULONG IE; // 0x14, interrupt enable - ULONG CMD; // 0x18, command and status - ULONG RSV0; // 0x1C, Reserved - ULONG TFD; // 0x20, task file data - ULONG SIG; // 0x24, signature - ULONG SSTS; // 0x28, SATA status (SCR0:SStatus) - ULONG SCTL; // 0x2C, SATA control (SCR2:SControl) - ULONG SERR; // 0x30, SATA error (SCR1:SError) - ULONG SACT; // 0x34, SATA active (SCR3:SActive) - ULONG CI; // 0x38, command issue - ULONG SNTF; // 0x3C, SATA notification (SCR4:SNotification) - ULONG FBS; // 0x40, FIS-based switch control - ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved - ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific + ULONG CLB; // 0x00, command list base address, 1K-byte aligned + ULONG CLBU; // 0x04, command list base address upper 32 bits + ULONG FB; // 0x08, FIS base address, 256-byte aligned + ULONG FBU; // 0x0C, FIS base address upper 32 bits + ULONG IS; // 0x10, interrupt status + ULONG IE; // 0x14, interrupt enable + ULONG CMD; // 0x18, command and status + ULONG RSV0; // 0x1C, Reserved + ULONG TFD; // 0x20, task file data + ULONG SIG; // 0x24, signature + ULONG SSTS; // 0x28, SATA status (SCR0:SStatus) + ULONG SCTL; // 0x2C, SATA control (SCR2:SControl) + ULONG SERR; // 0x30, SATA error (SCR1:SError) + ULONG SACT; // 0x34, SATA active (SCR3:SActive) + ULONG CI; // 0x38, command issue + ULONG SNTF; // 0x3C, SATA notification (SCR4:SNotification) + ULONG FBS; // 0x40, FIS-based switch control + ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved + ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific } AHCI_PORT; typedef struct _AHCI_MEMORY_REGISTERS { - // 0x00 - 0x2B, Generic Host Control - ULONG CAP; // 0x00, Host capability - ULONG GHC; // 0x04, Global host control - ULONG IS; // 0x08, Interrupt status - ULONG PI; // 0x0C, Port implemented - ULONG VS; // 0x10, Version - ULONG CCC_CTL; // 0x14, Command completion coalescing control - ULONG CCC_PTS; // 0x18, Command completion coalescing ports - ULONG EM_LOC; // 0x1C, Enclosure management location - ULONG EM_CTL; // 0x20, Enclosure management control - ULONG CAP2; // 0x24, Host capabilities extended - ULONG BOHC; // 0x28, BIOS/OS handoff control and status + // 0x00 - 0x2B, Generic Host Control + ULONG CAP; // 0x00, Host capability + ULONG GHC; // 0x04, Global host control + ULONG IS; // 0x08, Interrupt status + ULONG PI; // 0x0C, Port implemented + ULONG VS; // 0x10, Version + ULONG CCC_CTL; // 0x14, Command completion coalescing control + ULONG CCC_PTS; // 0x18, Command completion coalescing ports + ULONG EM_LOC; // 0x1C, Enclosure management location + ULONG EM_CTL; // 0x20, Enclosure management control + ULONG CAP2; // 0x24, Host capabilities extended + ULONG BOHC; // 0x28, BIOS/OS handoff control and status - // 0x2C - 0x9F, Reserved - ULONG Reserved[0xA0-0x2C]; + // 0x2C - 0x9F, Reserved + ULONG Reserved[0xA0-0x2C]; - // 0xA0 - 0xFF, Vendor specific registers - ULONG VendorSpecific[0x100-0xA0]; + // 0xA0 - 0xFF, Vendor specific registers + ULONG VendorSpecific[0x100-0xA0]; - AHCI_PORT PortList[32];//1~32 + AHCI_PORT PortList[32];//1~32 } AHCI_MEMORY_REGISTERS, *PAHCI_MEMORY_REGISTERS; typedef struct _AHCI_ADAPTER_EXTENSION { - ULONG AdapterNumber; - ULONG SystemIoBusNumber; - ULONG SlotNumber; - ULONG AhciBaseAddress; - ULONG IS; // Interrupt status - ULONG PortImplemented; + ULONG AdapterNumber; + ULONG SystemIoBusNumber; + ULONG SlotNumber; + ULONG AhciBaseAddress; + ULONG IS; // Interrupt status + ULONG PortImplemented; - USHORT VendorID; - USHORT DeviceID; - USHORT RevisionID; + USHORT VendorID; + USHORT DeviceID; + USHORT RevisionID; - ULONG Version; - ULONG CAP; - ULONG CAP2; - PAHCI_MEMORY_REGISTERS ABAR_Address; + ULONG Version; + ULONG CAP; + ULONG CAP2; + PAHCI_MEMORY_REGISTERS ABAR_Address; } AHCI_ADAPTER_EXTENSION, *PAHCI_ADAPTER_EXTENSION; typedef struct _AHCI_SRB_EXTENSION { - ULONG AdapterNumber; -} AHCI_SRB_EXTENSION; + ULONG AdapterNumber; +} AHCI_SRB_EXTENSION;

1 0

[apriyadarshi] 71499: == Storahci driver - Added DriverEntry - Added AhciFindAdapter : Need to add code for port initialization. - Compile : OK - Test : NOT TESTED
by apriyadarshi＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: apriyadarshi Date: Thu Jun 2 14:13:06 2016 New Revision: 71499 URL: http://svn.reactos.org/svn/reactos?rev=71499&view=rev Log: == Storahci driver - Added DriverEntry - Added AhciFindAdapter : Need to add code for port initialization. - Compile : OK - Test : NOT TESTED Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/ branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile (with props) branches/GSoC_2016/AHCI/drivers/storage/storahci/sources (with props) branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c (with props) branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h (with props) Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile [iso-8859-1] Thu Jun 2 14:13:06 2016 @@ -0,0 +1,3 @@ + +MINIMUM_NT_TARGET_VERSION=0x502 +!INCLUDE $(NTMAKEENV)\makefile.def Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/sources (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/sources [iso-8859-1] Thu Jun 2 14:13:06 2016 @@ -0,0 +1,8 @@ +TARGETNAME = storahci +TARGETTYPE = MINIPORT + +TARGETLIBS=$(DDK_LIB_PATH)\storport.lib + +INCLUDES = %BUILD%\inc +LIBS = %BUILD%\lib +SOURCES = storahci.c Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/sources ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Thu Jun 2 14:13:06 2016 @@ -0,0 +1,231 @@ +#include "storahci.h" + +BOOLEAN AhciAdapterReset( + __in PAHCI_ADAPTER_EXTENSION adapterExtension +); + +ULONG AhciFindAdapter( + IN PVOID DeviceExtension, + __in PVOID HwContext, + __in PVOID BusInformation, + __in IN PVOID ArgumentString, + __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, + __in PBOOLEAN Reserved3 +) +{ + /* Description : + * The HwStorFindAdapter routine uses the supplied configuration to determine whether a specific + * HBA is supported and, if it is, to return configuration information about that adapter. + * + * Refernce: + * 10.1 Platform Communication + * http://www.intel.in/content/dam/www/public/us/en/documents/technical-specif… + * + * Return Value: + * SP_RETURN_FOUND + * Indicates that a supported HBA was found and that the HBA-relevant configuration information was successfully determined and set in the PORT_CONFIGURATION_INFORMATION structure. + * + * SP_RETURN_ERROR + * Indicates that an HBA was found but there was an error obtaining the configuration information. If possible, such an error should be logged with StorPortLogError. + * + * SP_RETURN_BAD_CONFIG + * Indicates that the supplied configuration information was invalid for the adapter. + * + * SP_RETURN_NOT_FOUND + * Indicates that no supported HBA was found for the supplied configuration information. + */ + + ULONG ghc; + ULONG portCount, portImplemented; + ULONG pci_cfg_len; + UCHAR pci_cfg_buf[0x30]; + + PAHCI_MEMORY_REGISTERS abar; + PPCI_COMMON_CONFIG pciConfigData; + PAHCI_ADAPTER_EXTENSION adapterExtension; + + adapterExtension = (PAHCI_ADAPTER_EXTENSION)DeviceExtension; + adapterExtension->SlotNumber = ConfigInfo->SlotNumber; + adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; + + // get PCI configuration header + pci_cfg_len = StorPortGetBusData( + adapterExtension, + PCIConfiguration, + adapterExtension->SystemIoBusNumber, + adapterExtension->SlotNumber, + (PVOID)pci_cfg_buf, + (ULONG)0x30); + + if (pci_cfg_len != 0x30) + return SP_RETURN_ERROR;//Not a valid device at the given bus number + + pciConfigData = (PPCI_COMMON_CONFIG)pci_cfg_buf; + adapterExtension->VendorID = pciConfigData->VendorID; + adapterExtension->DeviceID = pciConfigData->DeviceID; + 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); + + // 2.1.11 + abar = NULL; + if (ConfigInfo->NumberOfAccessRanges > 0) + { + ULONG accessIndex; + for (accessIndex = 0; accessIndex < ConfigInfo->NumberOfAccessRanges; accessIndex++) + { + if ((*(ConfigInfo->AccessRanges))[accessIndex].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); + break; + } + } + } + + if (abar == NULL) + return SP_RETURN_ERROR; // corrupted information supplied + + adapterExtension->ABAR_Address = abar; + adapterExtension->CAP = StorPortReadRegisterUlong(adapterExtension, &abar->CAP); + adapterExtension->CAP2 = StorPortReadRegisterUlong(adapterExtension, &abar->CAP2); + adapterExtension->Version = StorPortReadRegisterUlong(adapterExtension, &abar->VS); + + // 10.1.2 + // 1. Indicate that system software is AHCI aware by setting GHC.AE to â1â. + ghc = StorPortReadRegisterUlong(adapterExtension, &abar->GHC); + // AE := Highest Significant bit of GHC + 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)) + return SP_RETURN_ERROR;// reset failed + } + + ghc = 0x1<<31;// only AE=1 + StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); + + adapterExtension->IS = abar->IS; + adapterExtension->PortImplemented = StorPortReadRegisterUlong(adapterExtension, &abar->PI); + + 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; + ConfigInfo->MaximumNumberOfLogicalUnits = 1; + ConfigInfo->ResetTargetSupported = TRUE; + ConfigInfo->NumberOfBuses = 32; + ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex; + ConfigInfo->ScatterGather = TRUE; + + // Turn IE -- Interrupt Enabled + ghc |= 0x2; + StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); + + + + return SP_RETURN_FOUND; +}// -- AhciFindAdapter(); + +ULONG DriverEntry( + IN PVOID DriverObject, + IN PVOID RegistryPath +) +{ + /* + * Description : + * Initial Entrypoint for storahci miniport driver + */ + + HW_INITIALIZATION_DATA hwInitializationData; + ULONG i, status; + + DebugPrint("Storahci -> DriverEntry()\n"); + + // initialize the hardware data structure + for (i = 0; i < sizeof(HW_INITIALIZATION_DATA); i++) + ((PUCHAR)&hwInitializationData)[i] = 0; + + // set size of hardware initialization structure + hwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA); + + // identity required miniport entry point routines + hwInitializationData.HwFindAdapter = AhciFindAdapter; + + // adapter specific information + hwInitializationData.NeedPhysicalAddresses = TRUE; + hwInitializationData.TaggedQueuing = TRUE; + hwInitializationData.AutoRequestSense = TRUE; + hwInitializationData.MultipleRequestPerLu = TRUE; + + hwInitializationData.NumberOfAccessRanges = 6; + hwInitializationData.AdapterInterfaceType = PCIBus; + hwInitializationData.MapBuffers = STOR_MAP_NON_READ_WRITE_BUFFERS; + + // set required extension sizes + hwInitializationData.SrbExtensionSize = sizeof(AHCI_SRB_EXTENSION); + hwInitializationData.DeviceExtensionSize = sizeof(AHCI_ADAPTER_EXTENSION); + + // register our hw init data + status = StorPortInitialize( + DriverObject, + RegistryPath, + &hwInitializationData, + NULL); + + return status; +}// -- DriverEntry(); + +BOOLEAN AhciAdapterReset( + PAHCI_ADAPTER_EXTENSION adapterExtension +) +{ + /* + * 10.4.3 HBA Reset + * If the HBA becomes unusable for multiple ports, and a software reset or port reset does not correct the + * problem, software may reset the entire HBA by setting GHC.HR to â1â. When software sets the GHC.HR + * bit to â1â, the HBA shall perform an internal reset action. The bit shall be cleared to â0â by the HBA when + * the reset is complete. A software write of â0â to GHC.HR shall have no effect. To perform the HBA reset, + * software sets GHC.HR to â1â and may poll until this bit is read to be â0â, at which point software knows that + * the HBA reset has completed. + * If the HBA has not cleared GHC.HR to â0â within 1 second of software setting GHC.HR to â1â, the HBA is in + * a hung or locked state. + */ + ULONG ghc, ticks; + PAHCI_MEMORY_REGISTERS abar = NULL; + + 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 + return FALSE; + + return TRUE; +}// -- AhciAdapterReset(); Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Thu Jun 2 14:13:06 2016 @@ -0,0 +1,74 @@ +#include "miniport.h" +#include "storport.h" + +typedef struct _AHCI_PORT +{ + ULONG CLB; // 0x00, command list base address, 1K-byte aligned + ULONG CLBU; // 0x04, command list base address upper 32 bits + ULONG FB; // 0x08, FIS base address, 256-byte aligned + ULONG FBU; // 0x0C, FIS base address upper 32 bits + ULONG IS; // 0x10, interrupt status + ULONG IE; // 0x14, interrupt enable + ULONG CMD; // 0x18, command and status + ULONG RSV0; // 0x1C, Reserved + ULONG TFD; // 0x20, task file data + ULONG SIG; // 0x24, signature + ULONG SSTS; // 0x28, SATA status (SCR0:SStatus) + ULONG SCTL; // 0x2C, SATA control (SCR2:SControl) + ULONG SERR; // 0x30, SATA error (SCR1:SError) + ULONG SACT; // 0x34, SATA active (SCR3:SActive) + ULONG CI; // 0x38, command issue + ULONG SNTF; // 0x3C, SATA notification (SCR4:SNotification) + ULONG FBS; // 0x40, FIS-based switch control + ULONG RSV1[11]; // 0x44 ~ 0x6F, Reserved + ULONG Vendor[4]; // 0x70 ~ 0x7F, vendor specific +} AHCI_PORT; + +typedef struct _AHCI_MEMORY_REGISTERS +{ + // 0x00 - 0x2B, Generic Host Control + ULONG CAP; // 0x00, Host capability + ULONG GHC; // 0x04, Global host control + ULONG IS; // 0x08, Interrupt status + ULONG PI; // 0x0C, Port implemented + ULONG VS; // 0x10, Version + ULONG CCC_CTL; // 0x14, Command completion coalescing control + ULONG CCC_PTS; // 0x18, Command completion coalescing ports + ULONG EM_LOC; // 0x1C, Enclosure management location + ULONG EM_CTL; // 0x20, Enclosure management control + ULONG CAP2; // 0x24, Host capabilities extended + ULONG BOHC; // 0x28, BIOS/OS handoff control and status + + // 0x2C - 0x9F, Reserved + ULONG Reserved[0xA0-0x2C]; + + // 0xA0 - 0xFF, Vendor specific registers + ULONG VendorSpecific[0x100-0xA0]; + + AHCI_PORT PortList[32];//1~32 + +} AHCI_MEMORY_REGISTERS, *PAHCI_MEMORY_REGISTERS; + +typedef struct _AHCI_ADAPTER_EXTENSION +{ + ULONG AdapterNumber; + ULONG SystemIoBusNumber; + ULONG SlotNumber; + ULONG AhciBaseAddress; + ULONG IS; // Interrupt status + ULONG PortImplemented; + + USHORT VendorID; + USHORT DeviceID; + USHORT RevisionID; + + ULONG Version; + ULONG CAP; + ULONG CAP2; + PAHCI_MEMORY_REGISTERS ABAR_Address; +} AHCI_ADAPTER_EXTENSION, *PAHCI_ADAPTER_EXTENSION; + +typedef struct _AHCI_SRB_EXTENSION +{ + ULONG AdapterNumber; +} AHCI_SRB_EXTENSION; Propchange: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 71498: [BROWSEUI] - Avoid a double free in CComCatCachedCategory::CacheDSA. CComHeapPtr already takes care of this.
by tfaber＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: tfaber Date: Thu Jun 2 12:19:56 2016 New Revision: 71498 URL: http://svn.reactos.org/svn/reactos?rev=71498&view=rev Log: [BROWSEUI] - Avoid a double free in CComCatCachedCategory::CacheDSA. CComHeapPtr already takes care of this. Modified: trunk/reactos/dll/win32/browseui/comcat.cpp Modified: trunk/reactos/dll/win32/browseui/comcat.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/comcat.… ============================================================================== --- trunk/reactos/dll/win32/browseui/comcat.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/comcat.cpp [iso-8859-1] Thu Jun 2 12:19:56 2016 @@ -161,7 +161,6 @@ SHSetValue(HKEY_CURRENT_USER, bufKey, IMPLEMENTING, REG_BINARY, buffer, bufferSize); guidArray = NULL; - CoTaskMemFree(buffer); return S_OK; }

1 0

[akhaldi] 71497: [MSI] Really silence DllRegisterServer MessageBoxes. Addendum to r71483. Spotted by Peter Hater. CORE-11244
by akhaldi＠svn.reactos.org 02 Jun '16

02 Jun '16

Author: akhaldi Date: Thu Jun 2 08:55:58 2016 New Revision: 71497 URL: http://svn.reactos.org/svn/reactos?rev=71497&view=rev Log: [MSI] Really silence DllRegisterServer MessageBoxes. Addendum to r71483. Spotted by Peter Hater. CORE-11244 Modified: trunk/reactos/dll/win32/msi/action.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Thu Jun 2 08:55:58 2016 @@ -4769,7 +4769,7 @@ static void register_dll( const WCHAR *dll, BOOL unregister ) { -#ifdef __REACTOS_ +#ifdef __REACTOS__ static const WCHAR regW[] = {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','s',' ','\"','%','s','\"',0}; static const WCHAR unregW[] =

1 0

[hbelusca] 71496: [i8042prt]: Yet another initialization hack for the PS/2 touchpad of the Dell Latitude E4300 (which has the same problems). Tested with success by contributor "william341". CORE-1...
by hbelusca＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: hbelusca Date: Wed Jun 1 23:04:08 2016 New Revision: 71496 URL: http://svn.reactos.org/svn/reactos?rev=71496&view=rev Log: [i8042prt]: Yet another initialization hack for the PS/2 touchpad of the Dell Latitude E4300 (which has the same problems). Tested with success by contributor "william341". CORE-11344 CORE-6901 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Wed Jun 1 23:04:08 2016 @@ -64,6 +64,7 @@ { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D600 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4300 "}}, FL_INITHACK }, };

1 0

[hbelusca] 71495: [i8042prt]: Add another initialization hack for the PS/2 touchpad of the Dell Latitude D430. Proposed by Victor Martinez Calvo and tested with success by contributor "william341"....
by hbelusca＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: hbelusca Date: Wed Jun 1 22:23:56 2016 New Revision: 71495 URL: http://svn.reactos.org/svn/reactos?rev=71495&view=rev Log: [i8042prt]: Add another initialization hack for the PS/2 touchpad of the Dell Latitude D430. Proposed by Victor Martinez Calvo and tested with success by contributor "william341". I emphasize that such hacks are absent from Windows' i8042prt.sys driver, yet it is able to correctly drive such touchpads. CORE-11344 #resolve CORE-6901 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Wed Jun 1 22:23:56 2016 @@ -37,7 +37,6 @@ BOARD_SERIAL, BOARD_ASSET_TAG, - ID_STRINGS_MAX, }; @@ -60,6 +59,7 @@ // { {{BOARD_VENDOR, "ASUSTeK Computer Inc."}, {BOARD_NAME, "G1S"}, {BOARD_VERSION, "1.0"}}, FL_NOLOOP }, { {{SYS_VENDOR, "Microsoft Corporation"}, {SYS_PRODUCT, "Virtual Machine"}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D430 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D600 "}}, FL_INITHACK },

1 0

[tthompson] 71494: [CMAKE] Add some fool-proofing to configure.cmd related to MSVS: -VSSolution switch now outputs to a dedicated folder if running from source directory. -Give an error if the user...
by tthompson＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: tthompson Date: Wed Jun 1 21:41:53 2016 New Revision: 71494 URL: http://svn.reactos.org/svn/reactos?rev=71494&view=rev Log: [CMAKE] Add some fool-proofing to configure.cmd related to MSVS: -VSSolution switch now outputs to a dedicated folder if running from source directory. -Give an error if the user is trying to mix ninja and VSSolution in the same output directory. -In a MingW environment, give an error on VSSolution switch and give a warning on RTC switch. Fix -DNEW_STYLE_BUILD=0 option. Modified: branches/GSoC_2016/NTFS/configure.cmd Modified: branches/GSoC_2016/NTFS/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/configure.cmd?re… ============================================================================== --- branches/GSoC_2016/NTFS/configure.cmd [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/configure.cmd [iso-8859-1] Wed Jun 1 21:41:53 2016 @@ -84,7 +84,7 @@ REM Parse command line parameters :repeat - if /I "%1%" == "-DNEW_STYLE_BUILD" ( + if /I "%1" == "-DNEW_STYLE_BUILD" ( set NEW_STYLE_BUILD=%2 ) else if "%BUILD_ENVIRONMENT%" == "MinGW" ( if /I "%1" == "Codeblocks" ( @@ -95,6 +95,13 @@ set CMAKE_GENERATOR="MinGW Makefiles" ) else if /I "%1" == "clang" ( set MINGW_TOOCHAIN_FILE=toolchain-clang.cmake + ) else if /I "%1" == "VSSolution" ( + echo. && echo Error: Creation of VS Solution files is not supported in a MinGW environment. + echo Please run this command in a [Developer] Command Prompt for Visual Studio. + endlocal + exit /b + ) else if /I "%1" == "RTC" ( + echo. && echo Warning: RTC switch is ignored outside of a Visual Studio environment. && echo. ) else ( goto continue ) @@ -167,13 +174,36 @@ REM Create directories set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% + +if "%VS_SOLUTION%" == "1" ( + set REACTOS_OUTPUT_PATH=%REACTOS_OUTPUT_PATH%-sln +) + if "%REACTOS_SOURCE_DIR%" == "%CD%\" ( + set CD_SAME_AS_SOURCE=1 echo Creating directories in %REACTOS_OUTPUT_PATH% if not exist %REACTOS_OUTPUT_PATH% ( mkdir %REACTOS_OUTPUT_PATH% ) cd %REACTOS_OUTPUT_PATH% +) + +if "%VS_SOLUTION%" == "1" ( + + if exist build.ninja ( + echo. && echo Error: This directory has already been configured for ninja. + echo An output folder configured for ninja can't be reconfigured for VSSolution. + echo Use an empty folder or delete the contents of this folder, then try again. + endlocal + exit /b + ) +) else if exist REACTOS.sln ( + echo. && echo Error: This directory has already been configured for Visual Studio. + echo An output folder configured for VSSolution can't be reconfigured for ninja. + echo Use an empty folder or delete the contents of this folder, then try again. && echo. + endlocal + exit /b ) if "%NEW_STYLE_BUILD%"=="0" ( @@ -231,7 +261,11 @@ cd.. ) -echo Configure script complete^^! Execute appropriate build commands (ex: ninja, make, nmake, etc...). +if "%CD_SAME_AS_SOURCE%" == "1" ( + echo Configure script complete^^! Execute appropriate build commands ^(ex: ninja, make, nmake, etc...^) from %REACTOS_OUTPUT_PATH%. +) else ( + echo Configure script complete^^! Execute appropriate build commands ^(ex: ninja, make, nmake, etc...^). +) endlocal exit /b

1 0

[hbelusca] 71493: [DESK.CPL]: Check properly if the StringCbCopy has been copied correctly just by moving the check block to where it belongs. CID 1322244 Patch by Victor Martinez Calvo CORE-11212 ...
by hbelusca＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: hbelusca Date: Wed Jun 1 21:23:37 2016 New Revision: 71493 URL: http://svn.reactos.org/svn/reactos?rev=71493&view=rev Log: [DESK.CPL]: Check properly if the StringCbCopy has been copied correctly just by moving the check block to where it belongs. CID 1322244 Patch by Victor Martinez Calvo CORE-11212 #resolve Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Wed Jun 1 21:23:37 2016 @@ -19,7 +19,7 @@ #define PLACEMENT_STRETCH 1 #define PLACEMENT_TILE 2 -/* The values in these macros are dependant on the +/* The values in these macros are dependent on the * layout of the monitor image and they must be adjusted * if that image will be changed. */ @@ -348,12 +348,11 @@ if ((result == ERROR_SUCCESS) && (_tcslen(originalWallpaper) > 0)) { hr = StringCbCopy(wallpaperFilename, sizeof(wallpaperFilename), originalWallpaper); - } - - if (FAILED(hr)) - { - RegCloseKey(regKey); - return; + if (FAILED(hr)) + { + RegCloseKey(regKey); + return; + } } }

1 0

[gadamopoulos] 71492: [BROWSEUI] - CExplorerBand: Implement IOleWindow, IDockingWindow, IDeskBand, IObjectWithSite, IInputObject and IPersist interfaces. This creates and shows an empty tree view c...
by gadamopoulos＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: gadamopoulos Date: Wed Jun 1 21:12:17 2016 New Revision: 71492 URL: http://svn.reactos.org/svn/reactos?rev=71492&view=rev Log: [BROWSEUI] - CExplorerBand: Implement IOleWindow, IDockingWindow, IDeskBand, IObjectWithSite, IInputObject and IPersist interfaces. This creates and shows an empty tree view control in the bar. - CShellBrowser: Restore the hack to use the local CExplorerBand instead of the system one. Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp 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] Wed Jun 1 21:12:17 2016 @@ -12,19 +12,32 @@ return ShellObjectCreator<CExplorerBand>(riid, ppv); } -CExplorerBand::CExplorerBand() +CExplorerBand::CExplorerBand() : + pSite(NULL), fVisible(FALSE), dwBandID(0) { } CExplorerBand::~CExplorerBand() { +} + +void CExplorerBand::InitializeExplorerBand() +{ + +} + +void CExplorerBand::DestroyExplorerBand() +{ + } // *** IOleWindow methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::GetWindow(HWND *lphwnd) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (!lphwnd) + return E_INVALIDARG; + *lphwnd = m_hWnd; + return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::ContextSensitiveHelp(BOOL fEnterMode) @@ -37,42 +50,135 @@ // *** IDockingWindow methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::CloseDW(DWORD dwReserved) { - UNIMPLEMENTED; - return E_NOTIMPL; + // We do nothing, we don't have anything to save yet + TRACE("CloseDW called\n"); + return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) { - UNIMPLEMENTED; + /* Must return E_NOTIMPL according to MSDN */ return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CExplorerBand::ShowDW(BOOL fShow) { - UNIMPLEMENTED; - return E_NOTIMPL; + fVisible = fShow; + ShowWindow(fShow); + return S_OK; } // *** IDeskBand methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (!pdbi) + { + return E_INVALIDARG; + } + this->dwBandID = dwBandID; + + if (pdbi->dwMask & DBIM_MINSIZE) + { + pdbi->ptMinSize.x = 200; + pdbi->ptMinSize.y = 30; + } + + if (pdbi->dwMask & DBIM_MAXSIZE) + { + pdbi->ptMaxSize.y = -1; + } + + if (pdbi->dwMask & DBIM_INTEGRAL) + { + pdbi->ptIntegral.y = 1; + } + + if (pdbi->dwMask & DBIM_ACTUAL) + { + pdbi->ptActual.x = 200; + pdbi->ptActual.y = 30; + } + + if (pdbi->dwMask & DBIM_TITLE) + { + lstrcpyW(pdbi->wszTitle, L"Explorer"); + } + + if (pdbi->dwMask & DBIM_MODEFLAGS) + { + pdbi->dwModeFlags = DBIMF_NORMAL | DBIMF_VARIABLEHEIGHT; + } + + if (pdbi->dwMask & DBIM_BKCOLOR) + { + pdbi->dwMask &= ~DBIM_BKCOLOR; + } + return S_OK; } // *** IObjectWithSite methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::SetSite(IUnknown *pUnkSite) { - UNIMPLEMENTED; - return E_NOTIMPL; + HRESULT hr; + HWND parentWnd; + + if (pUnkSite == pSite) + return S_OK; + + TRACE("SetSite called \n"); + if (!pUnkSite) + { + DestroyExplorerBand(); + DestroyWindow(); + m_hWnd = NULL; + } + + if (pUnkSite != pSite) + { + pSite = NULL; + } + + if(!pUnkSite) + return S_OK; + + hr = IUnknown_GetWindow(pUnkSite, &parentWnd); + if (!SUCCEEDED(hr)) + { + ERR("Could not get parent's window ! Status: %08lx\n", hr); + return E_INVALIDARG; + } + + pSite = pUnkSite; + + if (m_hWnd) + { + // Change its parent + SetParent(parentWnd); + } + else + { + HWND wnd = CreateWindow(WC_TREEVIEW, NULL, + WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | TVS_HASLINES | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_EDITLABELS /* | TVS_SINGLEEXPAND*/ , // remove TVS_SINGLEEXPAND for now since it has strange behaviour + 0, 0, 0, 0, parentWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + + // Subclass the window + SubclassWindow(wnd); + + // Initialize our treeview now + InitializeExplorerBand(); + RegisterDragDrop(m_hWnd, dynamic_cast<IDropTarget*>(this)); + } + return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::GetSite(REFIID riid, void **ppvSite) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (!ppvSite) + return E_POINTER; + *ppvSite = pSite; + return S_OK; } @@ -101,28 +207,40 @@ // *** IInputObject methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (fActivate) + { + //SetFocus(); + SetActiveWindow(); + } + // TODO: handle message + if(lpMsg) + { + TranslateMessage(lpMsg); + DispatchMessage(lpMsg); + } + return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::HasFocusIO() { - UNIMPLEMENTED; - return E_NOTIMPL; + return bFocused ? S_OK : S_FALSE; } HRESULT STDMETHODCALLTYPE CExplorerBand::TranslateAcceleratorIO(LPMSG lpMsg) { - UNIMPLEMENTED; - return E_NOTIMPL; + TranslateMessage(lpMsg); + DispatchMessage(lpMsg); + return S_OK; } // *** IPersist methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::GetClassID(CLSID *pClassID) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (!pClassID) + return E_POINTER; + memcpy(pClassID, &CLSID_ExplorerBand, sizeof(CLSID)); + return S_OK; } @@ -161,8 +279,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::IsWindowOwner(HWND hWnd) { - UNIMPLEMENTED; - return E_NOTIMPL; + return (hWnd == m_hWnd) ? S_OK : S_FALSE; } // *** IBandNavigate methods *** 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] Wed Jun 1 21:12:17 2016 @@ -29,6 +29,17 @@ LPITEMIDLIST relativePidl; BOOL expanded; }; + + // *** BaseBarSite information *** + CComPtr<IUnknown> pSite; + + // *** tree explorer band stuff *** + BOOL fVisible; + BOOL bFocused; + DWORD dwBandID; + + void InitializeExplorerBand(); + void DestroyExplorerBand(); public: CExplorerBand(); Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Jun 1 21:12:17 2016 @@ -24,7 +24,7 @@ #include <htiframe.h> #include <strsafe.h> -#define USE_CUSTOM_EXPLORERBAND 0 +#define USE_CUSTOM_EXPLORERBAND 1 extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); @@ -1237,9 +1237,23 @@ if (!IsBandLoaded(classID, vertical, &dwBandID)) { - hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; +#if USE_CUSTOM_EXPLORERBAND + TRACE("ShowBand called for CLSID %s, vertical=%d...\n", wine_dbgstr_guid(&classID), vertical); + if (IsEqualCLSID(CLSID_ExplorerBand, classID)) + { + TRACE("CLSID_ExplorerBand requested, building internal band.\n"); + hResult = CExplorerBand_Constructor(IID_PPV_ARG(IUnknown, &newBand)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + else +#endif + { + TRACE("A different CLSID requested, using CoCreateInstance.\n"); + hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } } else {

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