Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[cgutman] 54738: [FASTFAT] - Revert r54731

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Dec 23 15:56:25 2011 New Revision: 54738 URL: http://svn.reactos.org/svn/reactos?rev=54738&view=rev Log: [FASTFAT] - Revert r54731 Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c 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] Fri Dec 23 15:56:25 2011 @@ -558,6 +558,17 @@ Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + if (Fcb->Flags & FCB_IS_PAGE_FILE) + { + PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; + IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; + IoSkipCurrentIrpStackLocation(IrpContext->Irp); + DPRINT("Read from page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart); + Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); + VfatFreeIrpContext(IrpContext); + return Status; + } + DPRINT("<%wZ>\n", &Fcb->PathNameU); ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; @@ -759,6 +770,17 @@ ASSERT(IrpContext->FileObject); Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + + if (Fcb->Flags & FCB_IS_PAGE_FILE) + { + PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; + IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; + IoSkipCurrentIrpStackLocation(IrpContext->Irp); + DPRINT("Write to page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart); + Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); + VfatFreeIrpContext(IrpContext); + return Status; + } DPRINT("<%wZ>\n", &Fcb->PathNameU);

13 years

[janderwald] 54737: - Fix function declaration - add missing constant

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Dec 23 15:21:28 2011 New Revision: 54737 URL: http://svn.reactos.org/svn/reactos?rev=54737&view=rev Log: - Fix function declaration - add missing constant Modified: branches/usb-bringup/include/ddk/hidclass.h branches/usb-bringup/include/ddk/hidpddi.h Modified: branches/usb-bringup/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidclas… ============================================================================== --- branches/usb-bringup/include/ddk/hidclass.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidclass.h [iso-8859-1] Fri Dec 23 15:21:28 2011 @@ -73,6 +73,7 @@ #define IOCTL_HID_GET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(100) #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) +#define IOCTL_HID_GET_INDEXED_STRING HID_OUT_CTL_CODE(120) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) /* FIXME: these values are wrong! */ Modified: branches/usb-bringup/include/ddk/hidpddi.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidpddi… ============================================================================== --- branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] Fri Dec 23 15:21:28 2011 @@ -43,6 +43,7 @@ }HIDP_DEVICE_DESC, *PHIDP_DEVICE_DESC; NTSTATUS +NTAPI HidP_GetCollectionDescription( IN PHIDP_REPORT_DESCRIPTOR ReportDesc, IN ULONG DescLength,

13 years

[janderwald] 54736: [USBEHCI] - Implement URB_FUNCTION_ISOCH_TRANSFER, URB_FUNCTION_CLASS_ENDPOINT, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Dec 23 15:20:00 2011 New Revision: 54736 URL: http://svn.reactos.org/svn/reactos?rev=54736&view=rev Log: [USBEHCI] - Implement URB_FUNCTION_ISOCH_TRANSFER, URB_FUNCTION_CLASS_ENDPOINT, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Fri Dec 23 15:20:00 2011 @@ -60,13 +60,16 @@ VOID SetNotification(PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine); // internal ioctl routines NTSTATUS HandleGetDescriptor(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleGetDescriptorFromInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassDevice(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleGetStatusFromDevice(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleSelectConfiguration(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleSelectInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassInterface(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClassEndpoint(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleIsochronousTransfer(IN OUT PIRP Irp, PURB Urb); friend VOID StatusChangeEndpointCallBack(PVOID Context); @@ -756,6 +759,47 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleIsochronousTransfer( + IN OUT PIRP Irp, + PURB Urb) +{ + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndPointDesc = NULL; + + // + // Check PipeHandle to determine if this is a Bulk or Interrupt Transfer Request + // + EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbIsochronousTransfer.PipeHandle; + + if (!EndPointDesc) + { + DPRINT1("No EndpointDesc\n"); + Urb->UrbIsochronousTransfer.Hdr.Status = USBD_STATUS_INVALID_PIPE_HANDLE; + return STATUS_INVALID_PARAMETER; + } + + // + // sanity checks + // + ASSERT(EndPointDesc); + ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_ISOCHRONOUS); + + // + // check if this is a valid usb device handle + // + PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + return UsbDevice->SubmitIrp(Irp); +} + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleBulkOrInterruptTransfer( @@ -794,22 +838,11 @@ // EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; - switch(EndPointDesc->bmAttributes & 0x0F) - { - case USB_ENDPOINT_TYPE_CONTROL: - DPRINT1("Control Transfer is not expected!!!\n"); - return STATUS_INVALID_DEVICE_REQUEST; - case USB_ENDPOINT_TYPE_BULK: - DPRINT("Initiating Bulk Transfer\n"); - break; - case USB_ENDPOINT_TYPE_ISOCHRONOUS: - case USB_ENDPOINT_TYPE_INTERRUPT: - DPRINT1("Not Supported\n"); - break; - default: - DPRINT1("Unknown EndPoint Type!\n"); - break; - } + // + // sanity checks + // + ASSERT(EndPointDesc); + ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_BULK || (EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); // // check if this is a valid usb device handle @@ -1086,7 +1119,10 @@ IN OUT PIRP Irp, PURB Urb) { - PUSHORT Status; + PUSHORT DeviceStatus; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; // // sanity checks @@ -1094,22 +1130,54 @@ PC_ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBufferLength >= sizeof(USHORT)); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBuffer); - PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle == NULL); // // get status buffer // - Status = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; - - // - // FIXME need more flags ? - // - *Status = USB_PORT_STATUS_CONNECT; + DeviceStatus = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; + + + if (Urb->UrbHeader.UsbdDeviceHandle == NULL) + { + // + // FIXME need more flags ? + // + *DeviceStatus = USB_PORT_STATUS_CONNECT; + return STATUS_SUCCESS; + } + + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; + CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.HiByte = 0; + CtrlSetup.wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0x80; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + DPRINT1("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done // - return STATUS_SUCCESS; + return Status; } //----------------------------------------------------------------------------------------- @@ -1122,6 +1190,8 @@ PUSB_HUB_DESCRIPTOR UsbHubDescriptor; ULONG PortCount, Dummy2; USHORT Dummy1; + PUSBDEVICE UsbDevice; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; DPRINT("CHubController::HandleClassDevice Request %x Class %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); @@ -1130,6 +1200,36 @@ // switch(Urb->UrbControlVendorClassRequest.Request) { + case USB_REQUEST_GET_STATUS: + { + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; + CtrlSetup.wValue.LowByte = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0xA0; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + break; + } case USB_REQUEST_GET_DESCRIPTOR: { switch (Urb->UrbControlVendorClassRequest.Value >> 8) @@ -1191,6 +1291,55 @@ return Status; } + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleGetDescriptorFromInterface( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + PUSBDEVICE UsbDevice; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + + // + // sanity check + // + ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength); + ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); + + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; + CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + CtrlSetup.wLength = (USHORT)Urb->UrbControlDescriptorRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0x81; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + + // + // done + // + return Status; +} + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleGetDescriptor( @@ -1300,8 +1449,6 @@ } else { - DPRINT1("Length %u\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); - // // check if this is a valid usb device handle // @@ -1392,6 +1539,70 @@ //----------------------------------------------------------------------------------------- NTSTATUS +CHubController::HandleClassEndpoint( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + + // + // sanity check + // + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + + // + // check if this is a valid usb device handle + // + PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + DPRINT1("URB_FUNCTION_CLASS_ENDPOINT\n"); + DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); + DPRINT1("TransferBufferLength %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); + DPRINT1("TransferBuffer %x\n", Urb->UrbControlVendorClassRequest.TransferBuffer); + DPRINT1("TransferBufferMDL %x\n", Urb->UrbControlVendorClassRequest.TransferBufferMDL); + DPRINT1("RequestTypeReservedBits %x\n", Urb->UrbControlVendorClassRequest.RequestTypeReservedBits); + DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request); + DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); + DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0xa2; //FIXME: Const. + CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlVendorClassRequest.TransferBufferLength, Urb->UrbControlVendorClassRequest.TransferBuffer); + + // + // assert on failure + // + PC_ASSERT(NT_SUCCESS(Status)); + + + // + // done + // + return Status; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS CHubController::HandleClassInterface( IN OUT PIRP Irp, IN OUT PURB Urb) @@ -1403,8 +1614,8 @@ // // sanity check // - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); + //ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer || Urb->UrbControlVendorClassRequest.TransferBufferMDL); + //ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); // @@ -1490,6 +1701,9 @@ switch (Urb->UrbHeader.Function) { + case URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE: + Status = HandleGetDescriptorFromInterface(Irp, Urb); + break; case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: Status = HandleGetDescriptor(Irp, Urb); break; @@ -1511,8 +1725,14 @@ case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: Status = HandleBulkOrInterruptTransfer(Irp, Urb); break; + case URB_FUNCTION_ISOCH_TRANSFER: + Status = HandleIsochronousTransfer(Irp, Urb); + break; case URB_FUNCTION_CLASS_INTERFACE: Status = HandleClassInterface(Irp, Urb); + break; + case URB_FUNCTION_CLASS_ENDPOINT: + Status = HandleClassEndpoint(Irp, Urb); break; default: DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); @@ -2301,11 +2521,7 @@ PC_ASSERT(Controller->ValidateUsbDevice(OldUsbDevice)); DPRINT1("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress()); - - DPRINT1("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress()); - - PC_ASSERT(FALSE); // // remove old device handle

13 years

[rharabien] 54735: [CRT] - Fix splitpath when called with filename without path

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Dec 22 23:52:51 2011 New Revision: 54735 URL: http://svn.reactos.org/svn/reactos?rev=54735&view=rev Log: [CRT] - Fix splitpath when called with filename without path Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Thu Dec 22 23:52:51 2011 @@ -63,8 +63,10 @@ } /* Check if we got a file name / extension */ - if (!file_start) file_start = path; - if (!ext_start || ext_start < file_start) ext_start = path; + if (!file_start) + file_start = dir_start; + if (!ext_start || ext_start < file_start) + ext_start = path; if (dir) {

13 years

[tfaber] 54734: [EXPLORER][ADVAPI32][SETUPAPI][SYSSETUP] - Fix some issues found by cppcheck. Patch by Vincenzo Cotugno

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Dec 21 21:49:22 2011 New Revision: 54734 URL: http://svn.reactos.org/svn/reactos?rev=54734&view=rev Log: [EXPLORER][ADVAPI32][SETUPAPI][SYSSETUP] - Fix some issues found by cppcheck. Patch by Vincenzo Cotugno Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -234,7 +234,7 @@ CheckMenuItem(_menu_info._hMenuView, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); _hsidebar = CreateWindowEx(WS_EX_STATICEDGE, WC_TREEVIEW, TEXT("Sidebar"), - WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/WS_CHILD|TVS_HASLINES|TVS_HASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, + WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/TVS_HASLINES|TVS_HASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, -1, -1, 200, 0, _hwnd, (HMENU)IDW_SIDEBAR, g_Globals._hInstance, 0); _himl_old = TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -4029,8 +4029,8 @@ RtlInitAnsiString( &nameA, name ); if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) { + ClosePredefKey(hkey); return RtlNtStatusToDosError(status); - ClosePredefKey(hkey); } status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -1195,8 +1195,6 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else if (!DeviceInfoData && IsEqualIID(&list->ClassGuid, &GUID_NULL)) SetLastError(ERROR_INVALID_PARAMETER); - else if (!PropertySheetHeader) - SetLastError(ERROR_INVALID_PARAMETER); else if (PropertySheetType != DIGCDP_FLAG_ADVANCED && PropertySheetType != DIGCDP_FLAG_BASIC && PropertySheetType != DIGCDP_FLAG_REMOTE_ADVANCED Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Wed Dec 21 21:49:22 2011 @@ -743,7 +743,6 @@ MessageBoxW(hwndDlg, WrongPassword, Title, MB_ICONERROR | MB_OK); SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; - break; } Password++; }

13 years

[spetreolle] 54733: [KERNEL32] Silence BaseComputeProcessSearchPath.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Dec 21 20:54:14 2011 New Revision: 54733 URL: http://svn.reactos.org/svn/reactos?rev=54733&view=rev Log: [KERNEL32] Silence BaseComputeProcessSearchPath. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Wed Dec 21 20:54:14 2011 @@ -391,7 +391,7 @@ WINAPI BaseComputeProcessSearchPath(VOID) { - DPRINT1("Computing Process Search path\n"); + DPRINT("Computing Process Search path\n"); /* Compute the path using default process order */ return BasepComputeProcessPath(BaseProcessOrder, NULL, NULL);

13 years

[cgutman] 54732: [NTOSKRNL] - Don't wait to flush dirty pages during shutdown - This is a hack to fix KVM

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Dec 21 20:19:20 2011 New Revision: 54732 URL: http://svn.reactos.org/svn/reactos?rev=54732&view=rev Log: [NTOSKRNL] - Don't wait to flush dirty pages during shutdown - This is a hack to fix KVM Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Dec 21 20:19:20 2011 @@ -902,7 +902,7 @@ #ifndef NEWCC /* Flush dirty cache pages */ - CcRosFlushDirtyPages(-1, &Dummy, TRUE); + CcRosFlushDirtyPages(-1, &Dummy, FALSE); //HACK: We really should wait here! #else Dummy = 0; #endif

13 years

[cgutman] 54731: [FASTFAT] - Remove the old page file hack

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Dec 21 19:58:42 2011 New Revision: 54731 URL: http://svn.reactos.org/svn/reactos?rev=54731&view=rev Log: [FASTFAT] - Remove the old page file hack Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c 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] Wed Dec 21 19:58:42 2011 @@ -560,17 +560,6 @@ DPRINT("<%wZ>\n", &Fcb->PathNameU); - if (Fcb->Flags & FCB_IS_PAGE_FILE) - { - PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; - IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; - IoSkipCurrentIrpStackLocation(IrpContext->Irp); - DPRINT("Read from page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Read.ByteOffset.QuadPart); - Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); - VfatFreeIrpContext(IrpContext); - return Status; - } - ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; Length = IrpContext->Stack->Parameters.Read.Length; BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; @@ -772,17 +761,6 @@ ASSERT(Fcb); DPRINT("<%wZ>\n", &Fcb->PathNameU); - - if (Fcb->Flags & FCB_IS_PAGE_FILE) - { - PFATINFO FatInfo = &IrpContext->DeviceExt->FatInfo; - IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart += FatInfo->dataStart * FatInfo->BytesPerSector; - IoSkipCurrentIrpStackLocation(IrpContext->Irp); - DPRINT("Write to page file, disk offset %I64x\n", IrpContext->Stack->Parameters.Write.ByteOffset.QuadPart); - Status = IoCallDriver(IrpContext->DeviceExt->StorageDevice, IrpContext->Irp); - VfatFreeIrpContext(IrpContext); - return Status; - } /* fail if file is a directory and no paged read */ if (*Fcb->Attributes & FILE_ATTRIBUTE_DIRECTORY && !(IrpContext->Irp->Flags & IRP_PAGING_IO))

13 years

[cgutman] 54730: [NTOSKRNL] - Add a wait parameter to CcRosFlushDirtyPages and only block on the segment locks of it is safe

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Dec 21 19:46:07 2011 New Revision: 54730 URL: http://svn.reactos.org/svn/reactos?rev=54730&view=rev Log: [NTOSKRNL] - Add a wait parameter to CcRosFlushDirtyPages and only block on the segment locks of it is safe Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Dec 21 19:46:07 2011 @@ -175,43 +175,23 @@ NTSTATUS NTAPI -CcRosFlushDirtyPages(ULONG Target, PULONG Count) +CcRosFlushDirtyPages(ULONG Target, PULONG Count, BOOLEAN Wait) { PLIST_ENTRY current_entry; PCACHE_SEGMENT current; ULONG PagesPerSegment; BOOLEAN Locked; NTSTATUS Status; - static ULONG WriteCount[4] = {0, 0, 0, 0}; - ULONG NewTarget; + LARGE_INTEGER ZeroTimeout; DPRINT("CcRosFlushDirtyPages(Target %d)\n", Target); (*Count) = 0; + ZeroTimeout.QuadPart = 0; KeEnterCriticalRegion(); KeAcquireGuardedMutex(&ViewLock); - WriteCount[0] = WriteCount[1]; - WriteCount[1] = WriteCount[2]; - WriteCount[2] = WriteCount[3]; - WriteCount[3] = 0; - - NewTarget = WriteCount[0] + WriteCount[1] + WriteCount[2]; - - if (NewTarget < DirtyPageCount) - { - NewTarget = (DirtyPageCount - NewTarget + 3) / 4; - WriteCount[0] += NewTarget; - WriteCount[1] += NewTarget; - WriteCount[2] += NewTarget; - WriteCount[3] += NewTarget; - } - - NewTarget = WriteCount[0]; - - Target = max(NewTarget, Target); - current_entry = DirtySegmentListHead.Flink; if (current_entry == &DirtySegmentListHead) { @@ -225,17 +205,23 @@ current_entry = current_entry->Flink; Locked = current->Bcb->Callbacks->AcquireForLazyWrite( - current->Bcb->LazyWriteContext, TRUE); + current->Bcb->LazyWriteContext, Wait); if (!Locked) { continue; } - KeWaitForSingleObject(&current->Mutex, - Executive, - KernelMode, - FALSE, - NULL); + Status = KeWaitForSingleObject(&current->Mutex, + Executive, + KernelMode, + FALSE, + Wait ? NULL : &ZeroTimeout); + if (Status != STATUS_SUCCESS) + { + current->Bcb->Callbacks->ReleaseFromLazyWrite( + current->Bcb->LazyWriteContext); + continue; + } ASSERT(current->Dirty); if (current->ReferenceCount > 1) @@ -268,11 +254,6 @@ KeAcquireGuardedMutex(&ViewLock); current_entry = DirtySegmentListHead.Flink; - } - - if (*Count < NewTarget) - { - WriteCount[1] += (NewTarget - *Count); } KeReleaseGuardedMutex(&ViewLock); @@ -374,7 +355,7 @@ if (Target > 0 && !FlushedPages) { /* Flush dirty pages to disk */ - CcRosFlushDirtyPages(Target, &PagesFreed); + CcRosFlushDirtyPages(Target, &PagesFreed, FALSE); FlushedPages = TRUE; /* We can only swap as many pages as we flushed */ 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] Wed Dec 21 19:46:07 2011 @@ -261,7 +261,8 @@ NTAPI CcRosFlushDirtyPages( ULONG Target, - PULONG Count + PULONG Count, + BOOLEAN Wait ); VOID Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Dec 21 19:46:07 2011 @@ -306,7 +306,7 @@ #ifndef NEWCC // XXX arty -- we flush when evicting pages or destorying cache // sections. - CcRosFlushDirtyPages(128, &PagesWritten); + CcRosFlushDirtyPages(128, &PagesWritten, FALSE); #endif } } Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Dec 21 19:46:07 2011 @@ -902,7 +902,7 @@ #ifndef NEWCC /* Flush dirty cache pages */ - CcRosFlushDirtyPages(-1, &Dummy); + CcRosFlushDirtyPages(-1, &Dummy, TRUE); #else Dummy = 0; #endif

13 years

[cgutman] 54729: [NTOSKRNL] - Change the method of segment locking from a push lock to a mutex - Fixes the 'OldValue.Locked' assertion failure

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Dec 21 19:08:59 2011 New Revision: 54729 URL: http://svn.reactos.org/svn/reactos?rev=54729&view=rev Log: [NTOSKRNL] - Change the method of segment locking from a push lock to a mutex - Fixes the 'OldValue.Locked' assertion failure 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=5472… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Wed Dec 21 19:08:59 2011 @@ -240,8 +240,11 @@ IoStatus->Information = 0; if (WriteThrough) { - KeEnterCriticalRegion(); - ExAcquirePushLockExclusive(&iBcb->CacheSegment->Lock); + KeWaitForSingleObject(&iBcb->CacheSegment->Mutex, + Executive, + KernelMode, + FALSE, + NULL); if (iBcb->CacheSegment->Dirty) { IoStatus->Status = CcRosFlushCacheSegment(iBcb->CacheSegment); @@ -250,8 +253,7 @@ { IoStatus->Status = STATUS_SUCCESS; } - ExReleasePushLockExclusive(&iBcb->CacheSegment->Lock); - KeLeaveCriticalRegion(); + KeReleaseMutex(&iBcb->CacheSegment->Mutex, 0); } else { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Dec 21 19:08:59 2011 @@ -230,25 +230,29 @@ { continue; } - - ExAcquirePushLockExclusive(&current->Lock); - + + KeWaitForSingleObject(&current->Mutex, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(current->Dirty); if (current->ReferenceCount > 1) { - ExReleasePushLock(&current->Lock); + KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); continue; } - + PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; KeReleaseGuardedMutex(&ViewLock); Status = CcRosFlushCacheSegment(current); - ExReleasePushLock(&current->Lock); + KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); @@ -440,8 +444,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - ExReleasePushLock(&CacheSeg->Lock); - KeLeaveCriticalRegion(); + KeReleaseMutex(&CacheSeg->Mutex, 0); return(STATUS_SUCCESS); } @@ -470,8 +473,11 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - KeEnterCriticalRegion(); - ExAcquirePushLockExclusive(&current->Lock); + KeWaitForSingleObject(&current->Mutex, + Executive, + KernelMode, + FALSE, + NULL); return(current); } current_entry = current_entry->Flink; @@ -519,8 +525,7 @@ KeReleaseGuardedMutex(&ViewLock); CacheSeg->Dirty = TRUE; - ExReleasePushLock(&CacheSeg->Lock); - KeLeaveCriticalRegion(); + KeReleaseMutex(&CacheSeg->Mutex, 0); return(STATUS_SUCCESS); } @@ -569,8 +574,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - ExReleasePushLock(&CacheSeg->Lock); - KeLeaveCriticalRegion(); + KeReleaseMutex(&CacheSeg->Mutex, 0); return(STATUS_SUCCESS); } @@ -618,9 +622,12 @@ current->DirtySegmentListEntry.Flink = NULL; current->DirtySegmentListEntry.Blink = NULL; current->ReferenceCount = 1; - ExInitializePushLock(&current->Lock); - KeEnterCriticalRegion(); - ExAcquirePushLockExclusive(&current->Lock); + KeInitializeMutex(&current->Mutex, 0); + KeWaitForSingleObject(&current->Mutex, + Executive, + KernelMode, + FALSE, + NULL); KeAcquireGuardedMutex(&ViewLock); *CacheSeg = current; @@ -650,12 +657,15 @@ current ); } #endif - ExReleasePushLock(&(*CacheSeg)->Lock); + KeReleaseMutex(&(*CacheSeg)->Mutex, 0); KeReleaseGuardedMutex(&ViewLock); ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); *CacheSeg = current; - /* We're still in the critical region from above */ - ExAcquirePushLockExclusive(&current->Lock); + KeWaitForSingleObject(&current->Mutex, + Executive, + KernelMode, + FALSE, + NULL); return STATUS_SUCCESS; } if (current->FileOffset < FileOffset) @@ -1040,8 +1050,7 @@ IoStatus->Status = Status; } } - ExReleasePushLock(&current->Lock); - KeLeaveCriticalRegion(); + KeReleaseMutex(&current->Mutex, 0); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, 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] Wed Dec 21 19:08:59 2011 @@ -145,8 +145,8 @@ LIST_ENTRY CacheSegmentLRUListEntry; /* Offset in the file which this cache segment maps. */ ULONG FileOffset; - /* Lock. */ - EX_PUSH_LOCK Lock; + /* Mutex */ + KMUTEX Mutex; /* Number of references. */ ULONG ReferenceCount; /* Pointer to the BCB for the file which this cache segment maps data for. */

13 years

← Newer
1
...
4
5
6
7
8
9
10
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2011