Ros-diffs

ros-diffs@reactos.org

81390 discussions

[apriyadarshi] 72002: Added write support, next operation code 53 27.
by apriyadarshi＠svn.reactos.org 26 Jul '16

26 Jul '16

Author: apriyadarshi Date: Tue Jul 26 14:15:15 2016 New Revision: 72002 URL: http://svn.reactos.org/svn/reactos?rev=72002&view=rev Log: Added write support, next operation code 53 27. Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/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] Tue Jul 26 14:15:15 2016 @@ -849,7 +849,7 @@ Srb->SrbStatus = DeviceRequestSense(AdapterExtension, Srb, cdb); break; case SCSIOP_READ: - //case SCSIOP_WRITE: + case SCSIOP_WRITE: Srb->SrbStatus = DeviceRequestReadWrite(AdapterExtension, Srb, cdb); break; default: @@ -1726,7 +1726,7 @@ ModeHeader->ModeDataLength = sizeof(MODE_PARAMETER_HEADER); ModeHeader->MediumType = 0; - ModeHeader->DeviceSpecificParameter = MODE_DSP_WRITE_PROTECT; + ModeHeader->DeviceSpecificParameter = 0; ModeHeader->BlockDescriptorLength = 0; if (Cdb->MODE_SENSE.PageCode == MODE_SENSE_CURRENT_VALUES) @@ -1776,9 +1776,12 @@ NT_ASSERT(BytesPerSector > 0); - ROUND_UP(DataTransferLength, BytesPerSector); + //ROUND_UP(DataTransferLength, BytesPerSector); SectorCount = DataTransferLength / BytesPerSector; + + Srb->DataTransferLength = SectorCount * BytesPerSector; + StartOffset = AhciGetLba(Cdb, Srb->CdbLength); IsReading = (Cdb->CDB10.OperationCode == SCSIOP_READ); @@ -1796,7 +1799,8 @@ else { SrbExtension->Flags |= ATA_FLAGS_DATA_OUT; - NT_ASSERT(FALSE); + SrbExtension->CommandReg = IDE_COMMAND_WRITE_DMA; + //NT_ASSERT(FALSE); } SrbExtension->FeaturesLow = 0;

1 0

[pschweitzer] 72001: [NTOSKRNL_VISTA] Implement KeQueryActiveProcessorCount(). CORE-11674
by pschweitzer＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: pschweitzer Date: Mon Jul 25 20:45:48 2016 New Revision: 72001 URL: http://svn.reactos.org/svn/reactos?rev=72001&view=rev Log: [NTOSKRNL_VISTA] Implement KeQueryActiveProcessorCount(). CORE-11674 Added: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/ke.c (with props) Modified: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt Modified: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ntoskrnl_v… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt [iso-8859-1] Mon Jul 25 20:45:48 2016 @@ -5,6 +5,7 @@ list(APPEND SOURCE fsrtl.c + ke.c rtl.c) add_library(ntoskrnl_vista ${SOURCE}) Added: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/ke.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ntoskrnl_v… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/ke.c (added) +++ trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/ke.c [iso-8859-1] Mon Jul 25 20:45:48 2016 @@ -0,0 +1,27 @@ +/* + * PROJECT: ReactOS Kernel - Vista+ APIs + * LICENSE: GPL v2 - See COPYING in the top level directory + * FILE: lib/drivers/ntoskrnl_vista/ke.c + * PURPOSE: Ke functions of Vista+ + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <ntdef.h> +#include <ntifs.h> + +NTKERNELAPI +ULONG +NTAPI +KeQueryActiveProcessorCount(OUT PKAFFINITY ActiveProcessors OPTIONAL) +{ + RTL_BITMAP Bitmap; + KAFFINITY ActiveMap = KeQueryActiveProcessors(); + + if (ActiveProcessors != NULL) + { + *ActiveProcessors = ActiveMap; + } + + RtlInitializeBitMap(&Bitmap, &ActiveMap, sizeof(ActiveMap) * 8); + return RtlNumberOfSetBits(&Bitmap); +} Propchange: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/ke.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 72000: [MMSYS]: Improve AddSoundProfile, by Victor Martinez Calvo (with 1 minor modification by myself): ◾ Don't return TRUE when CB_SETITEMDATA fails. ◾ Avoid pScheme NULL dereference i...
by hbelusca＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: hbelusca Date: Mon Jul 25 20:24:30 2016 New Revision: 72000 URL: http://svn.reactos.org/svn/reactos?rev=72000&view=rev Log: [MMSYS]: Improve AddSoundProfile, by Victor Martinez Calvo (with 1 minor modification by myself): ◾ Don't return TRUE when CB_SETITEMDATA fails. ◾ Avoid pScheme NULL dereference if allocation fails. CID 1223154 ◾ Avoid overflowing the destiny buffer by using StringCchCopy() CID 510953 and: 1) Make it more readable by returning as soon as possible when an error happens. 2) Make it more readable by reducing the nested ifs-checks. 3) Remove the added string in the combobox if the sound scheme buffer mem allocation fails (pt.3 modified). CORE-11603 #resolve #comment Thanks! Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Mon Jul 25 20:24:30 2016 @@ -5,11 +5,14 @@ * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * Johannes Anderwald <janderwald(a)reactos.com> * Dmitry Chapyshev <dmitry(a)reactos.org> + * Victor Martinez Calvo <victor.martinez(a)reactos.org> */ #include "mmsys.h" #include <commdlg.h> +#include <strsafe.h> + #include <debug.h> struct __APP_MAP__; @@ -291,6 +294,8 @@ HKEY hSubKey; TCHAR szValue[MAX_PATH]; DWORD dwValue, dwResult; + LRESULT lResult; + PSOUND_SCHEME_CONTEXT pScheme; if (RegOpenKeyEx(hKey, szSubKey, @@ -309,27 +314,35 @@ (LPBYTE)szValue, &dwValue); RegCloseKey(hSubKey); - if (dwResult == ERROR_SUCCESS) - { - LRESULT lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); - if (lResult != CB_ERR) - { - PSOUND_SCHEME_CONTEXT pScheme = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUND_SCHEME_CONTEXT)); - if (pScheme != NULL) - { - _tcscpy(pScheme->szDesc, szValue); - _tcscpy(pScheme->szName, szSubKey); - } - - SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pScheme); - if (SetDefault) - { - SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); - } - } - return TRUE; - } - return FALSE; + + if (dwResult != ERROR_SUCCESS) + return FALSE; + + /* Try to add the new profile */ + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + if (lResult == CB_ERR) + return FALSE; + + /* Allocate the profile scheme buffer */ + pScheme = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUND_SCHEME_CONTEXT)); + if (pScheme == NULL) + { + /* We failed to allocate the buffer, no need to keep a dangling string in the combobox */ + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_DELETESTRING, (WPARAM)lResult, (LPARAM)0); + return FALSE; + } + + StringCchCopy(pScheme->szDesc, MAX_PATH, szValue); + StringCchCopy(pScheme->szName, MAX_PATH, szSubKey); + + /* Associate the value with the item in the combobox */ + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pScheme); + + /* Optionally, select the profile */ + if (SetDefault) + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + + return TRUE; }

1 0

[apriyadarshi] 71999: Handled SCSIOP_MODE_SENSE, Fixes made to maxLba count. FileSystem detection is still not working :/
by apriyadarshi＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: apriyadarshi Date: Mon Jul 25 19:50:09 2016 New Revision: 71999 URL: http://svn.reactos.org/svn/reactos?rev=71999&view=rev Log: Handled SCSIOP_MODE_SENSE, Fixes made to maxLba count. FileSystem detection is still not working :/ 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] Mon Jul 25 19:50:09 2016 @@ -845,6 +845,9 @@ case SCSIOP_TEST_UNIT_READY: Srb->SrbStatus = DeviceRequestComplete(AdapterExtension, Srb, cdb); break; + case SCSIOP_MODE_SENSE: + Srb->SrbStatus = DeviceRequestSense(AdapterExtension, Srb, cdb); + break; case SCSIOP_READ: //case SCSIOP_WRITE: Srb->SrbStatus = DeviceRequestReadWrite(AdapterExtension, Srb, cdb); @@ -1688,6 +1691,54 @@ }// -- InquiryCompletion(); /** + * @name DeviceRequestSense + * @implemented + * + * Handle SCSIOP_MODE_SENSE OperationCode + * + * @param AdapterExtension + * @param Srb + * @param Cdb + * + * @return + * return STOR status for DeviceRequestSense + */ +UCHAR DeviceRequestSense ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ) +{ + PMODE_PARAMETER_HEADER ModeHeader; + + AhciDebugPrint("DeviceRequestSense()\n"); + + UNREFERENCED_PARAMETER(AdapterExtension); + + NT_ASSERT(IsPortValid(AdapterExtension, Srb->PathId)); + NT_ASSERT(Cdb->CDB10.OperationCode == SCSIOP_MODE_SENSE); + + ModeHeader = (PMODE_PARAMETER_HEADER)Srb->DataBuffer; + + NT_ASSERT(ModeHeader != NULL); + + AhciZeroMemory((PCHAR)ModeHeader, Srb->DataTransferLength); + + ModeHeader->ModeDataLength = sizeof(MODE_PARAMETER_HEADER); + ModeHeader->MediumType = 0; + ModeHeader->DeviceSpecificParameter = MODE_DSP_WRITE_PROTECT; + ModeHeader->BlockDescriptorLength = 0; + + if (Cdb->MODE_SENSE.PageCode == MODE_SENSE_CURRENT_VALUES) + { + ModeHeader->ModeDataLength = sizeof(MODE_PARAMETER_HEADER) + sizeof(MODE_PARAMETER_BLOCK); + ModeHeader->BlockDescriptorLength = sizeof(MODE_PARAMETER_BLOCK); + } + + return SRB_STATUS_SUCCESS; +}// -- DeviceRequestSense(); + +/** * @name DeviceRequestReadWrite * @implemented * @@ -1817,9 +1868,8 @@ { ReadCapacity = (PREAD_CAPACITY_DATA)Srb->DataBuffer; - BytesPerLogicalSector = PortExtension->DeviceParams.BytesPerLogicalSector; - MaxLba = (ULONG)PortExtension->DeviceParams.MaxLba.QuadPart; + MaxLba = (ULONG)PortExtension->DeviceParams.MaxLba.QuadPart - 1; // I trust you windows :D NT_ASSERT(Srb->DataTransferLength >= sizeof(READ_CAPACITY_DATA)); 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] Mon Jul 25 19:50:09 2016 @@ -591,6 +591,12 @@ __in ULONG pathId ); +UCHAR DeviceRequestSense ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ); + UCHAR DeviceRequestReadWrite ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PSCSI_REQUEST_BLOCK Srb,

1 0

[tfaber] 71998: [TOOLS] - Fix MSVC 2013+ build. Patch by Victor Matovykh. CORE-11575 #resolve
by tfaber＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: tfaber Date: Mon Jul 25 19:28:40 2016 New Revision: 71998 URL: http://svn.reactos.org/svn/reactos?rev=71998&view=rev Log: [TOOLS] - Fix MSVC 2013+ build. Patch by Victor Matovykh. CORE-11575 #resolve Modified: trunk/reactos/sdk/include/host/typedefs.h Modified: trunk/reactos/sdk/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/host/typedefs.… ============================================================================== --- trunk/reactos/sdk/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/host/typedefs.h [iso-8859-1] Mon Jul 25 19:28:40 2016 @@ -13,20 +13,7 @@ #include <assert.h> #include <stdlib.h> #include <limits.h> - -#ifndef _MSC_VER #include <stdint.h> -#else -typedef __int8 int8_t; -typedef __int16 int16_t; -typedef __int32 int32_t; -typedef __int64 int64_t; - -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; -#endif /* Function attributes for GCC */ #if !defined(_MSC_VER) && !defined(__fastcall)

1 0

[tfaber] 71997: [SHELL32] - Add missing dependency
by tfaber＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: tfaber Date: Mon Jul 25 19:25:46 2016 New Revision: 71997 URL: http://svn.reactos.org/svn/reactos?rev=71997&view=rev Log: [SHELL32] - Add missing dependency Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Jul 25 19:25:46 2016 @@ -104,5 +104,6 @@ target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) add_delay_importlibs(shell32 uxtheme ole32 oleaut32 userenv version fmifs) add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm mpr msvcrt kernel32 ntdll) +add_dependencies(shell32 stdole2) # shell32_shldisp.tlb needs stdole2.tlb add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)

1 0

[apriyadarshi] 71996: Handled SCSIOP_TEST_UNIT_READY Changed Default status to SRB_STATUS_INVALID_REQUEST Added support for 48bits in GetLba function
by apriyadarshi＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: apriyadarshi Date: Mon Jul 25 11:09:25 2016 New Revision: 71996 URL: http://svn.reactos.org/svn/reactos?rev=71996&view=rev Log: Handled SCSIOP_TEST_UNIT_READY Changed Default status to SRB_STATUS_INVALID_REQUEST Added support for 48bits in GetLba function 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] Mon Jul 25 11:09:25 2016 @@ -570,6 +570,7 @@ } else { + NT_ASSERT(Srb->SrbStatus == SRB_STATUS_PENDING); Srb->SrbStatus = SRB_STATUS_SUCCESS; StorPortNotification(RequestComplete, AdapterExtension, Srb); } @@ -839,8 +840,10 @@ Srb->SrbStatus = DeviceReportLuns(AdapterExtension, Srb, cdb); break; case SCSIOP_READ_CAPACITY: - case SCSIOP_READ_CAPACITY16: Srb->SrbStatus = DeviceRequestCapacity(AdapterExtension, Srb, cdb); + break; + case SCSIOP_TEST_UNIT_READY: + Srb->SrbStatus = DeviceRequestComplete(AdapterExtension, Srb, cdb); break; case SCSIOP_READ: //case SCSIOP_WRITE: @@ -848,7 +851,7 @@ break; default: AhciDebugPrint("\tOperationCode: %d\n", cdb->CDB10.OperationCode); - Srb->SrbStatus = SRB_STATUS_BAD_FUNCTION; + Srb->SrbStatus = SRB_STATUS_INVALID_REQUEST; break; } } @@ -862,6 +865,10 @@ if (Srb->SrbStatus != SRB_STATUS_PENDING) { StorPortNotification(RequestComplete, AdapterExtension, Srb); + } + else + { + AhciProcessIO(AdapterExtension, Srb->PathId, Srb); } return TRUE; }// -- AhciHwStartIo(); @@ -1598,7 +1605,7 @@ PortExtension->DeviceParams.RemovableDevice = 1; } - if (IdentifyDeviceData->CommandSetSupport.BigLba && IdentifyDeviceData->CommandSetActive.BigLba) + if ((IdentifyDeviceData->CommandSetSupport.BigLba) && (IdentifyDeviceData->CommandSetActive.BigLba)) { PortExtension->DeviceParams.Lba48BitMode = 1; } @@ -1699,8 +1706,8 @@ __in PCDB Cdb ) { - ULONG64 SectorNo; BOOLEAN IsReading; + ULONG64 StartOffset; PAHCI_SRB_EXTENSION SrbExtension; PAHCI_PORT_EXTENSION PortExtension; ULONG DataTransferLength, BytesPerSector, SectorCount; @@ -1721,7 +1728,7 @@ ROUND_UP(DataTransferLength, BytesPerSector); SectorCount = DataTransferLength / BytesPerSector; - SectorNo = AhciGetLba(Cdb); + StartOffset = AhciGetLba(Cdb, Srb->CdbLength); IsReading = (Cdb->CDB10.OperationCode == SCSIOP_READ); NT_ASSERT(SectorCount > 0); @@ -1742,9 +1749,9 @@ } SrbExtension->FeaturesLow = 0; - SrbExtension->LBA0 = (SectorNo >> 0) & 0xFF; - SrbExtension->LBA1 = (SectorNo >> 8) & 0xFF; - SrbExtension->LBA2 = (SectorNo >> 16) & 0xFF; + SrbExtension->LBA0 = (StartOffset >> 0) & 0xFF; + SrbExtension->LBA1 = (StartOffset >> 8) & 0xFF; + SrbExtension->LBA2 = (StartOffset >> 16) & 0xFF; SrbExtension->Device = (0xA0 | IDE_LBA_MODE); @@ -1753,9 +1760,9 @@ SrbExtension->Flags |= ATA_FLAGS_48BIT_COMMAND; SrbExtension->CommandReg = IDE_COMMAND_READ_DMA_EXT; - SrbExtension->LBA3 = (SectorNo >> 24) & 0xFF; - SrbExtension->LBA4 = (SectorNo >> 32) & 0xFF; - SrbExtension->LBA5 = (SectorNo >> 40) & 0xFF; + SrbExtension->LBA3 = (StartOffset >> 24) & 0xFF; + SrbExtension->LBA4 = (StartOffset >> 32) & 0xFF; + SrbExtension->LBA5 = (StartOffset >> 40) & 0xFF; } else { @@ -1770,7 +1777,6 @@ SrbExtension->pSgl = (PLOCAL_SCATTER_GATHER_LIST)StorPortGetScatterGatherList(AdapterExtension, Srb); - AhciProcessIO(AdapterExtension, Srb->PathId, Srb); return SRB_STATUS_PENDING; }// -- DeviceRequestReadWrite(); @@ -1835,6 +1841,35 @@ return SRB_STATUS_SUCCESS; }// -- DeviceRequestCapacity(); + +/** + * @name DeviceRequestComplete + * @implemented + * + * Handle UnHandled Requests + * + * @param AdapterExtension + * @param Srb + * @param Cdb + * + * @return + * return STOR status for DeviceRequestComplete + */ +UCHAR DeviceRequestComplete ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ) +{ + AhciDebugPrint("DeviceRequestComplete()\n"); + + UNREFERENCED_PARAMETER(AdapterExtension); + UNREFERENCED_PARAMETER(Cdb); + + Srb->ScsiStatus = SCSISTAT_GOOD; + + return SRB_STATUS_SUCCESS; +}// -- DeviceRequestComplete(); /** * @name DeviceReportLuns @@ -1951,8 +1986,6 @@ SrbExtension->Sgl.List[0].Length = sizeof(IDENTIFY_DEVICE_DATA); SrbExtension->pSgl = &SrbExtension->Sgl; - - AhciProcessIO(AdapterExtension, Srb->PathId, Srb); return SRB_STATUS_PENDING; } else @@ -2224,21 +2257,41 @@ return (PAHCI_SRB_EXTENSION)(SrbExtension + Offset); }// -- PAHCI_SRB_EXTENSION(); - +/** + * @name AhciGetLba + * @implemented + * + * Find the logical address of demand block from Cdb + * + * @param Srb + * + * @return + * return Logical Address of the block + * + */ __inline ULONG64 AhciGetLba ( - __in PCDB Cdb + __in PCDB Cdb, + __in ULONG CdbLength ) { ULONG64 lba = 0; NT_ASSERT(Cdb != NULL); - - lba |= Cdb->CDB10.LogicalBlockByte3 << 0; - lba |= Cdb->CDB10.LogicalBlockByte2 << 8; - lba |= Cdb->CDB10.LogicalBlockByte1 << 16; - lba |= Cdb->CDB10.LogicalBlockByte0 << 24; + NT_ASSERT(CdbLength != 0); + + if (CdbLength == 0x10) + { + REVERSE_BYTES_QUAD(&lba, Cdb->CDB16.LogicalBlock); + } + else + { + lba |= Cdb->CDB10.LogicalBlockByte3 << 0; + lba |= Cdb->CDB10.LogicalBlockByte2 << 8; + lba |= Cdb->CDB10.LogicalBlockByte1 << 16; + lba |= Cdb->CDB10.LogicalBlockByte0 << 24; + } return lba; }// -- AhciGetLba(); 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] Mon Jul 25 11:09:25 2016 @@ -565,6 +565,13 @@ // Declarations // ////////////////////////////////////////////////////////////// +VOID +AhciProcessIO ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in UCHAR PathId, + __in PSCSI_REQUEST_BLOCK Srb + ); + BOOLEAN AhciAdapterReset ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension @@ -603,6 +610,12 @@ __in PCDB Cdb ); +UCHAR DeviceRequestComplete ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PSCSI_REQUEST_BLOCK Srb, + __in PCDB Cdb + ); + UCHAR DeviceReportLuns ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, __in PSCSI_REQUEST_BLOCK Srb, @@ -631,7 +644,8 @@ __inline ULONG64 AhciGetLba ( - __in PCDB Cdb + __in PCDB Cdb, + __in ULONG CdbLength ); //////////////////////////////////////////////////////////////

1 0

[cwittich] 71995: [ADVAPI32] silence debug spam
by cwittich＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: cwittich Date: Mon Jul 25 11:07:44 2016 New Revision: 71995 URL: http://svn.reactos.org/svn/reactos?rev=71995&view=rev Log: [ADVAPI32] silence debug spam Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Mon Jul 25 11:07:44 2016 @@ -746,8 +746,8 @@ NULL); if (ErrorCode != ERROR_SUCCESS) { - /* Most likely ERROR_NO_MORE_ITEMS */ - ERR("Returning %d.\n", ErrorCode); + if (ErrorCode != ERROR_NO_MORE_ITEMS) + ERR("Returning %d.\n", ErrorCode); goto Exit; } FallbackSubKeyName[FallbackSubkeyLen] = L'\0';

1 0

[tfaber] 71994: [WIN32K:NTUSER] - Fix UserDrawCaptionBar debug spam
by tfaber＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: tfaber Date: Mon Jul 25 10:45:30 2016 New Revision: 71994 URL: http://svn.reactos.org/svn/reactos?rev=71994&view=rev Log: [WIN32K:NTUSER] - Fix UserDrawCaptionBar debug spam Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Mon Jul 25 10:45:30 2016 @@ -846,7 +846,7 @@ if (!(Flags & DC_NOVISIBLE) && !IntIsWindowVisible(pWnd)) return; - ERR("UserDrawCaptionBar: pWnd %p, hDc %p, Flags 0x%x.\n", pWnd, hDC, Flags); + TRACE("UserDrawCaptionBar: pWnd %p, hDc %p, Flags 0x%x.\n", pWnd, hDC, Flags); Style = pWnd->style; ExStyle = pWnd->ExStyle;

1 0

[tfaber] 71993: [NTOS:CC] - Unconditionally acquire the VACB lock during map/pin/unpin operations and release it appropriately CORE-11555 #resolve CORE-11654 CORE-11504 CORE-11328 #comment This mig...
by tfaber＠svn.reactos.org 25 Jul '16

25 Jul '16

Author: tfaber Date: Mon Jul 25 08:48:50 2016 New Revision: 71993 URL: http://svn.reactos.org/svn/reactos?rev=71993&view=rev Log: [NTOS:CC] - Unconditionally acquire the VACB lock during map/pin/unpin operations and release it appropriately CORE-11555 #resolve CORE-11654 CORE-11504 CORE-11328 #comment This might be fixed with r71993. Could you retry please? Modified: trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=7199… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Mon Jul 25 08:48:50 2016 @@ -185,10 +185,8 @@ ASSERT(iBcb->Pinned == FALSE); iBcb->Pinned = TRUE; - if (InterlockedIncrement(&iBcb->Vacb->PinCount) == 1) - { - CcRosReleaseVacbLock(iBcb->Vacb); - } + iBcb->Vacb->PinCount++; + CcRosReleaseVacbLock(iBcb->Vacb); if (Flags & PIN_EXCLUSIVE) { @@ -281,10 +279,8 @@ { ExReleaseResourceForThreadLite(&iBcb->Lock, ResourceThreadId); iBcb->Pinned = FALSE; - if (InterlockedDecrement(&iBcb->Vacb->PinCount) == 0) - { - CcRosAcquireVacbLock(iBcb->Vacb, NULL); - } + CcRosAcquireVacbLock(iBcb->Vacb, NULL); + iBcb->Vacb->PinCount--; } CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, @@ -355,10 +351,8 @@ { ExReleaseResourceLite(&iBcb->Lock); iBcb->Pinned = FALSE; - if (InterlockedDecrement(&iBcb->Vacb->PinCount) == 0) - { - CcRosAcquireVacbLock(iBcb->Vacb, NULL); - } + CcRosAcquireVacbLock(iBcb->Vacb, NULL); + iBcb->Vacb->PinCount--; } ExDeleteResourceLite(&iBcb->Lock); ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=719… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Mon Jul 25 08:48:50 2016 @@ -422,10 +422,7 @@ KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - if (InterlockedCompareExchange(&Vacb->PinCount, 0, 0) == 0) - { - CcRosReleaseVacbLock(Vacb); - } + CcRosReleaseVacbLock(Vacb); return STATUS_SUCCESS; } @@ -462,10 +459,7 @@ CcRosVacbIncRefCount(current); KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - if (InterlockedCompareExchange(&current->PinCount, 0, 0) == 0) - { - CcRosAcquireVacbLock(current, NULL); - } + CcRosAcquireVacbLock(current, NULL); return current; } if (current->FileOffset.QuadPart > FileOffset) @@ -712,10 +706,7 @@ KeReleaseGuardedMutex(&ViewLock); ExFreeToNPagedLookasideList(&VacbLookasideList, *Vacb); *Vacb = current; - if (InterlockedCompareExchange(&current->PinCount, 0, 0) == 0) - { - CcRosAcquireVacbLock(current, NULL); - } + CcRosAcquireVacbLock(current, NULL); return STATUS_SUCCESS; } if (current->FileOffset.QuadPart < FileOffset) @@ -945,10 +936,7 @@ } } - if (InterlockedCompareExchange(&current->PinCount, 0, 0) == 0) - { - CcRosReleaseVacbLock(current); - } + CcRosReleaseVacbLock(current); KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Mon Jul 25 08:48:50 2016 @@ -185,7 +185,8 @@ /* Number of references. */ ULONG ReferenceCount; /* How many times was it pinned? */ - volatile LONG PinCount; + _Guarded_by_(Mutex) + LONG PinCount; /* Pointer to the shared cache map for the file which this view maps data for. */ PROS_SHARED_CACHE_MAP SharedCacheMap; /* Pointer to the next VACB in a chain. */

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