Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Fri Jun 10 08:27:20 2016 New Revision: 71607 URL: http://svn.reactos.org/svn/reactos?rev=71607&view=rev Log: Code Review #2 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 10 08:27:20 2016 @@ -13,49 +13,49 @@ * * Initialize port by setting up PxCLB & PxFB Registers * - * @param portExtension + * @param PortExtension * * @return * Return true if intialization was successful */ BOOLEAN AhciPortInitialize ( - __in PAHCI_PORT_EXTENSION portExtension - ) -{ - ULONG mappedLength; + __in PAHCI_PORT_EXTENSION PortExtension + ) +{ + ULONG mappedLength, portNumber; PAHCI_MEMORY_REGISTERS abar; PAHCI_ADAPTER_EXTENSION adapterExtension; STOR_PHYSICAL_ADDRESS commandListPhysical, receivedFISPhysical; DebugPrint("AhciPortInitialize()\n"); - NT_ASSERT(portExtension != NULL); - - adapterExtension = portExtension->AdapterExtension; + adapterExtension = PortExtension->AdapterExtension; abar = adapterExtension->ABAR_Address; + portNumber = PortExtension->PortNumber; NT_ASSERT(abar != NULL); - - portExtension->Port = &abar->PortList[portExtension->PortNumber]; - - commandListPhysical = StorPortGetPhysicalAddress( adapterExtension, - NULL, - portExtension->CommandList, - &mappedLength); - - if ((mappedLength) == 0 || ((commandListPhysical.LowPart % 1024) != 0)) + NT_ASSERT(portNumber < MAXIMUM_AHCI_PORT_COUNT); + + PortExtension->Port = &abar->PortList[portNumber]; + + commandListPhysical = StorPortGetPhysicalAddress(adapterExtension, + NULL, + PortExtension->CommandList, + &mappedLength); + + if ((mappedLength == 0) || ((commandListPhysical.LowPart % 1024) != 0)) { DebugPrint("\tcommandListPhysical mappedLength:%d\n", mappedLength); return FALSE; } - receivedFISPhysical = StorPortGetPhysicalAddress( adapterExtension, - NULL, - portExtension->ReceivedFIS, - &mappedLength); - - if ((mappedLength) == 0 || ((receivedFISPhysical.LowPart % 1024) != 0)) + receivedFISPhysical = StorPortGetPhysicalAddress(adapterExtension, + NULL, + PortExtension->ReceivedFIS, + &mappedLength); + + if ((mappedLength == 0) || ((receivedFISPhysical.LowPart % 256) != 0)) { DebugPrint("\treceivedFISPhysical mappedLength:%d\n", mappedLength); return FALSE; @@ -71,16 +71,16 @@ // ï· 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); + StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->CLB, commandListPhysical.LowPart); + StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->FB, receivedFISPhysical.LowPart); // set device power state flag to D0 - portExtension->DevicePowerState = StorPowerDeviceD0; + PortExtension->DevicePowerState = StorPowerDeviceD0; // clear pending interrupts - StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->SERR, (ULONG)-1); - StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->IS, (ULONG)-1); - StorPortWriteRegisterUlong(adapterExtension, portExtension->AdapterExtension->IS, (1 << portExtension->PortNumber)); + StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->SERR, (ULONG)-1); + StorPortWriteRegisterUlong(adapterExtension, &PortExtension->Port->IS, (ULONG)-1); + StorPortWriteRegisterUlong(adapterExtension, PortExtension->AdapterExtension->IS, (1 << PortExtension->PortNumber)); return TRUE; }// -- AhciPortInitialize(); @@ -91,7 +91,7 @@ * * Allocate memory from poll for required pointers * - * @param adapterExtension + * @param AdapterExtension * @param ConfigInfo * * @return @@ -99,8 +99,8 @@ */ 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; @@ -110,19 +110,23 @@ DebugPrint("AhciAllocateResourceForAdapter()\n"); - NCS = AHCI_Global_Port_CAP_NCS(adapterExtension->CAP); + NCS = AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); AlignedNCS = ROUND_UP(NCS, 8); - // get port count -- Number of set bits in `adapterExtension->PortImplemented` + // get port count -- Number of set bits in `AdapterExtension->PortImplemented` portCount = 0; - portImplemented = adapterExtension->PortImplemented; + portImplemented = AdapterExtension->PortImplemented; + + // make sure we don't allocate too much memory for the ports we have not implemented + // LOGIC: AND with all MAXIMUM_AHCI_PORT_COUNT (low significant) bits set + portImplemented = portImplemented & ((1 << MAXIMUM_AHCI_PORT_COUNT) - 1); while (portImplemented > 0) { portCount++; portImplemented &= (portImplemented - 1); } - NT_ASSERT(portCount != 0); + NT_ASSERT(portCount <= MAXIMUM_AHCI_PORT_COUNT); DebugPrint("\tPort Count: %d\n", portCount); nonCachedExtensionSize = sizeof(AHCI_COMMAND_HEADER) * AlignedNCS + //should be 1K aligned @@ -131,29 +135,29 @@ // align nonCachedExtensionSize to 1024 nonCachedExtensionSize = ROUND_UP(nonCachedExtensionSize, 1024); - adapterExtension->NonCachedExtension = StorPortGetUncachedExtension( adapterExtension, - ConfigInfo, - nonCachedExtensionSize * portCount); - - if (adapterExtension->NonCachedExtension == NULL) + AdapterExtension->NonCachedExtension = StorPortGetUncachedExtension(AdapterExtension, + ConfigInfo, + nonCachedExtensionSize * portCount); + + if (AdapterExtension->NonCachedExtension == NULL) { DebugPrint("\tadapterExtension->NonCachedExtension == NULL\n"); return FALSE; } - nonCachedExtension = adapterExtension->NonCachedExtension; + nonCachedExtension = AdapterExtension->NonCachedExtension; AhciZeroMemory(nonCachedExtension, nonCachedExtensionSize * portCount); for (index = 0; index < MAXIMUM_AHCI_PORT_COUNT; index++) { - adapterExtension->PortExtension[index].IsActive = FALSE; - if ((adapterExtension->PortImplemented & (1 << index)) != 0) + AdapterExtension->PortExtension[index].IsActive = FALSE; + if ((AdapterExtension->PortImplemented & (1 << index)) != 0) { - adapterExtension->PortExtension[index].PortNumber = index; - adapterExtension->PortExtension[index].IsActive = TRUE; - adapterExtension->PortExtension[index].AdapterExtension = adapterExtension; - adapterExtension->PortExtension[index].CommandList = nonCachedExtension; - adapterExtension->PortExtension[index].ReceivedFIS = (PAHCI_RECEIVED_FIS)(nonCachedExtension + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); + AdapterExtension->PortExtension[index].PortNumber = index; + AdapterExtension->PortExtension[index].IsActive = TRUE; + AdapterExtension->PortExtension[index].AdapterExtension = AdapterExtension; + AdapterExtension->PortExtension[index].CommandList = nonCachedExtension; + AdapterExtension->PortExtension[index].ReceivedFIS = (PAHCI_RECEIVED_FIS)(nonCachedExtension + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); nonCachedExtension += nonCachedExtensionSize; } } @@ -174,7 +178,7 @@ */ BOOLEAN AhciHwInitialize ( - __in PVOID AdapterExtension + __in PVOID AdapterExtension ) { ULONG ghc, messageCount, status; @@ -205,18 +209,18 @@ * @name AhciInterruptHandler * @implemented * - * Interrupt Handler for portExtension - * - * @param portExtension + * Interrupt Handler for PortExtension + * + * @param PortExtension * */ VOID AhciInterruptHandler ( - __in PAHCI_PORT_EXTENSION portExtension + __in PAHCI_PORT_EXTENSION PortExtension ) { DebugPrint("AhciInterruptHandler()\n"); - DebugPrint("\tPort Number: %d\n", portExtension->PortNumber); + DebugPrint("\tPort Number: %d\n", PortExtension->PortNumber); }// -- AhciInterruptHandler(); @@ -234,7 +238,7 @@ */ BOOLEAN AhciHwInterrupt( - __in PVOID AdapterExtension + __in PVOID AdapterExtension ) { ULONG portPending, nextPort, i; @@ -265,8 +269,8 @@ if ((portPending & (0x1 << nextPort)) == 0) continue; - if ((nextPort == adapterExtension->LastInterruptPort) - || (adapterExtension->PortExtension[nextPort].IsActive == FALSE)) + if ((nextPort == adapterExtension->LastInterruptPort) || + (adapterExtension->PortExtension[nextPort].IsActive == FALSE)) { return FALSE; } @@ -296,8 +300,8 @@ */ BOOLEAN AhciHwStartIo ( - __in PVOID AdapterExtension, - __in PSCSI_REQUEST_BLOCK Srb + __in PVOID AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb ) { UCHAR function, pathId; @@ -404,8 +408,8 @@ */ BOOLEAN AhciHwResetBus ( - __in PVOID AdapterExtension, - __in ULONG PathId + __in PVOID AdapterExtension, + __in ULONG PathId ) { PAHCI_ADAPTER_EXTENSION adapterExtension; @@ -451,12 +455,12 @@ */ ULONG AhciHwFindAdapter ( - __in PVOID AdapterExtension, - __in PVOID HwContext, - __in PVOID BusInformation, - __in PVOID ArgumentString, - __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, - __in PBOOLEAN Reserved3 + __in PVOID AdapterExtension, + __in PVOID HwContext, + __in PVOID BusInformation, + __in PVOID ArgumentString, + __inout PPORT_CONFIGURATION_INFORMATION ConfigInfo, + __in PBOOLEAN Reserved3 ) { ULONG ghc; @@ -498,7 +502,9 @@ // 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); - DebugPrint("\tVendorID:%d DeviceID:%d RevisionID:%d\n", adapterExtension->VendorID, adapterExtension->DeviceID, adapterExtension->RevisionID); + DebugPrint("\tVendorID:%d DeviceID:%d RevisionID:%d\n", adapterExtension->VendorID, + adapterExtension->DeviceID, + adapterExtension->RevisionID); // 2.1.11 abar = NULL; @@ -542,7 +548,8 @@ { // reset controller to have it in known state DebugPrint("\tAE Already set, Reset()\n"); - if (!AhciAdapterReset(adapterExtension)){ + if (!AhciAdapterReset(adapterExtension)) + { DebugPrint("\tReset Failed!\n"); return SP_RETURN_ERROR;// reset failed } @@ -603,8 +610,8 @@ */ ULONG DriverEntry ( - __in PVOID DriverObject, - __in PVOID RegistryPath + __in PVOID DriverObject, + __in PVOID RegistryPath ) { HW_INITIALIZATION_DATA hwInitializationData; @@ -664,22 +671,22 @@ * 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 + * @param AdapterExtension * * @return * TRUE in case AHCI Controller RESTARTED successfully. i.e GHC.HR == 0 */ BOOLEAN AhciAdapterReset ( - __in PAHCI_ADAPTER_EXTENSION adapterExtension - ) -{ - ULONG ghc, ticks; + __in PAHCI_ADAPTER_EXTENSION AdapterExtension + ) +{ + ULONG ghc, ticks, ghcStatus; PAHCI_MEMORY_REGISTERS abar = NULL; DebugPrint("AhciAdapterReset()\n"); - abar = adapterExtension->ABAR_Address; + abar = AdapterExtension->ABAR_Address; if (abar == NULL) // basic sanity { return FALSE; @@ -687,11 +694,12 @@ // HR -- Very first bit (lowest significant) ghc = AHCI_Global_HBA_CONTROL_HR; - StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); + StorPortWriteRegisterUlong(AdapterExtension, &abar->GHC, ghc); for (ticks = 0; ticks < 50; ++ticks) { - if ((StorPortReadRegisterUlong(adapterExtension, &abar->GHC) & AHCI_Global_HBA_CONTROL_HR) == 0) + ghcStatus = StorPortReadRegisterUlong(AdapterExtension, &abar->GHC); + if ((ghcStatus & AHCI_Global_HBA_CONTROL_HR) == 0) { break; } @@ -713,18 +721,21 @@ * * Clear buffer by filling zeros * - * @param buffer + * @param Buffer + * @param BufferSize */ __inline VOID AhciZeroMemory ( - __out PCHAR buffer, - __in ULONG bufferSize + __out PCHAR Buffer, + __in ULONG BufferSize ) { ULONG i; - for (i = 0; i < bufferSize; i++) - buffer[i] = 0; + for (i = 0; i < BufferSize; i++) + { + Buffer[i] = 0; + } }// -- AhciZeroMemory(); /** @@ -733,7 +744,7 @@ * * Tells wheather given port is implemented or not * - * @param adapterExtension + * @param AdapterExtension * @param PathId * * @return @@ -742,8 +753,8 @@ __inline BOOLEAN IsPortValid ( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in UCHAR pathId + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in UCHAR pathId ) { NT_ASSERT(pathId >= 0); @@ -753,7 +764,7 @@ return FALSE; } - return adapterExtension->PortExtension[pathId].IsActive; + return AdapterExtension->PortExtension[pathId].IsActive; }// -- IsPortValid() /** @@ -762,7 +773,7 @@ * * Tells wheather given port is implemented or not * - * @param adapterExtension + * @param AdapterExtension * @param Srb * @param Cdb * @@ -774,9 +785,9 @@ */ ULONG DeviceInquiryRequest ( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in PSCSI_REQUEST_BLOCK Srb, - __in PCDB Cdb + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb ) { PVOID DataBuffer; @@ -798,7 +809,9 @@ DataBufferLength = Srb->DataTransferLength; if (DataBuffer == NULL) + { return SRB_STATUS_INVALID_REQUEST; + } AhciZeroMemory(DataBuffer, DataBufferLength); } 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 10 08:27:20 2016 @@ -250,26 +250,26 @@ BOOLEAN AhciAdapterReset ( - __in PAHCI_ADAPTER_EXTENSION adapterExtension + __in PAHCI_ADAPTER_EXTENSION AdapterExtension ); __inline VOID AhciZeroMemory ( - __out PCHAR buffer, - __in ULONG bufferSize + __out PCHAR Buffer, + __in ULONG BufferSize ); __inline BOOLEAN IsPortValid ( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in UCHAR pathId + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in UCHAR pathId ); ULONG DeviceInquiryRequest ( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in PSCSI_REQUEST_BLOCK Srb, - __in PCDB Cdb - ); + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + );

8 years, 3 months

[hbelusca] 71606: [WRITE]: Add wordpad's icon to write.exe compatibility bootstrap.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 10 00:14:36 2016 New Revision: 71606 URL: http://svn.reactos.org/svn/reactos?rev=71606&view=rev Log: [WRITE]: Add wordpad's icon to write.exe compatibility bootstrap. Added: trunk/reactos/base/applications/write/write.ico - copied unchanged from r71605, trunk/reactos/base/applications/wordpad/res/wordpad.ico Modified: trunk/reactos/base/applications/write/rsrc.rc Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Fri Jun 10 00:14:36 2016 @@ -24,6 +24,8 @@ #include <reactos/manifest_exe.rc> LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 ICON "write.ico" /* UTF-8 */ #pragma code_page(65001)

8 years, 3 months

[apriyadarshi] 71605: changes after code review

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Thu Jun 9 23:47:19 2016 New Revision: 71605 URL: http://svn.reactos.org/svn/reactos?rev=71605&view=rev Log: changes after code review Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf Modified: 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 [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/makefile [iso-8859-1] Thu Jun 9 23:47:19 2016 @@ -1,3 +1,2 @@ - MINIMUM_NT_TARGET_VERSION=0x502 -!INCLUDE $(NTMAKEENV)\makefile.def +!INCLUDE $(NTMAKEENV)\makefile.def 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 9 23:47:19 2016 @@ -18,38 +18,59 @@ * @return * Return true if intialization was successful */ -BOOLEAN AhciPortInitialize( - __in PAHCI_PORT_EXTENSION portExtension -) +BOOLEAN +AhciPortInitialize ( + __in PAHCI_PORT_EXTENSION portExtension + ) { ULONG mappedLength; PAHCI_MEMORY_REGISTERS abar; PAHCI_ADAPTER_EXTENSION adapterExtension; STOR_PHYSICAL_ADDRESS commandListPhysical, receivedFISPhysical; - StorPortDebugPrint(0, "AhciPortInitialize()\n"); + DebugPrint("AhciPortInitialize()\n"); + + NT_ASSERT(portExtension != NULL); adapterExtension = portExtension->AdapterExtension; abar = adapterExtension->ABAR_Address; + NT_ASSERT(abar != NULL); + portExtension->Port = &abar->PortList[portExtension->PortNumber]; - commandListPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->CommandList, &mappedLength); - if (mappedLength == 0 || (commandListPhysical.LowPart % 1024) != 0){ - StorPortDebugPrint(0, "\tcommandListPhysical mappedLength:%d\n", mappedLength); + commandListPhysical = StorPortGetPhysicalAddress( adapterExtension, + NULL, + portExtension->CommandList, + &mappedLength); + + if ((mappedLength) == 0 || ((commandListPhysical.LowPart % 1024) != 0)) + { + DebugPrint("\tcommandListPhysical mappedLength:%d\n", mappedLength); return FALSE; } - receivedFISPhysical = StorPortGetPhysicalAddress(adapterExtension, NULL, portExtension->ReceivedFIS, &mappedLength); - if (mappedLength == 0 || (receivedFISPhysical.LowPart % 256) != 0){ - StorPortDebugPrint(0, "\treceivedFISPhysical mappedLength:%d\n", mappedLength); + receivedFISPhysical = StorPortGetPhysicalAddress( adapterExtension, + NULL, + portExtension->ReceivedFIS, + &mappedLength); + + if ((mappedLength) == 0 || ((receivedFISPhysical.LowPart % 1024) != 0)) + { + DebugPrint("\treceivedFISPhysical mappedLength:%d\n", mappedLength); + return FALSE; + } + + if ((adapterExtension->CAP & AHCI_Global_HBA_CAP_S64A) != 0) + { + DebugPrint("\tCAP.S64A not supported\n"); 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 + // Note: Assuming 32bit support only StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->CLB, commandListPhysical.LowPart); StorPortWriteRegisterUlong(adapterExtension, &portExtension->Port->FB, receivedFISPhysical.LowPart); @@ -76,60 +97,64 @@ * @return * return TRUE if allocation was successful */ -BOOLEAN AhciAllocateResourceForAdapter( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in PPORT_CONFIGURATION_INFORMATION ConfigInfo -) +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; - - StorPortDebugPrint(0, "AhciAllocateResourceForAdapter()\n"); - - // 3.1.1 NCS = CAP[12:08] -> Align - NCS = (adapterExtension->CAP & 0xF00) >> 8; - AlignedNCS = ((NCS/8) + 1) * 8; + ULONG status, index, NCS, AlignedNCS; + ULONG portCount, portImplemented, nonCachedExtensionSize; + + DebugPrint("AhciAllocateResourceForAdapter()\n"); + + NCS = AHCI_Global_Port_CAP_NCS(adapterExtension->CAP); + AlignedNCS = ROUND_UP(NCS, 8); // get port count -- Number of set bits in `adapterExtension->PortImplemented` portCount = 0; portImplemented = adapterExtension->PortImplemented; - while(portImplemented > 0) + while (portImplemented > 0) { portCount++; - portImplemented &= (portImplemented-1); - } - StorPortDebugPrint(0, "\tPort Count: %d\n", portCount); + portImplemented &= (portImplemented - 1); + } + + NT_ASSERT(portCount != 0); + DebugPrint("\tPort Count: %d\n", portCount); 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) { - StorPortDebugPrint(0, "\tadapterExtension->NonCachedExtension == NULL\n"); + + // align nonCachedExtensionSize to 1024 + nonCachedExtensionSize = ROUND_UP(nonCachedExtensionSize, 1024); + + adapterExtension->NonCachedExtension = StorPortGetUncachedExtension( adapterExtension, + ConfigInfo, + nonCachedExtensionSize * portCount); + + if (adapterExtension->NonCachedExtension == NULL) + { + DebugPrint("\tadapterExtension->NonCachedExtension == NULL\n"); return FALSE; } - nonCachedExtension = (PCHAR)adapterExtension->NonCachedExtension; - - AhciZeroMemory(nonCachedExtension, nonCachedExtensionSize); - - nonCachedExtensionSize /= portCount; - currentCount = 0; + nonCachedExtension = adapterExtension->NonCachedExtension; + AhciZeroMemory(nonCachedExtension, nonCachedExtensionSize * portCount); + for (index = 0; index < MAXIMUM_AHCI_PORT_COUNT; index++) { adapterExtension->PortExtension[index].IsActive = FALSE; - if ((adapterExtension->PortImplemented & (1<<index)) != 0) + if ((adapterExtension->PortImplemented & (1 << index)) != 0) { adapterExtension->PortExtension[index].PortNumber = index; adapterExtension->PortExtension[index].IsActive = TRUE; 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++; + adapterExtension->PortExtension[index].CommandList = nonCachedExtension; + adapterExtension->PortExtension[index].ReceivedFIS = (PAHCI_RECEIVED_FIS)(nonCachedExtension + sizeof(AHCI_COMMAND_HEADER) * AlignedNCS); + nonCachedExtension += nonCachedExtensionSize; } } @@ -147,29 +172,30 @@ * @return * return TRUE if intialization was successful */ -BOOLEAN AhciHwInitialize( - __in PVOID AdapterExtension -) +BOOLEAN +AhciHwInitialize ( + __in PVOID AdapterExtension + ) { ULONG ghc, messageCount, status; PAHCI_ADAPTER_EXTENSION adapterExtension; - StorPortDebugPrint(0, "AhciHwInitialize()\n"); - - adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + DebugPrint("AhciHwInitialize()\n"); + + adapterExtension = AdapterExtension; adapterExtension->StateFlags.MessagePerPort = FALSE; // First check what type of interrupt/synchronization device is using ghc = StorPortReadRegisterUlong(adapterExtension, &adapterExtension->ABAR_Address->GHC); - //When set to â1â by hardware, indicates that the HBA requested more than one MSI vector - //but has reverted to using the first vector only. When this bit is cleared to â0â, - //the HBA has not reverted to single MSI mode (i.e. hardware is already in single MSI mode, - //software has allocated the number of messages requested + // When set to â1â by hardware, indicates that the HBA requested more than one MSI vector + // but has reverted to using the first vector only. When this bit is cleared to â0â, + // the HBA has not reverted to single MSI mode (i.e. hardware is already in single MSI mode, + // software has allocated the number of messages requested if ((ghc & AHCI_Global_HBA_CONTROL_MRSM) == 0) { adapterExtension->StateFlags.MessagePerPort = TRUE; - StorPortDebugPrint(0, "\tMultiple MSI based message not supported\n"); + DebugPrint("\tMultiple MSI based message not supported\n"); } return TRUE; @@ -184,12 +210,13 @@ * @param portExtension * */ -VOID AhciInterruptHandler( - __in PAHCI_PORT_EXTENSION portExtension -) -{ - StorPortDebugPrint(0, "AhciInterruptHandler()\n"); - StorPortDebugPrint(0, "\tPort Number: %d\n", portExtension->PortNumber); +VOID +AhciInterruptHandler ( + __in PAHCI_PORT_EXTENSION portExtension + ) +{ + DebugPrint("AhciInterruptHandler()\n"); + DebugPrint("\tPort Number: %d\n", portExtension->PortNumber); }// -- AhciInterruptHandler(); @@ -205,26 +232,31 @@ * return TRUE Indicates that an interrupt was pending on adapter. * return FALSE Indicates the interrupt was not ours. */ -BOOLEAN AhciHwInterrupt( - __in PVOID AdapterExtension -) +BOOLEAN +AhciHwInterrupt( + __in PVOID AdapterExtension + ) { ULONG portPending, nextPort, i; PAHCI_ADAPTER_EXTENSION adapterExtension; - StorPortDebugPrint(0, "AhciHwInterrupt()\n"); - - adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + DebugPrint("AhciHwInterrupt()\n"); + + adapterExtension = AdapterExtension; if (adapterExtension->StateFlags.Removed) + { return FALSE; + } portPending = StorPortReadRegisterUlong(adapterExtension, adapterExtension->IS); // we process interrupt for implemented ports only portPending = portPending & adapterExtension->PortImplemented; if (portPending == 0) + { return FALSE; + } for (i = 1; i <= MAXIMUM_AHCI_PORT_COUNT; i++) { @@ -233,16 +265,19 @@ if ((portPending & (0x1 << nextPort)) == 0) continue; - if (nextPort == adapterExtension->LastInterruptPort - || adapterExtension->PortExtension[nextPort].IsActive == FALSE) + if ((nextPort == adapterExtension->LastInterruptPort) + || (adapterExtension->PortExtension[nextPort].IsActive == FALSE)) + { return FALSE; + } // we can assign this interrupt to this port adapterExtension->LastInterruptPort = nextPort; - AhciInterruptHandler(nextPort); + AhciInterruptHandler(&adapterExtension->PortExtension[nextPort]); return TRUE; } + DebugPrint("\tSomething wrong"); return FALSE; }// -- AhciHwInterrupt(); @@ -259,20 +294,20 @@ * 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 - -) +BOOLEAN +AhciHwStartIo ( + __in PVOID AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb + ) { UCHAR function, pathId; PAHCI_ADAPTER_EXTENSION adapterExtension; - StorPortDebugPrint(0, "AhciHwStartIo()\n"); + DebugPrint("AhciHwStartIo()\n"); pathId = Srb->PathId; function = Srb->Function; - adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + adapterExtension = AdapterExtension; if (!IsPortValid(adapterExtension, pathId)) { @@ -291,20 +326,23 @@ pnpRequest = (PSCSI_PNP_REQUEST_BLOCK)Srb; if ((pnpRequest->SrbPnPFlags & SRB_PNP_FLAGS_ADAPTER_REQUEST) != 0) { - if (pnpRequest->PnPAction == StorRemoveDevice || - pnpRequest->PnPAction == StorSurpriseRemoval) + if ((pnpRequest->PnPAction == StorRemoveDevice) || + (pnpRequest->PnPAction == StorSurpriseRemoval)) { Srb->SrbStatus = SRB_STATUS_SUCCESS; adapterExtension->StateFlags.Removed = 1; - StorPortDebugPrint(0, "\tadapter removed\n"); + DebugPrint("\tadapter removed\n"); } else if (pnpRequest->PnPAction == StorStopDevice) { Srb->SrbStatus = SRB_STATUS_SUCCESS; - StorPortDebugPrint(0, "\tRequested to Stop the adapter\n"); + DebugPrint("\tRequested to Stop the adapter\n"); } else + { Srb->SrbStatus = SRB_STATUS_INVALID_REQUEST; + } + StorPortNotification(RequestComplete, adapterExtension, Srb); return TRUE; } @@ -346,7 +384,7 @@ } } - StorPortDebugPrint(0, "\tUnknow function code recieved: %x\n", function); + DebugPrint("\tUnknow function code recieved: %x\n", function); Srb->SrbStatus = SRB_STATUS_BAD_FUNCTION; StorPortNotification(RequestComplete, adapterExtension, Srb); return TRUE; @@ -354,7 +392,7 @@ /** * @name AhciHwResetBus - * @implemented + * @not_implemented * * The HwStorResetBus routine is called by the port driver to clear error conditions. * @@ -364,17 +402,17 @@ * @return * return TRUE if bus was successfully reset */ -BOOLEAN AhciHwResetBus( - __in PVOID AdapterExtension, - __in ULONG PathId - -) +BOOLEAN +AhciHwResetBus ( + __in PVOID AdapterExtension, + __in ULONG PathId + ) { PAHCI_ADAPTER_EXTENSION adapterExtension; - StorPortDebugPrint(0, "AhciHwResetBus()\n"); - - adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + DebugPrint("AhciHwResetBus()\n"); + + adapterExtension = AdapterExtension; return FALSE; }// -- AhciHwResetBus(); @@ -411,28 +449,30 @@ * * @remarks Called by Storport. */ -ULONG AhciHwFindAdapter( - __in PVOID AdapterExtension, - __in PVOID HwContext, - __in PVOID BusInformation, - __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; ULONG index; ULONG portCount, portImplemented; ULONG pci_cfg_len; - UCHAR pci_cfg_buf[0x30]; + UCHAR pci_cfg_buf[sizeof(PCI_COMMON_CONFIG)]; + PACCESS_RANGE accessRange; PAHCI_MEMORY_REGISTERS abar; PPCI_COMMON_CONFIG pciConfigData; PAHCI_ADAPTER_EXTENSION adapterExtension; - StorPortDebugPrint(0, "AhciHwFindAdapter()\n"); - - adapterExtension = (PAHCI_ADAPTER_EXTENSION)AdapterExtension; + DebugPrint("AhciHwFindAdapter()\n"); + + adapterExtension = AdapterExtension; adapterExtension->SlotNumber = ConfigInfo->SlotNumber; adapterExtension->SystemIoBusNumber = ConfigInfo->SystemIoBusNumber; @@ -442,22 +482,23 @@ PCIConfiguration, adapterExtension->SystemIoBusNumber, adapterExtension->SlotNumber, - (PVOID)pci_cfg_buf, - (ULONG)0x30); - - if (pci_cfg_len != 0x30){ - StorPortDebugPrint(0, "\tpci_cfg_len != 0x30 :: %d", pci_cfg_len); + pci_cfg_buf, + sizeof(PCI_COMMON_CONFIG)); + + if (pci_cfg_len != sizeof(PCI_COMMON_CONFIG)) + { + DebugPrint("\tpci_cfg_len != %d :: %d", sizeof(PCI_COMMON_CONFIG), pci_cfg_len); return SP_RETURN_ERROR;//Not a valid device at the given bus number } - pciConfigData = (PPCI_COMMON_CONFIG)pci_cfg_buf; + pciConfigData = 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); - StorPortDebugPrint(0, "\tVendorID:%d DeviceID:%d RevisionID:%d\n", adapterExtension->VendorID, adapterExtension->DeviceID, adapterExtension->RevisionID); + DebugPrint("\tVendorID:%d DeviceID:%d RevisionID:%d\n", adapterExtension->VendorID, adapterExtension->DeviceID, adapterExtension->RevisionID); // 2.1.11 abar = NULL; @@ -465,22 +506,24 @@ { for (index = 0; index < ConfigInfo->NumberOfAccessRanges; index++) { - if ((*(ConfigInfo->AccessRanges))[index].RangeStart.QuadPart == adapterExtension->AhciBaseAddress) + accessRange = *ConfigInfo->AccessRanges; + if (accessRange[index].RangeStart.QuadPart == adapterExtension->AhciBaseAddress) { - abar = (PAHCI_MEMORY_REGISTERS)StorPortGetDeviceBase( + abar = StorPortGetDeviceBase( adapterExtension, ConfigInfo->AdapterInterfaceType, ConfigInfo->SystemIoBusNumber, - (*(ConfigInfo->AccessRanges))[index].RangeStart, - (*(ConfigInfo->AccessRanges))[index].RangeLength, - (BOOLEAN)!(*(ConfigInfo->AccessRanges))[index].RangeInMemory); + accessRange[index].RangeStart, + accessRange[index].RangeLength, + !accessRange[index].RangeInMemory); break; } } } - if (abar == NULL){ - StorPortDebugPrint(0, "\tabar == NULL\n"); + if (abar == NULL) + { + DebugPrint("\tabar == NULL\n"); return SP_RETURN_ERROR; // corrupted information supplied } @@ -498,9 +541,9 @@ if ((ghc & AHCI_Global_HBA_CONTROL_AE) != 0)//Hmm, controller was already in power state { // reset controller to have it in known state - StorPortDebugPrint(0, "\tAE Already set, Reset()\n"); + DebugPrint("\tAE Already set, Reset()\n"); if (!AhciAdapterReset(adapterExtension)){ - StorPortDebugPrint(0, "\tReset Failed!\n"); + DebugPrint("\tReset Failed!\n"); return SP_RETURN_ERROR;// reset failed } } @@ -511,12 +554,13 @@ adapterExtension->IS = &abar->IS; adapterExtension->PortImplemented = StorPortReadRegisterUlong(adapterExtension, &abar->PI); - if (adapterExtension->PortImplemented == 0){ - StorPortDebugPrint(0, "\tadapterExtension->PortImplemented == 0\n"); + if (adapterExtension->PortImplemented == 0) + { + DebugPrint("\tadapterExtension->PortImplemented == 0\n"); return SP_RETURN_ERROR; } - ConfigInfo->MaximumTransferLength = 128 * 1024;//128 KB + ConfigInfo->MaximumTransferLength = MAXIMUM_TRANSFER_LENGTH;//128 KB ConfigInfo->NumberOfPhysicalBreaks = 0x21; ConfigInfo->MaximumNumberOfTargets = 1; ConfigInfo->MaximumNumberOfLogicalUnits = 1; @@ -530,8 +574,9 @@ StorPortWriteRegisterUlong(adapterExtension, &abar->GHC, ghc); // allocate necessary resource for each port - if (!AhciAllocateResourceForAdapter(adapterExtension, ConfigInfo)){ - StorPortDebugPrint(0, "\tAhciAllocateResourceForAdapter() == FALSE\n"); + if (!AhciAllocateResourceForAdapter(adapterExtension, ConfigInfo)) + { + DebugPrint("\tAhciAllocateResourceForAdapter() == FALSE\n"); return SP_RETURN_ERROR; } @@ -556,18 +601,19 @@ * @return * NT_STATUS in case of driver loaded successfully. */ -ULONG DriverEntry( - __in PVOID DriverObject, - __in PVOID RegistryPath -) +ULONG +DriverEntry ( + __in PVOID DriverObject, + __in PVOID RegistryPath + ) { HW_INITIALIZATION_DATA hwInitializationData; ULONG i, status; - StorPortDebugPrint(0, "Storahci Loaded\n"); + DebugPrint("Storahci Loaded\n"); // initialize the hardware data structure - AhciZeroMemory((PCHAR)&hwInitializationData, sizeof(HW_INITIALIZATION_DATA)); + AhciZeroMemory(&hwInitializationData, sizeof(HW_INITIALIZATION_DATA)); // set size of hardware initialization structure hwInitializationData.HwInitializationDataSize = sizeof(HW_INITIALIZATION_DATA); @@ -600,7 +646,7 @@ &hwInitializationData, NULL); - StorPortDebugPrint(0, "\tstatus:%x\n", status); + DebugPrint("\tstatus:%x\n", status); return status; }// -- DriverEntry(); @@ -623,29 +669,38 @@ * @return * TRUE in case AHCI Controller RESTARTED successfully. i.e GHC.HR == 0 */ -BOOLEAN AhciAdapterReset( - __in PAHCI_ADAPTER_EXTENSION adapterExtension -) +BOOLEAN +AhciAdapterReset ( + __in PAHCI_ADAPTER_EXTENSION adapterExtension + ) { ULONG ghc, ticks; PAHCI_MEMORY_REGISTERS abar = NULL; - StorPortDebugPrint(0, "AhciAdapterReset()\n"); + DebugPrint("AhciAdapterReset()\n"); abar = adapterExtension->ABAR_Address; if (abar == NULL) // basic sanity + { return FALSE; + } // HR -- Very first bit (lowest significant) ghc = AHCI_Global_HBA_CONTROL_HR; 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"); + for (ticks = 0; ticks < 50; ++ticks) + { + if ((StorPortReadRegisterUlong(adapterExtension, &abar->GHC) & AHCI_Global_HBA_CONTROL_HR) == 0) + { + break; + } + StorPortStallExecution(20000); + } + + if (ticks == 50)// 1 second + { + DebugPrint("\tDevice Timeout\n"); return FALSE; } @@ -661,10 +716,11 @@ * @param buffer */ __inline -VOID AhciZeroMemory( - __in PCHAR buffer, - __in ULONG bufferSize -) +VOID +AhciZeroMemory ( + __out PCHAR buffer, + __in ULONG bufferSize + ) { ULONG i; for (i = 0; i < bufferSize; i++) @@ -684,13 +740,18 @@ * return TRUE if provided port is valid (implemented) or not */ __inline -BOOLEAN IsPortValid( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in UCHAR pathId -) -{ +BOOLEAN +IsPortValid ( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId + ) +{ + NT_ASSERT(pathId >= 0); + if (pathId >= MAXIMUM_AHCI_PORT_COUNT) + { return FALSE; + } return adapterExtension->PortExtension[pathId].IsActive; }// -- IsPortValid() @@ -711,26 +772,27 @@ * @remark * http://www.seagate.com/staticfiles/support/disc/manuals/Interface%20manuals… */ -ULONG DeviceInquiryRequest( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in PSCSI_REQUEST_BLOCK Srb, - __in PCDB Cdb -) +ULONG +DeviceInquiryRequest ( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ) { PVOID DataBuffer; ULONG DataBufferLength; - StorPortDebugPrint(0, "DeviceInquiryRequest()\n"); + DebugPrint("DeviceInquiryRequest()\n"); // 3.6.1 // If the EVPD bit is set to zero, the device server shall return the standard INQUIRY data if (Cdb->CDB6INQUIRY3.EnableVitalProductData == 0) { - StorPortDebugPrint(0, "\tEVPD Inquired\n"); + DebugPrint("\tEVPD Inquired\n"); } else { - StorPortDebugPrint(0, "\tVPD Inquired\n"); + DebugPrint("\tVPD Inquired\n"); DataBuffer = Srb->DataBuffer; DataBufferLength = Srb->DataTransferLength; @@ -738,7 +800,7 @@ if (DataBuffer == NULL) return SRB_STATUS_INVALID_REQUEST; - AhciZeroMemory((PCHAR)DataBuffer, DataBufferLength); + AhciZeroMemory(DataBuffer, DataBufferLength); } return SRB_STATUS_BAD_FUNCTION; 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 9 23:47:19 2016 @@ -5,17 +5,28 @@ * PROGRAMMERS: Aman Priyadarshi (aman.eureka(a)gmail.com) */ -#include "miniport.h" -#include "storport.h" - -#define AHCI_POOL_TAG 'ahci' -#define MAXIMUM_AHCI_PORT_COUNT 12 +#include <ntddk.h> +#include <storport.h> + +#define DEBUG 1 + +#define MAXIMUM_AHCI_PORT_COUNT 12 +#define MAXIMUM_TRANSFER_LENGTH (128*1024) // 128 KB // section 3.1.2 -#define AHCI_Global_HBA_CONTROL_HR (0x1<<0) -#define AHCI_Global_HBA_CONTROL_IE (0x1<<1) -#define AHCI_Global_HBA_CONTROL_MRSM (0x1<<2) -#define AHCI_Global_HBA_CONTROL_AE (0x1<<31) +#define AHCI_Global_HBA_CONTROL_HR (1 << 0) +#define AHCI_Global_HBA_CONTROL_IE (1 << 1) +#define AHCI_Global_HBA_CONTROL_MRSM (1 << 2) +#define AHCI_Global_HBA_CONTROL_AE (1 << 31) +#define AHCI_Global_HBA_CAP_S64A (1 << 31) + +// 3.1.1 NCS = CAP[12:08] -> Align +#define AHCI_Global_Port_CAP_NCS(x) (((x) & 0xF00) >> 8) + +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) +#if DEBUG + #define DebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) +#endif ////////////////////////////////////////////////////////////// // ---- Support Structures --- // @@ -32,17 +43,17 @@ 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 + 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 FisType; UCHAR Reserved1 :5; - UCHAR D :1; // 1 is write (device to host) + UCHAR D :1; UCHAR I :1; UCHAR Reserved2 :1; UCHAR Status; @@ -237,24 +248,28 @@ // Declarations // ////////////////////////////////////////////////////////////// -BOOLEAN AhciAdapterReset( - __in PAHCI_ADAPTER_EXTENSION adapterExtension -); +BOOLEAN +AhciAdapterReset ( + __in PAHCI_ADAPTER_EXTENSION adapterExtension + ); __inline -VOID AhciZeroMemory( - __in PCHAR buffer, - __in ULONG bufferSize -); +VOID +AhciZeroMemory ( + __out PCHAR buffer, + __in ULONG bufferSize + ); __inline -BOOLEAN IsPortValid( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in UCHAR pathId -); - -ULONG DeviceInquiryRequest( - __in PAHCI_ADAPTER_EXTENSION adapterExtension, - __in PSCSI_REQUEST_BLOCK Srb, - __in PCDB Cdb -); +BOOLEAN +IsPortValid ( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in UCHAR pathId + ); + +ULONG +DeviceInquiryRequest ( + __in PAHCI_ADAPTER_EXTENSION adapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ); Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.inf [iso-8859-1] Thu Jun 9 23:47:19 2016 @@ -1,9 +1,9 @@ -/* - * PROJECT: ROS Kernel - * LICENSE: GNU GPLv2 only as published by the Free Software Foundation - * PURPOSE: Storahci Driver INF - * PROGRAMMERS: Aman Priyadarshi (aman.eureka(a)gmail.com) - */ +; +; PROJECT: ROS Kernel +; LICENSE: GNU GPLv2 only as published by the Free Software Foundation +; PURPOSE: Storahci Driver INF +; PROGRAMMERS: Aman Priyadarshi (aman.eureka(a)gmail.com) +; [version] signature="$Windows NT$" @@ -21,7 +21,7 @@ DefaultDestDir = 12 ; DIRID_DRIVERS [Manufacturer] -%STORAHCI%=STORAHCI,NTx86 +%ROS%=STORAHCI,NTx86 [STORAHCI] @@ -65,7 +65,7 @@ HKR,,TypesSupported,%REG_DWORD%,7 [Strings] -ROS = "React OS" +ROS = "ROS" DeviceDesc = "AHCI SATA Driver" SATA_AHCI.DeviceDesc = "Standard SATA AHCI Controller"

8 years, 3 months

[hbelusca] 71604: [SHELL32]: Replace icon 210 (filecab) with a valid one (coming from explorer).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 9 22:27:54 2016 New Revision: 71604 URL: http://svn.reactos.org/svn/reactos?rev=71604&view=rev Log: [SHELL32]: Replace icon 210 (filecab) with a valid one (coming from explorer). Added: trunk/reactos/dll/win32/shell32/res/icons/210.ico - copied unchanged from r71603, trunk/reactos/base/shell/explorer/res/ico/101.ico

8 years, 3 months

[ekohl] 71603: [SERVICES] - Create a default service security descriptor. - RCreateServiceW: Assign the default security descriptor to new services on service creation and store it in the registry....

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 9 21:30:48 2016 New Revision: 71603 URL: http://svn.reactos.org/svn/reactos?rev=71603&view=rev Log: [SERVICES] - Create a default service security descriptor. - RCreateServiceW: Assign the default security descriptor to new services on service creation and store it in the registry. - RQueryServiceObjectSecurity: Return the services security descriptor to the caller. Added: trunk/reactos/base/system/services/security.c (with props) Modified: trunk/reactos/base/system/services/CMakeLists.txt trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMake… ============================================================================== --- trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] Thu Jun 9 21:30:48 2016 @@ -14,6 +14,7 @@ groupdb.c lock.c rpcserver.c + security.c services.c services.h ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.c) Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Thu Jun 9 21:30:48 2016 @@ -498,4 +498,154 @@ return dwError; } + +DWORD +ScmWriteSecurityDescriptor( + _In_ HKEY hServiceKey, + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + PSECURITY_DESCRIPTOR pRelativeSD = NULL; + HKEY hSecurityKey = NULL; + DWORD dwBufferLength = 0; + DWORD dwDisposition; + DWORD dwError; + NTSTATUS Status; + + DPRINT1("ScmWriteSecurityDescriptor(%p %p)\n", hServiceKey, pSecurityDescriptor); + + Status = RtlAbsoluteToSelfRelativeSD(pSecurityDescriptor, + NULL, + &dwBufferLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + { +DPRINT1("\n"); + return RtlNtStatusToDosError(Status); + } + + DPRINT1("BufferLength %lu\n", dwBufferLength); + + pRelativeSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwBufferLength); + if (pRelativeSD == NULL) + { +DPRINT1("\n"); + return ERROR_OUTOFMEMORY; + } + +DPRINT1("\n"); + Status = RtlAbsoluteToSelfRelativeSD(pSecurityDescriptor, + pRelativeSD, + &dwBufferLength); + if (!NT_SUCCESS(Status)) + { +DPRINT1("\n"); + dwError = RtlNtStatusToDosError(Status); + goto done; + } + +DPRINT1("\n"); + dwError = RegCreateKeyExW(hServiceKey, + L"Security", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, + &hSecurityKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { +DPRINT1("\n"); + goto done; + } + +DPRINT1("\n"); + dwError = RegSetValueExW(hSecurityKey, + L"Security", + 0, + REG_BINARY, + (LPBYTE)pRelativeSD, + dwBufferLength); +DPRINT1("\n"); + +done: + if (hSecurityKey != NULL) + RegCloseKey(hSecurityKey); + + if (pRelativeSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pRelativeSD); + + return dwError; +} + + +DWORD +ScmReadSecurityDescriptor( + _In_ HKEY hServiceKey, + _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor) +{ + PSECURITY_DESCRIPTOR pRelativeSD = NULL; + HKEY hSecurityKey = NULL; + DWORD dwBufferLength = 0; + DWORD dwType; + DWORD dwError; + + dwError = RegOpenKeyExW(hServiceKey, + L"Security", + 0, + KEY_QUERY_VALUE, + &hSecurityKey); + if (dwError != ERROR_SUCCESS) + { +DPRINT1("\n"); + goto done; + } + + dwError = RegQueryValueExW(hSecurityKey, + L"Security", + 0, + &dwType, + NULL, + &dwBufferLength); + if (dwError != ERROR_SUCCESS) + { +DPRINT1("\n"); + goto done; + } + + pRelativeSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwBufferLength); + if (pRelativeSD == NULL) + { +DPRINT1("\n"); + return ERROR_OUTOFMEMORY; + } + + dwError = RegQueryValueExW(hSecurityKey, + L"Security", + 0, + &dwType, + (LPBYTE)pRelativeSD, + &dwBufferLength); + if (dwError != ERROR_SUCCESS) + { +DPRINT1("\n"); + goto done; + } + + + +done: + if (pRelativeSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pRelativeSD); + + if (hSecurityKey != NULL) + RegCloseKey(hSecurityKey); + + + return dwError; +} + /* EOF */ Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Jun 9 21:30:48 2016 @@ -1364,9 +1364,6 @@ DWORD dwBytesNeeded; DWORD dwError; - - SECURITY_DESCRIPTOR ObjectDescriptor; - DPRINT("RQueryServiceObjectSecurity() called\n"); hSvc = ScmGetServiceFromHandle(hService); @@ -1401,11 +1398,8 @@ /* Lock the service database */ ScmLockDatabaseShared(); - - /* hack */ - Status = RtlCreateSecurityDescriptor(&ObjectDescriptor, SECURITY_DESCRIPTOR_REVISION); - - Status = RtlQuerySecurityObject(&ObjectDescriptor /* lpService->lpSecurityDescriptor */, + /* Retrieve the security descriptor */ + Status = RtlQuerySecurityObject(lpService->pSecurityDescriptor, dwSecurityInformation, (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, cbBufSize, @@ -2258,6 +2252,12 @@ goto done; } + /* Assign the default security descriptor */ + if (dwServiceType & SERVICE_WIN32) + { + lpService->pSecurityDescriptor = pDefaultServiceSD; + } + /* Write service data to the registry */ /* Create the service key */ dwError = ScmCreateServiceKey(lpServiceName, @@ -2391,6 +2391,13 @@ if (dwError != ERROR_SUCCESS) goto done; } + +DPRINT1("\n"); + /* Write the security descriptor */ + dwError = ScmWriteSecurityDescriptor(hServiceKey, + lpService->pSecurityDescriptor); + if (dwError != ERROR_SUCCESS) + goto done; } dwError = ScmCreateServiceHandle(lpService, Added: trunk/reactos/base/system/services/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/secur… ============================================================================== --- trunk/reactos/base/system/services/security.c (added) +++ trunk/reactos/base/system/services/security.c [iso-8859-1] Thu Jun 9 21:30:48 2016 @@ -0,0 +1,268 @@ +/* + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/security.c + * PURPOSE: Security functions + * COPYRIGHT: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "services.h" + +#define NDEBUG +#include <debug.h> + +PSECURITY_DESCRIPTOR pDefaultServiceSD = NULL; + +static PSID pNullSid = NULL; +static PSID pLocalSystemSid = NULL; +static PSID pAuthenticatedUserSid = NULL; +static PSID pAliasAdminsSid = NULL; + + +/* FUNCTIONS ****************************************************************/ + +static +VOID +ScmFreeSids(VOID) +{ + if (pNullSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pNullSid); + + if (pLocalSystemSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pLocalSystemSid); + + if (pAuthenticatedUserSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pAuthenticatedUserSid); + + if (pAliasAdminsSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pAliasAdminsSid); + +} + + +static +DWORD +ScmCreateSids(VOID) +{ + SID_IDENTIFIER_AUTHORITY NullAuthority = {SECURITY_NULL_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + PULONG pSubAuthority; + ULONG ulLength1 = RtlLengthRequiredSid(1); + ULONG ulLength2 = RtlLengthRequiredSid(2); + + /* Create the Null SID */ + pNullSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, ulLength1); + if (pNullSid == NULL) + { + return ERROR_OUTOFMEMORY; + } + + RtlInitializeSid(pNullSid, &NullAuthority, 1); + pSubAuthority = RtlSubAuthoritySid(pNullSid, 0); + *pSubAuthority = SECURITY_NULL_RID; + + /* Create the LocalSystem SID */ + pLocalSystemSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, ulLength1); + if (pLocalSystemSid == NULL) + { + return ERROR_OUTOFMEMORY; + } + + RtlInitializeSid(pLocalSystemSid, &NtAuthority, 1); + pSubAuthority = RtlSubAuthoritySid(pLocalSystemSid, 0); + *pSubAuthority = SECURITY_LOCAL_SYSTEM_RID; + + /* Create the AuthenticatedUser SID */ + pAuthenticatedUserSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, ulLength1); + if (pAuthenticatedUserSid == NULL) + { + return ERROR_OUTOFMEMORY; + } + + RtlInitializeSid(pAuthenticatedUserSid, &NtAuthority, 1); + pSubAuthority = RtlSubAuthoritySid(pAuthenticatedUserSid, 0); + *pSubAuthority = SECURITY_AUTHENTICATED_USER_RID; + + /* Create the AliasAdmins SID */ + pAliasAdminsSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, ulLength2); + if (pAliasAdminsSid == NULL) + { + return ERROR_OUTOFMEMORY; + } + + RtlInitializeSid(pAliasAdminsSid, &NtAuthority, 2); + pSubAuthority = RtlSubAuthoritySid(pAliasAdminsSid, 0); + *pSubAuthority = SECURITY_BUILTIN_DOMAIN_RID; + pSubAuthority = RtlSubAuthoritySid(pAliasAdminsSid, 1); + *pSubAuthority = DOMAIN_ALIAS_RID_ADMINS; + + return ERROR_SUCCESS; +} + + +static +DWORD +ScmCreateDefaultServiceSD(VOID) +{ + PSECURITY_DESCRIPTOR pServiceSD = NULL; + PACL pDacl = NULL; + PACL pSacl = NULL; + ULONG ulLength; + NTSTATUS Status; + DWORD dwError = ERROR_SUCCESS; + + /* Create DACL */ + ulLength = sizeof(ACL) + + (sizeof(ACE) + RtlLengthSid(pLocalSystemSid)) + + (sizeof(ACE) + RtlLengthSid(pAliasAdminsSid)) + + (sizeof(ACE) + RtlLengthSid(pAuthenticatedUserSid)); + + pDacl = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, ulLength); + if (pDacl == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + RtlCreateAcl(pDacl, ulLength, ACL_REVISION); + + RtlAddAccessAllowedAce(pDacl, + ACL_REVISION, + READ_CONTROL | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_INTERROGATE | + SERVICE_PAUSE_CONTINUE | SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS | + SERVICE_START | SERVICE_STOP | SERVICE_USER_DEFINED_CONTROL, + pLocalSystemSid); + + RtlAddAccessAllowedAce(pDacl, + ACL_REVISION, + SERVICE_ALL_ACCESS, + pAliasAdminsSid); + + RtlAddAccessAllowedAce(pDacl, + ACL_REVISION, + READ_CONTROL | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_INTERROGATE | + SERVICE_QUERY_CONFIG | SERVICE_QUERY_STATUS | SERVICE_USER_DEFINED_CONTROL, + pAuthenticatedUserSid); + + /* Create SACL */ + ulLength = sizeof(ACL) + + (sizeof(ACE) + RtlLengthSid(pNullSid)); + + pSacl = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, ulLength); + if (pSacl == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + RtlCreateAcl(pSacl, ulLength, ACL_REVISION); + + RtlAddAuditAccessAce(pSacl, + ACL_REVISION, + SERVICE_ALL_ACCESS, + pNullSid, + FALSE, + TRUE); + + + pServiceSD = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SECURITY_DESCRIPTOR)); + if (pServiceSD == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } +DPRINT1("pServiceSD %p\n", pServiceSD); + + Status = RtlCreateSecurityDescriptor(pServiceSD, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + Status = RtlSetOwnerSecurityDescriptor(pServiceSD, + pLocalSystemSid, + FALSE); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + Status = RtlSetGroupSecurityDescriptor(pServiceSD, + pLocalSystemSid, + FALSE); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + Status = RtlSetDaclSecurityDescriptor(pServiceSD, + TRUE, + pDacl, + FALSE); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + Status = RtlSetSaclSecurityDescriptor(pServiceSD, + TRUE, + pSacl, + FALSE); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + + pDefaultServiceSD = pServiceSD; +DPRINT1("pDefaultServiceSD %p\n", pDefaultServiceSD); + +done: + if (dwError != ERROR_SUCCESS) + { + if (pDacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pDacl); + + if (pSacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pSacl); + + if (pServiceSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pServiceSD); + } + + return dwError; +} + + +DWORD +ScmInitializeSecurity(VOID) +{ + DWORD dwError; + + dwError = ScmCreateSids(); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = ScmCreateDefaultServiceSD(); + if (dwError != ERROR_SUCCESS) + return dwError; + + return ERROR_SUCCESS; +} + + +VOID +ScmShutdownSecurity(VOID) +{ + ScmFreeSids(); +} + +/* EOF */ Propchange: trunk/reactos/base/system/services/security.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Thu Jun 9 21:30:48 2016 @@ -354,6 +354,8 @@ // ScmInitThreadManager(); + ScmInitializeSecurity(); + /* FIXME: more initialization */ /* Read the control set values */ @@ -432,6 +434,8 @@ WaitForSingleObject(hScmShutdownEvent, INFINITE); done: + ScmShutdownSecurity(); + /* Delete our communication named pipe's critical section */ if (bCanDeleteNamedPipeCriticalSection == TRUE) ScmDeleteNamedPipeCriticalSection(); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Thu Jun 9 21:30:48 2016 @@ -72,7 +72,7 @@ ULONG Flags; - PSECURITY_DESCRIPTOR lpSecurityDescriptor; + PSECURITY_DESCRIPTOR pSecurityDescriptor; BOOLEAN ServiceVisited; @@ -98,6 +98,8 @@ extern BOOL ScmInitialize; extern BOOL ScmShutdown; +extern PSECURITY_DESCRIPTOR pDefaultServiceSD; + /* FUNCTIONS ***************************************************************/ @@ -131,6 +133,12 @@ ScmSetServicePassword( IN PCWSTR pszServiceName, IN PCWSTR pszPassword); + +DWORD +ScmWriteSecurityDescriptor( + _In_ HKEY hServiceKey, + _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor); + /* controlset.c */ @@ -197,6 +205,12 @@ VOID ScmStartRpcServer(VOID); +/* security.c */ + +DWORD ScmInitializeSecurity(VOID); +VOID ScmShutdownSecurity(VOID); + + /* services.c */ VOID PrintString(LPCSTR fmt, ...);

8 years, 3 months

[hbelusca] 71602: [SOLITAIRE][SPIDER][CARDLIB] - Remove the ugly WS_EX_CLIENTEDGE style from Solitaire and Spider. - Make use of the member function parameters when calling CreateWindowEx in cardli...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 9 20:33:36 2016 New Revision: 71602 URL: http://svn.reactos.org/svn/reactos?rev=71602&view=rev Log: [SOLITAIRE][SPIDER][CARDLIB] - Remove the ugly WS_EX_CLIENTEDGE style from Solitaire and Spider. - Make use of the member function parameters when calling CreateWindowEx in cardlib. Patch by "toe_head2001". CORE-11391 Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/spider/spider.cpp trunk/reactos/sdk/lib/3rdparty/cardlib/cardwindow.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Thu Jun 9 20:33:36 2016 @@ -610,7 +610,7 @@ SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)""); - SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); + SolWnd.Create(hwnd, 0, WS_CHILD | WS_VISIBLE, 0, 0, 100, 100); CreateSol(); Modified: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Thu Jun 9 20:33:36 2016 @@ -332,7 +332,7 @@ { case WM_CREATE: { - SpiderWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); + SpiderWnd.Create(hwnd, 0, WS_CHILD | WS_VISIBLE, 0, 0, 100, 100); dwDifficulty = IDC_DIF_ONECOLOR; CreateSpider(); Modified: trunk/reactos/sdk/lib/3rdparty/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/cardlib/c… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] Thu Jun 9 20:33:36 2016 @@ -112,10 +112,10 @@ return FALSE; //Create the window associated with this object - m_hWnd = CreateWindowEx(WS_EX_CLIENTEDGE, szCardName, 0, - WS_CHILD | WS_VISIBLE, - 0,0,100,100, - hwndParent, 0, GetModuleHandle(0), this); + m_hWnd = CreateWindowEx(dwExStyle, szCardName, NULL, + dwStyle, + x, y, width, height, + hwndParent, NULL, GetModuleHandle(NULL), this); return TRUE; }

8 years, 3 months

[hbelusca] 71601: [COMP] - Fix the output of localized strings (and use the "well-known" PrintResourceString function already used in all the other cmdtools) - Unconditionally increase the number o...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 9 19:20:35 2016 New Revision: 71601 URL: http://svn.reactos.org/svn/reactos?rev=71601&view=rev Log: [COMP] - Fix the output of localized strings (and use the "well-known" PrintResourceString function already used in all the other cmdtools) - Unconditionally increase the number of lines & the offset when performing the comparison. Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c trunk/reactos/base/applications/cmdutils/comp/resource.h Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Thu Jun 9 19:20:35 2016 @@ -24,43 +24,48 @@ * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) */ -#include <windows.h> -#include <tchar.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> +// #include <string.h> +// #include <wchar.h> #include <assert.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #include "resource.h" #define STRBUF 1024 -VOID ResPrint(INT res_no, ...) -{ - TCHAR * res_string; - va_list vargs; - - va_start(vargs, res_no); - - if (LoadString(GetModuleHandle(NULL), res_no, (TCHAR*)&res_string, 0)) - { - _vtprintf(res_string, vargs); - } +VOID PrintResourceString(INT resID, ...) +{ + WCHAR bufSrc[RC_STRING_MAX_SIZE]; + WCHAR bufFormatted[RC_STRING_MAX_SIZE]; + CHAR bufFormattedOem[RC_STRING_MAX_SIZE]; + + va_list args; + va_start(args, resID); + + if (LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, ARRAYSIZE(bufSrc))) + vswprintf(bufFormatted, bufSrc, args); else - { - _tprintf(_T("Resource loading error!")); - } - - va_end(vargs); + swprintf(bufFormatted, L"Resource loading error!"); + + CharToOemW(bufFormatted, bufFormattedOem); + fputs(bufFormattedOem, stdout); + + va_end(args); } /* getline: read a line, return length */ -INT GetBuff(PBYTE buff, FILE *in) +INT GetBuff(PBYTE buff, FILE* in) { return fread(buff, sizeof(BYTE), STRBUF, in); } -INT FileSize(FILE * fd) +INT FileSize(FILE* fd) { INT result = -1; if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1) @@ -74,11 +79,11 @@ /* Print program usage */ VOID Usage(VOID) { - ResPrint(IDS_HELP); -} - - -int _tmain (int argc, TCHAR *argv[]) + PrintResourceString(IDS_HELP); +} + + +int wmain (int argc, WCHAR* argv[]) { INT i; @@ -89,41 +94,41 @@ INT BufLen1, BufLen2; PBYTE Buff1 = NULL; PBYTE Buff2 = NULL; - TCHAR File1[_MAX_PATH + 1], // File paths + WCHAR File1[_MAX_PATH + 1], // File paths File2[_MAX_PATH + 1]; BOOL bAscii = FALSE, // /A switch bLineNos = FALSE; // /L switch - UINT LineNumber; - UINT Offset; + UINT LineNumber; + UINT Offset; INT FileSizeFile1; INT FileSizeFile2; INT NumberOfOptions = 0; INT FilesOK = 1; - INT Status = EXIT_SUCCESS; + INT Status = EXIT_SUCCESS; /* Parse command line for options */ for (i = 1; i < argc; i++) { - if (argv[i][0] == _T('/')) + if (argv[i][0] == L'/') { switch (argv[i][1]) { - case _T('A'): + case L'A': bAscii = TRUE; NumberOfOptions++; break; - case _T('L'): + case L'L': bLineNos = TRUE; NumberOfOptions++; break; - case _T('?'): + case L'?': Usage(); return EXIT_SUCCESS; default: - ResPrint(IDS_INVALIDSWITCH, argv[i][1]); + PrintResourceString(IDS_INVALIDSWITCH, argv[i][1]); Usage(); return EXIT_FAILURE; } @@ -132,19 +137,19 @@ if (argc - NumberOfOptions == 3) { - _tcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH); - _tcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH); + wcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH); + wcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH); } else { - ResPrint(IDS_BADSYNTAX); + PrintResourceString(IDS_BADSYNTAX); return EXIT_FAILURE; } Buff1 = (PBYTE)malloc(STRBUF); if (Buff1 == NULL) { - _tprintf(_T("Can't get free memory for Buff1\n")); + wprintf(L"Can't get free memory for Buff1\n"); Status = EXIT_FAILURE; goto Cleanup; } @@ -152,31 +157,30 @@ Buff2 = (PBYTE)malloc(STRBUF); if (Buff2 == NULL) { - _tprintf(_T("Can't get free memory for Buff2\n")); - Status = EXIT_FAILURE; - goto Cleanup; - } - - if ((fp1 = _tfopen(File1, _T("rb"))) == NULL) - { - ResPrint(IDS_FILEERROR, File1); - Status = EXIT_FAILURE; - goto Cleanup; - } - if ((fp2 = _tfopen(File2, _T("rb"))) == NULL) - { - ResPrint(IDS_FILEERROR, File2); - Status = EXIT_FAILURE; - goto Cleanup; - } - - - ResPrint(IDS_COMPARING, File1, File2); + wprintf(L"Can't get free memory for Buff2\n"); + Status = EXIT_FAILURE; + goto Cleanup; + } + + if ((fp1 = _wfopen(File1, L"rb")) == NULL) + { + PrintResourceString(IDS_FILEERROR, File1); + Status = EXIT_FAILURE; + goto Cleanup; + } + if ((fp2 = _wfopen(File2, L"rb")) == NULL) + { + PrintResourceString(IDS_FILEERROR, File2); + Status = EXIT_FAILURE; + goto Cleanup; + } + + PrintResourceString(IDS_COMPARING, File1, File2); FileSizeFile1 = FileSize(fp1); if (FileSizeFile1 == -1) { - ResPrint(IDS_FILESIZEERROR, File1); + PrintResourceString(IDS_FILESIZEERROR, File1); Status = EXIT_FAILURE; goto Cleanup; } @@ -184,14 +188,14 @@ FileSizeFile2 = FileSize(fp2); if (FileSizeFile2 == -1) { - ResPrint(IDS_FILESIZEERROR, File2); + PrintResourceString(IDS_FILESIZEERROR, File2); Status = EXIT_FAILURE; goto Cleanup; } if (FileSizeFile1 != FileSizeFile2) { - ResPrint(IDS_SIZEDIFFERS); + PrintResourceString(IDS_SIZEDIFFERS); Status = EXIT_FAILURE; goto Cleanup; } @@ -205,7 +209,7 @@ if (ferror(fp1) || ferror(fp2)) { - ResPrint(IDS_READERROR); + PrintResourceString(IDS_READERROR); Status = EXIT_FAILURE; goto Cleanup; } @@ -223,34 +227,34 @@ /* Reporting here a mismatch */ if (bLineNos) { - ResPrint(IDS_MISMATCHLINE, LineNumber); + PrintResourceString(IDS_MISMATCHLINE, LineNumber); } else { - ResPrint(IDS_MISMATCHOFFSET, Offset); + PrintResourceString(IDS_MISMATCHOFFSET, Offset); } if (bAscii) { - ResPrint(IDS_ASCIIDIFF, 1, Buff1[i]); - ResPrint(IDS_ASCIIDIFF, 2, Buff2[i]); + PrintResourceString(IDS_ASCIIDIFF, 1, Buff1[i]); + PrintResourceString(IDS_ASCIIDIFF, 2, Buff2[i]); } else { - ResPrint(IDS_HEXADECIMALDIFF, 1, Buff1[i]); - ResPrint(IDS_HEXADECIMALDIFF, 2, Buff2[i]); - } - - Offset++; - - if (Buff1[i] == '\n') - LineNumber++; + PrintResourceString(IDS_HEXADECIMALDIFF, 1, Buff1[i]); + PrintResourceString(IDS_HEXADECIMALDIFF, 2, Buff2[i]); + } } - } + + Offset++; + + if (Buff1[i] == '\n') + LineNumber++; + } } if (FilesOK) - ResPrint(IDS_MATCH); + PrintResourceString(IDS_MATCH); Cleanup: if (fp2) Modified: trunk/reactos/base/applications/cmdutils/comp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] Thu Jun 9 19:20:35 2016 @@ -1,4 +1,6 @@ #pragma once + +#define RC_STRING_MAX_SIZE 4096 #define IDS_HELP 100 #define IDS_INVALIDSWITCH 101

8 years, 3 months

[hbelusca] 71600: [COMP] - Localize comp.exe. Patch + romanian translation by Stefan Fulea. - French translation by Hermès Bélusca. CORE-11060

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 9 19:01:47 2016 New Revision: 71600 URL: http://svn.reactos.org/svn/reactos?rev=71600&view=rev Log: [COMP] - Localize comp.exe. Patch + romanian translation by Stefan Fulea. - French translation by Hermès Bélusca. CORE-11060 Added: trunk/reactos/base/applications/cmdutils/comp/lang/ trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc (with props) trunk/reactos/base/applications/cmdutils/comp/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt trunk/reactos/base/applications/cmdutils/comp/comp.c trunk/reactos/base/applications/cmdutils/comp/comp.rc Modified: trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -1,5 +1,5 @@ add_executable(comp comp.c comp.rc) -set_module_type(comp win32cui) -add_importlibs(comp msvcrt kernel32) +set_module_type(comp win32cui UNICODE) +add_importlibs(comp user32 msvcrt kernel32) add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -31,7 +31,28 @@ #include <string.h> #include <assert.h> +#include "resource.h" + #define STRBUF 1024 + +VOID ResPrint(INT res_no, ...) +{ + TCHAR * res_string; + va_list vargs; + + va_start(vargs, res_no); + + if (LoadString(GetModuleHandle(NULL), res_no, (TCHAR*)&res_string, 0)) + { + _vtprintf(res_string, vargs); + } + else + { + _tprintf(_T("Resource loading error!")); + } + + va_end(vargs); +} /* getline: read a line, return length */ INT GetBuff(PBYTE buff, FILE *in) @@ -53,12 +74,7 @@ /* Print program usage */ VOID Usage(VOID) { - _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n" - "COMP [/L] [/A] [data1] [data2]\n\n" - " data1 Specifies location and name of first file to compare.\n" - " data2 Specifies location and name of second file to compare.\n" - " /A Display differences in ASCII characters.\n" - " /L Display line numbers for differences.\n")); + ResPrint(IDS_HELP); } @@ -88,26 +104,26 @@ /* Parse command line for options */ for (i = 1; i < argc; i++) { - if (argv[i][0] == '/') + if (argv[i][0] == _T('/')) { switch (argv[i][1]) { - case 'A': + case _T('A'): bAscii = TRUE; NumberOfOptions++; break; - case 'L': + case _T('L'): bLineNos = TRUE; NumberOfOptions++; break; - case '?': + case _T('?'): Usage(); return EXIT_SUCCESS; default: - _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); + ResPrint(IDS_INVALIDSWITCH, argv[i][1]); Usage(); return EXIT_FAILURE; } @@ -121,7 +137,7 @@ } else { - _tprintf(_T("Bad command line syntax\n")); + ResPrint(IDS_BADSYNTAX); return EXIT_FAILURE; } @@ -141,26 +157,26 @@ goto Cleanup; } - if ((fp1 = fopen(File1, "rb")) == NULL) - { - _tprintf(_T("Can't find/open file: %s\n"), File1); - Status = EXIT_FAILURE; - goto Cleanup; - } - if ((fp2 = fopen(File2, "rb")) == NULL) - { - _tprintf(_T("Can't find/open file: %s\n"), File2); - Status = EXIT_FAILURE; - goto Cleanup; - } - - - _tprintf(_T("Comparing %s and %s...\n"), File1, File2); + if ((fp1 = _tfopen(File1, _T("rb"))) == NULL) + { + ResPrint(IDS_FILEERROR, File1); + Status = EXIT_FAILURE; + goto Cleanup; + } + if ((fp2 = _tfopen(File2, _T("rb"))) == NULL) + { + ResPrint(IDS_FILEERROR, File2); + Status = EXIT_FAILURE; + goto Cleanup; + } + + + ResPrint(IDS_COMPARING, File1, File2); FileSizeFile1 = FileSize(fp1); if (FileSizeFile1 == -1) { - _tprintf(_T("Can't determine size of file: %s\n"), File1); + ResPrint(IDS_FILESIZEERROR, File1); Status = EXIT_FAILURE; goto Cleanup; } @@ -168,14 +184,14 @@ FileSizeFile2 = FileSize(fp2); if (FileSizeFile2 == -1) { - _tprintf(_T("Can't determine size of file: %s\n"), File2); + ResPrint(IDS_FILESIZEERROR, File2); Status = EXIT_FAILURE; goto Cleanup; } if (FileSizeFile1 != FileSizeFile2) { - _tprintf(_T("Files are different sizes.\n")); + ResPrint(IDS_SIZEDIFFERS); Status = EXIT_FAILURE; goto Cleanup; } @@ -189,7 +205,7 @@ if (ferror(fp1) || ferror(fp2)) { - _tprintf(_T("Files read error.\n")); + ResPrint(IDS_READERROR); Status = EXIT_FAILURE; goto Cleanup; } @@ -207,22 +223,22 @@ /* Reporting here a mismatch */ if (bLineNos) { - _tprintf(_T("Compare error at LINE %d\n"), LineNumber); + ResPrint(IDS_MISMATCHLINE, LineNumber); } else { - _tprintf(_T("Compare error at OFFSET %d\n"), Offset); + ResPrint(IDS_MISMATCHOFFSET, Offset); } if (bAscii) { - _tprintf(_T("file1 = %c\n"), Buff1[i]); - _tprintf(_T("file2 = %c\n"), Buff2[i]); + ResPrint(IDS_ASCIIDIFF, 1, Buff1[i]); + ResPrint(IDS_ASCIIDIFF, 2, Buff2[i]); } else { - _tprintf(_T("file1 = %X\n"), Buff1[i]); - _tprintf(_T("file2 = %X\n"), Buff2[i]); + ResPrint(IDS_HEXADECIMALDIFF, 1, Buff1[i]); + ResPrint(IDS_HEXADECIMALDIFF, 2, Buff2[i]); } Offset++; @@ -234,7 +250,7 @@ } if (FilesOK) - _tprintf(_T("Files compare OK\n")); + ResPrint(IDS_MATCH); Cleanup: if (fp2) Modified: trunk/reactos/base/applications/cmdutils/comp/comp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -1,5 +1,23 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_FILE_DESCRIPTION "File Compare Utility" #define REACTOS_STR_INTERNAL_NAME "comp" #define REACTOS_STR_ORIGINAL_FILENAME "comp.exe" #include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,23 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_HELP "Compares the contents of two files or sets of files.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 Specifies location and name of first file to compare.\n\ + data2 Specifies location and name of second file to compare.\n\ + /A Display differences in ASCII characters (default: hexadecimal).\n\ + /L Display line numbers for differences.\n" + IDS_INVALIDSWITCH "Invalid switch - /%c\n" + IDS_BADSYNTAX "Bad command line syntax\n" + IDS_FILEERROR "Cannot find/open file: %s\n" + IDS_COMPARING "Comparing %s and %s...\n" + IDS_FILESIZEERROR "Cannot determine size of file: %s\n" + IDS_SIZEDIFFERS "Files are different sizes.\n" + IDS_READERROR "Files read error.\n" + IDS_MISMATCHLINE "Compare error at LINE %d\n" + IDS_MISMATCHOFFSET "Compare error at OFFSET 0x%X\n" + IDS_ASCIIDIFF "file%d = %c\n" + IDS_HEXADECIMALDIFF "file%d = %X\n" + IDS_MATCH "Files compare OK\n" +END Propchange: trunk/reactos/base/applications/cmdutils/comp/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,23 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_HELP "Compare le contenu de deux fichiers ou ensembles de fichiers.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 SpÃ©cifie l'emplacement et le nom du premier fichier Ã comparer.\n\ + data2 SpÃ©cifie l'emplacement et le nom du second fichier Ã comparer.\n\ + /A Affiche les diffÃ©rences en caractÃ¨res ASCII (dÃ©faut: hexadÃ©cimal).\n\ + /L Affiche les numÃ©ros de ligne des diffÃ©rences.\n" + IDS_INVALIDSWITCH "ParamÃ¨tre invalide - /%c\n" + IDS_BADSYNTAX "Syntaxe incorrecte\n" + IDS_FILEERROR "Impossible de trouver/ouvrir le fichier : %s\n" + IDS_COMPARING "Comparaison de %s et %s...\n" + IDS_FILESIZEERROR "Ne peut pas dÃ©terminer la taille du fichier : %s\n" + IDS_SIZEDIFFERS "Les fichiers sont de taille diffÃ©rente.\n" + IDS_READERROR "Erreur lors de la lecture des fichiers.\n" + IDS_MISMATCHLINE "Erreur de comparaison Ã LIGNE %d\n" + IDS_MISMATCHOFFSET "Erreur de comparaison Ã OFFSET 0x%X\n" + IDS_ASCIIDIFF "fichier%d = %c\n" + IDS_HEXADECIMALDIFF "fichier%d = %X\n" + IDS_MATCH "Comparaison des fichiers OK\n" +END Propchange: trunk/reactos/base/applications/cmdutils/comp/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,24 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_HELP "ComparÄ conÈinuturile a douÄ fiÈiere sau grupuri de fiÈiere.\n\n\ +COMP [/L] [/A] [data1] [data2]\n\n\ + data1 Calea Èi numele primului fiÈier de comparat.\n\ + data2 Calea Èi numele celui de-al doilea fiÈier de comparat.\n\ + /A AfiÈeazÄ diferenÈele Ã®n caractere ASCII (default: hexadecimal).\n\ + /L AfiÈeazÄ numÄrul liniei pentru diferenÈe.\n" + IDS_INVALIDSWITCH "Parametru nevalid - /%c\n" + IDS_BADSYNTAX "SintaxÄ eronatÄ\n" + IDS_FILEERROR "Nu se poate gÄsi/deschide fiÈierul: %s\n" + IDS_COMPARING "Se comparÄ %s Èi %s...\n" + IDS_FILESIZEERROR "Nu se poate determina dimensiunea fiÈierului: %s\n" + IDS_SIZEDIFFERS "FiÈierele au dimensiuni diferite.\n" + IDS_READERROR "Eroare la citirea fiÈierelor.\n" + IDS_MISMATCHLINE "DiferenÈÄ identificatÄ la linia %d\n" + IDS_MISMATCHOFFSET "DiferenÈÄ identificatÄ la poziÈia 0x%X\n" + IDS_ASCIIDIFF "fiÈier%d = %c\n" + IDS_HEXADECIMALDIFF "fiÈier%d = %X\n" + IDS_MATCH "FiÈierele sunt identice\n" +END Propchange: trunk/reactos/base/applications/cmdutils/comp/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/comp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/comp/resource.h [iso-8859-1] Thu Jun 9 19:01:47 2016 @@ -0,0 +1,15 @@ +#pragma once + +#define IDS_HELP 100 +#define IDS_INVALIDSWITCH 101 +#define IDS_BADSYNTAX 102 +#define IDS_FILEERROR 103 +#define IDS_COMPARING 104 +#define IDS_FILESIZEERROR 105 +#define IDS_SIZEDIFFERS 106 +#define IDS_READERROR 107 +#define IDS_MISMATCHLINE 108 +#define IDS_MISMATCHOFFSET 109 +#define IDS_ASCIIDIFF 110 +#define IDS_HEXADECIMALDIFF 111 +#define IDS_MATCH 112 Propchange: trunk/reactos/base/applications/cmdutils/comp/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 3 months

[hbelusca] 71599: [COMP] - The comparison buffers contain bytes, not (T)CHARs. Pointed out by Stefan Fulea in CORE-11060. - Remove a now unnecessary comment header "history" line since we have SVN ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 9 18:43:36 2016 New Revision: 71599 URL: http://svn.reactos.org/svn/reactos?rev=71599&view=rev Log: [COMP] - The comparison buffers contain bytes, not (T)CHARs. Pointed out by Stefan Fulea in CORE-11060. - Remove a now unnecessary comment header "history" line since we have SVN for that instead. Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Thu Jun 9 18:43:36 2016 @@ -22,9 +22,6 @@ * FILE: base/applications/cmdutils/comp/comp.c * PURPOSE: Compares the contents of two files * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) - * REVISIONS: - * GM 25/09/05 Created - * */ #include <windows.h> @@ -37,9 +34,9 @@ #define STRBUF 1024 /* getline: read a line, return length */ -INT GetBuff(char *buff, FILE *in) -{ - return fread(buff, 1, STRBUF, in); +INT GetBuff(PBYTE buff, FILE *in) +{ + return fread(buff, sizeof(BYTE), STRBUF, in); } INT FileSize(FILE * fd) @@ -74,8 +71,8 @@ FILE *fp2 = NULL; INT BufLen1, BufLen2; - PTCHAR Buff1 = NULL; - PTCHAR Buff2 = NULL; + PBYTE Buff1 = NULL; + PBYTE Buff2 = NULL; TCHAR File1[_MAX_PATH + 1], // File paths File2[_MAX_PATH + 1]; BOOL bAscii = FALSE, // /A switch @@ -128,14 +125,15 @@ return EXIT_FAILURE; } - Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + Buff1 = (PBYTE)malloc(STRBUF); if (Buff1 == NULL) { _tprintf(_T("Can't get free memory for Buff1\n")); - return EXIT_FAILURE; - } - - Buff2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + Status = EXIT_FAILURE; + goto Cleanup; + } + + Buff2 = (PBYTE)malloc(STRBUF); if (Buff2 == NULL) { _tprintf(_T("Can't get free memory for Buff2\n")); @@ -239,15 +237,15 @@ _tprintf(_T("Files compare OK\n")); Cleanup: + if (fp2) + fclose(fp2); if (fp1) fclose(fp1); - if (fp2) - fclose(fp2); - + + if (Buff2) + free(Buff2); if (Buff1) free(Buff1); - if (Buff2) - free(Buff2); return Status; }

8 years, 3 months

[jimtabor] 71598: [User32] - Patch by Jared Smudde : Set text background the same color as the rectangle. - Adapted by Hermès Bélusca-Maïto. Themes, see CORE-11364.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jun 9 02:50:13 2016 New Revision: 71598 URL: http://svn.reactos.org/svn/reactos?rev=71598&view=rev Log: [User32] - Patch by Jared Smudde : Set text background the same color as the rectangle. - Adapted by Hermès Bélusca-Maïto. Themes, see CORE-11364. Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Thu Jun 9 02:50:13 2016 @@ -238,7 +238,7 @@ dcFont = SelectObject(dialogDC, dialogFont); SetTextColor(dialogDC, GetSysColor(COLOR_BTNTEXT)); - SetBkColor(dialogDC, GetSysColor(COLOR_BTNFACE)); + SetBkMode(dialogDC, TRANSPARENT); textRC.top = itemsH; textRC.left = 8;

8 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016