Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[pschweitzer] 54778: [SYSDM] Fix memory leak

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Dec 29 13:20:18 2011 New Revision: 54778 URL: http://svn.reactos.org/svn/reactos?rev=54778&view=rev Log: [SYSDM] Fix memory leak Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Thu Dec 29 13:20:18 2011 @@ -207,7 +207,10 @@ return FALSE; if (!GetProfileCount(&pProfileData->dwProfileCount)) - return FALSE; + { + HeapFree(pProfileData, 0, GetProcessHeap()); + return FALSE; + } pProfileData->pProfiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pProfileData->dwProfileCount * sizeof(PROFILE));

12 years, 12 months

[janderwald] 54777: [USBOHCI] - Silence a few traces - Add a hack for handling URB_FUNCTION_CLASS_INTERFACE. The hid bus driver performs this request with zero buffer length, which is not valid. Ne...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 29 10:13:36 2011 New Revision: 54777 URL: http://svn.reactos.org/svn/reactos?rev=54777&view=rev Log: [USBOHCI] - Silence a few traces - Add a hack for handling URB_FUNCTION_CLASS_INTERFACE. The hid bus driver performs this request with zero buffer length, which is not valid. Needs more investigation Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -1364,7 +1364,7 @@ // // defer processing // - DPRINT1("Status %x Acknowledge %x FrameNumber %x\n", Status, Acknowledge, This->m_HCCA->CurrentFrameNumber); + DPRINT("Status %x Acknowledge %x FrameNumber %x\n", Status, Acknowledge, This->m_HCCA->CurrentFrameNumber); KeInsertQueueDpc(&This->m_IntDpcObject, (PVOID)Status, (PVOID)(DoneHead & ~1)); // Modified: branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -1633,6 +1633,12 @@ DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request); DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); + + if (Urb->UrbControlVendorClassRequest.TransferBufferLength == 0) + { + DPRINT1("Invalid request length\n"); + return STATUS_SUCCESS; + } // // initialize setup packet Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -620,7 +620,7 @@ POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, PreviousEndpointDescriptor; NTSTATUS Status; - DPRINT1("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); + DPRINT("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); // // find transfer descriptor in control list Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Thu Dec 29 10:13:36 2011 @@ -941,7 +941,7 @@ Descriptor->Flags |= OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(GetEndpointAddress()); Descriptor->Flags |= OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(GetMaxPacketSize()); - DPRINT1("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %x\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); + DPRINT("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %x\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); // // is there an endpoint descriptor

12 years, 12 months

[janderwald] 54776: [USB-BRINGUP] - Usage page of zero is not used, increment, the MouHid_ButtonUpFlags / MouHid_ButtonDownFlags array - Mouse clicks now work - Implement flushing of the hid report...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 29 10:07:00 2011 New Revision: 54776 URL: http://svn.reactos.org/svn/reactos?rev=54776&view=rev Log: [USB-BRINGUP] - Usage page of zero is not used, increment, the MouHid_ButtonUpFlags / MouHid_ButtonDownFlags array - Mouse clicks now work - Implement flushing of the hid report queue - Driver now works in VBox 4.1.4 + WinXP - Secondary mouse pointer does not move in VBox (either a Vbox bug / WinXP), tested with ms driver and the same results were reveiled Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Thu Dec 29 10:07:00 2011 @@ -12,6 +12,7 @@ static USHORT MouHid_ButtonUpFlags[] = { + 0xFF, /* unused */ MOUSE_LEFT_BUTTON_DOWN, MOUSE_RIGHT_BUTTON_DOWN, MOUSE_MIDDLE_BUTTON_DOWN, @@ -21,6 +22,7 @@ static USHORT MouHid_ButtonDownFlags[] = { + 0xFF, /* unused */ MOUSE_LEFT_BUTTON_UP, MOUSE_RIGHT_BUTTON_UP, MOUSE_MIDDLE_BUTTON_UP, @@ -400,7 +402,7 @@ NTSTATUS NTAPI -MouHid_DeviceControl( +MouHid_InternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -412,7 +414,7 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[MOUHID] DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + DPRINT1("[MOUHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -424,6 +426,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) { /* invalid request */ + DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; @@ -443,6 +446,11 @@ /* queue length */ Attributes->InputDataQueueLength = 2; + + DPRINT1("[MOUHID] MouseIdentifier %x\n", Attributes->MouseIdentifier); + DPRINT1("[MOUHID] NumberOfButtons %x\n", Attributes->NumberOfButtons); + DPRINT1("[MOUHID] SampleRate %x\n", Attributes->SampleRate); + DPRINT1("[MOUHID] InputDataQueueLength %x\n", Attributes->InputDataQueueLength); /* complete request */ Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); @@ -504,6 +512,7 @@ return STATUS_INVALID_DEVICE_REQUEST; } + DPRINT1("[MOUHID] Unknown DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* unknown request not supported */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -512,7 +521,7 @@ NTSTATUS NTAPI -MouHid_InternalDeviceControl( +MouHid_DeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -535,7 +544,6 @@ IN PIRP Irp) { UNIMPLEMENTED - ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; } @@ -738,6 +746,32 @@ NTSTATUS NTAPI +MouHid_Flush( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* skip current stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* change request to hid flush queue request */ + IoStack->MajorFunction = IRP_MJ_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_FLUSH_QUEUE; + + /* call device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI MouHid_Pnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -915,6 +949,7 @@ DriverObject->DriverExtension->AddDevice = MouHid_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = MouHid_Create; DriverObject->MajorFunction[IRP_MJ_CLOSE] = MouHid_Close; + DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = MouHid_Flush; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = MouHid_DeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = MouHid_InternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_POWER] = MouHid_Power;

12 years, 12 months

[janderwald] 54775: [USB-BRINGUP] - Fix up / down button detection - Fix move detection. Mouse changes are now detected - Mouse does not yet work in Vbox, as mouclass driver is for unknown reasons ...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Dec 28 17:18:56 2011 New Revision: 54775 URL: http://svn.reactos.org/svn/reactos?rev=54775&view=rev Log: [USB-BRINGUP] - Fix up / down button detection - Fix move detection. Mouse changes are now detected - Mouse does not yet work in Vbox, as mouclass driver is for unknown reasons not connecting to the mouhid, needs to be investigated - Tested in VBox 4.1.4 + ReactOS mouhid.sys Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Wed Dec 28 17:18:56 2011 @@ -10,7 +10,7 @@ #include "mouhid.h" -static USHORT MouHid_ButtonDownFlags[] = +static USHORT MouHid_ButtonUpFlags[] = { MOUSE_LEFT_BUTTON_DOWN, MOUSE_RIGHT_BUTTON_DOWN, @@ -19,7 +19,7 @@ MOUSE_BUTTON_5_DOWN }; -static USHORT MouHid_ButtonUpFlags[] = +static USHORT MouHid_ButtonDownFlags[] = { MOUSE_LEFT_BUTTON_UP, MOUSE_RIGHT_BUTTON_UP, @@ -41,12 +41,12 @@ *LastY = 0; /* get scaled usage value x */ - Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, (PLONG)&LastX, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, (PLONG)LastX, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); /* FIXME handle error */ ASSERT(Status == HIDP_STATUS_SUCCESS); /* get scaled usage value y */ - Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, (PLONG)&LastY, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, (PLONG)LastY, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); /* FIXME handle error */ ASSERT(Status == HIDP_STATUS_SUCCESS); @@ -225,7 +225,7 @@ } } - DPRINT1("[MOUHID] LastX %lu LastY %lu Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + DPRINT1("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); /* dispatch mouse action */ MouHid_DispatchInputData(DeviceExtension, &MouseInputData); @@ -411,6 +411,8 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("[MOUHID] DeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -750,6 +752,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) { @@ -896,7 +899,6 @@ IN PDRIVER_OBJECT DriverObject) { UNIMPLEMENTED - ASSERT(FALSE); }

12 years, 12 months

[janderwald] 54774: [USB-BRINGUP] - Fix a few bugs & race condition in the read report routine - mouhid initializes and is able to read input reports - button press / wheel state change is detected...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Dec 28 16:35:41 2011 New Revision: 54774 URL: http://svn.reactos.org/svn/reactos?rev=54774&view=rev Log: [USB-BRINGUP] - Fix a few bugs & race condition in the read report routine - mouhid initializes and is able to read input reports - button press / wheel state change is detected - mouse move detection not yet working Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c branches/usb-bringup/drivers/hid/mouhid/mouhid.h Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Wed Dec 28 16:35:41 2011 @@ -30,15 +30,11 @@ VOID MouHid_GetButtonMove( - IN PDEVICE_OBJECT DeviceObject, + IN PMOUHID_DEVICE_EXTENSION DeviceExtension, OUT PLONG LastX, OUT PLONG LastY) { - PMOUHID_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* init result */ *LastX = 0; @@ -59,18 +55,14 @@ VOID MouHid_GetButtonFlags( - IN PDEVICE_OBJECT DeviceObject, + IN PMOUHID_DEVICE_EXTENSION DeviceExtension, OUT PUSHORT ButtonFlags) { - PMOUHID_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; USAGE Usage; ULONG Index; PUSAGE TempList; ULONG CurrentUsageListLength; - - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* init flags */ *ButtonFlags = 0; @@ -142,15 +134,14 @@ VOID MouHid_DispatchInputData( - IN PDEVICE_OBJECT DeviceObject, + IN PMOUHID_DEVICE_EXTENSION DeviceExtension, IN PMOUSE_INPUT_DATA InputData) { - PMOUHID_DEVICE_EXTENSION DeviceExtension; KIRQL OldIrql; ULONG InputDataConsumed; - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + if (!DeviceExtension->ClassService) + return; /* sanity check */ ASSERT(DeviceExtension->ClassService); @@ -181,13 +172,32 @@ MOUSE_INPUT_DATA MouseInputData; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)Context; + + if (Irp->IoStatus.Status == STATUS_PRIVILEGE_NOT_HELD || + Irp->IoStatus.Status == STATUS_DEVICE_NOT_CONNECTED || + Irp->IoStatus.Status == STATUS_CANCELLED || + DeviceExtension->StopReadReport) + { + /* failed to read or should be stopped*/ + DPRINT1("[MOUHID] ReadCompletion terminating read Status %x\n", Irp->IoStatus.Status); + + /* report no longer active */ + DeviceExtension->ReadReportActive = FALSE; + + /* request stopping of the report cycle */ + DeviceExtension->StopReadReport = FALSE; + + /* signal completion event */ + KeSetEvent(&DeviceExtension->ReadCompletionEvent, 0, 0); + return STATUS_MORE_PROCESSING_REQUIRED; + } /* get mouse change flags */ - MouHid_GetButtonFlags(DeviceObject, &ButtonFlags); + MouHid_GetButtonFlags(DeviceExtension, &ButtonFlags); /* get mouse change */ - MouHid_GetButtonMove(DeviceObject, &LastX, &LastY); + MouHid_GetButtonMove(DeviceExtension, &LastX, &LastY); /* init input data */ RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); @@ -215,11 +225,13 @@ } } + DPRINT1("[MOUHID] LastX %lu LastY %lu Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + /* dispatch mouse action */ - MouHid_DispatchInputData(DeviceObject, &MouseInputData); + MouHid_DispatchInputData(DeviceExtension, &MouseInputData); /* re-init read */ - MouHid_InitiateRead(DeviceObject); + MouHid_InitiateRead(DeviceExtension); /* stop completion */ return STATUS_MORE_PROCESSING_REQUIRED; @@ -227,14 +239,10 @@ NTSTATUS MouHid_InitiateRead( - IN PDEVICE_OBJECT DeviceObject) -{ - PMOUHID_DEVICE_EXTENSION DeviceExtension; + IN PMOUHID_DEVICE_EXTENSION DeviceExtension) +{ PIO_STACK_LOCATION IoStack; NTSTATUS Status; - - /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* re-use irp */ IoReuseIrp(DeviceExtension->Irp, STATUS_SUCCESS); @@ -255,6 +263,9 @@ /* set completion routine */ IoSetCompletionRoutine(DeviceExtension->Irp, MouHid_ReadCompletion, DeviceExtension, TRUE, TRUE, TRUE); + /* read is active */ + DeviceExtension->ReadReportActive = TRUE; + /* start the read */ Status = IoCallDriver(DeviceExtension->NextDeviceObject, DeviceExtension->Irp); @@ -323,18 +334,23 @@ if (DeviceExtension->FileObject == NULL) { /* did the caller specify correct attributes */ - if (IoStack->Parameters.Create.FileAttributes & FILE_ATTRIBUTE_READONLY) + ASSERT(IoStack->Parameters.Create.SecurityContext); + if (IoStack->Parameters.Create.SecurityContext->DesiredAccess) { /* store file object */ DeviceExtension->FileObject = IoStack->FileObject; + /* reset event */ + KeResetEvent(&DeviceExtension->ReadCompletionEvent); + /* initiating read */ - Status = MouHid_InitiateRead(DeviceObject); - } - else - { - /* wrong mode */ - DPRINT1("MOUHID: wrong attributes: %x\n", IoStack->Parameters.Create.FileAttributes); + Status = MouHid_InitiateRead(DeviceExtension); + DPRINT1("[MOUHID] MouHid_InitiateRead: status %x\n", Status); + if (Status == STATUS_PENDING) + { + /* report irp is pending */ + Status = STATUS_SUCCESS; + } } } @@ -356,7 +372,21 @@ /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - /* FIXME: cancel irp */ + DPRINT("[MOUHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); + + if (DeviceExtension->ReadReportActive) + { + /* request stopping of the report cycle */ + DeviceExtension->StopReadReport = TRUE; + + /* wait until the reports have been read */ + KeWaitForSingleObject(&DeviceExtension->ReadCompletionEvent, Executive, KernelMode, FALSE, NULL); + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + } + + DPRINT("[MOUHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); /* remove file object */ DeviceExtension->FileObject = NULL; @@ -572,22 +602,25 @@ if (!NT_SUCCESS(Status)) { /* failed to query collection information */ + DPRINT1("[MOUHID] failed to obtain collection information with %x\n", Status); return Status; } /* lets allocate space for preparsed data */ PreparsedData = ExAllocatePool(NonPagedPool, Information.DescriptorSize); - if (PreparsedData) + if (!PreparsedData) { /* no memory */ + DPRINT1("[MOUHID] no memory size %u\n", Information.DescriptorSize); return STATUS_INSUFFICIENT_RESOURCES; } /* now obtain the preparsed data */ - Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_DRIVER_CONFIG, 0, NULL, Information.DescriptorSize, PreparsedData); + Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, 0, NULL, Information.DescriptorSize, PreparsedData); if (!NT_SUCCESS(Status)) { /* failed to get preparsed data */ + DPRINT1("[MOUHID] failed to obtain collection information with %x\n", Status); ExFreePool(PreparsedData); return Status; } @@ -597,9 +630,12 @@ if (!NT_SUCCESS(Status)) { /* failed to get capabilities */ + DPRINT1("[MOUHID] failed to obtain caps with %x\n", Status); ExFreePool(PreparsedData); return Status; } + + DPRINT1("[MOUHID] Usage %x UsagePage %x\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); /* verify capabilities */ if (Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) @@ -615,12 +651,17 @@ DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); + + /* build mdl */ DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, DeviceExtension->ReportLength, FALSE, FALSE, NULL); ASSERT(DeviceExtension->ReportMDL); + /* init mdl */ + MmBuildMdlForNonPagedPool(DeviceExtension->ReportMDL); /* get max number of buttons */ Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); + DPRINT1("[MOUHID] Buttons %lu\n", Buttons); ASSERT(Buttons > 0); /* now allocate an array for those buttons */ @@ -662,6 +703,7 @@ /* mouse has wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; + DPRINT1("[MOUHID] mouse wheel support detected\n", Status); } else { @@ -673,6 +715,7 @@ /* wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; + DPRINT1("[MOUHID] mouse wheel support detected with z-axis\n", Status); } } @@ -827,7 +870,7 @@ DeviceExtension->MouseIdentifier = MOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = 0; DeviceExtension->NextDeviceObject = NextDeviceObject; - KeInitializeEvent(&DeviceExtension->Event, NotificationEvent, FALSE); + KeInitializeEvent(&DeviceExtension->ReadCompletionEvent, NotificationEvent, FALSE); DeviceExtension->Irp = IoAllocateIrp(NextDeviceObject->StackSize, FALSE); /* FIXME handle allocation error */ Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] Wed Dec 28 16:35:41 2011 @@ -8,6 +8,7 @@ #include <debug.h> #include <ntddmou.h> #include <kbdmou.h> +#include <debug.h> typedef struct @@ -25,7 +26,7 @@ // // event // - KEVENT Event; + KEVENT ReadCompletionEvent; // // device object for class callback @@ -97,9 +98,19 @@ // PFILE_OBJECT FileObject; + // + // report read is active + // + UCHAR ReadReportActive; + + // + // stop reading flag + // + UCHAR StopReadReport; + }MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; NTSTATUS MouHid_InitiateRead( - IN PDEVICE_OBJECT DeviceObject); + IN PMOUHID_DEVICE_EXTENSION DeviceExtension);

12 years, 12 months

[rharabien] 54773: [WIN32K] - Fix IntGdiSetBkColor setting wrong dirty flags. Fixes wrong background under text in Open With applications list.

by rharabien＠svn.reactos.org

Author: rharabien Date: Wed Dec 28 13:05:24 2011 New Revision: 54773 URL: http://svn.reactos.org/svn/reactos?rev=54773&view=rev Log: [WIN32K] - Fix IntGdiSetBkColor setting wrong dirty flags. Fixes wrong background under text in Open With applications list. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Wed Dec 28 13:05:24 2011 @@ -20,7 +20,7 @@ oldColor = pdcattr->crBackgroundClr; pdcattr->crBackgroundClr = color; pdcattr->ulBackgroundClr = (ULONG)color; - pdcattr->ulDirty_ &= ~(DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); // Clear Flag if set. + pdcattr->ulDirty_ |= DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL; // Clear Flag if set. hBrush = pdcattr->hbrush; DC_UnlockDc(dc); NtGdiSelectBrush(hDC, hBrush);

12 years, 12 months

[janderwald] 54772: [USB-BRINGUP] - Implement mouse move detection, wheel state detection

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Dec 28 11:36:05 2011 New Revision: 54772 URL: http://svn.reactos.org/svn/reactos?rev=54772&view=rev Log: [USB-BRINGUP] - Implement mouse move detection, wheel state detection Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c branches/usb-bringup/drivers/hid/mouhid/mouhid.h Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.c [iso-8859-1] Wed Dec 28 11:36:05 2011 @@ -29,6 +29,35 @@ }; VOID +MouHid_GetButtonMove( + IN PDEVICE_OBJECT DeviceObject, + OUT PLONG LastX, + OUT PLONG LastY) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + /* get device extension */ + DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* init result */ + *LastX = 0; + *LastY = 0; + + /* get scaled usage value x */ + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, (PLONG)&LastX, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* get scaled usage value y */ + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, (PLONG)&LastY, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + +} + + +VOID MouHid_GetButtonFlags( IN PDEVICE_OBJECT DeviceObject, OUT PUSHORT ButtonFlags) @@ -146,6 +175,9 @@ { PMOUHID_DEVICE_EXTENSION DeviceExtension; USHORT ButtonFlags; + LONG UsageValue; + NTSTATUS Status; + LONG LastX, LastY; MOUSE_INPUT_DATA MouseInputData; /* get device extension */ @@ -154,14 +186,34 @@ /* get mouse change flags */ MouHid_GetButtonFlags(DeviceObject, &ButtonFlags); - /* FIXME detect mouse move change */ - /* FIXME detect mouse wheel change */ + /* get mouse change */ + MouHid_GetButtonMove(DeviceObject, &LastX, &LastY); /* init input data */ RtlZeroMemory(&MouseInputData, sizeof(MOUSE_INPUT_DATA)); /* init input data */ MouseInputData.ButtonFlags = ButtonFlags; + MouseInputData.LastX = LastX; + MouseInputData.LastY = LastY; + + /* detect mouse wheel change */ + if (DeviceExtension->MouseIdentifier == WHEELMOUSE_HID_HARDWARE) + { + /* get usage */ + UsageValue = 0; + Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_WHEEL, &UsageValue, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + if (Status == HIDP_STATUS_SUCCESS) + { + /* store wheel status */ + MouseInputData.ButtonFlags |= MOUSE_WHEEL; + MouseInputData.ButtonData = (USHORT)UsageValue; /* FIXME */ + } + else + { + DPRINT1("[MOUHID] failed to get wheel status with %x\n", Status); + } + } /* dispatch mouse action */ MouHid_DispatchInputData(DeviceObject, &MouseInputData); Modified: branches/usb-bringup/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/mouhid/… ============================================================================== --- branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/mouhid/mouhid.h [iso-8859-1] Wed Dec 28 11:36:05 2011 @@ -12,26 +12,89 @@ typedef struct { + // + // lower device object + // PDEVICE_OBJECT NextDeviceObject; + + // + // irp which is used for reading input reports + // PIRP Irp; + + // + // event + // KEVENT Event; + + // + // device object for class callback + // PDEVICE_OBJECT ClassDeviceObject; + + // + // class callback + // PVOID ClassService; + + // + // mouse type + // USHORT MouseIdentifier; + + // + // wheel usage page + // USHORT WheelUsagePage; + // + // usage list length + // USHORT UsageListLength; + + // + // current usage list length + // PUSAGE CurrentUsageList; + + // + // previous usage list + // PUSAGE PreviousUsageList; + + // + // removed usage item list + // PUSAGE BreakUsageList; + + // + // new item usage list + // PUSAGE MakeUsageList; + + // + // preparsed data + // PVOID PreparsedData; + // + // mdl for reading input report + // PMDL ReportMDL; + + // + // input report buffer + // PUCHAR Report; + + // + // input report length + // ULONG ReportLength; - + // + // file object the device is reading reports from + // PFILE_OBJECT FileObject; }MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION;

12 years, 12 months

[cgutman] 54771: [NTOSKRNL] - Tweak the balancer to prevent an excessive buildup of user pages while cache is paged out completely each run - Bugcheck if we've trimmed everything as much as possibl...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Dec 28 01:18:35 2011 New Revision: 54771 URL: http://svn.reactos.org/svn/reactos?rev=54771&view=rev Log: [NTOSKRNL] - Tweak the balancer to prevent an excessive buildup of user pages while cache is paged out completely each run - Bugcheck if we've trimmed everything as much as possibly but we are still in need of pages Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Dec 28 01:18:35 2011 @@ -132,17 +132,20 @@ return(STATUS_SUCCESS); } -VOID -NTAPI -MiTrimMemoryConsumer(ULONG Consumer) -{ - LONG Target = 0; +ULONG +NTAPI +MiTrimMemoryConsumer(ULONG Consumer, ULONG InitialTarget) +{ + LONG Target = InitialTarget; ULONG NrFreedPages = 0; NTSTATUS Status; /* Make sure we can trim this consumer */ if (!MiMemoryConsumers[Consumer].Trim) - return; + { + /* Return the unmodified initial target */ + return InitialTarget; + } if (MiMemoryConsumers[Consumer].PagesUsed > MiMemoryConsumers[Consumer].PagesTarget) { @@ -157,8 +160,12 @@ if (Target) { - /* Swap at least MiMinimumPagesPerRun */ - Target = max(Target, MiMinimumPagesPerRun); + if (!InitialTarget) + { + /* If there was no initial target, + * swap at least MiMinimumPagesPerRun */ + Target = max(Target, MiMinimumPagesPerRun); + } /* Now swap the pages out */ Status = MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages); @@ -169,6 +176,20 @@ { KeBugCheck(MEMORY_MANAGEMENT); } + + /* Update the target */ + if (NrFreedPages < Target) + Target -= NrFreedPages; + else + Target = 0; + + /* Return the remaining pages needed to meet the target */ + return Target; + } + else + { + /* Initial target is zero and we don't have anything else to add */ + return 0; } } @@ -348,16 +369,26 @@ if (Status == STATUS_WAIT_0 || Status == STATUS_WAIT_1) { - for (i = 0; i < MC_MAXIMUM; i++) + ULONG InitialTarget = 0; + + do { - MiTrimMemoryConsumer(i); - } - - if (MmAvailablePages < MiMinimumAvailablePages) - { - /* This is really bad... */ - DPRINT1("Balancer failed to resolve low memory condition! Complete memory exhaustion is imminent!\n"); - } + ULONG OldTarget = InitialTarget; + + /* Trim each consumer */ + for (i = 0; i < MC_MAXIMUM; i++) + { + InitialTarget = MiTrimMemoryConsumer(i, InitialTarget); + } + + /* No pages left to swap! */ + if (InitialTarget != 0 && + InitialTarget == OldTarget) + { + /* Game over */ + KeBugCheck(NO_PAGES_AVAILABLE); + } + } while (InitialTarget != 0); } else {

12 years, 12 months

[rharabien] 54770: [SHELL32] - Use file description in version block instead of filename for application name in Open With menu

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Dec 27 21:58:55 2011 New Revision: 54770 URL: http://svn.reactos.org/svn/reactos?rev=54770&view=rev Log: [SHELL32] - Use file description in version block instead of filename for application name in Open With menu Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Tue Dec 27 21:58:55 2011 @@ -47,8 +47,8 @@ typedef struct { HICON hIcon; - WCHAR szAppName[MAX_PATH]; - WCHAR szManufacturer[MANUFACTURER_NAME_SIZE]; + WCHAR wszAppPath[MAX_PATH]; + WCHAR wszManufacturer[MANUFACTURER_NAME_SIZE]; } OPEN_ITEM_CONTEXT, *POPEN_ITEM_CONTEXT; typedef struct _LANGANDCODEPAGE_ @@ -522,10 +522,10 @@ /* Build the command line. Don't use applcation name as first parameter of CreateProcessW, because it have to be an absolute path. */ - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"\"%s\" \"%s\"", pItemContext->szAppName, pwszPath); + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"\"%s\" \"%s\"", pItemContext->wszAppPath, pwszPath); /* Start the application now */ - TRACE("AppName %ls Path %ls\n", pItemContext->szAppName, pwszPath); + TRACE("AppName %ls Path %ls\n", pItemContext->wszAppPath, pwszPath); if (CreateProcessW(NULL, wszBuf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { CloseHandle(pi.hThread); @@ -595,12 +595,12 @@ OPENASINFO *poainfo = (OPENASINFO*)GetWindowLongPtr(hwndDlg, DWLP_USER); /* store settings in HKCU path */ - StoreNewSettings(poainfo->pcszFile, pItemContext->szAppName); + StoreNewSettings(poainfo->pcszFile, pItemContext->wszAppPath); if (SendDlgItemMessage(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) { /* set programm as default handler */ - SetProgramAsDefaultHandler(poainfo->pcszFile, pItemContext->szAppName); + SetProgramAsDefaultHandler(poainfo->pcszFile, pItemContext->wszAppPath); } if (poainfo->oaifInFlags & OAIF_EXEC) @@ -668,10 +668,10 @@ /* paint manufacturer description */ cyOffset += mt.tmHeight + 2; preColor = SetTextColor(lpdis->hDC, RGB(192, 192, 192)); - if (pItemContext->szManufacturer[0]) - TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->szManufacturer, wcslen(pItemContext->szManufacturer)); + if (pItemContext->wszManufacturer[0]) + TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->wszManufacturer, wcslen(pItemContext->wszManufacturer)); else - TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->szAppName, wcslen(pItemContext->szAppName)); + TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->wszAppPath, wcslen(pItemContext->wszAppPath)); SetTextColor(lpdis->hDC, preColor); SetBkColor(lpdis->hDC, preBkColor); break; @@ -747,8 +747,8 @@ return E_NOTIMPL; } -VOID -GetManufacturer(LPCWSTR pwszAppName, POPEN_ITEM_CONTEXT pContext) +static VOID +LoadFileInfo(LPCWSTR pwszAppPath, POPEN_ITEM_CONTEXT pContext, LPWSTR pwszAppName, unsigned cchAppName) { UINT cbSize; LPVOID pBuf; @@ -758,10 +758,10 @@ WCHAR *pResult; /* Clear manufacturer */ - pContext->szManufacturer[0] = 0; + pContext->wszManufacturer[0] = 0; /* query version info size */ - cbSize = GetFileVersionInfoSizeW(pwszAppName, NULL); + cbSize = GetFileVersionInfoSizeW(pwszAppPath, NULL); if (!cbSize) return; @@ -771,7 +771,7 @@ return; /* query version info */ - if(!GetFileVersionInfoW(pwszAppName, 0, cbSize, pBuf)) + if(!GetFileVersionInfoW(pwszAppPath, 0, cbSize, pBuf)) { HeapFree(GetProcessHeap(), 0, pBuf); return; @@ -788,38 +788,34 @@ wCode = lpLangCode->code; } + /* Query name */ + swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\FileDescription", wLang, wCode); + if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cbSize)) + StringCchCopyNW(pwszAppName, cchAppName, pResult, cbSize); + /* Query manufacturer */ swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\CompanyName", wLang, wCode); if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cbSize)) - StringCbCopyNW(pContext->szManufacturer, sizeof(pContext->szManufacturer), pResult, cbSize); + StringCbCopyNW(pContext->wszManufacturer, sizeof(pContext->wszManufacturer), pResult, cbSize); HeapFree(GetProcessHeap(), 0, pBuf); } static VOID -InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppName) +InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppPath) { POPEN_ITEM_CONTEXT pItemContext; - WCHAR *pwszExt; - WCHAR wszFileName[_MAX_FNAME]; - + WCHAR wszAppName[256]; + + /* Allocate new item context */ pItemContext = (OPEN_ITEM_CONTEXT *)HeapAlloc(GetProcessHeap(), 0, sizeof(OPEN_ITEM_CONTEXT)); if (!pItemContext) return; /* Store app path and icon */ - wcscpy(pItemContext->szAppName, pwszAppName); - pItemContext->hIcon = ExtractIconW(shell32_hInstance, pwszAppName, 0); - pItemContext->szManufacturer[0] = 0; - - /* Extract path name */ - _wsplitpath(pwszAppName, NULL, NULL, wszFileName, NULL); - - /* Build application name from filename. FIXME: do it properly */ - pwszExt = wcsrchr(wszFileName, '.'); - if (pwszExt) - pwszExt[0] = L'\0'; - wszFileName[0] = towupper(wszFileName[0]); + wcscpy(pItemContext->wszAppPath, pwszAppPath); + pItemContext->hIcon = ExtractIconW(shell32_hInstance, pwszAppPath, 0); + LoadFileInfo(pwszAppPath, pItemContext, wszAppName, _countof(wszAppName)); /* Add item to the list */ if (pContext->bMenu) @@ -832,8 +828,8 @@ mii.fType = MFT_STRING; //MFT_OWNERDRAW; mii.fState = MFS_ENABLED; mii.wID = pContext->idCmd; - mii.dwTypeData = wszFileName; - mii.cch = wcslen(wszFileName); + mii.dwTypeData = wszAppName; + mii.cch = wcslen(wszAppName); mii.dwItemData = (ULONG_PTR)pItemContext; mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(pItemContext->hIcon); @@ -844,9 +840,7 @@ { LRESULT Index; - /* get manufacturer */ - GetManufacturer(pwszAppName, pItemContext); - Index = SendMessageW(pContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)wszFileName); + Index = SendMessageW(pContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)wszAppName); if (Index != LB_ERR) SendMessageW(pContext->hDlgCtrl, LB_SETITEMDATA, Index, (LPARAM)pItemContext); }

12 years, 12 months

[rharabien] 54769: [SHELL32] - Fix memory leak in Open With menu - Show icons in Open With menu - General code improvements

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Dec 27 15:25:32 2011 New Revision: 54769 URL: http://svn.reactos.org/svn/reactos?rev=54769&view=rev Log: [SHELL32] - Fix memory leak in Open With menu - Show icons in Open With menu - General code improvements Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp trunk/reactos/dll/win32/shell32/openwithmenu.h Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Tue Dec 27 15:25:32 2011 @@ -37,13 +37,12 @@ { BOOL bMenu; HMENU hMenu; - HWND hDlgCtrl; - UINT Count; - BOOL NoOpen; - UINT idCmdFirst; + HWND hDlgCtrl; + BOOL bNoOpen; + UINT idCmd; } OPEN_WITH_CONTEXT, *POPEN_WITH_CONTEXT; -#define MANUFACTURER_NAME_SIZE 100 +#define MANUFACTURER_NAME_SIZE 100 typedef struct { @@ -52,7 +51,6 @@ WCHAR szManufacturer[MANUFACTURER_NAME_SIZE]; } OPEN_ITEM_CONTEXT, *POPEN_ITEM_CONTEXT; - typedef struct _LANGANDCODEPAGE_ { WORD lang; @@ -61,26 +59,83 @@ static HANDLE OpenMRUList(HKEY hKey); -static VOID LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt); -static VOID LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt); -static VOID InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName); +static VOID LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszExt); +static VOID LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszExt); +static VOID InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppName); +static VOID FreeMenuItemContext(HMENU hMenu); COpenWithMenu::COpenWithMenu() { - count = 0; - wId = 0; + m_idCmdFirst = 0; + m_idCmdLast = 0; } COpenWithMenu::~COpenWithMenu() { - TRACE(" destroying IContextMenu(%p)\n", this); -} - -static VOID -AddChooseProgramItem(HMENU hMenu, UINT idCmdFirst) -{ + TRACE("Destroying IContextMenu(%p)\n", this); + if (m_hSubMenu) + FreeMenuItemContext(m_hSubMenu); +} + +static VOID +FreeMenuItemContext(HMENU hMenu) +{ + INT Count, Index; MENUITEMINFOW mii; - WCHAR szBuffer[MAX_PATH]; + + /* get item count */ + Count = GetMenuItemCount(hMenu); + if (Count == -1) + return; + + /* setup menuitem info */ + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_DATA | MIIM_FTYPE | MIIM_CHECKMARKS; + + for(Index = 0; Index < Count; Index++) + { + if (GetMenuItemInfoW(hMenu, Index, TRUE, &mii)) + { + if (mii.dwItemData) + HeapFree(GetProcessHeap(), 0, (LPVOID)mii.dwItemData); + if (mii.hbmpChecked) + DeleteObject(mii.hbmpChecked); + } + } +} + +static HBITMAP +IconToBitmap(HICON hIcon) +{ + HDC hdc, hdcScr; + HBITMAP hbm, hbmOld; + RECT rc; + + hdcScr = GetDC(NULL); + hdc = CreateCompatibleDC(hdcScr); + SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK)); + hbm = CreateCompatibleBitmap(hdcScr, rc.right, rc.bottom); + ReleaseDC(NULL, hdcScr); + + hbmOld = (HBITMAP)SelectObject(hdc, hbm); + FillRect(hdc, &rc, (HBRUSH)(COLOR_MENU + 1)); + if(!DrawIconEx(hdc, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL)) + ERR("DrawIcon failed: %x\n", GetLastError()); + SelectObject(hdc, hbmOld); + + DeleteDC(hdc); + + return hbm; +} + +static VOID +AddChooseProgramItem(HMENU hMenu, UINT idCmd) +{ + MENUITEMINFOW mii; + WCHAR wszBuf[128]; + + TRACE("hMenu %p idCmd %u\n", hMenu, idCmd); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -89,15 +144,18 @@ mii.wID = -1; InsertMenuItemW(hMenu, -1, TRUE, &mii); - if (!LoadStringW(shell32_hInstance, IDS_OPEN_WITH_CHOOSE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - wcscpy(szBuffer, L"Choose Program..."); - - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; + if (!LoadStringW(shell32_hInstance, IDS_OPEN_WITH_CHOOSE, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) + { + ERR("Failed to load string\n"); + return; + } + + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; mii.fType = MFT_STRING; mii.fState = MFS_ENABLED; - mii.wID = idCmdFirst; - mii.dwTypeData = (LPWSTR)szBuffer; - mii.cch = wcslen(szBuffer); + mii.wID = idCmd; + mii.dwTypeData = (LPWSTR)wszBuf; + mii.cch = wcslen(wszBuf); InsertMenuItemW(hMenu, -1, TRUE, &mii); } @@ -105,51 +163,47 @@ static VOID LoadOpenWithItems(POPEN_WITH_CONTEXT pContext, LPCWSTR szName) { - const WCHAR * szExt; - WCHAR szPath[100]; - DWORD dwPath; - - szExt = wcsrchr(szName, '.'); - if (!szExt) - { - /* FIXME - * show default list of available programs - */ + const WCHAR *pwszExt; + WCHAR wszPath[100]; + DWORD dwSize; + + pwszExt = wcsrchr(szName, '.'); + if (!pwszExt) + { + /* FIXME: show default list of available programs */ return; } /* load programs directly associated from HKCU */ - LoadItemFromHKCU(pContext, szExt); + LoadItemFromHKCU(pContext, pwszExt); /* load programs associated from HKCR\Extension */ - LoadItemFromHKCR(pContext, szExt); + LoadItemFromHKCR(pContext, pwszExt); /* load programs referenced from HKCR\ProgId */ - dwPath = sizeof(szPath); - szPath[0] = 0; - if (RegGetValueW(HKEY_CLASSES_ROOT, szExt, NULL, RRF_RT_REG_SZ, NULL, szPath, &dwPath) == ERROR_SUCCESS) - { - szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; - LoadItemFromHKCR(pContext, szPath); - } + dwSize = sizeof(wszPath); + if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, NULL, RRF_RT_REG_SZ, NULL, wszPath, &dwSize) == ERROR_SUCCESS) + LoadItemFromHKCR(pContext, wszPath); } HRESULT WINAPI COpenWithMenu::QueryContextMenu( - HMENU hmenu, + HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { MENUITEMINFOW mii; - WCHAR szBuffer[100] = {0}; - INT pos; - HMENU hSubMenu = NULL; + WCHAR wszBuf[100]; + INT DefaultPos; + HMENU hSubMenu; OPEN_WITH_CONTEXT Context; - if (!LoadStringW(shell32_hInstance, IDS_OPEN_WITH, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - ERR("failed to load string\n"); + TRACE("hMenu %p indexMenu %u idFirst %u idLast %u uFlags %u\n", hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + if (!LoadStringW(shell32_hInstance, IDS_OPEN_WITH, wszBuf, sizeof(wszBuf) / sizeof(WCHAR))) + { + ERR("Failed to load string\n"); return E_FAIL; } @@ -158,50 +212,52 @@ /* set up context */ ZeroMemory(&Context, sizeof(OPEN_WITH_CONTEXT)); Context.bMenu = TRUE; - Context.Count = 0; Context.hMenu = hSubMenu; - Context.idCmdFirst = idCmdFirst; + Context.idCmd = idCmdFirst; + /* load items */ - LoadOpenWithItems(&Context, szPath); - if (!Context.Count) - { + LoadOpenWithItems(&Context, m_wszPath); + if (Context.idCmd == idCmdFirst) + { + /* No items has been added */ DestroyMenu(hSubMenu); - hSubMenu = NULL; - wId = 0; - count = 0; + m_hSubMenu = NULL; + m_idCmdFirst = idCmdFirst; + m_idCmdLast = idCmdFirst; } else { - AddChooseProgramItem(hSubMenu, Context.idCmdFirst++); - count = Context.idCmdFirst - idCmdFirst; - /* verb start at index zero */ - wId = count - 1; - hSubMenu = hSubMenu; - } - - pos = GetMenuDefaultItem(hmenu, TRUE, 0) + 1; + AddChooseProgramItem(hSubMenu, Context.idCmd); + m_idCmdFirst = idCmdFirst; + m_idCmdLast = Context.idCmd; + m_hSubMenu = hSubMenu; + } + + DefaultPos = GetMenuDefaultItem(hMenu, TRUE, 0); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; - if (hSubMenu) + if (m_hSubMenu) { mii.fMask |= MIIM_SUBMENU; - mii.hSubMenu = hSubMenu; - } - mii.dwTypeData = (LPWSTR) szBuffer; + mii.hSubMenu = m_hSubMenu; + mii.wID = -1; + } + else + mii.wID = m_idCmdLast; + + mii.fType = MFT_STRING; + mii.dwTypeData = (LPWSTR)wszBuf; + mii.cch = wcslen(wszBuf); + mii.fState = MFS_ENABLED; - if (!pos) - { + if (DefaultPos == -1) mii.fState |= MFS_DEFAULT; - } - - mii.wID = Context.idCmdFirst; - mii.fType = MFT_STRING; - if (InsertMenuItemW(hmenu, pos, TRUE, &mii)) - Context.Count++; - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Context.Count); + + InsertMenuItemW(hMenu, DefaultPos + 1, TRUE, &mii); + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, m_idCmdLast - idCmdFirst + 1); } static VOID @@ -229,22 +285,21 @@ } static BOOL -HideApplicationFromList(WCHAR *pFileName) -{ - WCHAR szBuffer[100] = L"Applications\\"; +IsAppHidden(LPCWSTR pwszFileName) +{ + WCHAR wszBuf[100]; DWORD dwSize = 0; LONG result; - if (wcslen(pFileName) > (sizeof(szBuffer) / sizeof(WCHAR)) - 14) + if (FAILED(StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Applications\\%s", pwszFileName))) { ERR("insufficient buffer\n"); return FALSE; } - wcscpy(&szBuffer[13], pFileName); - - result = RegGetValueW(HKEY_CLASSES_ROOT, szBuffer, L"NoOpenWith", RRF_RT_REG_SZ, NULL, NULL, &dwSize); - - TRACE("result %d szBuffer %s\n", result, debugstr_w(szBuffer)); + + result = RegGetValueW(HKEY_CLASSES_ROOT, wszBuf, L"NoOpenWith", RRF_RT_REG_SZ, NULL, NULL, &dwSize); + + TRACE("result %d wszBuf %s\n", result, wszBuf); if (result == ERROR_SUCCESS) return TRUE; @@ -253,101 +308,95 @@ } static VOID -WriteStaticShellExtensionKey(HKEY hRootKey, const WCHAR * pVerb, WCHAR *pFullPath) +WriteStaticShellExtensionKey(HKEY hRootKey, LPCWSTR pwszVerb, LPCWSTR pwszFullPath) { HKEY hShell; - LONG result; - WCHAR szBuffer[MAX_PATH+10] = L"shell\\"; - - if (wcslen(pVerb) > (sizeof(szBuffer) / sizeof(WCHAR)) - 15 || - wcslen(pFullPath) > (sizeof(szBuffer) / sizeof(WCHAR)) - 4) + WCHAR wszBuf[MAX_PATH]; + + /* construct verb reg path */ + if (FAILED(StringCbPrintfW(wszBuf, sizeof(wszBuf), L"shell\\%s\\command", pwszVerb))) { ERR("insufficient buffer\n"); return; } - /* construct verb reg path */ - wcscpy(&szBuffer[6], pVerb); - wcscat(szBuffer, L"\\command"); - /* create verb reg key */ - if (RegCreateKeyExW(hRootKey, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hShell, NULL) != ERROR_SUCCESS) + if (RegCreateKeyExW(hRootKey, wszBuf, 0, NULL, 0, KEY_WRITE, NULL, &hShell, NULL) != ERROR_SUCCESS) return; /* build command buffer */ - wcscpy(szBuffer, pFullPath); - wcscat(szBuffer, L" %1"); - - result = RegSetValueExW(hShell, NULL, 0, REG_SZ, (const BYTE*)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s %%1", pwszFullPath); + + RegSetValueExW(hShell, NULL, 0, REG_SZ, (const BYTE*)wszBuf, (wcslen(wszBuf) + 1) * sizeof(WCHAR)); RegCloseKey(hShell); } static VOID -StoreNewSettings(LPCWSTR szFileName, WCHAR *szAppName) -{ - WCHAR szBuffer[100] = { L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\"}; - const WCHAR * pFileExt; +StoreNewSettings(LPCWSTR pwszFileName, LPCWSTR pwszAppName) +{ + WCHAR wszBuf[100]; + LPCWSTR pwszExt; HKEY hKey; - LONG result; HANDLE hList; - /* get file extension */ - pFileExt = wcsrchr(szFileName, L'.'); - if (wcslen(pFileExt) > (sizeof(szBuffer) / sizeof(WCHAR)) - 60) + /* Get file extension */ + pwszExt = wcsrchr(pwszFileName, L'.'); + if (!pwszExt) + return; + + /* Build registry key */ + if (FAILED(StringCbPrintfW(wszBuf, sizeof(wszBuf), + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%s", + pwszExt))) { ERR("insufficient buffer\n"); return; } - wcscpy(&szBuffer[60], pFileExt); - /* open base key for this file extension */ - if (RegCreateKeyExW(HKEY_CURRENT_USER, szBuffer, 0, NULL, 0, KEY_WRITE | KEY_READ, NULL, &hKey, NULL) != ERROR_SUCCESS) - return; - - /* open mru list */ + + /* Open base key for this file extension */ + if (RegCreateKeyExW(HKEY_CURRENT_USER, wszBuf, 0, NULL, 0, KEY_WRITE | KEY_READ, NULL, &hKey, NULL) != ERROR_SUCCESS) + return; + + /* Open MRU list */ hList = OpenMRUList(hKey); - - if (!hList) - { - RegCloseKey(hKey); - return; - } - - /* insert the entry */ - result = AddMRUStringW(hList, szAppName); - - /* close mru list */ - FreeMRUList(hList); - /* create mru list key */ + if (hList) + { + /* Insert the entry */ + AddMRUStringW(hList, pwszAppName); + + /* Close MRU list */ + FreeMRUList(hList); + } + RegCloseKey(hKey); } static VOID -SetProgrammAsDefaultHandler(LPCWSTR szFileName, WCHAR * szAppName) +SetProgramAsDefaultHandler(LPCWSTR pwszFileName, LPCWSTR pwszAppName) { HKEY hKey; HKEY hAppKey; DWORD dwDisposition; - WCHAR szBuffer[100]; + WCHAR wszBuf[100]; DWORD dwSize; BOOL result; - const WCHAR * pFileExt; - WCHAR * pFileName; - - /* extract file extension */ - pFileExt = wcsrchr(szFileName, L'.'); - if (!pFileExt) - return; - - /* create file extension key */ - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, pFileExt, 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) - return; - - if (dwDisposition & REG_CREATED_NEW_KEY) - { - /* a new entry was created create the prog key id */ - wcscpy(szBuffer, &pFileExt[1]); - wcscat(szBuffer, L"_auto_file"); - if (RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szBuffer, (wcslen(szBuffer) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) + LPCWSTR pwszExt; + LPCWSTR pwszAppFileName; + + /* Extract file extension */ + pwszExt = wcsrchr(pwszFileName, L'.'); + if (!pwszExt) + return; + + /* Create file extension key */ + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) + return; + + if (dwDisposition == REG_CREATED_NEW_KEY) + { + /* A new entry was created create the prog key id */ + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s_auto_file", pwszExt + 1); + if (RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)wszBuf, (wcslen(wszBuf) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) { RegCloseKey(hKey); return; @@ -355,38 +404,36 @@ } else { - /* entry already exists fetch prog key id */ - dwSize = sizeof(szBuffer); - if (RegGetValueW(hKey, NULL, NULL, RRF_RT_REG_SZ, NULL, szBuffer, &dwSize) != ERROR_SUCCESS) + /* Entry already exists fetch prog key id */ + dwSize = sizeof(wszBuf); + if (RegGetValueW(hKey, NULL, NULL, RRF_RT_REG_SZ, NULL, wszBuf, &dwSize) != ERROR_SUCCESS) { RegCloseKey(hKey); return; } } - /* close file extension key */ + + /* Close file extension key */ RegCloseKey(hKey); - /* create prog id key */ - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) - return; - - - /* check if there already verbs existing for that app */ - pFileName = wcsrchr(szAppName, L'\\'); - wcscpy(szBuffer, L"Classes\\Applications\\"); - wcscat(szBuffer, pFileName); - wcscat(szBuffer, L"\\shell"); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ, &hAppKey) == ERROR_SUCCESS) - { - /* copy static verbs from Classes\Applications key */ - HKEY hTemp; - if (RegCreateKeyExW(hKey, L"shell", 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hTemp, &dwDisposition) == ERROR_SUCCESS) - { - result = RegCopyTreeW(hAppKey, NULL, hTemp); - RegCloseKey(hTemp); + /* Create prog id key */ + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, wszBuf, 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) + return; + + /* Check if there already verbs existing for that app */ + pwszAppFileName = wcsrchr(pwszAppName, L'\\'); + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Classes\\Applications\\%s\\shell", pwszAppFileName); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszBuf, 0, KEY_READ, &hAppKey) == ERROR_SUCCESS) + { + /* Copy static verbs from Classes\Applications key */ + HKEY hDestKey; + if (RegCreateKeyExW(hKey, L"shell", 0, NULL, 0, KEY_WRITE, NULL, &hDestKey, &dwDisposition) == ERROR_SUCCESS) + { + result = RegCopyTreeW(hAppKey, NULL, hDestKey); + RegCloseKey(hDestKey); if (result == ERROR_SUCCESS) { - /* copied all subkeys, we are done */ + /* Copied all subkeys, we are done */ RegCloseKey(hKey); RegCloseKey(hAppKey); return; @@ -394,55 +441,54 @@ } RegCloseKey(hAppKey); } - /* write standard static shell extension */ - WriteStaticShellExtensionKey(hKey, L"open", szAppName); + + /* Write standard static shell extension */ + WriteStaticShellExtensionKey(hKey, L"open", pwszAppName); RegCloseKey(hKey); } static VOID BrowseForApplication(HWND hwndDlg) { - WCHAR szBuffer[64] = {0}; - WCHAR szFilter[256] = {0}; - WCHAR szPath[MAX_PATH]; + WCHAR wszTitle[64]; + WCHAR wszFilter[256]; + WCHAR wszPath[MAX_PATH]; OPENFILENAMEW ofn; OPEN_WITH_CONTEXT Context; - INT count; - - /* load resource open with */ - if (LoadStringW(shell32_hInstance, IDS_OPEN_WITH, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - { - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - ofn.lpstrTitle = szBuffer; - ofn.nMaxFileTitle = wcslen(szBuffer); - } - + INT iCount; + + /* Initialize OPENFILENAMEW structure */ ZeroMemory(&ofn, sizeof(OPENFILENAMEW)); ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hInstance = shell32_hInstance; ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; - ofn.nMaxFile = (sizeof(szPath) / sizeof(WCHAR)); - ofn.lpstrFile = szPath; - - /* load the filter resource string */ - if (LoadStringW(shell32_hInstance, IDS_OPEN_WITH_FILTER, szFilter, sizeof(szFilter) / sizeof(WCHAR))) - { - szFilter[(sizeof(szFilter)/sizeof(WCHAR))-1] = 0; - ofn.lpstrFilter = szFilter; - } - ZeroMemory(szPath, sizeof(szPath)); - - /* call openfilename */ + ofn.nMaxFile = (sizeof(wszPath) / sizeof(WCHAR)); + ofn.lpstrFile = wszPath; + + /* Init title */ + if (LoadStringW(shell32_hInstance, IDS_OPEN_WITH, wszTitle, sizeof(wszTitle) / sizeof(WCHAR))) + { + ofn.lpstrTitle = wszTitle; + ofn.nMaxFileTitle = wcslen(wszTitle); + } + + /* Init the filter string */ + if (LoadStringW(shell32_hInstance, IDS_OPEN_WITH_FILTER, wszFilter, sizeof(wszFilter) / sizeof(WCHAR))) + ofn.lpstrFilter = wszFilter; + ZeroMemory(wszPath, sizeof(wszPath)); + + /* Create OpenFile dialog */ if (!GetOpenFileNameW(&ofn)) return; - /* setup context for insert proc */ + /* Setup context for insert proc */ ZeroMemory(&Context, sizeof(OPEN_WITH_CONTEXT)); Context.hDlgCtrl = GetDlgItem(hwndDlg, 14002); - count = SendMessage(Context.hDlgCtrl, LB_GETCOUNT, 0, 0); - InsertOpenWithItem(&Context, szPath); - /* select new item */ - SendMessage(Context.hDlgCtrl, LB_SETCURSEL, count, 0); + iCount = SendMessage(Context.hDlgCtrl, LB_GETCOUNT, 0, 0); + InsertOpenWithItem(&Context, wszPath); + + /* Select new item */ + SendMessage(Context.hDlgCtrl, LB_SETCURSEL, iCount, 0); } static POPEN_ITEM_CONTEXT @@ -464,48 +510,39 @@ } static VOID -ExecuteOpenItem(POPEN_ITEM_CONTEXT pItemContext, LPCWSTR FileName) +ExecuteOpenItem(POPEN_ITEM_CONTEXT pItemContext, LPCWSTR pwszPath) { STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR szPath[(MAX_PATH * 2)]; + WCHAR wszBuf[MAX_PATH * 2 + 8]; /* setup path with argument */ ZeroMemory(&si, sizeof(STARTUPINFOW)); si.cb = sizeof(STARTUPINFOW); - wcscpy(szPath, pItemContext->szAppName); - wcscat(szPath, L" "); - wcscat(szPath, FileName); - - ERR("path %s\n", debugstr_w(szPath)); - - if (CreateProcessW(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + + /* Build the command line. Don't use applcation name as first parameter of + CreateProcessW, because it have to be an absolute path. */ + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"\"%s\" \"%s\"", pItemContext->szAppName, pwszPath); + + /* Start the application now */ + TRACE("AppName %ls Path %ls\n", pItemContext->szAppName, pwszPath); + if (CreateProcessW(NULL, wszBuf, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - SHAddToRecentDocs(SHARD_PATHW, FileName); + SHAddToRecentDocs(SHARD_PATHW, pwszPath); } } static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - LPMEASUREITEMSTRUCT lpmis; - LPDRAWITEMSTRUCT lpdis; - INT index; - WCHAR szBuffer[MAX_PATH + 30] = { 0 }; - OPENASINFO *poainfo; - TEXTMETRIC mt; - COLORREF preColor, preBkColor; - POPEN_ITEM_CONTEXT pItemContext; - LONG YOffset; - OPEN_WITH_CONTEXT Context; - - poainfo = (OPENASINFO*) GetWindowLongPtr(hwndDlg, DWLP_USER); - switch(uMsg) { case WM_INITDIALOG: + { + OPENASINFO *poainfo; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); poainfo = (OPENASINFO*)lParam; if (!(poainfo->oaifInFlags & OAIF_ALLOW_REGISTRATION)) @@ -516,23 +553,28 @@ ShowWindow(GetDlgItem(hwndDlg, 14003), SW_HIDE); if (poainfo->pcszFile) { - szBuffer[0] = L'\0'; - GetDlgItemTextW(hwndDlg, 14001, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); - index = wcslen(szBuffer); - if (index + wcslen(poainfo->pcszFile) + 1 < sizeof(szBuffer) / sizeof(szBuffer[0])) - wcscat(szBuffer, poainfo->pcszFile); - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SetDlgItemTextW(hwndDlg, 14001, szBuffer); + WCHAR wszBuf[MAX_PATH]; + UINT cchBuf; + OPEN_WITH_CONTEXT Context; + + cchBuf = GetDlgItemTextW(hwndDlg, 14001, wszBuf, sizeof(wszBuf) / sizeof(wszBuf[0])); + StringCchCopyW(wszBuf, _countof(wszBuf) - cchBuf, poainfo->pcszFile); + SetDlgItemTextW(hwndDlg, 14001, wszBuf); + ZeroMemory(&Context, sizeof(OPEN_WITH_CONTEXT)); Context.hDlgCtrl = GetDlgItem(hwndDlg, 14002); LoadOpenWithItems(&Context, poainfo->pcszFile); + SendMessage(Context.hDlgCtrl, LB_SETCURSEL, 0, 0); } return TRUE; + } case WM_MEASUREITEM: - lpmis = (LPMEASUREITEMSTRUCT) lParam; + { + LPMEASUREITEMSTRUCT lpmis = (LPMEASUREITEMSTRUCT)lParam; lpmis->itemHeight = 64; return TRUE; + } case WM_COMMAND: switch(LOWORD(wParam)) { @@ -544,16 +586,21 @@ InvalidateRect((HWND)lParam, NULL, TRUE); // FIXME USE UPDATE RECT break; case 14005: /* ok */ + { + POPEN_ITEM_CONTEXT pItemContext; + pItemContext = GetCurrentOpenItemContext(hwndDlg); if (pItemContext) { + OPENASINFO *poainfo = (OPENASINFO*)GetWindowLongPtr(hwndDlg, DWLP_USER); + /* store settings in HKCU path */ StoreNewSettings(poainfo->pcszFile, pItemContext->szAppName); if (SendDlgItemMessage(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) { /* set programm as default handler */ - SetProgrammAsDefaultHandler(poainfo->pcszFile, pItemContext->szAppName); + SetProgramAsDefaultHandler(poainfo->pcszFile, pItemContext->szAppName); } if (poainfo->oaifInFlags & OAIF_EXEC) @@ -562,6 +609,7 @@ FreeListItems(hwndDlg); DestroyWindow(hwndDlg); return TRUE; + } case 14006: /* cancel */ FreeListItems(hwndDlg); DestroyWindow(hwndDlg); @@ -571,7 +619,15 @@ } break; case WM_DRAWITEM: - lpdis = (LPDRAWITEMSTRUCT) lParam; + { + LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam; + TEXTMETRIC mt; + COLORREF preColor, preBkColor; + LONG cyOffset; + POPEN_ITEM_CONTEXT pItemContext; + INT Index; + WCHAR wszBuf[MAX_PATH]; + if ((int)lpdis->itemID == -1) break; @@ -579,10 +635,10 @@ { case ODA_SELECT: case ODA_DRAWENTIRE: - index = SendMessageW(lpdis->hwndItem, LB_GETCURSEL, 0, 0); + Index = SendMessageW(lpdis->hwndItem, LB_GETCURSEL, 0, 0); pItemContext = (POPEN_ITEM_CONTEXT)SendMessage(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, (LPARAM) 0); - if ((int)lpdis->itemID == index) + if ((int)lpdis->itemID == Index) { /* paint focused item with standard background colour */ HBRUSH hBrush; @@ -601,26 +657,27 @@ preBkColor = SetBkColor(lpdis->hDC, RGB(255, 255, 255)); } - SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, (LPARAM) szBuffer); + SendMessageW(lpdis->hwndItem, LB_GETTEXT, lpdis->itemID, (LPARAM)wszBuf); /* paint the icon */ DrawIconEx(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, pItemContext->hIcon, 0, 0, 0, NULL, DI_NORMAL); /* get text size */ GetTextMetrics(lpdis->hDC, &mt); /* paint app name */ - YOffset = lpdis->rcItem.top + mt.tmHeight / 2; - TextOutW(lpdis->hDC, 45, YOffset, szBuffer, wcslen(szBuffer)); + cyOffset = lpdis->rcItem.top + mt.tmHeight / 2; + TextOutW(lpdis->hDC, 45, cyOffset, wszBuf, wcslen(wszBuf)); /* paint manufacturer description */ - YOffset += mt.tmHeight + 2; + cyOffset += mt.tmHeight + 2; preColor = SetTextColor(lpdis->hDC, RGB(192, 192, 192)); if (pItemContext->szManufacturer[0]) - TextOutW(lpdis->hDC, 45, YOffset, pItemContext->szManufacturer, wcslen(pItemContext->szManufacturer)); + TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->szManufacturer, wcslen(pItemContext->szManufacturer)); else - TextOutW(lpdis->hDC, 45, YOffset, pItemContext->szAppName, wcslen(pItemContext->szAppName)); + TextOutW(lpdis->hDC, 45, cyOffset, pItemContext->szAppName, wcslen(pItemContext->szAppName)); SetTextColor(lpdis->hDC, preColor); SetBkColor(lpdis->hDC, preBkColor); break; } break; + } case WM_CLOSE: FreeListItems(hwndDlg); DestroyWindow(hwndDlg); @@ -631,72 +688,43 @@ return FALSE; } -static VOID -FreeMenuItemContext(HMENU hMenu) -{ - INT Count; - INT Index; - MENUITEMINFOW mii; - - /* get item count */ - Count = GetMenuItemCount(hMenu); - if (Count == -1) - return; - - /* setup menuitem info */ - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_DATA | MIIM_FTYPE; - - for(Index = 0; Index < Count; Index++) - { - if (GetMenuItemInfoW(hMenu, Index, TRUE, &mii)) - { - if ((mii.fType & MFT_SEPARATOR) || mii.dwItemData == 0) - continue; - HeapFree(GetProcessHeap(), 0, (LPVOID)mii.dwItemData); - } - } -} - HRESULT WINAPI COpenWithMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - MENUITEMINFOW mii; - - ERR("This %p wId %x count %u verb %x\n", this, wId, count, LOWORD(lpici->lpVerb)); - - if (HIWORD(lpici->lpVerb) != 0 || LOWORD(lpici->lpVerb) > wId) - return E_FAIL; - - if (wId == LOWORD(lpici->lpVerb)) - { - OPENASINFO info; - - info.pcszFile = szPath; - info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT | OAIF_EXEC; - info.pcszClass = NULL; - FreeMenuItemContext(hSubMenu); - return SHOpenWithDialog(lpici->hwnd, &info); - } - - /* retrieve menu item info */ - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_DATA | MIIM_FTYPE; - - if (GetMenuItemInfoW(hSubMenu, LOWORD(lpici->lpVerb), TRUE, &mii)) - { - POPEN_ITEM_CONTEXT pItemContext = (POPEN_ITEM_CONTEXT)mii.dwItemData; - if (pItemContext) - { - /* launch item with specified app */ - ExecuteOpenItem(pItemContext, szPath); - } - } - /* free menu item context */ - FreeMenuItemContext(hSubMenu); - return S_OK; + HRESULT hr = E_FAIL; + + TRACE("This %p idFirst %u idLast %u idCmd %u\n", this, m_idCmdFirst, m_idCmdLast, m_idCmdFirst + LOWORD(lpici->lpVerb)); + + if (HIWORD(lpici->lpVerb) == 0 && m_idCmdFirst + LOWORD(lpici->lpVerb) <= m_idCmdLast) + { + if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdLast) + { + OPENASINFO info; + + info.pcszFile = m_wszPath; + info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT | OAIF_EXEC; + info.pcszClass = NULL; + hr = SHOpenWithDialog(lpici->hwnd, &info); + } + else + { + /* retrieve menu item info */ + MENUITEMINFOW mii; + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_DATA | MIIM_FTYPE; + + if (GetMenuItemInfoW(m_hSubMenu, LOWORD(lpici->lpVerb), TRUE, &mii) && mii.dwItemData) + { + /* launch item with specified app */ + POPEN_ITEM_CONTEXT pItemContext = (POPEN_ITEM_CONTEXT)mii.dwItemData; + ExecuteOpenItem(pItemContext, m_wszPath); + hr = S_OK; + } + } + } + + return hr; } HRESULT WINAPI @@ -720,117 +748,107 @@ } VOID -GetManufacturer(WCHAR * szAppName, POPEN_ITEM_CONTEXT pContext) -{ - UINT VerSize; - DWORD DummyHandle; +GetManufacturer(LPCWSTR pwszAppName, POPEN_ITEM_CONTEXT pContext) +{ + UINT cbSize; LPVOID pBuf; - WORD lang = 0; - WORD code = 0; - LPLANGANDCODEPAGE lplangcode; - WCHAR szBuffer[100]; - WCHAR * pResult; - BOOL bResult; - - static const WCHAR wFormat[] = L"\\StringFileInfo\\%04x%04x\\CompanyName"; - static const WCHAR wTranslation[] = L"VarFileInfo\\Translation"; + WORD wLang = 0, wCode = 0; + LPLANGANDCODEPAGE lpLangCode; + WCHAR wszBuf[100]; + WCHAR *pResult; + + /* Clear manufacturer */ + pContext->szManufacturer[0] = 0; /* query version info size */ - VerSize = GetFileVersionInfoSizeW(szAppName, &DummyHandle); - if (!VerSize) - { - pContext->szManufacturer[0] = 0; - return; - } + cbSize = GetFileVersionInfoSizeW(pwszAppName, NULL); + if (!cbSize) + return; /* allocate buffer */ - pBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, VerSize); + pBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbSize); if (!pBuf) - { - pContext->szManufacturer[0] = 0; - return; - } + return; /* query version info */ - if(!GetFileVersionInfoW(szAppName, 0, VerSize, pBuf)) - { - pContext->szManufacturer[0] = 0; + if(!GetFileVersionInfoW(pwszAppName, 0, cbSize, pBuf)) + { HeapFree(GetProcessHeap(), 0, pBuf); return; } /* query lang code */ - if(VerQueryValueW(pBuf, const_cast<LPWSTR>(wTranslation), (LPVOID *)&lplangcode, &VerSize)) - { - /* FIXME find language from current locale / if not available, + if(VerQueryValueW(pBuf, L"VarFileInfo\\Translation", (LPVOID*)&lpLangCode, &cbSize)) + { + /* FIXME: find language from current locale / if not available, * default to english * for now default to first available language */ - lang = lplangcode->lang; - code = lplangcode->code; - } - /* set up format */ - swprintf(szBuffer, wFormat, lang, code); - /* query manufacturer */ - pResult = NULL; - bResult = VerQueryValueW(pBuf, szBuffer, (LPVOID *)&pResult, &VerSize); - - if (VerSize && bResult && pResult) - wcscpy(pContext->szManufacturer, pResult); - else - pContext->szManufacturer[0] = 0; + wLang = lpLangCode->lang; + wCode = lpLangCode->code; + } + + /* Query manufacturer */ + swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\CompanyName", wLang, wCode); + + if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cbSize)) + StringCbCopyNW(pContext->szManufacturer, sizeof(pContext->szManufacturer), pResult, cbSize); HeapFree(GetProcessHeap(), 0, pBuf); } static VOID -InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName) -{ - MENUITEMINFOW mii; +InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszAppName) +{ POPEN_ITEM_CONTEXT pItemContext; - LRESULT index; WCHAR *pwszExt; - WCHAR Buffer[_MAX_FNAME]; + WCHAR wszFileName[_MAX_FNAME]; pItemContext = (OPEN_ITEM_CONTEXT *)HeapAlloc(GetProcessHeap(), 0, sizeof(OPEN_ITEM_CONTEXT)); if (!pItemContext) return; - /* store app path */ - wcscpy(pItemContext->szAppName, szAppName); - /* extract path name */ - _wsplitpath(szAppName, NULL, NULL, Buffer, NULL); - pwszExt = wcsrchr(Buffer, '.'); + /* Store app path and icon */ + wcscpy(pItemContext->szAppName, pwszAppName); + pItemContext->hIcon = ExtractIconW(shell32_hInstance, pwszAppName, 0); + pItemContext->szManufacturer[0] = 0; + + /* Extract path name */ + _wsplitpath(pwszAppName, NULL, NULL, wszFileName, NULL); + + /* Build application name from filename. FIXME: do it properly */ + pwszExt = wcsrchr(wszFileName, '.'); if (pwszExt) pwszExt[0] = L'\0'; - Buffer[0] = towupper(Buffer[0]); - + wszFileName[0] = towupper(wszFileName[0]); + + /* Add item to the list */ if (pContext->bMenu) { + MENUITEMINFOW mii; + ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA | MIIM_CHECKMARKS; mii.fType = MFT_STRING; //MFT_OWNERDRAW; mii.fState = MFS_ENABLED; - mii.wID = pContext->idCmdFirst; - mii.dwTypeData = Buffer; - mii.cch = wcslen(Buffer); + mii.wID = pContext->idCmd; + mii.dwTypeData = wszFileName; + mii.cch = wcslen(wszFileName); mii.dwItemData = (ULONG_PTR)pItemContext; - wcscpy(pItemContext->szManufacturer, Buffer); + mii.hbmpChecked = mii.hbmpUnchecked = IconToBitmap(pItemContext->hIcon); + if (InsertMenuItemW(pContext->hMenu, -1, TRUE, &mii)) - { - pContext->idCmdFirst++; - pContext->Count++; - } + pContext->idCmd++; } else { - /* get default icon */ - pItemContext->hIcon = ExtractIconW(shell32_hInstance, szAppName, 0); + LRESULT Index; + /* get manufacturer */ - GetManufacturer(pItemContext->szAppName, pItemContext); - index = SendMessageW(pContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)Buffer); - if (index != LB_ERR) - SendMessageW(pContext->hDlgCtrl, LB_SETITEMDATA, index, (LPARAM)pItemContext); + GetManufacturer(pwszAppName, pItemContext); + Index = SendMessageW(pContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)wszFileName); + if (Index != LB_ERR) + SendMessageW(pContext->hDlgCtrl, LB_SETITEMDATA, Index, (LPARAM)pItemContext); } } @@ -843,18 +861,18 @@ static HANDLE OpenMRUList(HKEY hKey) { - CREATEMRULISTW info; + CREATEMRULISTW Info; /* initialize mru list info */ - info.cbSize = sizeof(info); - info.nMaxItems = 32; - info.dwFlags = MRU_STRING; - info.hKey = hKey; - info.lpszSubKey = L"OpenWithList"; - info.lpfnCompare = NULL; + Info.cbSize = sizeof(Info); + Info.nMaxItems = 32; + Info.dwFlags = MRU_STRING; + Info.hKey = hKey; + Info.lpszSubKey = L"OpenWithList"; + Info.lpfnCompare = NULL; /* load list */ - return CreateMRUListW(&info); + return CreateMRUListW(&Info); } static VOID @@ -862,7 +880,7 @@ { HANDLE hList; int nItem, nCount, nResult; - WCHAR szBuffer[MAX_PATH]; + WCHAR wszBuf[MAX_PATH]; /* open mru list */ hList = OpenMRUList(hKey); @@ -877,14 +895,13 @@ for(nItem = 0; nItem < nCount; nItem++) { - nResult = EnumMRUListW(hList, nItem, szBuffer, MAX_PATH); + nResult = EnumMRUListW(hList, nItem, wszBuf, _countof(wszBuf)); if (nResult <= 0) continue; - /* make sure its zero terminated */ - szBuffer[min(MAX_PATH-1, nResult)] = '\0'; + /* insert item */ - if (!HideApplicationFromList(szBuffer)) - InsertOpenWithItem(pContext, szBuffer); + if (!IsAppHidden(wszBuf)) + InsertOpenWithItem(pContext, wszBuf); } /* free the mru list */ @@ -892,83 +909,70 @@ } static VOID -LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt) +LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszExt) { HKEY hKey; HKEY hSubKey; - WCHAR szBuffer[MAX_PATH+10]; - WCHAR szResult[100]; + WCHAR wszBuf[MAX_PATH], wszBuf2[MAX_PATH]; DWORD dwSize; - static const WCHAR szOpenWithList[] = L"OpenWithList"; - static const WCHAR szOpenWithProgIds[] = L"OpenWithProgIDs"; - static const WCHAR szPerceivedType[] = L"PerceivedType"; - static const WCHAR szSysFileAssoc[] = L"SystemFileAssociations\\%s"; - - /* check if extension exists */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ | KEY_WRITE, &hKey) != ERROR_SUCCESS) + /* Check if extension exists */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return; if (RegGetValueW(hKey, NULL, L"NoOpen", RRF_RT_REG_SZ, NULL, NULL, &dwSize) == ERROR_SUCCESS) { - /* display warning dialog */ - pContext->NoOpen = TRUE; - } - - /* check if there is a directly available execute key */ - if (RegOpenKeyExW(hKey, L"shell\\open\\command", 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) - { - DWORD dwBuffer = sizeof(szBuffer); - - if (RegGetValueW(hSubKey, NULL, NULL, RRF_RT_REG_SZ, NULL, (PVOID)szBuffer, &dwBuffer) == ERROR_SUCCESS) - { - WCHAR * pszSpace = wcsrchr(szBuffer, ' '); - if (pszSpace) - { - /* erase %1 or extra arguments */ - *pszSpace = 0; // FIXME: what about '"' - } - if(!HideApplicationFromList(szBuffer)) - InsertOpenWithItem(pContext, szBuffer); - } - RegCloseKey(hSubKey); - } - - /* load items from HKCR\Ext\OpenWithList */ - if (RegOpenKeyExW(hKey, szOpenWithList, 0, KEY_READ | KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) + /* Display warning dialog */ + pContext->bNoOpen = TRUE; + } + + /* Check if there is a directly available execute key */ + dwSize = sizeof(wszBuf); + if (RegGetValueW(hKey, L"shell\\open\\command", NULL, RRF_RT_REG_SZ, NULL, (PVOID)wszBuf, &dwSize) == ERROR_SUCCESS) + { + WCHAR *pwszSpace = wcsrchr(wszBuf, L' '); + if (pwszSpace) + { + /* Erase %1 or extra arguments */ + *pwszSpace = 0; // FIXME: what about '"' + } + if(!IsAppHidden(wszBuf)) + InsertOpenWithItem(pContext, wszBuf); + } + + /* Load items from HKCR\Ext\OpenWithList */ + if (RegOpenKeyExW(hKey, L"OpenWithList", 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) { AddItemFromMRUList(pContext, hKey); RegCloseKey(hSubKey); } - /* load items from HKCR\Ext\OpenWithProgIDs */ - if (RegOpenKeyExW(hKey, szOpenWithProgIds, 0, KEY_READ | KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) + /* Load items from HKCR\Ext\OpenWithProgIDs */ + if (RegOpenKeyExW(hKey, L"OpenWithProgIDs", 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) { AddItemFromProgIDList(pContext, hSubKey); RegCloseKey(hSubKey); } - /* load items from SystemFileAssociations\Ext key */ - swprintf(szResult, szSysFileAssoc, szExt); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szResult, 0, KEY_READ | KEY_WRITE, &hSubKey) == ERROR_SUCCESS) + /* Load items from SystemFileAssociations\Ext key */ + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"SystemFileAssociations\\%s", pwszExt); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszBuf, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) { AddItemFromMRUList(pContext, hSubKey); RegCloseKey(hSubKey); } - /* load additional items from referenced PerceivedType*/ - dwSize = sizeof(szBuffer); - if (RegGetValueW(hKey, NULL, szPerceivedType, RRF_RT_REG_SZ, NULL, szBuffer, &dwSize) != ERROR_SUCCESS) + /* Load additional items from referenced PerceivedType*/ + dwSize = sizeof(wszBuf); + if (RegGetValueW(hKey, NULL, L"PerceivedType", RRF_RT_REG_SZ, NULL, wszBuf, &dwSize) != ERROR_SUCCESS) { RegCloseKey(hKey); return; } RegCloseKey(hKey); - /* terminate it explictely */ - szBuffer[29] = 0; - swprintf(szResult, szSysFileAssoc, szBuffer); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szResult, 0, KEY_READ | KEY_WRITE, &hSubKey) == ERROR_SUCCESS) + StringCbPrintfW(wszBuf2, sizeof(wszBuf2), L"SystemFileAssociations\\%s", wszBuf); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszBuf2, 0, KEY_READ | KEY_WRITE, &hSubKey) == ERROR_SUCCESS) { AddItemFromMRUList(pContext, hSubKey); RegCloseKey(hSubKey); @@ -976,25 +980,26 @@ } static VOID -LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, const WCHAR * szExt) -{ - WCHAR szBuffer[MAX_PATH]; +LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, LPCWSTR pwszExt) +{ + WCHAR wszBuf[MAX_PATH]; HKEY hKey; - static const WCHAR szOpenWithProgIDs[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%s\\OpenWithProgIDs"; - static const WCHAR szOpenWithList[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%s"; - - /* handle first progid lists */ - swprintf(szBuffer, szOpenWithProgIDs, szExt); - if (RegOpenKeyExW(HKEY_CURRENT_USER, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + /* Handle ProgId lists first */ + StringCbPrintfW(wszBuf, sizeof(wszBuf), + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%s\\OpenWithProgIDs", + pwszExt); + if (RegOpenKeyExW(HKEY_CURRENT_USER, wszBuf, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { AddItemFromProgIDList(pContext, hKey); RegCloseKey(hKey); } - /* now handle mru lists */ - swprintf(szBuffer, szOpenWithList, szExt); - if (RegOpenKeyExW(HKEY_CURRENT_USER, szBuffer, 0, KEY_READ | KEY_WRITE, &hKey) == ERROR_SUCCESS) + /* Now handle MRU lists */ + StringCbPrintfW(wszBuf, sizeof(wszBuf), + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\%s", + pwszExt); + if (RegOpenKeyExW(HKEY_CURRENT_USER, wszBuf, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { AddItemFromMRUList(pContext, hKey); RegCloseKey(hKey); @@ -1013,7 +1018,7 @@ LPCITEMIDLIST pidlFolder2; LPCITEMIDLIST pidlChild; LPCITEMIDLIST pidl; - LPWSTR pszExt; + LPCWSTR pwszExt; TRACE("This %p\n", this); @@ -1059,7 +1064,7 @@ return E_FAIL; } - if (!SHGetPathFromIDListW(pidl, szPath)) + if (!SHGetPathFromIDListW(pidl, m_wszPath)) { IID *iid = _ILGetGUIDPointer(pidl); SHFree((void*)pidl); @@ -1068,15 +1073,14 @@ } SHFree((void*)pidl); - TRACE("szPath %s\n", debugstr_w(szPath)); - - pszExt = wcsrchr(szPath, L'.'); - - if (pszExt) - { - if (!_wcsicmp(pszExt, L".exe") || !_wcsicmp(pszExt, L".lnk")) - { - TRACE("path is a executable or shortcut\n"); + TRACE("szPath %s\n", debugstr_w(m_wszPath)); + + pwszExt = wcsrchr(m_wszPath, L'.'); + if (pwszExt) + { + if (!_wcsicmp(pwszExt, L".exe") || !_wcsicmp(pwszExt, L".lnk")) + { + TRACE("file is a executable or shortcut\n"); return E_FAIL; } } @@ -1103,7 +1107,7 @@ ShowWindow(hwnd, SW_SHOWNORMAL); - while (GetMessage(&msg, NULL, 0, 0) != 0 && IsWindow(hwnd)) + while (GetMessage(&msg, NULL, 0, 0) && IsWindow(hwnd)) { if (!IsDialogMessage(hwnd, &msg)) { Modified: trunk/reactos/dll/win32/shell32/openwithmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.h [iso-8859-1] Tue Dec 27 15:25:32 2011 @@ -29,11 +29,9 @@ public IShellExtInit { private: - LONG wId; - BOOL NoOpen; - UINT count; - WCHAR szPath[MAX_PATH]; - HMENU hSubMenu; + UINT m_idCmdFirst, m_idCmdLast; + WCHAR m_wszPath[MAX_PATH]; + HMENU m_hSubMenu; public: COpenWithMenu();

12 years, 12 months

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