Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[tkreuzer] 62322: [NTOSKRNL] Zero out the guid object, remove debug breakpoints in WmipDeleteMethod and WmipCloseMethod (for now there's nothing to do), factor out the code to capture the guid obje...
by tkreuzer＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: tkreuzer Date: Mon Feb 24 18:07:18 2014 New Revision: 62322 URL: http://svn.reactos.org/svn/reactos?rev=62322&view=rev Log: [NTOSKRNL] Zero out the guid object, remove debug breakpoints in WmipDeleteMethod and WmipCloseMethod (for now there's nothing to do), factor out the code to capture the guid object attributes into WmipCaptureGuidObjectAttributes, ignore ioctl 0x228168 for now and stubplement IOCTL_WMI_OPEN_GUID_FOR_EVENTS Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] Mon Feb 24 18:07:18 2014 @@ -80,7 +80,14 @@ WmipDeleteMethod( _In_ PVOID Object) { - UNIMPLEMENTED_DBGBREAK(); + PWMIP_GUID_OBJECT GuidObject = Object; + + /* Check if the object is attached to an IRP */ + if (GuidObject->Irp != NULL) + { + /* This is not supported yet */ + ASSERT(FALSE); + } } VOID @@ -92,7 +99,7 @@ _In_ ULONG ProcessHandleCount, _In_ ULONG SystemHandleCount) { - UNIMPLEMENTED_DBGBREAK(); + /* For now nothing */ } NTSTATUS @@ -199,6 +206,7 @@ return Status; } + RtlZeroMemory(GuidObject, sizeof(*GuidObject)); GuidObject->Guid = Guid; *OutGuidObject = GuidObject; Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Mon Feb 24 18:07:18 2014 @@ -107,6 +107,59 @@ ULONG InputBufferLength) { UNIMPLEMENTED_DBGBREAK(); + return STATUS_SUCCESS; +} + +static +NTSTATUS +WmipCaptureGuidObjectAttributes( + _In_ POBJECT_ATTRIBUTES GuidObjectAttributes, + _Out_ POBJECT_ATTRIBUTES CapuredObjectAttributes, + _Out_ PUNICODE_STRING CapturedObjectName, + _Out_ PWSTR ObjectNameBuffer, + _In_ KPROCESSOR_MODE AccessMode) +{ + NT_ASSERT(AccessMode != KernelMode); + + _SEH2_TRY + { + /* Probe and copy the object attributes structure */ + ProbeForRead(GuidObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(PVOID)); + *CapuredObjectAttributes = *GuidObjectAttributes; + + /* Probe and copy the object name UNICODE_STRING */ + ProbeForRead(CapuredObjectAttributes->ObjectName, + sizeof(UNICODE_STRING), + sizeof(PVOID)); + *CapturedObjectName = *CapuredObjectAttributes->ObjectName; + + /* Check if the object name has the expected length */ + if (CapturedObjectName->Length != 45 * sizeof(WCHAR)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Probe and copy the object name buffer */ + ProbeForRead(CapturedObjectName->Buffer, + CapturedObjectName->Length, + sizeof(WCHAR)); + RtlCopyMemory(ObjectNameBuffer, + CapturedObjectName->Buffer, + CapturedObjectName->Length); + + /* Fix pointers */ + CapturedObjectName->Buffer = ObjectNameBuffer; + GuidObjectAttributes->ObjectName = CapturedObjectName; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception!\n"); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + return STATUS_SUCCESS; } @@ -143,45 +196,20 @@ return STATUS_UNSUCCESSFUL; } - _SEH2_TRY - { - /* Probe and copy the object attributes structure */ - ProbeForRead(RegisterGuids->ObjectAttributes, - sizeof(OBJECT_ATTRIBUTES), - sizeof(PVOID)); - LocalObjectAttributes = *RegisterGuids->ObjectAttributes; - - /* Probe and copy the object name UNICODE_STRING */ - ProbeForRead(LocalObjectAttributes.ObjectName, - sizeof(UNICODE_STRING), - sizeof(PVOID)); - LocalObjectName = *LocalObjectAttributes.ObjectName; - - /* Check if the object name has the expected length */ - if (LocalObjectName.Length != 45 * sizeof(WCHAR)) - { - return STATUS_INVALID_PARAMETER; - } - - /* Probe and copy the object name buffer */ - ProbeForRead(LocalObjectName.Buffer, LocalObjectName.Length, sizeof(WCHAR)); - RtlCopyMemory(LocalObjectNameBuffer, - LocalObjectName.Buffer, - LocalObjectName.Length); - - /* Fix pointers */ - LocalObjectName.Buffer = LocalObjectNameBuffer; - LocalObjectAttributes.ObjectName = &LocalObjectName; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT1("Got exception!\n"); - return _SEH2_GetExceptionCode(); - } - _SEH2_END; + /* Capture object attributes */ + PreviousMode = ExGetPreviousMode(); + Status = WmipCaptureGuidObjectAttributes(RegisterGuids->ObjectAttributes, + &LocalObjectAttributes, + &LocalObjectName, + LocalObjectNameBuffer, + PreviousMode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WmipCaptureGuidObjectAttributes failed: 0x%lx\n", Status); + return Status; + } /* Open a new GUID object */ - PreviousMode = ExGetPreviousMode(); Status = WmipOpenGuidObject(&LocalObjectAttributes, SPECIFIC_RIGHTS_ALL, PreviousMode, @@ -189,6 +217,7 @@ &GuidObject); if (!NT_SUCCESS(Status)) { + DPRINT1("WmipOpenGuidObject failed: 0x%lx\n", Status); return Status; } @@ -325,6 +354,77 @@ } return Status; +} + +typedef struct _WMI_OPEN_GUID_FOR_EVENTS +{ + POBJECT_ATTRIBUTES ObjectAttributes; + ACCESS_MASK DesiredAccess; + ULONG Unknown08; + ULONG Unknown0C; +} WMI_OPEN_GUID_FOR_EVENTS, *PWMI_OPEN_GUID_FOR_EVENTS; + +typedef struct _WMIP_RESULT2 +{ + ULONG Unknown00; + ULONG Unknown04; + HANDLE Handle; + ULONG Unknown0C; +} WMIP_RESULT2, *PWMIP_RESULT2; + +static +NTSTATUS +WmipOpenGuidForEvents( + PVOID Buffer, + ULONG InputLength, + PULONG OutputLength) +{ + PWMI_OPEN_GUID_FOR_EVENTS OpenGuidForEvents = Buffer; + PWMIP_RESULT2 Result = (PWMIP_RESULT2)Buffer; + OBJECT_ATTRIBUTES LocalObjectAttributes; + UNICODE_STRING LocalObjectName; + WCHAR LocalObjectNameBuffer[45 + 1]; + KPROCESSOR_MODE PreviousMode; + HANDLE GuidObjectHandle; + PVOID GuidObject; + NTSTATUS Status; + + if ((InputLength != sizeof(WMI_OPEN_GUID_FOR_EVENTS)) || + (*OutputLength != sizeof(WMIP_RESULT2))) + { + return STATUS_UNSUCCESSFUL; + } + + /* Capture object attributes */ + PreviousMode = ExGetPreviousMode(); + Status = WmipCaptureGuidObjectAttributes(OpenGuidForEvents->ObjectAttributes, + &LocalObjectAttributes, + &LocalObjectName, + LocalObjectNameBuffer, + PreviousMode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ProbeAndCaptureGuidObjectAttributes failed: 0x%lx\n", Status); + return Status; + } + + /* Open a new GUID object */ + Status = WmipOpenGuidObject(&LocalObjectAttributes, + OpenGuidForEvents->DesiredAccess, + PreviousMode, + &GuidObjectHandle, + &GuidObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WmipOpenGuidObject failed: 0x%lx\n", Status); + return Status; + } + + Result->Handle = GuidObjectHandle; + + ObDereferenceObject(GuidObject); + + return STATUS_SUCCESS; } NTSTATUS @@ -375,6 +475,19 @@ Buffer, InputLength, &OutputLength); + break; + } + + case 0x228168: + { + DPRINT1("IOCTL 0x228168 is unimplemented, ignoring\n"); + Status = STATUS_SUCCESS; + break; + } + + case IOCTL_WMI_OPEN_GUID_FOR_EVENTS: + { + Status = WmipOpenGuidForEvents(Buffer, InputLength, &OutputLength); break; }

1 0

[tkreuzer] 62321: [NTOSKRNL] Stubplement IOCTL_WMI_UNREGISTER_GUIDS and IOCTL_WMI_RECEIVE_NOTIFICATIONS, just enough that the callers don't error out.
by tkreuzer＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: tkreuzer Date: Mon Feb 24 15:14:31 2014 New Revision: 62321 URL: http://svn.reactos.org/svn/reactos?rev=62321&view=rev Log: [NTOSKRNL] Stubplement IOCTL_WMI_UNREGISTER_GUIDS and IOCTL_WMI_RECEIVE_NOTIFICATIONS, just enough that the callers don't error out. Modified: branches/kernel-fun/reactos/include/reactos/wmiioctl.h branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h Modified: branches/kernel-fun/reactos/include/reactos/wmiioctl.h URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/include/reac… ============================================================================== --- branches/kernel-fun/reactos/include/reactos/wmiioctl.h [iso-8859-1] (original) +++ branches/kernel-fun/reactos/include/reactos/wmiioctl.h [iso-8859-1] Mon Feb 24 15:14:31 2014 @@ -25,13 +25,13 @@ #define IOCTL_WMI_4e CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4e, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224138 #define IOCTL_WMI_4f CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4f, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22413C #define IOCTL_WMI_OPEN_GUID_FOR_EVENTS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x50, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224140 -#define IOCTL_WMI_51 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x51, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228144 +#define IOCTL_WMI_RECEIVE_NOTIFICATIONS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x51, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228144 #define IOCTL_WMI_52 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x52, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224148 #define IOCTL_WMI_REGISTER_GUIDS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x53, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22414C, called from ntdll!EtwpRegisterGuids #define IOCTL_WMI_54 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x54, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224150 #define IOCTL_WMI_55 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x55, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224154 #define IOCTL_WMI_56 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x56, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224158 -#define IOCTL_WMI_57 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x57, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22415C +#define IOCTL_WMI_UNREGISTER_GUIDS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x57, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22415C, called from ntdll!WmiUnregisterGuids #define IOCTL_WMI_58 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x58, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224160 #define IOCTL_WMI_59 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x59, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224164 #define IOCTL_WMI_5a CTL_CODE(FILE_DEVICE_UNKNOWN, 0x5a, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228168 Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Mon Feb 24 15:14:31 2014 @@ -33,11 +33,35 @@ { HANDLE Handle; ULONG Unknown04; + TRACEHANDLE TraceHandle; + BOOLEAN Unknown10; +} WMIP_RESULT, *PWMIP_RESULT; + +typedef struct _WMI_UNREGISTER_GUID +{ + GUID Guid; + ULONG Unknown10; + ULONG Unknown14; + ULONG Unknown18; + ULONG Unknown1C; +} WMI_UNREGISTER_GUID, *PWMI_UNREGISTER_GUID; + +typedef struct _WMI_GUID_OBJECT_ENTRY +{ + HANDLE Handle; + ULONG Unknown04; +} WMI_GUID_OBJECT_ENTRY, *PWMI_GUID_OBJECT_ENTRY; + +typedef struct _WMI_NOTIFICATION +{ + ULONG NumberOfGuidObjects; + ULONG Unknown04; ULONG Unknown08; ULONG Unknown0C; - BOOLEAN Unknown10; -} WMIP_RESULT, *PWMIP_RESULT; - + ULONG Unknown10; + ULONG Unknown14; + WMI_GUID_OBJECT_ENTRY GuidObjects[0]; +} WMI_NOTIFICATION, *PWMI_NOTIFICATION; PDEVICE_OBJECT WmipServiceDeviceObject; PDEVICE_OBJECT WmipAdminDeviceObject; @@ -106,7 +130,7 @@ /* Make sure the input buffer is large enough */ if ((InputLength < sizeof(WMIP_REGISTER_GUIDS)) || - (RegisterGuids->RegInfo.BufferSize > + (RegisterGuids->RegInfo.BufferSize > (InputLength - FIELD_OFFSET(WMIP_REGISTER_GUIDS, RegInfo)))) { return STATUS_UNSUCCESSFUL; @@ -168,14 +192,139 @@ return Status; } - /* Derefernce the GUID object */ + /* Dereference the GUID object */ ObDereferenceObject(GuidObject); - /* Return the handle */ + /* Return the handle (user mode will close it) */ Result->Handle = GuidObjectHandle; + Result->TraceHandle = 0; *OutputLength = 24; return STATUS_SUCCESS; +} + + +static +NTSTATUS +WmipUnregisterGuids( + _In_ PVOID Buffer, + _In_ ULONG InputLength, + _Inout_ PULONG OutputLength) +{ + /* For now we have nothing to do */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +WmipClearIrpObjectList( + _In_ PIRP Irp) +{ + PWMIP_IRP_CONTEXT IrpContext; + PLIST_ENTRY ListEntry; + PWMIP_GUID_OBJECT GuidObject; + + /* Get the IRP context */ + IrpContext = (PWMIP_IRP_CONTEXT)Irp->Tail.Overlay.DriverContext; + + /* Loop all GUID objects attached to this IRP */ + for (ListEntry = IrpContext->GuidObjectListHead.Flink; + ListEntry != &IrpContext->GuidObjectListHead; + ListEntry = ListEntry->Flink) + { + /* Get the GUID object */ + GuidObject = CONTAINING_RECORD(ListEntry, WMIP_GUID_OBJECT, IrpLink); + + /* Make sure the IRP matches and clear it */ + ASSERT(GuidObject->Irp == Irp); + GuidObject->Irp = NULL; + + /* Remove the entry */ + RemoveEntryList(ListEntry); + } +} + +VOID +NTAPI +WmipNotificationIrpCancel( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + /* Clear the list */ + WmipClearIrpObjectList(Irp); + + /* Release the cancel spin lock */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Set the status to cancelled and complete the IRP */ + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +static +VOID +WmipInitializeIrpContext( + PWMIP_IRP_CONTEXT IrpContext) +{ + /* Initialize the list head for GUID objects */ + InitializeListHead(&IrpContext->GuidObjectListHead); +} + +static +NTSTATUS +WmipReceiveNotifications( + _Inout_ PIRP Irp, + _In_ PVOID Buffer, + _In_ ULONG InputLength, + _Inout_ PULONG OutputLength) +{ + PWMI_NOTIFICATION Notification; + PWMIP_IRP_CONTEXT IrpContext; + NTSTATUS Status; + + //__debugbreak(); + if ((InputLength < sizeof(WMI_NOTIFICATION)) || (*OutputLength < 0x38)) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + /// FIXME: For now we don't do any actual work, but simply pretend we are + /// waiting for notifications. We won't ever deliver any though. + Notification = (PWMI_NOTIFICATION)Buffer; + DBG_UNREFERENCED_LOCAL_VARIABLE(Notification); + + // loop all objects + // reference the object + // on failure, fail the whole request + + // loop all objects + // update the irp (synchronization!) + // if we had one before complete the old irp with an error + + /* Get the IRP context and initialize it */ + IrpContext = (PWMIP_IRP_CONTEXT)Irp->Tail.Overlay.DriverContext; + WmipInitializeIrpContext(IrpContext); + + // loop all objects + // insert the objects into the IRP list + + /* Set our cancel routine for cleanup */ + IoSetCancelRoutine(Irp, WmipNotificationIrpCancel); + + /* Check if the IRP is already being cancelled */ + if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + Status = STATUS_CANCELLED; + } + else + { + /* Mark the IRP as pending */ + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + } + + return Status; } NTSTATUS @@ -209,6 +358,23 @@ Buffer, InputLength, &OutputLength); + break; + } + + case IOCTL_WMI_UNREGISTER_GUIDS: + { + Status = WmipUnregisterGuids(Buffer, + InputLength, + &OutputLength); + break; + } + + case IOCTL_WMI_RECEIVE_NOTIFICATIONS: + { + Status = WmipReceiveNotifications(Irp, + Buffer, + InputLength, + &OutputLength); break; } Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] Mon Feb 24 15:14:31 2014 @@ -3,9 +3,16 @@ #define GUID_STRING_LENGTH 36 +typedef struct _WMIP_IRP_CONTEXT +{ + LIST_ENTRY GuidObjectListHead; +} WMIP_IRP_CONTEXT, *PWMIP_IRP_CONTEXT; + typedef struct _WMIP_GUID_OBJECT { GUID Guid; + PIRP Irp; + LIST_ENTRY IrpLink; } WMIP_GUID_OBJECT, *PWMIP_GUID_OBJECT;

1 0

[dquintana] 62320: [RSHELL] * CMenuBand: Fix menu colors. CORE-7881
by dquintana＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: dquintana Date: Mon Feb 24 13:05:24 2014 New Revision: 62320 URL: http://svn.reactos.org/svn/reactos?rev=62320&view=rev Log: [RSHELL] * CMenuBand: Fix menu colors. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Feb 24 13:05:24 2014 @@ -610,6 +610,16 @@ HDC hdc; HBRUSH bgBrush; HBRUSH hotBrush; + NMHDR * hdr; + NMTBCUSTOMDRAW * cdraw; + NMTBHOTITEM * hot; + NMMOUSE * rclick; + NMPGCALCSIZE* csize; + TBBUTTONINFO btni; + BOOL useFlatMenus = FALSE; + COLORREF clrText; + COLORREF clrTextHighlight; + *theResult = 0; switch (uMsg) @@ -629,12 +639,7 @@ return S_OK; case WM_NOTIFY: - NMHDR * hdr = reinterpret_cast<LPNMHDR>(lParam); - NMTBCUSTOMDRAW * cdraw; - NMTBHOTITEM * hot; - NMMOUSE * rclick; - NMPGCALCSIZE* csize; - TBBUTTONINFO btni; + hdr = reinterpret_cast<LPNMHDR>(lParam); switch (hdr->code) { case PGN_CALCSIZE: @@ -725,15 +730,13 @@ case CDDS_ITEMPREPAINT: - cdraw->clrBtnFace = GetSysColor(COLOR_MENU); - cdraw->clrBtnHighlight = GetSysColor(COLOR_MENUHILIGHT); - - cdraw->clrText = GetSysColor(COLOR_MENUTEXT); - cdraw->clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); - cdraw->clrHighlightHotTrack = GetSysColor(COLOR_HIGHLIGHTTEXT); + SystemParametersInfo(SPI_GETFLATMENU, 0, &useFlatMenus, 0); + + clrText = GetSysColor(COLOR_MENUTEXT); + clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); bgBrush = GetSysColorBrush(COLOR_MENU); - hotBrush = GetSysColorBrush(COLOR_MENUHILIGHT); + hotBrush = GetSysColorBrush(useFlatMenus ? COLOR_MENUHILIGHT : COLOR_HIGHLIGHT); rc = cdraw->nmcd.rc; hdc = cdraw->nmcd.hdc; @@ -750,9 +753,13 @@ case CDIS_HOT: case CDIS_FOCUS: FillRect(hdc, &rc, hotBrush); + SetTextColor(hdc, clrTextHighlight); + cdraw->clrText = clrTextHighlight; break; default: FillRect(hdc, &rc, bgBrush); + SetTextColor(hdc, clrText); + cdraw->clrText = clrText; break; }

1 0

[dquintana] 62319: [RSHELL] * Move some classes to separate files. * Move class declarations to .h files. CORE-7586
by dquintana＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: dquintana Date: Mon Feb 24 11:59:34 2014 New Revision: 62319 URL: http://svn.reactos.org/svn/reactos?rev=62319&view=rev Log: [RSHELL] * Move some classes to separate files. * Move class declarations to .h files. CORE-7586 Added: branches/shell-experiments/base/shell/rshell/CMenuBand.h (with props) branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h (with props) branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp (with props) branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h (with props) branches/shell-experiments/base/shell/rshell/CMenuSite.h (with props) branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp (with props) branches/shell-experiments/base/shell/rshell/CMenuToolbars.h (with props) Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Added: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Added: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Added: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Added: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Added: branches/shell-experiments/base/shell/rshell/CMenuSite.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Added: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… Added: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…

1 0

[dquintana] 62318: [RSHELL] * Undo a test change that shouldn't have reached the commit. ; P
by dquintana＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: dquintana Date: Mon Feb 24 11:20:16 2014 New Revision: 62318 URL: http://svn.reactos.org/svn/reactos?rev=62318&view=rev Log: [RSHELL] * Undo a test change that shouldn't have reached the commit. ;P Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Feb 24 11:20:16 2014 @@ -915,7 +915,7 @@ CMINVOKECOMMANDINFO cmi = { 0 }; cmi.cbSize = sizeof(cmi); - cmi.lpVerb = reinterpret_cast<LPCSTR>(uCommand); + cmi.lpVerb = MAKEINTRESOURCEA(uCommand); cmi.hwnd = m_hwnd; hr = contextMenu->InvokeCommand(&cmi); @@ -934,7 +934,6 @@ } return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); } - HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType) {

1 0

[dquintana] 62317: [RSHELL] * CMenuBand: - Use a Pager control on top of the SF Toolbar, like Windows does. - Cache the ideal size of the toolbars to reuse it next time the start menu shows. - Draw...
by dquintana＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: dquintana Date: Mon Feb 24 11:07:16 2014 New Revision: 62317 URL: http://svn.reactos.org/svn/reactos?rev=62317&view=rev Log: [RSHELL] * CMenuBand: - Use a Pager control on top of the SF Toolbar, like Windows does. - Cache the ideal size of the toolbars to reuse it next time the start menu shows. - Draw the dropdown arrows on items with dropdowns. - Cancel the timer and open a submenu immediately if the item is clicked. - Draw the selected background color on the item with a popup if there is no other item being hovered. - Add some space for the dropdown arrows in the size calculations (hardcoded). - Simplify the size calculation and positioning. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Feb 24 11:07:16 2014 @@ -44,18 +44,24 @@ class CMenuToolbarBase { +private: + HWND m_hwnd; // May be the pager + protected: CMenuBand * m_menuBand; - HWND m_hwnd; + HWND m_hwndToolbar; DWORD m_dwMenuFlags; INT m_hotItem; WNDPROC m_SubclassOld; + BOOL m_hasIdealSize; + SIZE m_idealSize; + BOOL m_usePager; private: static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); public: - CMenuToolbarBase(CMenuBand *menuBand); + CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager); virtual ~CMenuToolbarBase() {} HRESULT IsWindowOwner(HWND hwnd); @@ -70,12 +76,17 @@ virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); - HRESULT PopupSubMenu(UINT index, IShellMenu* childShellMenu); + HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu); HRESULT PopupSubMenu(UINT index, HMENU menu); HRESULT DoContextMenu(IContextMenu* contextMenu); HRESULT ChangeHotItem(DWORD changeType); HRESULT OnHotItemChange(const NMTBHOTITEM * hot); + + HRESULT GetIdealSize(SIZE& size); + HRESULT SetPosSize(int x, int y, int cx, int cy); + + void InvalidateDraw(); protected: LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -164,6 +175,9 @@ CMenuToolbarBase * m_hotBar; INT m_hotItem; + INT m_popupItem; + + HFONT m_marlett; public: CMenuBand(); @@ -279,7 +293,7 @@ HRESULT _GetTopLevelWindow(HWND*topLevel); HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id); HRESULT _MenuItemHotTrack(DWORD changeType); - HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude); + HRESULT _OnPopupSubMenu(INT popupItem, IMenuPopup * popup, POINTL * pAt, RECTL * pExclude); BOOL UseBigIcons() { @@ -562,16 +576,24 @@ return hr; } -CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand) : +CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : + m_hwnd(NULL), m_menuBand(menuBand), - m_hwnd(NULL), - m_dwMenuFlags(0) + m_hwndToolbar(NULL), + m_dwMenuFlags(0), + m_hasIdealSize(FALSE) { } HRESULT CMenuToolbarBase::IsWindowOwner(HWND hwnd) { - return (m_hwnd && m_hwnd == hwnd) ? S_OK : S_FALSE; + return (m_hwnd && m_hwnd == hwnd) || + (m_hwndToolbar && m_hwndToolbar == hwnd) ? S_OK : S_FALSE; +} + +void CMenuToolbarBase::InvalidateDraw() +{ + InvalidateRect(m_hwnd, NULL, FALSE); } HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow) @@ -583,11 +605,11 @@ if (m_menuBand->UseBigIcons()) { - SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(ilBig)); + SendMessageW(m_hwndToolbar, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(ilBig)); } else { - SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(ilSmall)); + SendMessageW(m_hwndToolbar, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(ilSmall)); } return S_OK; @@ -595,7 +617,10 @@ HRESULT CMenuToolbarBase::Close() { - DestroyWindow(m_hwnd); + DestroyWindow(m_hwndToolbar); + if (m_hwndToolbar != m_hwnd) + DestroyWindow(m_hwnd); + m_hwndToolbar = NULL; m_hwnd = NULL; return S_OK; } @@ -631,12 +656,32 @@ if (hwndToolbar == NULL) return E_FAIL; - ::SetParent(hwndToolbar, hwndParent); - - m_hwnd = hwndToolbar; - + if (m_usePager) + { + LONG pgStyles = PGS_VERT | WS_CHILD | WS_VISIBLE; + LONG pgExStyles = 0; + + HWND hwndPager = CreateWindowEx( + pgExStyles, WC_PAGESCROLLER, NULL, + pgStyles, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + hwndParent, NULL, _AtlBaseModule.GetModuleInstance(), 0); + + ::SetParent(hwndToolbar, hwndPager); + ::SetParent(hwndPager, hwndParent); + + SendMessage(hwndPager, PGM_SETCHILD, 0, reinterpret_cast<LPARAM>(hwndToolbar)); + m_hwndToolbar = hwndToolbar; + m_hwnd = hwndPager; + } + else + { + ::SetParent(hwndToolbar, hwndParent); + m_hwndToolbar = hwndToolbar; + m_hwnd = hwndToolbar; + } + /* Identify the version of the used Common Controls DLL by sending the size of the TBBUTTON structure */ - SendMessageW(m_hwnd, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); //if (dwFlags & SMINIT_TOPLEVEL) //{ @@ -644,25 +689,59 @@ // SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0); //} //else + int shiml; if (m_menuBand->UseBigIcons()) { - IImageList * piml; - HRESULT hr = SHGetImageList(SHIL_LARGE, IID_PPV_ARG(IImageList, &piml)); - - SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); - SendMessageW(m_hwnd, TB_SETPADDING, 0, MAKELPARAM(0, 0)); + shiml = SHIL_LARGE; + SendMessageW(hwndToolbar, TB_SETPADDING, 0, MAKELPARAM(0, 0)); } else { - IImageList * piml; - HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); - - SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); - } - - SetWindowLongPtr(m_hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this)); - m_SubclassOld = (WNDPROC) SetWindowLongPtr(m_hwnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(CMenuToolbarBase::s_SubclassProc)); - + shiml = SHIL_SMALL; + } + + IImageList * piml; + HRESULT hr = SHGetImageList(shiml, IID_PPV_ARG(IImageList, &piml)); + if (SUCCEEDED(hr)) + { + SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + } + else + { + SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, 0); + } + + SetWindowLongPtr(hwndToolbar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this)); + m_SubclassOld = (WNDPROC) SetWindowLongPtr(hwndToolbar, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(CMenuToolbarBase::s_SubclassProc)); + + return S_OK; +} + +HRESULT CMenuToolbarBase::GetIdealSize(SIZE& size) +{ + size.cx = size.cy = 0; + + if (m_hwndToolbar && !m_hasIdealSize) + { + SendMessageW(m_hwndToolbar, TB_AUTOSIZE, 0, 0); + SendMessageW(m_hwndToolbar, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&m_idealSize)); + m_hasIdealSize = TRUE; + } + + size = m_idealSize; + + return S_OK; +} + +HRESULT CMenuToolbarBase::SetPosSize(int x, int y, int cx, int cy) +{ + if (m_hwnd != m_hwndToolbar) + { + SetWindowPos(m_hwndToolbar, NULL, x, y, cx, m_idealSize.cy, 0); + } + SetWindowPos(m_hwnd, NULL, x, y, cx, cy, 0); + DWORD btnSize = SendMessage(m_hwndToolbar, TB_GETBUTTONSIZE, 0, 0); + SendMessage(m_hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(cx, HIWORD(btnSize))); return S_OK; } @@ -691,7 +770,7 @@ { KillTimer(hWnd, TIMERID_HOTTRACK); - m_menuBand->_OnPopupSubMenu(NULL, NULL, NULL); + m_menuBand->_OnPopupSubMenu(-1, NULL, NULL, NULL); if (HasSubMenu(m_hotItem) == S_OK) { @@ -707,7 +786,7 @@ { if (hot->dwFlags & HICF_LEAVING) { - KillTimer(m_hwnd, TIMERID_HOTTRACK); + KillTimer(m_hwndToolbar, TIMERID_HOTTRACK); m_hotItem = -1; m_menuBand->_OnHotItemChanged(NULL, -1); m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); @@ -716,7 +795,7 @@ { DWORD elapsed = 0; SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); - SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL); + SetTimer(m_hwndToolbar, TIMERID_HOTTRACK, elapsed, NULL); m_hotItem = hot->idNew; m_menuBand->_OnHotItemChanged(this, m_hotItem); @@ -725,7 +804,7 @@ return S_OK; } -HRESULT CMenuToolbarBase::PopupSubMenu(UINT index, IShellMenu* childShellMenu) +HRESULT CMenuToolbarBase::PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu) { IBandSite* pBandSite; IDeskBar* pDeskBar; @@ -733,14 +812,14 @@ HRESULT hr = 0; RECT rc = { 0 }; - if (!SendMessage(m_hwnd, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc))) + if (!SendMessage(m_hwndToolbar, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc))) return E_FAIL; POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; - ClientToScreen(m_hwnd, &a); - ClientToScreen(m_hwnd, &b); + ClientToScreen(m_hwndToolbar, &a); + ClientToScreen(m_hwndToolbar, &b); POINTL pt = { b.x, a.y }; RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar? @@ -791,7 +870,7 @@ if (FAILED(hr)) return hr; - m_menuBand->_OnPopupSubMenu(popup, &pt, &rcl); + m_menuBand->_OnPopupSubMenu(itemId, popup, &pt, &rcl); return S_OK; } @@ -800,12 +879,12 @@ { RECT rc = { 0 }; - if (!SendMessage(m_hwnd, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc))) + if (!SendMessage(m_hwndToolbar, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc))) return E_FAIL; POINT b = { rc.right, rc.bottom }; - ClientToScreen(m_hwnd, &b); + ClientToScreen(m_hwndToolbar, &b); HMENU popup = GetSubMenu(menu, index); @@ -836,7 +915,7 @@ CMINVOKECOMMANDINFO cmi = { 0 }; cmi.cbSize = sizeof(cmi); - cmi.lpVerb = MAKEINTRESOURCEA(uCommand); + cmi.lpVerb = reinterpret_cast<LPCSTR>(uCommand); cmi.hwnd = m_hwnd; hr = contextMenu->InvokeCommand(&cmi); @@ -847,6 +926,12 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { theResult = 0; + if (HasSubMenu(wParam) == S_OK) + { + KillTimer(m_hwndToolbar, TIMERID_HOTTRACK); + PopupItem(wParam); + return S_FALSE; + } return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); } @@ -858,14 +943,14 @@ if (dwSelectType != 0xFFFFFFFF) { - int count = SendMessage(m_hwnd, TB_BUTTONCOUNT, 0, 0); + int count = SendMessage(m_hwndToolbar, TB_BUTTONCOUNT, 0, 0); if (m_hotItem >= 0) { TBBUTTONINFO info = { 0 }; info.cbSize = sizeof(TBBUTTONINFO); info.dwMask = 0; - index = SendMessage(m_hwnd, TB_GETBUTTONINFO, m_hotItem, reinterpret_cast<LPARAM>(&info)); + index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, m_hotItem, reinterpret_cast<LPARAM>(&info)); } if (dwSelectType == VK_HOME) @@ -904,7 +989,7 @@ TBBUTTON btn = { 0 }; while (index >= 0 && index < count) { - DWORD res = SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); + DWORD res = SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); if (!res) return E_FAIL; @@ -913,7 +998,7 @@ m_hotItem = btn.idCommand; if (prev != m_hotItem) { - SendMessage(m_hwnd, TB_SETHOTITEM, index, 0); + SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0); return m_menuBand->_OnHotItemChanged(this, m_hotItem); } return S_OK; @@ -933,7 +1018,7 @@ m_hotItem = -1; if (prev != m_hotItem) { - SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0); + SendMessage(m_hwndToolbar, TB_SETHOTITEM, -1, 0); m_menuBand->_OnHotItemChanged(NULL, -1); } return S_FALSE; @@ -959,7 +1044,7 @@ } CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) : - CMenuToolbarBase(menuBand), + CMenuToolbarBase(menuBand, FALSE), m_hmenu(NULL) { } @@ -1029,7 +1114,7 @@ tbb.fsStyle |= BTNS_SEP; } - SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); if (MenuString) HeapFree(GetProcessHeap(), 0, MenuString); @@ -1055,6 +1140,10 @@ if (FAILED(hr)) return hr; + // in case the clicked item has a submenu, we do not need to execute the item + if (hr == S_FALSE) + return hr; + return m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); } @@ -1063,12 +1152,12 @@ TBBUTTONINFO info = { 0 }; info.cbSize = sizeof(TBBUTTONINFO); info.dwMask = 0; - int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); + int index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); if (index < 0) return E_FAIL; TBBUTTON btn = { 0 }; - SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); + SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); SMINFO * nfo = reinterpret_cast<SMINFO*>(btn.dwData); if (!nfo) @@ -1085,7 +1174,7 @@ if (FAILED(hr)) return hr; - return PopupSubMenu(index, shellMenu); + return PopupSubMenu(uItem, index, shellMenu); } } @@ -1094,14 +1183,14 @@ TBBUTTONINFO info = { 0 }; info.cbSize = sizeof(TBBUTTONINFO); info.dwMask = 0; - int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); + int index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); if (index < 0) return E_FAIL; return ::GetSubMenu(m_hmenu, index) ? S_OK : S_FALSE; } CMenuSFToolbar::CMenuSFToolbar(CMenuBand * menuBand) : - CMenuToolbarBase(menuBand), + CMenuToolbarBase(menuBand, TRUE), m_shellFolder(NULL) { } @@ -1117,7 +1206,7 @@ PWSTR MenuString; IEnumIDList * eidl; - m_shellFolder->EnumObjects(m_hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); + m_shellFolder->EnumObjects(m_hwndToolbar, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); LPITEMIDLIST item = static_cast<LPITEMIDLIST>(CoTaskMemAlloc(sizeof(ITEMIDLIST))); ULONG fetched; @@ -1155,7 +1244,7 @@ tbb.dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); // FIXME: remove before deleting the toolbar or it will leak - SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); HeapFree(GetProcessHeap(), 0, MenuString); } @@ -1172,7 +1261,7 @@ tbb.iString = (INT_PTR) MenuString; tbb.iBitmap = -1; - SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); return S_OK; } @@ -1225,7 +1314,7 @@ TBBUTTONINFO info = { 0 }; info.cbSize = sizeof(TBBUTTONINFO); info.dwMask = 0; - int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); + int index = SendMessage(m_hwndToolbar, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); if (index < 0) return NULL; @@ -1233,7 +1322,7 @@ *pIndex = index; TBBUTTON btn = { 0 }; - if (!SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn))) + if (!SendMessage(m_hwndToolbar, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn))) return NULL; return reinterpret_cast<LPITEMIDLIST>(btn.dwData); @@ -1245,7 +1334,7 @@ CComPtr<IContextMenu> contextMenu; LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(rclick->dwItemData); - hr = m_shellFolder->GetUIObjectOf(m_hwnd, 1, &pidl, IID_IContextMenu, NULL, reinterpret_cast<VOID **>(&contextMenu)); + hr = m_shellFolder->GetUIObjectOf(m_hwndToolbar, 1, &pidl, IID_IContextMenu, NULL, reinterpret_cast<VOID **>(&contextMenu)); if (hr != S_OK) return hr; @@ -1257,6 +1346,10 @@ HRESULT hr; hr = CMenuToolbarBase::OnCommand(wParam, lParam, theResult); if (FAILED(hr)) + return hr; + + // in case the clicked item has a submenu, we do not need to execute the item + if (hr == S_FALSE) return hr; return m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); @@ -1295,7 +1388,7 @@ m_menuBand->GetMenuInfo(&psmc, &uId, &uIdAncestor, &flags); - // FIXME: not sure waht to use as uId/uIdAncestor here + // FIXME: not sure what to use as uId/uIdAncestor here hr = shellMenu->Initialize(psmc, 0, uId, SMINIT_VERTICAL); if (FAILED(hr)) return hr; @@ -1309,7 +1402,7 @@ if (FAILED(hr)) return hr; - return PopupSubMenu(index, shellMenu); + return PopupSubMenu(uItem, index, shellMenu); } HRESULT CMenuSFToolbar::HasSubMenu(UINT uItem) @@ -1336,9 +1429,15 @@ m_subMenuChild(NULL), m_useBigIcons(FALSE), m_hotBar(NULL), - m_hotItem(-1) + m_hotItem(-1), + m_popupItem(-1) { m_focusManager = CMenuFocusManager::AcquireManager(); + + m_marlett = CreateFont( + 0, 0, 0, 0, 0, 0, 0, 0, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FF_DONTCARE, L"Marlett"); } CMenuBand::~CMenuBand() @@ -1350,6 +1449,8 @@ if (m_SFToolbar) delete m_SFToolbar; + + DeleteObject(m_marlett); } HRESULT STDMETHODCALLTYPE CMenuBand::Initialize( @@ -1518,133 +1619,73 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc) { - SIZE sizeStaticY = { 0 }; - SIZE sizeShlFldY = { 0 }; - HWND hwndStatic = NULL; - HWND hwndShlFld = NULL; + SIZE sizeStatic = { 0 }; + SIZE sizeShlFld = { 0 }; HRESULT hr = S_OK; if (m_staticToolbar != NULL) - hr = m_staticToolbar->GetWindow(&hwndStatic); + hr = m_staticToolbar->GetIdealSize(sizeStatic); if (FAILED(hr)) return hr; if (m_SFToolbar != NULL) - hr = m_SFToolbar->GetWindow(&hwndShlFld); - if (FAILED(hr)) - return hr; - - if (hwndStatic == NULL && hwndShlFld == NULL) + hr = m_SFToolbar->GetIdealSize(sizeShlFld); + if (FAILED(hr)) + return hr; + + if (m_staticToolbar == NULL && m_SFToolbar == NULL) return E_FAIL; - if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStaticY)); - if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFldY)); - - int sy = min(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); - - int syStatic = sizeStaticY.cy; + int sy = min(prc->bottom - prc->top, sizeStatic.cy + sizeShlFld.cy); + + int syStatic = sizeStatic.cy; int syShlFld = sy - syStatic; - if (hwndShlFld) - { - SetWindowPos(hwndShlFld, NULL, - prc->left, - prc->top, - prc->right - prc->left, - syShlFld, - 0); - DWORD btnSize = SendMessage(hwndShlFld, TB_GETBUTTONSIZE, 0, 0); - SendMessage(hwndShlFld, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); - } - if (hwndStatic) - { - SetWindowPos(hwndStatic, hwndShlFld, - prc->left, - prc->top + syShlFld, - prc->right - prc->left, - syStatic, - 0); - DWORD btnSize = SendMessage(hwndStatic, TB_GETBUTTONSIZE, 0, 0); - SendMessage(hwndStatic, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); - } - - return S_OK; -} - + if (m_SFToolbar) + { + m_SFToolbar->SetPosSize( + prc->left, + prc->top, + prc->right - prc->left, + syShlFld); + } + if (m_staticToolbar) + { + m_staticToolbar->SetPosSize( + prc->left, + prc->top + syShlFld, + prc->right - prc->left, + syStatic); + } + + return S_OK; +} HRESULT STDMETHODCALLTYPE CMenuBand::GetBandInfo( DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) { - HWND hwndStatic = NULL; - HWND hwndShlFld = NULL; + SIZE sizeStatic = { 0 }; + SIZE sizeShlFld = { 0 }; + HRESULT hr = S_OK; if (m_staticToolbar != NULL) - hr = m_staticToolbar->GetWindow(&hwndStatic); + hr = m_staticToolbar->GetIdealSize(sizeStatic); if (FAILED(hr)) return hr; if (m_SFToolbar != NULL) - hr = m_SFToolbar->GetWindow(&hwndShlFld); - if (FAILED(hr)) - return hr; - - if (hwndStatic == NULL && hwndShlFld == NULL) + hr = m_SFToolbar->GetIdealSize(sizeShlFld); + if (FAILED(hr)) + return hr; + + if (m_staticToolbar == NULL && m_SFToolbar == NULL) return E_FAIL; - // HACK (?) - if (pdbi->dwMask == 0) - { - pdbi->dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR; - } - - if (pdbi->dwMask & DBIM_MINSIZE) - { - SIZE sizeStatic = { 0 }; - SIZE sizeShlFld = { 0 }; - - if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStatic)); - if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFld)); - - pdbi->ptMinSize.x = 0; - pdbi->ptMinSize.y = sizeStatic.cy + sizeShlFld.cy; - } - if (pdbi->dwMask & DBIM_MAXSIZE) - { - SIZE sizeStatic = { 0 }; - SIZE sizeShlFld = { 0 }; - - if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeStatic)); - if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeShlFld)); - - pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx); // ignored - pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; - } - if (pdbi->dwMask & DBIM_INTEGRAL) - { - pdbi->ptIntegral.x = 0; - pdbi->ptIntegral.y = 0; - } - if (pdbi->dwMask & DBIM_ACTUAL) - { - SIZE sizeStatic = { 0 }; - SIZE sizeShlFld = { 0 }; - - if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, FALSE, reinterpret_cast<LPARAM>(&sizeStatic)); - if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, FALSE, reinterpret_cast<LPARAM>(&sizeShlFld)); - pdbi->ptActual.x = max(sizeStatic.cx, sizeShlFld.cx); - - if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStatic)); - if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFld)); - pdbi->ptActual.y = sizeStatic.cy + sizeShlFld.cy; - } - if (pdbi->dwMask & DBIM_TITLE) - wcscpy(pdbi->wszTitle, L""); - if (pdbi->dwMask & DBIM_MODEFLAGS) - pdbi->dwModeFlags = DBIMF_UNDELETEABLE; - if (pdbi->dwMask & DBIM_BKCOLOR) - pdbi->crBkgnd = 0; + pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx) + 20; + pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; + return S_OK; } @@ -1940,6 +1981,11 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { + RECT rc; + HDC hdc; + HBRUSH bgBrush; + HBRUSH hotBrush; + *theResult = 0; switch (uMsg) { @@ -1962,8 +2008,58 @@ NMTBCUSTOMDRAW * cdraw; NMTBHOTITEM * hot; NMMOUSE * rclick; + NMPGCALCSIZE* csize; + TBBUTTONINFO btni; switch (hdr->code) { + case PGN_CALCSIZE: + csize = reinterpret_cast<LPNMPGCALCSIZE>(hdr); + + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) + { + SIZE tbs; + m_staticToolbar->GetIdealSize(tbs); + if (csize->dwFlag == PGF_CALCHEIGHT) + { + csize->iHeight = tbs.cy; + } + else if (csize->dwFlag == PGF_CALCWIDTH) + { + csize->iHeight = tbs.cx; + } + } + + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) + { + SIZE tbs; + m_SFToolbar->GetIdealSize(tbs); + if (csize->dwFlag == PGF_CALCHEIGHT) + { + csize->iHeight = tbs.cy; + } + else if (csize->dwFlag == PGF_CALCWIDTH) + { + csize->iHeight = tbs.cx; + } + } + return S_OK; + + case TBN_DROPDOWN: + + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) + { + WPARAM wp = reinterpret_cast<LPNMTOOLBAR>(hdr)->iItem; + return m_staticToolbar->OnCommand(wp, 0, theResult); + } + + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) + { + WPARAM wp = reinterpret_cast<LPNMTOOLBAR>(hdr)->iItem; + return m_SFToolbar->OnCommand(wp, 0, theResult); + } + + return S_OK; + case TBN_HOTITEMCHANGE: hot = reinterpret_cast<LPNMTBHOTITEM>(hdr); @@ -1993,6 +2089,7 @@ } return S_OK; + case NM_CUSTOMDRAW: cdraw = reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr); switch (cdraw->nmcd.dwDrawStage) @@ -2010,11 +2107,18 @@ cdraw->clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); cdraw->clrHighlightHotTrack = GetSysColor(COLOR_HIGHLIGHTTEXT); - RECT rc = cdraw->nmcd.rc; - HDC hdc = cdraw->nmcd.hdc; - - HBRUSH bgBrush = GetSysColorBrush(COLOR_MENU); - HBRUSH hotBrush = GetSysColorBrush(COLOR_MENUHILIGHT); + bgBrush = GetSysColorBrush(COLOR_MENU); + hotBrush = GetSysColorBrush(COLOR_MENUHILIGHT); + + rc = cdraw->nmcd.rc; + hdc = cdraw->nmcd.hdc; + + if (cdraw->nmcd.uItemState != CDIS_DISABLED && + ((INT)cdraw->nmcd.dwItemSpec == m_hotItem || + (m_hotItem < 0 && (INT)cdraw->nmcd.dwItemSpec == m_popupItem))) + { + cdraw->nmcd.uItemState = CDIS_HOT; + } switch (cdraw->nmcd.uItemState) { @@ -2027,7 +2131,21 @@ break; } - *theResult = TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOETCHEDEFFECT | TBCDRF_HILITEHOTTRACK | TBCDRF_NOOFFSET; + *theResult = CDRF_NOTIFYPOSTPAINT | TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOOFFSET | TBCDRF_NOMARK | 0x00800000; // FIXME: the last bit is Vista+, for debugging only + return S_OK; + + case CDDS_ITEMPOSTPAINT: + btni.cbSize = sizeof(btni); + btni.dwMask = TBIF_STYLE; + SendMessage(hWnd, TB_GETBUTTONINFO, cdraw->nmcd.dwItemSpec, reinterpret_cast<LPARAM>(&btni)); + if (btni.fsStyle & BTNS_DROPDOWN) + { + SelectObject(cdraw->nmcd.hdc, m_marlett); + WCHAR text [] = L"8"; + SetBkMode(cdraw->nmcd.hdc, TRANSPARENT); + DrawTextEx(cdraw->nmcd.hdc, text, 1, &cdraw->nmcd.rc, DT_NOCLIP | DT_VCENTER | DT_RIGHT | DT_SINGLELINE, NULL); + } + *theResult = TRUE; return S_OK; } return S_OK; @@ -2178,6 +2296,8 @@ m_hotBar->ChangeHotItem(-1); m_hotBar = tb; m_hotItem = id; + if (m_staticToolbar) m_staticToolbar->InvalidateDraw(); + if (m_SFToolbar) m_SFToolbar->InvalidateDraw(); return S_OK; } @@ -2246,7 +2366,7 @@ return S_OK; } -HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude) +HRESULT CMenuBand::_OnPopupSubMenu(INT popupItem, IMenuPopup * popup, POINTL * pAt, RECTL * pExclude) { if (m_subMenuChild) { @@ -2254,11 +2374,14 @@ if (FAILED(hr)) return hr; } + m_popupItem = popupItem; m_subMenuChild = popup; if (popup) { IUnknown_SetSite(popup, m_subMenuParent); popup->Popup(pAt, pExclude, MPPF_RIGHT); } - return S_OK; -} + if (m_staticToolbar) m_staticToolbar->InvalidateDraw(); + if (m_SFToolbar) m_SFToolbar->InvalidateDraw(); + return S_OK; +} Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Mon Feb 24 11:07:16 2014 @@ -446,7 +446,8 @@ { cy = waHeight; } - else if (y + cy > rcWorkArea.bottom) + + if (y + cy > rcWorkArea.bottom) { y = rcWorkArea.bottom - cy; }

1 0

[aandrejevic] 62316: [FAST486] Add missing returns after calls to Fast486Exception.
by aandrejevic＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: aandrejevic Date: Mon Feb 24 03:53:02 2014 New Revision: 62316 URL: http://svn.reactos.org/svn/reactos?rev=62316&view=rev Log: [FAST486] Add missing returns after calls to Fast486Exception. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Mon Feb 24 03:53:02 2014 @@ -1728,6 +1728,7 @@ || State->Flags.Vm) { Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; } return Fast486WriteModrmWordOperands(State, @@ -1744,6 +1745,7 @@ || State->Flags.Vm) { Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; } return Fast486WriteModrmWordOperands(State, @@ -1763,6 +1765,7 @@ || State->Flags.Vm) { Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; } /* This is a privileged instruction */ @@ -1838,6 +1841,7 @@ || State->Flags.Vm) { Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; } /* This is a privileged instruction */ @@ -1915,6 +1919,7 @@ || State->Flags.Vm) { Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; } /* This is a privileged instruction */

1 0

[aandrejevic] 62315: [BASESRV] Implement BaseSrvExitVDM.
by aandrejevic＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: aandrejevic Date: Mon Feb 24 03:51:49 2014 New Revision: 62315 URL: http://svn.reactos.org/svn/reactos?rev=62315&view=rev Log: [BASESRV] Implement BaseSrvExitVDM. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Mon Feb 24 03:51:49 2014 @@ -190,8 +190,61 @@ CSR_API(BaseSrvExitVDM) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_EXIT_VDM ExitVdmRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.ExitVDMRequest; + PRTL_CRITICAL_SECTION CriticalSection = NULL; + PVDM_CONSOLE_RECORD ConsoleRecord = NULL; + PVDM_DOS_RECORD DosRecord; + + CriticalSection = (ExitVdmRequest->iWowTask == 0) + ? &DosCriticalSection + : &WowCriticalSection; + + /* Enter the critical section */ + RtlEnterCriticalSection(CriticalSection); + + if (ExitVdmRequest->iWowTask == 0) + { + /* Get the console record */ + Status = BaseSrvGetConsoleRecord(ExitVdmRequest->ConsoleHandle, &ConsoleRecord); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Cleanup the DOS records */ + while (ConsoleRecord->DosListHead.Flink != &ConsoleRecord->DosListHead) + { + DosRecord = CONTAINING_RECORD(ConsoleRecord->DosListHead.Flink, + VDM_DOS_RECORD, + Entry); + + /* Remove the DOS entry */ + RemoveEntryList(&DosRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, DosRecord); + } + + if (ConsoleRecord->CurrentDirs != NULL) + { + /* Free the current directories */ + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord->CurrentDirs); + ConsoleRecord->CurrentDirs = NULL; + ConsoleRecord->CurDirsLength = 0; + } + + /* Remove the console record */ + RemoveEntryList(&ConsoleRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord); + } + else + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + +Cleanup: + /* Leave the critical section */ + RtlLeaveCriticalSection(CriticalSection); + + return Status; } CSR_API(BaseSrvIsFirstVDM)

1 0

[hbelusca] 62314: [NTVDM] - Move an "enable interrupts" command to where it belongs (i.e. in the BIOS32 initialization code; we do it at the very end). Otherwise some problems appears when trying t...
by hbelusca＠svn.reactos.org 24 Feb '14

24 Feb '14

Author: hbelusca Date: Mon Feb 24 00:33:21 2014 New Revision: 62314 URL: http://svn.reactos.org/svn/reactos?rev=62314&view=rev Log: [NTVDM] - Move an "enable interrupts" command to where it belongs (i.e. in the BIOS32 initialization code; we do it at the very end). Otherwise some problems appears when trying to load 16-bit bios images. - Use the new macro REAL_TO_PHYS to convert "real-mode" pointers (valid inside the VM only) into "physical" ones (valid in ROS/Windows/whatever). - Add BIG HACKs (thanks Aleksander ;) ) in EmulatorRead/WriteMemory for wrapping up high memory addresses to low ones, so that we can load bios images (when you start running code at F000:FFF0). To test 16-bit bios images: in ntvdm.c, put a valid bios file name in the BiosInitialize(...) call, and disable all DOS calls that happen before EmulatorSimulate(). Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c branches/ntvdm/subsystems/ntvdm/emulator.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Mon Feb 24 00:33:21 2014 @@ -386,6 +386,10 @@ /* Initialize the Video BIOS */ if (!VidBios32Initialize(ConsoleOutput)) return FALSE; + /* Enable interrupts */ + setIF(1); + + /* We are done */ return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Mon Feb 24 00:33:21 2014 @@ -65,6 +65,10 @@ { UNREFERENCED_PARAMETER(State); + // BIG HACK!!!! To make BIOS images working correctly, + // until Aleksander rewrites memory management!! + if (Address >= 0xFFFFFFF0) Address -= 0xFFF00000; + /* If the A20 line is disabled, mask bit 20 */ if (!A20Line) Address &= ~(1 << 20); @@ -81,19 +85,23 @@ DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); DWORD ActualSize = min(Address + Size - 1, VgaGetVideoLimitAddress()) - VgaAddress + 1; - LPBYTE DestBuffer = (LPBYTE)((ULONG_PTR)BaseAddress + VgaAddress); + LPBYTE DestBuffer = (LPBYTE)REAL_TO_PHYS(VgaAddress); /* Read from the VGA memory */ VgaReadMemory(VgaAddress, DestBuffer, ActualSize); } /* Read the data from the virtual address space and store it in the buffer */ - RtlCopyMemory(Buffer, (LPVOID)((ULONG_PTR)BaseAddress + Address), Size); + RtlCopyMemory(Buffer, REAL_TO_PHYS(Address), Size); } VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); + + // BIG HACK!!!! To make BIOS images working correctly, + // until Aleksander rewrites memory management!! + if (Address >= 0xFFFFFFF0) Address -= 0xFFF00000; /* If the A20 line is disabled, mask bit 20 */ if (!A20Line) Address &= ~(1 << 20); @@ -105,7 +113,7 @@ if ((Address + Size) >= ROM_AREA_START && (Address < ROM_AREA_END)) return; /* Read the data from the buffer and store it in the virtual address space */ - RtlCopyMemory((LPVOID)((ULONG_PTR)BaseAddress + Address), Buffer, Size); + RtlCopyMemory(REAL_TO_PHYS(Address), Buffer, Size); /* * Check if we modified the VGA memory. @@ -116,7 +124,7 @@ DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); DWORD ActualSize = min(Address + Size - 1, VgaGetVideoLimitAddress()) - VgaAddress + 1; - LPBYTE SrcBuffer = (LPBYTE)((ULONG_PTR)BaseAddress + VgaAddress); + LPBYTE SrcBuffer = (LPBYTE)REAL_TO_PHYS(VgaAddress); /* Write to the VGA memory */ VgaWriteMemory(VgaAddress, SrcBuffer, ActualSize); @@ -355,9 +363,6 @@ EmulatorIntAcknowledge, NULL /* TODO: Use a TLB */); - /* Enable interrupts */ - setIF(1); - /* Initialize DMA */ /* Initialize the PIC, the PIT, the CMOS and the PC Speaker */

1 0

[hbelusca] 62313: [FAST486] - Fix return values of Fast486OpcodeSahf and Fast486OpcodeLahf handlers. - [TheFlash], can you please see what we should return after calling Fast486ExceptionWithErrorCo...
by hbelusca＠svn.reactos.org 23 Feb '14

23 Feb '14

Author: hbelusca Date: Sun Feb 23 21:02:02 2014 New Revision: 62313 URL: http://svn.reactos.org/svn/reactos?rev=62313&view=rev Log: [FAST486] - Fix return values of Fast486OpcodeSahf and Fast486OpcodeLahf handlers. - [TheFlash], can you please see what we should return after calling Fast486ExceptionWithErrorCode in Fast486OpcodePopFlags ? Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sun Feb 23 21:02:02 2014 @@ -4268,6 +4268,7 @@ return FALSE; } + /* Check for VM86 mode when IOPL is not 3 */ if (State->Flags.Vm && (State->Flags.Iopl != 3)) { /* Call the VM86 monitor */ @@ -4305,7 +4306,7 @@ State->Flags.AlwaysSet = TRUE; State->Flags.Reserved0 = State->Flags.Reserved1 = FALSE; - return FALSE; + return TRUE; } FAST486_OPCODE_HANDLER(Fast486OpcodeLahf) @@ -4316,7 +4317,7 @@ /* Set AH to the low-order byte of FLAGS */ State->GeneralRegs[FAST486_REG_EAX].HighByte = LOBYTE(State->Flags.Long); - return FALSE; + return TRUE; } FAST486_OPCODE_HANDLER(Fast486OpcodeRet)

1 0

← Newer
1
2
3
4
5
6
7
8
...
47
Older →

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 February 2014