Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[gadamopoulos] 51699: [win32k] - Return the correct menu bar rect in GetMenuBarInfo
by gadamopoulos＠svn.reactos.org 13 May '11

13 May '11

Author: gadamopoulos Date: Fri May 13 15:36:25 2011 New Revision: 51699 URL: http://svn.reactos.org/svn/reactos?rev=51699&view=rev Log: [win32k] - Return the correct menu bar rect in GetMenuBarInfo Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri May 13 15:36:25 2011 @@ -1864,8 +1864,8 @@ } Rect.left = Offset.x; Rect.right = Offset.x + MenuObject->MenuInfo.Width; - Rect.top = Offset.y; - Rect.bottom = Offset.y + MenuObject->MenuInfo.Height; + Rect.bottom = Offset.y; + Rect.top = Offset.y - MenuObject->MenuInfo.Height; kmbi.rcBar = Rect; DPRINT("Rect top = %d bottom = %d left = %d right = %d \n", Rect.top, Rect.bottom, Rect.left, Rect.right);

1 0

[ilardig] 51698: [kbdit] - Fix the "divide" key. Thanks to Giannis Adamopoulos for the help. See issue #6250 for more details.
by ilardig＠svn.reactos.org 13 May '11

13 May '11

Author: ilardig Date: Fri May 13 15:16:49 2011 New Revision: 51698 URL: http://svn.reactos.org/svn/reactos?rev=51698&view=rev Log: [kbdit] - Fix the "divide" key. Thanks to Giannis Adamopoulos for the help. See issue #6250 for more details. Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdit/kbdit.c [iso-8859-1] Fri May 13 15:16:49 2011 @@ -86,7 +86,7 @@ /* 32 */ 'M', /* 33 */ VK_OEM_COMMA, /* 34 */ VK_OEM_PERIOD, -/* 35 */ VK_OEM_MINUS, +/* 35 */ VK_DIVIDE, /* 36 */ VK_RSHIFT, /* 37 */ VK_MULTIPLY, /* 38 */ VK_LMENU,

1 0

[ekohl] 51697: [SETUPAPI] CM_Create_DevNode_ExW: Copy the device id string into a local buffer before passing it to PNP_CreateDevInst because its 2nd argument is an 'in out' string. Using a writabl...
by ekohl＠svn.reactos.org 13 May '11

13 May '11

Author: ekohl Date: Fri May 13 15:15:40 2011 New Revision: 51697 URL: http://svn.reactos.org/svn/reactos?rev=51697&view=rev Log: [SETUPAPI] CM_Create_DevNode_ExW: Copy the device id string into a local buffer before passing it to PNP_CreateDevInst because its 2nd argument is an 'in out' string. Using a writable string buffer prevents exceptions in case the device id passed to CM_Create_DevNode_ExW is a string constant. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Fri May 13 15:15:40 2011 @@ -595,8 +595,9 @@ HSTRING_TABLE StringTable = NULL; LPWSTR lpParentDevInst; CONFIGRET ret = CR_SUCCESS; - - FIXME("%p %s %p %lx %p\n", + WCHAR szLocalDeviceID[MAX_DEVICE_ID_LEN]; + + TRACE("%p %s %p %lx %p\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); if (!pSetupIsUserAdmin()) @@ -605,7 +606,7 @@ if (pdnDevInst == NULL) return CR_INVALID_POINTER; - if (pDeviceID == NULL || wcslen(pDeviceID) == 0) + if (pDeviceID == NULL || wcslen(pDeviceID) == 0 || wcslen(pDeviceID) >= MAX_DEVICE_ID_LEN) return CR_INVALID_DEVICE_ID; if (dnParent == 0) @@ -634,10 +635,12 @@ if (lpParentDevInst == NULL) return CR_INVALID_DEVNODE; + wcscpy(szLocalDeviceID, pDeviceID); + RpcTryExcept { ret = PNP_CreateDevInst(BindingHandle, - pDeviceID, + szLocalDeviceID, lpParentDevInst, MAX_DEVICE_ID_LEN, ulFlags);

1 0

[gadamopoulos] 51696: [win32k] - Fix braindead logic that caused GetMenuItemRect to fail in every case
by gadamopoulos＠svn.reactos.org 13 May '11

13 May '11

Author: gadamopoulos Date: Fri May 13 14:47:36 2011 New Revision: 51696 URL: http://svn.reactos.org/svn/reactos?rev=51696&view=rev Log: [win32k] - Fix braindead logic that caused GetMenuItemRect to fail in every case Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri May 13 14:47:36 2011 @@ -2050,7 +2050,6 @@ UINT uItem, PRECTL lprcItem) { - ROSMENUINFO mi; PWND ReferenceWnd; LONG XMove, YMove; RECTL Rect; @@ -2074,15 +2073,12 @@ if(!hWnd) { - if(!UserMenuInfo(Menu, &mi, FALSE)) - RETURN( FALSE); - if(mi.Wnd == 0) - RETURN( FALSE); + hWnd = Menu->MenuInfo.Wnd; } if (lprcItem == NULL) RETURN( FALSE); - if (!(ReferenceWnd = UserGetWindowObject(mi.Wnd))) RETURN( FALSE); + if (!(ReferenceWnd = UserGetWindowObject(hWnd))) RETURN( FALSE); if(MenuItem->fType & MF_POPUP) {

1 0

[janderwald] 51695: [USBSTOR] - Start implementing write command - Disabled for now as it causes corruptions
by janderwald＠svn.reactos.org 13 May '11

13 May '11

Author: janderwald Date: Fri May 13 14:44:24 2011 New Revision: 51695 URL: http://svn.reactos.org/svn/reactos?rev=51695&view=rev Log: [USBSTOR] - Start implementing write command - Disabled for now as it causes corruptions Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 13 14:44:24 2011 @@ -50,14 +50,14 @@ // Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ) - { - DPRINT1("SCSIOP_READ DataTransferLength %lu\n", Request->DataTransferLength); - - // - // send read command - // - Status = USBSTOR_SendReadCmd(DeviceObject, Irp); + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ /*|| pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE*/) + { + DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read / write command + // + Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp); } else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) { Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 14:44:24 2011 @@ -332,6 +332,8 @@ { PIRP_CONTEXT Context; PIO_STACK_LOCATION IoStack; + UCHAR Code; + USBD_PIPE_HANDLE PipeHandle; DPRINT1("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); @@ -351,12 +353,31 @@ if (Context->TransferDataLength) { // + // get command code + // + Code = Context->cbw->CommandBlock[0]; + + if (Code == SCSIOP_WRITE) + { + // + // write request use bulk out pipe + // + PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkOutPipeIndex].PipeHandle; + } + else + { + // + // default bulk in pipe + // + PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; + } + + // // now initialize the urb for sending data // - UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), - Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + PipeHandle, NULL, Context->TransferBufferMDL, Context->TransferDataLength, @@ -871,11 +892,11 @@ } NTSTATUS -USBSTOR_SendReadCmd( +USBSTOR_SendReadWriteCmd( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UFI_READ_CMD Cmd; + UFI_READ_WRITE_CMD Cmd; NTSTATUS Status; PPDO_DEVICE_EXTENSION PDODeviceExtension; PCDB pCDB; @@ -907,7 +928,12 @@ // // informal debug print // - DPRINT1("USBSTOR_SendReadCmd DataTransferLength %x, BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); + DPRINT1("USBSTOR_SendReadWriteCmd DataTransferLength %x, BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); + + // + // sanity check + // + ASSERT(PDODeviceExtension->BlockLength); // // block count @@ -917,8 +943,8 @@ // // initialize read cmd // - RtlZeroMemory(&Cmd, sizeof(UFI_READ_CMD)); - Cmd.Code = SCSIOP_READ; + RtlZeroMemory(&Cmd, sizeof(UFI_READ_WRITE_CMD)); + Cmd.Code = pCDB->AsByte[0]; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.ContiguousLogicBlocks = _byteswap_ushort(BlockCount); Cmd.LogicalBlockByte0 = pCDB->CDB10.LogicalBlockByte0; @@ -931,7 +957,7 @@ // // send request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); } NTSTATUS Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 13 14:44:24 2011 @@ -158,11 +158,11 @@ UCHAR Reserved; // reserved 0x00 USHORT ContiguousLogicBlocks; // num of contiguous logical blocks UCHAR Reserved1[3]; // reserved 0x00 -}UFI_READ_CMD; - -C_ASSERT(sizeof(UFI_READ_CMD) == 12); - -#define UFI_READ_CMD_LEN (0xA) +}UFI_READ_WRITE_CMD; + +C_ASSERT(sizeof(UFI_READ_WRITE_CMD) == 12); + +#define UFI_READ_WRITE_CMD_LEN (0xA) //-------------------------------------------------------------------------------------------------------------------------------------------- // @@ -375,7 +375,7 @@ IN PIRP Irp); NTSTATUS -USBSTOR_SendReadCmd( +USBSTOR_SendReadWriteCmd( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp);

1 0

[janderwald] 51694: [USBSTOR] - Fix bug in read command, which uses wrong format. LBA address is stored in the CDB10 struct - Don't build the mdl for nonpaged pool if the driver passes an mdl (i/o ...
by janderwald＠svn.reactos.org 13 May '11

13 May '11

Author: janderwald Date: Fri May 13 14:04:38 2011 New Revision: 51694 URL: http://svn.reactos.org/svn/reactos?rev=51694&view=rev Log: [USBSTOR] - Fix bug in read command, which uses wrong format. LBA address is stored in the CDB10 struct - Don't build the mdl for nonpaged pool if the driver passes an mdl (i/o paging requests) - Usbstor can now list disk contents and browse files when used in Windows XP - Need to implement SCSIOP_WRITE to write files Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 14:04:38 2011 @@ -507,6 +507,10 @@ return STATUS_INSUFFICIENT_RESOURCES; } + // + // build mdl for nonpaged pool + // + MmBuildMdlForNonPagedPool(Context->TransferBufferMDL); } } else @@ -522,12 +526,12 @@ // return STATUS_INSUFFICIENT_RESOURCES; } + + // + // build mdl for nonpaged pool + // + MmBuildMdlForNonPagedPool(Context->TransferBufferMDL); } - - // - // build mdl for nonpaged pool - // - MmBuildMdlForNonPagedPool(Context->TransferBufferMDL); } // @@ -917,10 +921,12 @@ Cmd.Code = SCSIOP_READ; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.ContiguousLogicBlocks = _byteswap_ushort(BlockCount); - - RtlCopyMemory(&Cmd.LogicalBlockAddress, pCDB->READ12.LogicalBlock, sizeof(UCHAR) * 4); - - DPRINT1("BlockAddress %lu BlockCount %lu BlockLength %lu\n", NTOHL(Cmd.LogicalBlockAddress), BlockCount, PDODeviceExtension->BlockLength); + Cmd.LogicalBlockByte0 = pCDB->CDB10.LogicalBlockByte0; + Cmd.LogicalBlockByte1 = pCDB->CDB10.LogicalBlockByte1; + Cmd.LogicalBlockByte2 = pCDB->CDB10.LogicalBlockByte2; + Cmd.LogicalBlockByte3 = pCDB->CDB10.LogicalBlockByte3; + + DPRINT1("BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); // // send request Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 13 14:04:38 2011 @@ -151,7 +151,10 @@ { UCHAR Code; // operation code UCHAR LUN; // lun - ULONG LogicalBlockAddress; // logical block address + UCHAR LogicalBlockByte0; // lba byte 0 + UCHAR LogicalBlockByte1; // lba byte 1 + UCHAR LogicalBlockByte2; // lba byte 2 + UCHAR LogicalBlockByte3; // lba byte 3 UCHAR Reserved; // reserved 0x00 USHORT ContiguousLogicBlocks; // num of contiguous logical blocks UCHAR Reserved1[3]; // reserved 0x00

1 0

[janderwald] 51693: [USBSTOR] - Handle SCSIOP_MEDIUM_REMOVAL - Handle paging i/o requests. These request don't provide a data buffer in the srb, but the buffer is stored in the irp' mdl - Fix the h...
by janderwald＠svn.reactos.org 13 May '11

13 May '11

Author: janderwald Date: Fri May 13 13:37:50 2011 New Revision: 51693 URL: http://svn.reactos.org/svn/reactos?rev=51693&view=rev Log: [USBSTOR] - Handle SCSIOP_MEDIUM_REMOVAL - Handle paging i/o requests. These request don't provide a data buffer in the srb, but the buffer is stored in the irp' mdl - Fix the hack for unimplemented Mode Sense command - Usbstor now completes initializes and receives read requests - Still need to fix read request, as Windows XP fails to recognize the disk format, WIP Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 13 13:37:50 2011 @@ -53,12 +53,24 @@ else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ) { DPRINT1("SCSIOP_READ DataTransferLength %lu\n", Request->DataTransferLength); - ASSERT(Request->DataBuffer); // // send read command // Status = USBSTOR_SendReadCmd(DeviceObject, Irp); + } + else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) + { + DPRINT1("SCSIOP_MEDIUM_REMOVAL\n"); + + // + // just complete the request + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Request->DataTransferLength; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) { Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 13:37:50 2011 @@ -110,12 +110,34 @@ // Context = (PIRP_CONTEXT)Ctx; + // + // is there a mdl + // if (Context->TransferBufferMDL) { // - // free mdl - // - IoFreeMdl(Context->TransferBufferMDL); + // is there an irp associated + // + if (Context->Irp) + { + // + // did we allocate the mdl + // + if (Context->TransferBufferMDL != Context->Irp->MdlAddress) + { + // + // free mdl + // + IoFreeMdl(Context->TransferBufferMDL); + } + } + else + { + // + // free mdl + // + IoFreeMdl(Context->TransferBufferMDL); + } } if (Context->Irp) @@ -317,7 +339,6 @@ // access context // Context = (PIRP_CONTEXT)Ctx; - // // get next stack location @@ -461,15 +482,46 @@ if (Context->TransferDataLength) { // - // allocate mdl for buffer, buffer must be allocated from NonPagedPool - // - Context->TransferBufferMDL = IoAllocateMdl(Context->TransferData, Context->TransferDataLength, FALSE, FALSE, NULL); - if (!Context->TransferBufferMDL) + // check if the original request already does not have an mdl associated + // + if (OriginalRequest) { - // - // failed to allocate MDL - // - return STATUS_INSUFFICIENT_RESOURCES; + if (OriginalRequest->MdlAddress != NULL && Context->TransferData == NULL) + { + // + // I/O paging request + // + Context->TransferBufferMDL = OriginalRequest->MdlAddress; + } + else + { + // + // allocate mdl for buffer, buffer must be allocated from NonPagedPool + // + Context->TransferBufferMDL = IoAllocateMdl(Context->TransferData, Context->TransferDataLength, FALSE, FALSE, NULL); + if (!Context->TransferBufferMDL) + { + // + // failed to allocate MDL + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + } + } + else + { + // + // allocate mdl for buffer, buffer must be allocated from NonPagedPool + // + Context->TransferBufferMDL = IoAllocateMdl(Context->TransferData, Context->TransferDataLength, FALSE, FALSE, NULL); + if (!Context->TransferBufferMDL) + { + // + // failed to allocate MDL + // + return STATUS_INSUFFICIENT_RESOURCES; + } } // @@ -656,8 +708,26 @@ PCDB pCDB; PUFI_MODE_PARAMETER_HEADER Header; - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + RtlZeroMemory(Request->DataBuffer, Request->DataTransferLength); + Request->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Information = Request->DataTransferLength; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; #if 0 // @@ -808,6 +878,7 @@ ULONG BlockCount; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; + PVOID Buffer; // // get current stack location @@ -830,10 +901,9 @@ PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // - // FIXME: support more logical blocks - // - DPRINT1("Request->DataTransferLength %x, PDODeviceExtension->BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); - ASSERT(Request->DataTransferLength == PDODeviceExtension->BlockLength); + // informal debug print + // + DPRINT1("USBSTOR_SendReadCmd DataTransferLength %x, BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); // // block count @@ -855,7 +925,7 @@ // // send request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); } NTSTATUS

1 0

[ilardig] 51692: [input] - Fix an Italian typo spotted by r3ddr4g0n
by ilardig＠svn.reactos.org 13 May '11

13 May '11

Author: ilardig Date: Fri May 13 13:25:44 2011 New Revision: 51692 URL: http://svn.reactos.org/svn/reactos?rev=51692&view=rev Log: [input] - Fix an Italian typo spotted by r3ddr4g0n Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Fri May 13 13:25:44 2011 @@ -9,7 +9,7 @@ CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 PUSHBUTTON "&Predefinito", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "&Aggiungi...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remuovi...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&Rimuovi...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 PUSHBUTTON "&Proprietà...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferenze", -1, 7, 185, 240, 36 PUSHBUTTON "&Impostazioni tasti...", IDC_KEY_SET_BTN, 14, 198, 110, 14

1 0

[mjmartin] 51691: [USBSTOR] - Add a check at USBSTOR_FdoHandleStartDevice to make sure the device uses Bulk Transfers. - Use macros for initializing the Urbs. The macros ensure that the proper fiel...
by mjmartin＠svn.reactos.org 13 May '11

13 May '11

Author: mjmartin Date: Fri May 13 09:14:28 2011 New Revision: 51691 URL: http://svn.reactos.org/svn/reactos?rev=51691&view=rev Log: [USBSTOR] - Add a check at USBSTOR_FdoHandleStartDevice to make sure the device uses Bulk Transfers. - Use macros for initializing the Urbs. The macros ensure that the proper fields of the URB are set correctly. Fixes failing of getting device descriptor and getting devices BlockLength. Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c branches/usb-bringup/drivers/usb/usbstor/fdo.c branches/usb-bringup/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] Fri May 13 09:14:28 2011 @@ -60,13 +60,15 @@ // // initialize urb // - Urb->UrbHeader.Function = URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE; - Urb->UrbHeader.Length = sizeof(URB); - Urb->UrbControlDescriptorRequest.DescriptorType = DescriptorType; - Urb->UrbControlDescriptorRequest.TransferBuffer = Descriptor; - Urb->UrbControlDescriptorRequest.TransferBufferLength = DescriptorLength; - Urb->UrbControlDescriptorRequest.Index = DescriptorIndex; - Urb->UrbControlDescriptorRequest.LanguageId = LanguageId; + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + DescriptorType, + DescriptorIndex, + LanguageId, + Descriptor, + NULL, + DescriptorLength, + NULL); // // submit urb Modified: branches/usb-bringup/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] Fri May 13 09:14:28 2011 @@ -124,6 +124,7 @@ IN PFDO_DEVICE_EXTENSION DeviceExtension, IN OUT PIRP Irp) { + PUSB_INTERFACE_DESCRIPTOR InterfaceDesc; NTSTATUS Status; UCHAR Index = 0; @@ -157,6 +158,18 @@ // dump device descriptor // USBSTOR_DumpDeviceDescriptor(DeviceExtension->DeviceDescriptor); + + // + // Check that this device uses bulk transfers and is SCSI + // + InterfaceDesc = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)DeviceExtension->ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + DPRINT1("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); + if (InterfaceDesc->bInterfaceProtocol != 0x50) + { + DPRINT1("USB Device is not a bulk only device and is not currently supported\n"); + return STATUS_NOT_SUPPORTED; + } + // // now select an interface @@ -290,6 +303,7 @@ // // just forward irp to lower device // + //IoSkipCurrentIrpStackLocation(Irp); Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); break; } Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 09:14:28 2011 @@ -258,19 +258,20 @@ // // get next stack location // + IoStack = IoGetNextIrpStackLocation(Irp); // // now initialize the urb for sending the csw // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBuffer = Context->csw; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = 512; //FIXME - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferMDL = NULL; - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; - + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + Context->csw, + NULL, + 512, //FIXME + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); // // initialize stack location @@ -291,6 +292,7 @@ // call driver // IoCallDriver(Context->FDODeviceExtension->LowerDeviceObject, Irp); + return STATUS_MORE_PROCESSING_REQUIRED; } @@ -330,12 +332,15 @@ // // now initialize the urb for sending data // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferMDL = Context->TransferBufferMDL; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = Context->TransferDataLength; - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; + + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + NULL, + Context->TransferBufferMDL, + Context->TransferDataLength, + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); // // setup completion routine @@ -347,12 +352,15 @@ // // now initialize the urb for sending the csw // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBuffer = Context->csw; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = 512; //FIXME - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; + + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + Context->csw, + NULL, + 512, //FIXME + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); // // setup completion routine @@ -373,6 +381,7 @@ // call driver // IoCallDriver(Context->FDODeviceExtension->LowerDeviceObject, Irp); + return STATUS_MORE_PROCESSING_REQUIRED; } @@ -427,12 +436,14 @@ // // now initialize the urb // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkOutPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBuffer = (PVOID)Context->cbw; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = sizeof(CBW); - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_OUT | USBD_SHORT_TRANSFER_OK; + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkOutPipeIndex].PipeHandle, + Context->cbw, + NULL, + sizeof(CBW), + USBD_TRANSFER_DIRECTION_OUT | USBD_SHORT_TRANSFER_OK, + NULL); // // initialize rest of context @@ -477,7 +488,6 @@ FreeItem(Context); return STATUS_INSUFFICIENT_RESOURCES; } - // // get next stack location @@ -822,6 +832,7 @@ // // FIXME: support more logical blocks // + DPRINT1("Request->DataTransferLength %x, PDODeviceExtension->BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); ASSERT(Request->DataTransferLength == PDODeviceExtension->BlockLength); //

1 0

[gadamopoulos] 51690: [win32k] - Dereference the SMWP object before deleting it. Fixes handle leak
by gadamopoulos＠svn.reactos.org 13 May '11

13 May '11

Author: gadamopoulos Date: Fri May 13 08:34:24 2011 New Revision: 51690 URL: http://svn.reactos.org/svn/reactos?rev=51690&view=rev Log: [win32k] - Dereference the SMWP object before deleting it. Fixes handle leak Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Fri May 13 08:34:24 2011 @@ -1793,6 +1793,7 @@ winpos->pos.flags); } ExFreePoolWithTag(pDWP->acvr, USERTAG_SWP); + UserDereferenceObject(pDWP); UserDeleteObject(hdwp, otSMWP); return res; }

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011