Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59017: [VBSCRIPT] * Import from Wine 1.5.26.
by akhaldi＠svn.reactos.org 15 May '13

15 May '13

Author: akhaldi Date: Wed May 15 17:33:01 2013 New Revision: 59017 URL: http://svn.reactos.org/svn/reactos?rev=59017&view=rev Log: [VBSCRIPT] * Import from Wine 1.5.26. Added: trunk/reactos/dll/win32/vbscript/ (with props) trunk/reactos/dll/win32/vbscript/CMakeLists.txt (with props) trunk/reactos/dll/win32/vbscript/compile.c (with props) trunk/reactos/dll/win32/vbscript/error.c (with props) trunk/reactos/dll/win32/vbscript/global.c (with props) trunk/reactos/dll/win32/vbscript/interp.c (with props) trunk/reactos/dll/win32/vbscript/lex.c (with props) trunk/reactos/dll/win32/vbscript/parse.h (with props) trunk/reactos/dll/win32/vbscript/parser.tab.c (with props) trunk/reactos/dll/win32/vbscript/parser.tab.h (with props) trunk/reactos/dll/win32/vbscript/parser.y (with props) trunk/reactos/dll/win32/vbscript/regexp.c (with props) trunk/reactos/dll/win32/vbscript/regexp.h (with props) trunk/reactos/dll/win32/vbscript/vbdisp.c (with props) trunk/reactos/dll/win32/vbscript/vbregexp.c (with props) trunk/reactos/dll/win32/vbscript/vbscript.c (with props) trunk/reactos/dll/win32/vbscript/vbscript.h (with props) trunk/reactos/dll/win32/vbscript/vbscript.rc (with props) trunk/reactos/dll/win32/vbscript/vbscript.rgs (with props) trunk/reactos/dll/win32/vbscript/vbscript.spec (with props) trunk/reactos/dll/win32/vbscript/vbscript_classes.idl (with props) trunk/reactos/dll/win32/vbscript/vbscript_classes.rgs (with props) trunk/reactos/dll/win32/vbscript/vbscript_defs.h (with props) trunk/reactos/dll/win32/vbscript/vbscript_main.c (with props) trunk/reactos/dll/win32/vbscript/vbsglobal.idl (with props) trunk/reactos/dll/win32/vbscript/vbsglobal.rgs (with props) trunk/reactos/dll/win32/vbscript/vbsregexp10.idl (with props) trunk/reactos/dll/win32/vbscript/vbsregexp10.rgs (with props) trunk/reactos/dll/win32/vbscript/vbsregexp55.idl (with props) trunk/reactos/dll/win32/vbscript/vbsregexp55.rgs (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Added: trunk/reactos/dll/win32/vbscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/CMakeLi… Added: trunk/reactos/dll/win32/vbscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/compile… Added: trunk/reactos/dll/win32/vbscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/error.c… Added: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… Added: trunk/reactos/dll/win32/vbscript/interp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/interp.… Added: trunk/reactos/dll/win32/vbscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/lex.c?r… Added: trunk/reactos/dll/win32/vbscript/parse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parse.h… Added: trunk/reactos/dll/win32/vbscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Added: trunk/reactos/dll/win32/vbscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Added: trunk/reactos/dll/win32/vbscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Added: trunk/reactos/dll/win32/vbscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/regexp.… Added: trunk/reactos/dll/win32/vbscript/regexp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/regexp.… Added: trunk/reactos/dll/win32/vbscript/vbdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.… Added: trunk/reactos/dll/win32/vbscript/vbregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbregex… Added: trunk/reactos/dll/win32/vbscript/vbscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbsglobal.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsglob… Added: trunk/reactos/dll/win32/vbscript/vbsglobal.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsglob… Added: trunk/reactos/dll/win32/vbscript/vbsregexp10.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Added: trunk/reactos/dll/win32/vbscript/vbsregexp10.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Added: trunk/reactos/dll/win32/vbscript/vbsregexp55.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Added: trunk/reactos/dll/win32/vbscript/vbsregexp55.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 59016: [PSDK] * Add some missing definitions in activscp.idl.
by akhaldi＠svn.reactos.org 15 May '13

15 May '13

Author: akhaldi Date: Wed May 15 17:28:21 2013 New Revision: 59016 URL: http://svn.reactos.org/svn/reactos?rev=59016&view=rev Log: [PSDK] * Add some missing definitions in activscp.idl. Modified: trunk/reactos/include/psdk/activscp.idl Modified: trunk/reactos/include/psdk/activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activscp.idl?… ============================================================================== --- trunk/reactos/include/psdk/activscp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/activscp.idl [iso-8859-1] Wed May 15 17:28:21 2013 @@ -59,6 +59,17 @@ SCRIPTTHREADSTATE_NOTINSCRIPT = 0, SCRIPTTHREADSTATE_RUNNING = 1 } SCRIPTTHREADSTATE; + +typedef enum tagSCRIPTUICITEM { + SCRIPTUICITEM_INPUTBOX = 1, + SCRIPTUICITEM_MSGBOX = 2 +} SCRIPTUICITEM; + +typedef enum tagSCRIPTUICHANDLING { + SCRIPTUICHANDLING_ALLOW = 0, + SCRIPTUICHANDLING_NOUIERROR = 1, + SCRIPTUICHANDLING_NOUIDEFAULT = 2 +} SCRIPTUICHANDLING; typedef DWORD SCRIPTTHREADID; cpp_quote("#define SCRIPTTHREADID_CURRENT ((SCRIPTTHREADID)-1)") @@ -187,6 +198,18 @@ } [ + object, + uuid(aedae97e-d7ee-4796-b960-7f092ae844ab), + pointer_default(unique) +] +interface IActiveScriptSiteUIControl : IUnknown +{ + HRESULT GetUIBehavior( + [in] SCRIPTUICITEM UicItem, + [out] SCRIPTUICHANDLING *pUicHandling); +} + +[ object, uuid(539698A0-CDCA-11CF-A5EB-00AA0047A063), pointer_default(unique)

1 0

[spetreolle] 59015: [RUNDLL32] Rundll32 always returns 0. Mike McCormack (mike at codeweavers dot com)
by spetreolle＠svn.reactos.org 15 May '13

15 May '13

Author: spetreolle Date: Wed May 15 12:41:25 2013 New Revision: 59015 URL: http://svn.reactos.org/svn/reactos?rev=59015&view=rev Log: [RUNDLL32] Rundll32 always returns 0. Mike McCormack (mike at codeweavers dot com) Modified: trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] Wed May 15 12:41:25 2013 @@ -343,7 +343,7 @@ DllWinMainW fnDllWinMainW; DllWinMainA fnDllWinMainA; HWND hWindow; - int nRetVal,i; + int i; size_t nStrLen; // Get command-line in argc-argv format @@ -380,8 +380,6 @@ lptCmdLine = argv[i]; else lptCmdLine = _T(""); - - nRetVal = 0; // Everything is all setup, so load the dll now hDll = LoadLibrary(lptDllName); @@ -439,13 +437,13 @@ if (fnDllWinMainW) { // Convert the command-line string to unicode and call the dll function lpwCmdLine = ConvertToWideChar(lptCmdLine); - nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); + fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); FreeConvertedWideChar(lpwCmdLine); } else if (fnDllWinMainA) { // Convert the command-line string to ansi and call the dll function lpaCmdLine = ConvertToMultiByte(lptCmdLine); - nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); + fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); FreeConvertedMultiByte(lpaCmdLine); } else { @@ -478,6 +476,6 @@ } if (argv) free(argv); - return nRetVal; -} - + return 0; /* rundll32 always returns 0! */ +} +

1 0

[ekohl] 59014: [MSV1_0] AppendRidToSid: Copy the whole source SID into the destination SID.
by ekohl＠svn.reactos.org 13 May '13

13 May '13

Author: ekohl Date: Mon May 13 13:47:33 2013 New Revision: 59014 URL: http://svn.reactos.org/svn/reactos?rev=59014&view=rev Log: [MSV1_0] AppendRidToSid: Copy the whole source SID into the destination SID. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Mon May 13 13:47:33 2013 @@ -227,22 +227,20 @@ { PSID DstSid = NULL; UCHAR RidCount; - ULONG Size; - ULONG i; RidCount = *RtlSubAuthorityCountSid(SrcSid); if (RidCount >= 8) return NULL; - Size = RtlLengthRequiredSid(RidCount + 1); - - DstSid = DispatchTable.AllocateLsaHeap(Size); + DstSid = DispatchTable.AllocateLsaHeap(RtlLengthRequiredSid(RidCount + 1)); if (DstSid == NULL) return NULL; - for (i = 0; i < RidCount; i++) - *RtlSubAuthoritySid(DstSid, i) = *RtlSubAuthoritySid(SrcSid, i); - + RtlCopyMemory(DstSid, + SrcSid, + RtlLengthRequiredSid(RidCount)); + + *RtlSubAuthorityCountSid(DstSid) = RidCount + 1; *RtlSubAuthoritySid(DstSid, RidCount) = Rid; return DstSid; @@ -256,6 +254,12 @@ { User->User.Sid = AppendRidToSid(AccountDomainSid, RelativeId); + if (User->User.Sid == NULL) + { + ERR("Could not create the user SID\n"); + return STATUS_UNSUCCESSFUL; + } + User->User.Attributes = 0; return STATUS_SUCCESS;

1 0

[ekohl] 59013: [LSASRV] - LsapCheckLogonProcess: Open client process using the PROCESS_DUP_HANDLE access right because we need to duplicate the logon token back into the clients handle table.
by ekohl＠svn.reactos.org 13 May '13

13 May '13

Author: ekohl Date: Mon May 13 13:05:16 2013 New Revision: 59013 URL: http://svn.reactos.org/svn/reactos?rev=59013&view=rev Log: [LSASRV] - LsapCheckLogonProcess: Open client process using the PROCESS_DUP_HANDLE access right because we need to duplicate the logon token back into the clients handle table. Modified: trunk/reactos/dll/win32/lsasrv/authport.c Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Mon May 13 13:05:16 2013 @@ -59,7 +59,7 @@ NULL); Status = NtOpenProcess(&ProcessHandle, - PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION, + PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION | PROCESS_DUP_HANDLE, &ObjectAttributes, &RequestMsg->h.ClientId); if (!NT_SUCCESS(Status)) @@ -163,10 +163,11 @@ for (;;) { + TRACE("Reply: %p\n", ReplyMsg); Status = NtReplyWaitReceivePort(AuthPortHandle, (PVOID*)&LogonContext, - &ReplyMsg->h, - &RequestMsg.h); + (PPORT_MESSAGE)ReplyMsg, + (PPORT_MESSAGE)&RequestMsg); if (!NT_SUCCESS(Status)) { TRACE("NtReplyWaitReceivePort() failed (Status %lx)\n", Status); @@ -208,8 +209,8 @@ ReplyMsg = &RequestMsg; RequestMsg.Status = STATUS_SUCCESS; - Status = NtReplyPort(AuthPortHandle, - &ReplyMsg->h); + NtReplyPort(AuthPortHandle, + &ReplyMsg->h); LsapDeregisterLogonProcess(&RequestMsg, LogonContext); @@ -230,7 +231,7 @@ break; default: - RequestMsg.Status = STATUS_SUCCESS; /* FIXME */ + RequestMsg.Status = STATUS_INVALID_SYSTEM_SERVICE; ReplyMsg = &RequestMsg; break; }

1 0

[tfaber] 59012: [HIDUSB] - Unconfigure device, and don't leak memory ... okay, enough HID for now.
by tfaber＠svn.reactos.org 12 May '13

12 May '13

Author: tfaber Date: Sun May 12 19:03:02 2013 New Revision: 59012 URL: http://svn.reactos.org/svn/reactos?rev=59012&view=rev Log: [HIDUSB] - Unconfigure device, and don't leak memory ... okay, enough HID for now. Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 19:03:02 2013 @@ -1287,6 +1287,90 @@ } NTSTATUS +Hid_DisableConfiguration( + IN PDEVICE_OBJECT DeviceObject) +{ + PHID_DEVICE_EXTENSION DeviceExtension; + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + NTSTATUS Status; + PURB Urb; + + // + // get device extension + // + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; + + // + // build urb + // + Urb = ExAllocatePoolWithTag(NonPagedPool, + sizeof(struct _URB_SELECT_CONFIGURATION), + HIDUSB_URB_TAG); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // format urb + // + UsbBuildSelectConfigurationRequest(Urb, + sizeof(struct _URB_SELECT_CONFIGURATION), + NULL); + + // + // dispatch request + // + Status = Hid_DispatchUrb(DeviceObject, Urb); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[HIDUSB] Dispatching unconfigure URB failed with %lx\n", Status); + } + else if (!USBD_SUCCESS(Urb->UrbHeader.Status)) + { + DPRINT("[HIDUSB] Unconfigure URB failed with %lx\n", Status); + } + + // + // free urb + // + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); + + // + // free resources + // + HidDeviceExtension->ConfigurationHandle = NULL; + + if (HidDeviceExtension->InterfaceInfo) + { + ExFreePoolWithTag(HidDeviceExtension->InterfaceInfo, HIDUSB_TAG); + HidDeviceExtension->InterfaceInfo = NULL; + } + + if (HidDeviceExtension->ConfigurationDescriptor) + { + ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); + HidDeviceExtension->ConfigurationDescriptor = NULL; + HidDeviceExtension->HidDescriptor = NULL; + } + + if (HidDeviceExtension->DeviceDescriptor) + { + ExFreePoolWithTag(HidDeviceExtension->DeviceDescriptor, HIDUSB_TAG); + HidDeviceExtension->DeviceDescriptor = NULL; + } + + // + // done + // + return Status; +} + +NTSTATUS Hid_SetIdle( IN PDEVICE_OBJECT DeviceObject) { @@ -1646,20 +1730,18 @@ case IRP_MN_REMOVE_DEVICE: { // + // unconfigure device + // FIXME: Call this on IRP_MN_SURPRISE_REMOVAL, but don't send URBs + // FIXME: Don't call this after we've already seen a surprise removal or stop + // + Hid_DisableConfiguration(DeviceObject); + + // // pass request onto lower driver // IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - // - // free resources - // - if (HidDeviceExtension->ConfigurationDescriptor) - { - ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); - HidDeviceExtension->ConfigurationDescriptor = NULL; - } - return Status; } case IRP_MN_QUERY_PNP_DEVICE_STATE: @@ -1702,8 +1784,9 @@ case IRP_MN_STOP_DEVICE: { // - // FIXME: unconfigure the device - // + // unconfigure device + // + Hid_DisableConfiguration(DeviceObject); // // prepare irp

1 0

[tfaber] 59011: [HID] - Hidclass must delete the FDO, not the minidriver.
by tfaber＠svn.reactos.org 12 May '13

12 May '13

Author: tfaber Date: Sun May 12 18:51:11 2013 New Revision: 59011 URL: http://svn.reactos.org/svn/reactos?rev=59011&view=rev Log: [HID] - Hidclass must delete the FDO, not the minidriver. Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 12 18:51:11 2013 @@ -411,6 +411,13 @@ IN PIRP Irp) { NTSTATUS Status; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); /* FIXME cleanup */ @@ -425,6 +432,13 @@ // Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // detach and delete device + // + IoDetachDevice(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); + IoDeleteDevice(DeviceObject); + return Status; } Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 18:51:11 2013 @@ -1660,12 +1660,6 @@ HidDeviceExtension->ConfigurationDescriptor = NULL; } - // - // delete and detach device - // - IoDetachDevice(DeviceExtension->NextDeviceObject); - IoDeleteDevice(DeviceObject); - return Status; } case IRP_MN_QUERY_PNP_DEVICE_STATE:

1 0

[tfaber] 59010: [HIDUSB] - Plug a memory leak in HidUsb_GetReportDescriptor - Do not try to free in the middle of a pool block on IRP_MN_STOP_DEVICE - Implement HidPower - Do not access an IRP afte...
by tfaber＠svn.reactos.org 12 May '13

12 May '13

Author: tfaber Date: Sun May 12 18:24:12 2013 New Revision: 59010 URL: http://svn.reactos.org/svn/reactos?rev=59010&view=rev Log: [HIDUSB] - Plug a memory leak in HidUsb_GetReportDescriptor - Do not try to free in the middle of a pool block on IRP_MN_STOP_DEVICE - Implement HidPower - Do not access an IRP after completing it in HidCreate - Do not waste a stack location in HidSystemControl Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 18:24:12 2013 @@ -312,16 +312,16 @@ ASSERT(IoStack->MajorFunction == IRP_MJ_CREATE || IoStack->MajorFunction == IRP_MJ_CLOSE); // + // informational debug print + // + DPRINT("HIDUSB Request: %x\n", IoStack->MajorFunction); + + // // complete request // Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - - // - // informal debug print - // - DPRINT("HIDUSB Request: %x\n", IoStack->MajorFunction); // // done @@ -715,6 +715,11 @@ Irp->IoStatus.Information = Length; // + // free the report buffer + // + ExFreePoolWithTag(Report, HIDUSB_TAG); + + // // done // return Status; @@ -909,9 +914,12 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PHID_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->NextDeviceObject, Irp); } NTSTATUS @@ -928,9 +936,9 @@ DeviceExtension = DeviceObject->DeviceExtension; // - // copy stack location - // - IoCopyCurrentIrpStackLocationToNext(Irp); + // skip stack location + // + IoSkipCurrentIrpStackLocation(Irp); // // submit request @@ -1721,15 +1729,6 @@ } // - // free resources - // - if (HidDeviceExtension->HidDescriptor) - { - ExFreePoolWithTag(HidDeviceExtension->HidDescriptor, HIDUSB_TAG); - HidDeviceExtension->HidDescriptor = NULL; - } - - // // done // IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[tfaber] 59009: [HIDUSB] - Use pool tagging
by tfaber＠svn.reactos.org 12 May '13

12 May '13

Author: tfaber Date: Sun May 12 17:59:14 2013 New Revision: 59009 URL: http://svn.reactos.org/svn/reactos?rev=59009&view=rev Log: [HIDUSB] - Use pool tagging Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/hid/hidusb/hidusb.h Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 17:59:14 2013 @@ -142,7 +142,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -167,7 +167,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // done @@ -194,7 +194,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -226,7 +226,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // done @@ -410,7 +410,7 @@ ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); IoFreeWorkItem(ResetContext->WorkItem); IoCompleteRequest(ResetContext->Irp, IO_NO_INCREMENT); - ExFreePool(ResetContext); + ExFreePoolWithTag(ResetContext, HIDUSB_TAG); } @@ -460,7 +460,7 @@ // // free the urb // - ExFreePool(Context); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // finish completion @@ -477,7 +477,7 @@ // // allocate reset context // - ResetContext = (PHID_USB_RESET_CONTEXT)ExAllocatePool(NonPagedPool, sizeof(HID_USB_RESET_CONTEXT)); + ResetContext = ExAllocatePoolWithTag(NonPagedPool, sizeof(HID_USB_RESET_CONTEXT), HIDUSB_TAG); if (ResetContext) { // @@ -500,7 +500,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // defer completion @@ -510,13 +510,13 @@ // // free context // - ExFreePool(ResetContext); + ExFreePoolWithTag(ResetContext, HIDUSB_TAG); } // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // complete request @@ -564,7 +564,7 @@ // // lets allocate urb // - Urb = (PURB)ExAllocatePool(NonPagedPool, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), HIDUSB_URB_TAG); if (!Urb) { // @@ -1068,7 +1068,7 @@ // // allocate urb // - Urb = (PURB)ExAllocatePool(NonPagedPool, UrbLength); + Urb = ExAllocatePoolWithTag(NonPagedPool, UrbLength, HIDUSB_URB_TAG); if (!Urb) { // @@ -1085,13 +1085,13 @@ // // allocate buffer // - *UrbBuffer = ExAllocatePool(NonPagedPool, *UrbBufferLength); + *UrbBuffer = ExAllocatePoolWithTag(NonPagedPool, *UrbBufferLength, HIDUSB_TAG); if (!*UrbBuffer) { // // no memory // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1132,14 +1132,14 @@ // // free allocated buffer // - ExFreePool(*UrbBuffer); + ExFreePoolWithTag(*UrbBuffer, HIDUSB_TAG); *UrbBuffer = NULL; } // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); *UrbBufferLength = 0; return Status; } @@ -1154,14 +1154,14 @@ // // free allocated buffer // - ExFreePool(*UrbBuffer); + ExFreePoolWithTag(*UrbBuffer, HIDUSB_TAG); *UrbBuffer = NULL; } // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); *UrbBufferLength = 0; return STATUS_UNSUCCESSFUL; } @@ -1174,7 +1174,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // completed successfully @@ -1257,7 +1257,7 @@ // // copy interface info // - HidDeviceExtension->InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)ExAllocatePool(NonPagedPool, Urb->UrbSelectConfiguration.Interface.Length); + HidDeviceExtension->InterfaceInfo = ExAllocatePoolWithTag(NonPagedPool, Urb->UrbSelectConfiguration.Interface.Length, HIDUSB_TAG); if (HidDeviceExtension->InterfaceInfo) { // @@ -1270,7 +1270,7 @@ // // free urb request // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, 0); // // done @@ -1296,7 +1296,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -1334,7 +1334,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // print status @@ -1372,7 +1372,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -1410,7 +1410,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // boot protocol active 0x00 disabled 0x1 @@ -1502,7 +1502,7 @@ // // delete partial configuration descriptor // - ExFreePool(HidDeviceExtension->ConfigurationDescriptor); + ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); HidDeviceExtension->ConfigurationDescriptor = NULL; // @@ -1648,7 +1648,7 @@ // if (HidDeviceExtension->ConfigurationDescriptor) { - ExFreePool(HidDeviceExtension->ConfigurationDescriptor); + ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); HidDeviceExtension->ConfigurationDescriptor = NULL; } @@ -1725,7 +1725,7 @@ // if (HidDeviceExtension->HidDescriptor) { - ExFreePool(HidDeviceExtension->HidDescriptor); + ExFreePoolWithTag(HidDeviceExtension->HidDescriptor, HIDUSB_TAG); HidDeviceExtension->HidDescriptor = NULL; } Modified: trunk/reactos/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] Sun May 12 17:59:14 2013 @@ -86,3 +86,6 @@ #define USB_SET_IDLE_REQUEST 0xA #define USB_GET_PROTOCOL_REQUEST 0x3 + +#define HIDUSB_TAG 'UdiH' +#define HIDUSB_URB_TAG 'rUiH'

1 0

[tfaber] 59008: [HIDCLASS] - Get rid of HidClass_GetSystemAddress - More minor fixes
by tfaber＠svn.reactos.org 12 May '13

12 May '13

Author: tfaber Date: Sun May 12 17:16:41 2013 New Revision: 59008 URL: http://svn.reactos.org/svn/reactos?rev=59008&view=rev Log: [HIDCLASS] - Get rid of HidClass_GetSystemAddress - More minor fixes Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidclass/hidclass.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 12 17:16:41 2013 @@ -20,7 +20,7 @@ // // set event // - KeSetEvent((PRKEVENT)Context, 0, FALSE); + KeSetEvent(Context, 0, FALSE); // // completion is done in the HidClassFDO_QueryCapabilities routine @@ -131,7 +131,7 @@ // // signal event // - KeSetEvent((PRKEVENT)Context, 0, FALSE); + KeSetEvent(Context, 0, FALSE); // // done @@ -447,7 +447,7 @@ // allocate result // DeviceRelations = ExAllocatePoolWithTag(NonPagedPool, - sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count-1) * sizeof(PDEVICE_OBJECT), + sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count - 1) * sizeof(PDEVICE_OBJECT), HIDCLASS_TAG); if (!DeviceRelations) { Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun May 12 17:16:41 2013 @@ -354,31 +354,6 @@ return STATUS_SUCCESS; } -PVOID -HidClass_GetSystemAddress( - IN PMDL ReportMDL) -{ - // - // sanity check - // - ASSERT(ReportMDL); - - if (ReportMDL->MdlFlags & (MDL_SOURCE_IS_NONPAGED_POOL | MDL_MAPPED_TO_SYSTEM_VA)) - { - // - // buffer is non paged pool - // - return ReportMDL->MappedSystemVa; - } - else - { - // - // map mdl - // - return MmMapLockedPages(ReportMDL, KernelMode); - } -} - NTSTATUS NTAPI HidClass_ReadCompleteIrp( @@ -415,7 +390,7 @@ // // get address // - Address = HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); + Address = MmGetSystemAddressForMdlSafe(IrpContext->OriginalIrp->MdlAddress, NormalPagePriority); if (Address) { // @@ -1060,7 +1035,6 @@ // return IoCallDriver(CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, Irp); } - NTSTATUS NTAPI @@ -1119,7 +1093,10 @@ } /* now allocate the driver object extension */ - Status = IoAllocateDriverObjectExtension(MinidriverRegistration->DriverObject, (PVOID)ClientIdentificationAddress, sizeof(HIDCLASS_DRIVER_EXTENSION), (PVOID*)&DriverExtension); + Status = IoAllocateDriverObjectExtension(MinidriverRegistration->DriverObject, + ClientIdentificationAddress, + sizeof(HIDCLASS_DRIVER_EXTENSION), + (PVOID *)&DriverExtension); if (!NT_SUCCESS(Status)) { /* failed to allocate driver extension */ @@ -1140,7 +1117,7 @@ /* copy driver dispatch routines */ RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, - sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION+1)); + sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION + 1)); /* initialize lock */ KeInitializeSpinLock(&DriverExtension->Lock);

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