Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 71611: [SERVICES] - Read the service security descriptors when the service list is created. - Assign and write the default security descriptor when a service does not have its own security ...
by ekohl＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: ekohl Date: Sat Jun 11 09:41:05 2016 New Revision: 71611 URL: http://svn.reactos.org/svn/reactos?rev=71611&view=rev Log: [SERVICES] - Read the service security descriptors when the service list is created. - Assign and write the default security descriptor when a service does not have its own security desciptor. - Delete a service security desciptor when the service is deleted. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/services.h 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] Sat Jun 11 09:41:05 2016 @@ -586,10 +586,17 @@ _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { PSECURITY_DESCRIPTOR pRelativeSD = NULL; + PSECURITY_DESCRIPTOR pResizedBuffer = NULL; HKEY hSecurityKey = NULL; DWORD dwBufferLength = 0; + DWORD dwAbsoluteSDSize = 0; DWORD dwType; DWORD dwError; + NTSTATUS Status; + + DPRINT("ScmReadSecurityDescriptor()\n"); + + *ppSecurityDescriptor = NULL; dwError = RegOpenKeyExW(hServiceKey, L"Security", @@ -598,7 +605,11 @@ &hSecurityKey); if (dwError != ERROR_SUCCESS) { -DPRINT1("\n"); + DPRINT("RegOpenKeyExW() failed (Error %lu)\n", dwError); + + /* Do not fail if the Security key does not exist */ + if (dwError == ERROR_FILE_NOT_FOUND) + dwError = ERROR_SUCCESS; goto done; } @@ -610,19 +621,24 @@ &dwBufferLength); if (dwError != ERROR_SUCCESS) { -DPRINT1("\n"); + DPRINT("RegQueryValueExW() failed (Error %lu)\n", dwError); + + /* Do not fail if the Security value does not exist */ + if (dwError == ERROR_FILE_NOT_FOUND) + dwError = ERROR_SUCCESS; goto done; } + DPRINT("dwBufferLength: %lu\n", dwBufferLength); pRelativeSD = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, dwBufferLength); if (pRelativeSD == NULL) { -DPRINT1("\n"); return ERROR_OUTOFMEMORY; } + DPRINT("pRelativeSD: %lu\n", pRelativeSD); dwError = RegQueryValueExW(hSecurityKey, L"Security", 0, @@ -631,20 +647,48 @@ &dwBufferLength); if (dwError != ERROR_SUCCESS) { -DPRINT1("\n"); goto done; } - + Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, + &dwAbsoluteSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + pResizedBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), + 0, + pRelativeSD, + dwAbsoluteSDSize); + if (pResizedBuffer == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + pRelativeSD = pResizedBuffer; + Status = RtlSelfRelativeToAbsoluteSD2(pRelativeSD, + &dwAbsoluteSDSize); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + } + else if (!NT_SUCCESS(Status)) + { + + dwError = RtlNtStatusToDosError(Status); + goto done; + } + + *ppSecurityDescriptor = pRelativeSD; done: - if (pRelativeSD != NULL) + if (dwError != ERROR_SUCCESS && pRelativeSD != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, pRelativeSD); if (hSecurityKey != NULL) RegCloseKey(hSecurityKey); - return dwError; } Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Jun 11 09:41:05 2016 @@ -554,8 +554,10 @@ /* Decrement the group reference counter */ ScmSetServiceGroup(lpService, NULL); - /* FIXME: SecurityDescriptor */ - + /* Release the SecurityDescriptor */ + if ((lpService->pSecurityDescriptor != NULL) && + (lpService->pSecurityDescriptor != pDefaultServiceSD)) + HeapFree(GetProcessHeap(), 0, lpService->pSecurityDescriptor); /* Remove the Service from the List */ RemoveEntryList(&lpService->ServiceListEntry); @@ -693,7 +695,27 @@ if (ScmIsDeleteFlagSet(hServiceKey)) lpService->bDeleted = TRUE; -done:; + if (lpService->Status.dwServiceType & SERVICE_WIN32) + { + dwError = ScmReadSecurityDescriptor(hServiceKey, + &lpService->pSecurityDescriptor); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Assing the default security descriptor if the security descriptor cannot be read */ + if (lpService->pSecurityDescriptor == NULL) + { + DPRINT("No security descriptor found! Assign default security descriptor!\n"); + lpService->pSecurityDescriptor = pDefaultServiceSD; + + dwError = ScmWriteSecurityDescriptor(hServiceKey, + lpService->pSecurityDescriptor); + if (dwError != ERROR_SUCCESS) + goto done; + } + } + +done: if (lpGroup != NULL) HeapFree(GetProcessHeap(), 0, lpGroup); 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] Sat Jun 11 09:41:05 2016 @@ -139,6 +139,11 @@ _In_ HKEY hServiceKey, _In_ PSECURITY_DESCRIPTOR pSecurityDescriptor); +DWORD +ScmReadSecurityDescriptor( + _In_ HKEY hServiceKey, + _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor); + /* controlset.c */

1 0

[pschweitzer] 71610: [FASTFAT] Properly round up 64b values. This fixes reads on 4GB+ volumes. Patch by Wim Hueskes. CORE-10932 #resolve #comment Thanks for the patch! Commited in r71610
by pschweitzer＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: pschweitzer Date: Sat Jun 11 09:32:00 2016 New Revision: 71610 URL: http://svn.reactos.org/svn/reactos?rev=71610&view=rev Log: [FASTFAT] Properly round up 64b values. This fixes reads on 4GB+ volumes. Patch by Wim Hueskes. CORE-10932 #resolve #comment Thanks for the patch! Commited in r71610 Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -668,7 +668,7 @@ } rcFCB->RFCB.FileSize.QuadPart = Size; rcFCB->RFCB.ValidDataLength.QuadPart = Size; - rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, vcb->FatInfo.BytesPerCluster); + rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP_64(Size, vcb->FatInfo.BytesPerCluster); rcFCB->RefCount = 1; if (vfatFCBIsDirectory(rcFCB)) { Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -1114,7 +1114,7 @@ { if (Size > 0) { - Fcb->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, ClusterSize); + Fcb->RFCB.AllocationSize.QuadPart = ROUND_UP_64(Size, ClusterSize); } else { Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -576,7 +576,7 @@ } VolumeFcb->Flags = FCB_IS_VOLUME; - VolumeFcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.Sectors * DeviceExt->FatInfo.BytesPerSector; + VolumeFcb->RFCB.FileSize.QuadPart = (LONGLONG) DeviceExt->FatInfo.Sectors * DeviceExt->FatInfo.BytesPerSector; VolumeFcb->RFCB.ValidDataLength = VolumeFcb->RFCB.FileSize; VolumeFcb->RFCB.AllocationSize = VolumeFcb->RFCB.FileSize; DeviceExt->VolumeFcb = VolumeFcb; Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -150,7 +150,7 @@ BytesPerSector = DeviceExt->FatInfo.BytesPerSector; BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; - ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)); + ASSERT(ReadOffset.QuadPart + Length <= ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)); ASSERT(ReadOffset.u.LowPart % BytesPerSector == 0); ASSERT(Length % BytesPerSector == 0); @@ -711,9 +711,9 @@ else { // non cached read - if (ByteOffset.QuadPart + Length > ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) - { - Length = (ULONG)(ROUND_UP(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); + if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector)) + { + Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sat Jun 11 09:32:00 2016 @@ -24,6 +24,12 @@ #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) + +#define ROUND_DOWN_64(n, align) \ + (((ULONGLONG)n) & ~((align) - 1LL)) + +#define ROUND_UP_64(n, align) \ + ROUND_DOWN_64(((ULONGLONG)n) + (align) - 1LL, (align)) #include <pshpack1.h> struct _BootSector

1 0

[mjansen] 71609: [WIN32SS] Try to load the module before fetching an icon, instead of failing on a module that is not available in the current process. CORE-10292 #resolve
by mjansen＠svn.reactos.org 10 Jun '16

10 Jun '16

Author: mjansen Date: Fri Jun 10 20:57:26 2016 New Revision: 71609 URL: http://svn.reactos.org/svn/reactos?rev=71609&view=rev Log: [WIN32SS] Try to load the module before fetching an icon, instead of failing on a module that is not available in the current process. CORE-10292 #resolve Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Fri Jun 10 20:57:26 2016 @@ -1867,11 +1867,12 @@ TRACE("Got module %wZ, resource %p (%S).\n", &ustrModule, ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer); - /* Get the module handle */ - if (!GetModuleHandleExW(0, ustrModule.Buffer, &hModule)) - { - /* This should never happen */ - ERR("Invalid handle? Module='%wZ', error %lu.\n", &ustrModule, GetLastError()); + /* Get the module handle or load the module */ + hModule = LoadLibraryExW(ustrModule.Buffer, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + if (!hModule) + { + DWORD err = GetLastError(); + ERR("Unable to load/use module '%wZ' in process %lu, error %lu.\n", &ustrModule, GetCurrentProcessId(), err); SetLastError(ERROR_INVALID_PARAMETER); goto leave; }

1 0

[akhaldi] 71608: * Create a branch for Zuodian's work off of trunk to avoid SVN merge issues.
by akhaldi＠svn.reactos.org 10 Jun '16

10 Jun '16

Author: akhaldi Date: Fri Jun 10 17:29:17 2016 New Revision: 71608 URL: http://svn.reactos.org/svn/reactos?rev=71608&view=rev Log: * Create a branch for Zuodian's work off of trunk to avoid SVN merge issues. Added: branches/GSoC_2016/lwIP-tcpip/ (props changed) - copied from r71607, trunk/reactos/ Propchange: branches/GSoC_2016/lwIP-tcpip/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jun 10 17:29:17 2016 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/GSoC_2016/lwIP-tcpip/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jun 10 17:29:17 2016 @@ -0,0 +1,22 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/condrv_restructure:63104-65657 +/branches/header-work:45691-47721 +/branches/kd++:58883-58973 +/branches/kernel-fun/reactos:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm:59241-63176 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-csrss:57561-58762 +/branches/shell-experiments:61927-65494 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/GSoC_2016/lwIP-tcpip/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[apriyadarshi] 71607: Code Review #2
by apriyadarshi＠svn.reactos.org 10 Jun '16

10 Jun '16

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 + );

1 0

[hbelusca] 71606: [WRITE]: Add wordpad's icon to write.exe compatibility bootstrap.
by hbelusca＠svn.reactos.org 10 Jun '16

10 Jun '16

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)

1 0

[apriyadarshi] 71605: changes after code review
by apriyadarshi＠svn.reactos.org 09 Jun '16

09 Jun '16

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"

1 0

[hbelusca] 71604: [SHELL32]: Replace icon 210 (filecab) with a valid one (coming from explorer).
by hbelusca＠svn.reactos.org 09 Jun '16

09 Jun '16

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

1 0

[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 09 Jun '16

09 Jun '16

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, ...);

1 0

[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 09 Jun '16

09 Jun '16

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; }

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