Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64143: [WIN32K] Prevent NULL pointer dereference and fix a compiler warning
by tkreuzer＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: tkreuzer Date: Sun Sep 14 12:33:03 2014 New Revision: 64143 URL: http://svn.reactos.org/svn/reactos?rev=64143&view=rev Log: [WIN32K] Prevent NULL pointer dereference and fix a compiler warning Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Sun Sep 14 12:33:03 2014 @@ -324,12 +324,12 @@ r = 0; DPRINT1("Used entry has KernelData == 0\n"); } - if (pEntry->KernelData <= MmHighestUserAddress) + else if (pEntry->KernelData <= MmHighestUserAddress) { r = 0; DPRINT1("Used entry invalid KernelData\n"); } - if (((POBJ)(pEntry->KernelData))->hHmgr != Handle) + else if (((POBJ)(pEntry->KernelData))->hHmgr != Handle) { r = 0; DPRINT1("Used entry %lu, has invalid hHmg %p (expected: %p)\n", @@ -606,7 +606,7 @@ } iChannel = ChannelEntry->Id; - ASSERT(iChannel >= 0 && iChannel < DbgChCount); + ASSERT(iChannel < DbgChCount); if(level == NULL || *level == L'\0' ||wcslen(level) == 0 ) iLevel = MAX_LEVEL;

1 0

[spetreolle] 64142: [BOOTDATA] Install the mount manager.
by spetreolle＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: spetreolle Date: Sun Sep 14 12:03:17 2014 New Revision: 64142 URL: http://svn.reactos.org/svn/reactos?rev=64142&view=rev Log: [BOOTDATA] Install the mount manager. Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Sep 14 12:03:17 2014 @@ -61,6 +61,7 @@ ntdll.dll=,,,,,,,,,,,,2 wmilib.sys=,,,,,,,,,,,,4 ksecdd.sys=,,,,,,,,,,,,4 +mountmgr.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] ;*PNP0A00 = isapnp

1 0

[hpoussin] 64141: [MOUNTMGR] Activate it by default
by hpoussin＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: hpoussin Date: Sun Sep 14 11:59:24 2014 New Revision: 64141 URL: http://svn.reactos.org/svn/reactos?rev=64141&view=rev Log: [MOUNTMGR] Activate it by default Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Sep 14 11:59:24 2014 @@ -1623,12 +1623,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Type",0x00010001,0x00000001 ; MountMgr driver -;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ErrorControl",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"Boot Bus Extender" -;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ImagePath",0x00020000,"system32\drivers\mountmgr.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Start",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Tag",0x00010001,0x00000008 -;HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"Boot Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ImagePath",0x00020000,"system32\drivers\mountmgr.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Tag",0x00010001,0x00000008 +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Type",0x00010001,0x00000001 ; ACPI driver HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x00000001

1 0

[hpoussin] 64140: [MOUNTMGR] Misc fixes We're now able to do something and to not crash when receiving a device arrival notification.
by hpoussin＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: hpoussin Date: Sun Sep 14 07:53:46 2014 New Revision: 64140 URL: http://svn.reactos.org/svn/reactos?rev=64140&view=rev Log: [MOUNTMGR] Misc fixes We're now able to do something and to not crash when receiving a device arrival notification. Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h trunk/reactos/drivers/filters/mountmgr/mountmgr.c Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Sun Sep 14 07:53:46 2014 @@ -13,7 +13,7 @@ #undef IsEqualGUID #endif -#define IsEqualGUID(rguid1, rguid2) (!RtlCompareMemory(rguid1, rguid2, sizeof(GUID))) +#define IsEqualGUID(rguid1, rguid2) (RtlCompareMemory(rguid1, rguid2, sizeof(GUID)) == sizeof(GUID)) #define FILE_READ_PROPERTIES 0x00000008 #define FILE_WRITE_PROPERTIES 0x00000010 Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Sun Sep 14 07:53:46 2014 @@ -132,8 +132,8 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; /* Allocate a big enough buffer to contain the symbolic link */ - DriveLetter->MaximumLength = sizeof(DosDevices.Buffer) + 3 * sizeof(WCHAR); - DriveLetter->Buffer = AllocatePool(sizeof(DosDevices.Buffer) + 3 * sizeof(WCHAR)); + DriveLetter->MaximumLength = DosDevices.Length + 3 * sizeof(WCHAR); + DriveLetter->Buffer = AllocatePool(DriveLetter->MaximumLength); if (!DriveLetter->Buffer) { return STATUS_INSUFFICIENT_RESOURCES; @@ -143,9 +143,9 @@ RtlCopyUnicodeString(DriveLetter, &DosDevices); /* Update string to reflect real contents */ - DriveLetter->Length = sizeof(DosDevices.Buffer) + 2 * sizeof(WCHAR); - DriveLetter->Buffer[(sizeof(DosDevices.Buffer) + 2 * sizeof(WCHAR)) / sizeof (WCHAR)] = UNICODE_NULL; - DriveLetter->Buffer[(sizeof(DosDevices.Buffer) + sizeof(WCHAR)) / sizeof (WCHAR)] = L':'; + DriveLetter->Length = DosDevices.Length + 2 * sizeof(WCHAR); + DriveLetter->Buffer[DosDevices.Length / sizeof(WCHAR) + 2] = UNICODE_NULL; + DriveLetter->Buffer[DosDevices.Length / sizeof(WCHAR) + 1] = L':'; /* If caller wants a no drive entry */ if (Letter == (UCHAR)-1) @@ -158,7 +158,7 @@ else if (Letter) { /* Use the letter given by the caller */ - DriveLetter->Buffer[sizeof(DosDevices.Buffer) / sizeof(WCHAR)] = (WCHAR)Letter; + DriveLetter->Buffer[DosDevices.Length / sizeof(WCHAR)] = (WCHAR)Letter; Status = GlobalCreateSymbolicLink(DriveLetter, DeviceName); if (NT_SUCCESS(Status)) { @@ -187,16 +187,18 @@ /* Try to affect a letter (up to Z, ofc) until it's possible */ for (; Letter <= 'Z'; Letter++) { - DriveLetter->Buffer[sizeof(DosDevices.Buffer) / sizeof(WCHAR)] = (WCHAR)Letter; + DriveLetter->Buffer[DosDevices.Length / sizeof(WCHAR)] = (WCHAR)Letter; Status = GlobalCreateSymbolicLink(DriveLetter, DeviceName); if (NT_SUCCESS(Status)) { + DPRINT("Assigned drive %c: to %wZ\n", Letter, DeviceName); return Status; } } /* We failed to allocate a letter */ FreePool(DriveLetter->Buffer); + DPRINT("Failed to create a drive letter for %wZ\n", DeviceName); return Status; } @@ -558,7 +560,7 @@ /* Query unique ID */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTDEV_QUERY_UNIQUE_ID, DeviceObject, NULL, 0, @@ -1070,7 +1072,7 @@ { CurrentDevice = CONTAINING_RECORD(NextEntry, DEVICE_INFORMATION, DeviceListEntry); - if (RtlEqualUnicodeString(&(DeviceInformation->DeviceName), &TargetDeviceName, TRUE)) + if (RtlEqualUnicodeString(&(CurrentDevice->DeviceName), &TargetDeviceName, TRUE)) { break; } @@ -1876,7 +1878,7 @@ &MountedDevicesGuid, DriverObject, MountMgrMountedDeviceNotification, - DeviceObject, + DeviceExtension, &(DeviceExtension->NotificationEntry)); if (!NT_SUCCESS(Status))

1 0

[hpoussin] 64139: [RAMDISK] Remove support for IOCTL_CDROM_GET_LAST_SESSION (useless since r64106)
by hpoussin＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: hpoussin Date: Sun Sep 14 07:51:40 2014 New Revision: 64139 URL: http://svn.reactos.org/svn/reactos?rev=64139&view=rev Log: [RAMDISK] Remove support for IOCTL_CDROM_GET_LAST_SESSION (useless since r64106) Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Sep 14 07:51:40 2014 @@ -1522,47 +1522,6 @@ Information = sizeof(DISK_GEOMETRY); break; - // - // Hack to support ReactOS's broken CDFS - // - case IOCTL_CDROM_GET_LAST_SESSION: - - // - // Validate the length - // - if (IoStackLocation->Parameters.DeviceIoControl. - OutputBufferLength < RAMDISK_SESSION_SIZE) - { - // - // Invalid length - // - Status = STATUS_BUFFER_TOO_SMALL; - break; - } - - // - // Fill out the TOC - // - Toc = Irp->AssociatedIrp.SystemBuffer; - Toc->Length[0] = 0; - Toc->Length[1] = RAMDISK_SESSION_SIZE - sizeof(Toc->Length); - Toc->FirstTrack = 1; - Toc->LastTrack = 1; - Toc->TrackData[0].Adr = 1; - Toc->TrackData[0].Control = TOC_DATA_TRACK; - Toc->TrackData[0].TrackNumber = 1; - Toc->TrackData[0].Address[0] = - Toc->TrackData[0].Address[1] = - Toc->TrackData[0].Address[2] = - Toc->TrackData[0].Address[3] = 0; - - // - // We're done - // - Status = STATUS_SUCCESS; - Information = RAMDISK_SESSION_SIZE; - break; - case IOCTL_CDROM_READ_TOC: //

1 0

[hbelusca] 64138: [NTVDM]: Implement few INT 33h (mouse) functions: - For function 0Ah, we don't still support defining hardware cursor. - Implement function 0Ch (define interrupt subroutine params...
by hbelusca＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: hbelusca Date: Sun Sep 14 00:48:21 2014 New Revision: 64138 URL: http://svn.reactos.org/svn/reactos?rev=64138&view=rev Log: [NTVDM]: Implement few INT 33h (mouse) functions: - For function 0Ah, we don't still support defining hardware cursor. - Implement function 0Ch (define interrupt subroutine params), compatible MSMOUSE v1.0+ - Implement function 14h (exchange interrupt subroutines), compatible MSMOUSE v3.0+ - Implement function 18h (set alternate mouse user handler), that is the same thing as function 0Ch but for a set of maximum 3 handlers, compatible MSMOUSE v6.0+ - Implement function 19h (return user alternate interrupt vector) that returns the handler associated with a call mask, compatible MSMOUSE v6.0+ - Call all those handlers accordingly to their associated call mask, for mouse moves and mouse button presses. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Sun Sep 14 00:48:21 2014 @@ -75,6 +75,60 @@ { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; + } +} + +static VOID CallMouseUserHandlers(USHORT CallMask) +{ + USHORT i; + + /* Call handler 0 */ + if ((DriverState.Handler0.CallMask & CallMask) != 0 && + DriverState.Handler0.Callback != (ULONG)NULL) + { + /* + * Set the parameters for the callback. + * NOTE: In text modes, the row and column will be reported + * as a multiple of the cell size, typically 8x8 pixels. + */ + setAX(CallMask); + setBX(DriverState.ButtonState); + setCX(DriverState.Position.X); + setDX(DriverState.Position.Y); + setSI(DriverState.MickeysPerCellHoriz); + setDI(DriverState.MickeysPerCellVert); + + DPRINT1("Calling Handler0 0x%08x with CallMask 0x%04x\n", + DriverState.Handler0.Callback, CallMask); + + /* Call the callback */ + RunCallback16(&BiosContext, DriverState.Handler0.Callback); + } + + for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) + { + /* Call the suitable handlers */ + if ((DriverState.Handlers[i].CallMask & CallMask) != 0 && + DriverState.Handlers[i].Callback != (ULONG)NULL) + { + /* + * Set the parameters for the callback. + * NOTE: In text modes, the row and column will be reported + * as a multiple of the cell size, typically 8x8 pixels. + */ + setAX(CallMask); + setBX(DriverState.ButtonState); + setCX(DriverState.Position.X); + setDX(DriverState.Position.Y); + setSI(DriverState.MickeysPerCellHoriz); + setDI(DriverState.MickeysPerCellVert); + + DPRINT1("Calling Handler[%d] 0x%08x with CallMask 0x%04x\n", + i, DriverState.Handlers[i].Callback, CallMask); + + /* Call the callback */ + RunCallback16(&BiosContext, DriverState.Handlers[i].Callback); + } } } @@ -176,7 +230,6 @@ setBX(DriverState.ButtonState); setCX(DriverState.Position.X); setDX(DriverState.Position.Y); - break; } @@ -249,8 +302,26 @@ /* Define Text Cursor */ case 0x0A: { - DriverState.TextCursor.ScreenMask = getCX(); - DriverState.TextCursor.CursorMask = getDX(); + USHORT BX = getBX(); + + if (BX == 0x0000) + { + /* Define software cursor */ + DriverState.TextCursor.ScreenMask = getCX(); + DriverState.TextCursor.CursorMask = getDX(); + } + else if (BX == 0x0001) + { + /* Define hardware cursor */ + DPRINT1("Defining hardware cursor is unimplemented\n"); + UNIMPLEMENTED; + // CX == start scan line + // DX == end scan line + } + else + { + DPRINT1("Invalid BX value 0x%04x\n", BX); + } break; } @@ -267,11 +338,37 @@ break; } + /* Define Interrupt Subroutine Parameters, compatible MS MOUSE v1.0+ */ + case 0x0C: + { + DriverState.Handler0.CallMask = getCX(); + DriverState.Handler0.Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback + DPRINT1("Define callback 0x%04x, 0x%08x\n", + DriverState.Handler0.CallMask, DriverState.Handler0.Callback); + break; + } + /* Define Mickey/Pixel Ratio */ case 0x0F: { DriverState.MickeysPerCellHoriz = getCX(); - DriverState.MickeysPerCellVert = getDX(); + DriverState.MickeysPerCellVert = getDX(); + break; + } + + /* Exchange Interrupt Subroutines, compatible MS MOUSE v3.0+ (see function 0x0C) */ + case 0x14: + { + USHORT OldCallMask = DriverState.Handler0.CallMask; + ULONG OldCallback = DriverState.Handler0.Callback; + + DriverState.Handler0.CallMask = getCX(); + DriverState.Handler0.Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback + + /* Return old callmask in CX and callback vector in ES:DX */ + setCX(OldCallMask); + setES(HIWORD(OldCallback)); + setDX(LOWORD(OldCallback)); break; } @@ -297,6 +394,150 @@ break; } + /* Set Alternate Mouse User Handler, compatible MS MOUSE v6.0+ */ + case 0x18: + { + /* + * Up to three handlers can be defined by separate calls to this + * function, each with a different combination of shift states in + * the call mask; calling this function again with a call mask of + * 0000h undefines the specified handler (official documentation); + * specifying the same call mask and an address of 0000h:0000h + * undefines the handler (real life). + * See Ralf Brown: http://www.ctyme.com/intr/rb-5981.htm + * for more information. + */ + + USHORT i; + USHORT CallMask = getCX(); + ULONG Callback = MAKELONG(getDX(), getES()); // Far pointer to the callback + BOOLEAN Success = FALSE; + + DPRINT1("Define v6.0+ callback 0x%04x, 0x%08x\n", + CallMask, Callback); + + if (CallMask == 0x0000) + { + /* + * Find the handler entry corresponding to the given + * callback and undefine it. + */ + for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) + { + if (DriverState.Handlers[i].Callback == Callback) + { + /* Found it, undefine the handler */ + DriverState.Handlers[i].CallMask = 0x0000; + DriverState.Handlers[i].Callback = (ULONG)NULL; + Success = TRUE; + break; + } + } + } + else if (Callback == (ULONG)NULL) + { + /* + * Find the handler entry corresponding to the given + * callmask and undefine it. + */ + for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) + { + if (DriverState.Handlers[i].CallMask == CallMask) + { + /* Found it, undefine the handler */ + DriverState.Handlers[i].CallMask = 0x0000; + DriverState.Handlers[i].Callback = (ULONG)NULL; + Success = TRUE; + break; + } + } + } + else + { + /* + * Try to find a handler entry corresponding to the given + * callmask to redefine it, otherwise find an empty handler + * entry and set the new handler in there. + */ + + USHORT EmptyHandler = 0xFFFF; // Invalid handler + + for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) + { + /* Find the first empty handler */ + if (EmptyHandler == 0xFFFF && + DriverState.Handlers[i].CallMask == 0x0000 && + DriverState.Handlers[i].Callback == (ULONG)NULL) + { + EmptyHandler = i; + } + + if (DriverState.Handlers[i].CallMask == CallMask) + { + /* Found it, redefine the handler */ + DriverState.Handlers[i].CallMask = CallMask; + DriverState.Handlers[i].Callback = Callback; + Success = TRUE; + break; + } + } + + /* + * If we haven't found anything and we found + * an empty handler, set it. + */ + if (!Success && EmptyHandler != 0xFFFF + /* && EmptyHandler < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]) */) + { + DriverState.Handlers[EmptyHandler].CallMask = CallMask; + DriverState.Handlers[EmptyHandler].Callback = Callback; + Success = TRUE; + } + } + + /* If we failed, set error code */ + if (!Success) setAX(0xFFFF); + + break; + } + + /* Return User Alternate Interrupt Vector, compatible MS MOUSE v6.0+ */ + case 0x19: + { + USHORT i; + USHORT CallMask = getCX(); + ULONG Callback; + BOOLEAN Success = FALSE; + + /* + * Find the handler entry corresponding to the given callmask. + */ + for (i = 0; i < sizeof(DriverState.Handlers)/sizeof(DriverState.Handlers[0]); ++i) + { + if (DriverState.Handlers[i].CallMask == CallMask) + { + /* Found it */ + Callback = DriverState.Handlers[i].Callback; + Success = TRUE; + break; + } + } + + if (Success) + { + /* Return the callback vector in BX:DX */ + setBX(HIWORD(Callback)); + setDX(LOWORD(Callback)); + } + else + { + /* We failed, set error code */ + setCX(0x0000); + } + + break; + } + /* Disable Mouse Driver */ case 0x1F: { @@ -331,19 +572,23 @@ if (!DriverEnabled) return; DriverState.HorizCount += (DeltaX * (SHORT)DriverState.MickeysPerCellHoriz) / 8; - DriverState.VertCount += (DeltaY * (SHORT)DriverState.MickeysPerCellVert) / 8; - + DriverState.VertCount += (DeltaY * (SHORT)DriverState.MickeysPerCellVert ) / 8; + if (DriverState.ShowCount > 0) { EraseMouseCursor(); DriverState.Position = *NewPosition; PaintMouseCursor(); } + + /* Call the mouse handlers */ + CallMouseUserHandlers(0x0001); // We use MS MOUSE v1.0+ format } VOID MouseBiosUpdateButtons(WORD ButtonState) { - WORD i; + USHORT i; + USHORT CallMask = 0x0000; // We use MS MOUSE v1.0+ format if (!DriverEnabled) return; @@ -357,16 +602,23 @@ /* Mouse press */ DriverState.PressCount[i]++; DriverState.LastPress[i] = DriverState.Position; + + CallMask |= (1 << (2 * i + 1)); } else if (NewState < OldState) { /* Mouse release */ DriverState.ReleaseCount[i]++; DriverState.LastRelease[i] = DriverState.Position; + + CallMask |= (1 << (2 * i + 2)); } } DriverState.ButtonState = ButtonState; + + /* Call the mouse handlers */ + CallMouseUserHandlers(CallMask); } BOOLEAN MouseBios32Initialize(VOID) Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h [iso-8859-1] Sun Sep 14 00:48:21 2014 @@ -25,6 +25,16 @@ NUM_MOUSE_BUTTONS }; +typedef struct _MOUSE_USER_HANDLER +{ + /* + * CallMask format: see table: http://www.ctyme.com/intr/rb-5968.htm#Table3171 + * Alternatively, see table: http://www.ctyme.com/intr/rb-5981.htm#Table3174 + */ + USHORT CallMask; + ULONG Callback; // Far pointer to the callback +} MOUSE_USER_HANDLER, *PMOUSE_USER_HANDLER; + typedef struct _MOUSE_DRIVER_STATE { SHORT ShowCount; @@ -39,6 +49,12 @@ SHORT VertCount; WORD MickeysPerCellHoriz; WORD MickeysPerCellVert; + + /* + * User Subroutine Handlers called on mouse events + */ + MOUSE_USER_HANDLER Handler0; // Handler compatible MS MOUSE v1.0+ + MOUSE_USER_HANDLER Handlers[3]; // Handlers compatible MS MOUSE v6.0+ struct {

1 0

[hbelusca] 64137: [NTVDM] - Add DPRINTs to the DumpMemory function. - Use a VgaSetActiveScreenBuffer function to change active screen buffers: it calls the SetConsoleActiveScreenBuffer API but also...
by hbelusca＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: hbelusca Date: Sun Sep 14 00:43:43 2014 New Revision: 64137 URL: http://svn.reactos.org/svn/reactos?rev=64137&view=rev Log: [NTVDM] - Add DPRINTs to the DumpMemory function. - Use a VgaSetActiveScreenBuffer function to change active screen buffers: it calls the SetConsoleActiveScreenBuffer API but also recreates the VDM console menus, because on windows custom console menus are per-screen-buffer, and not per-console, so that if you set menus when one screen buffer is activated, and if you change it, then your menus become unuseful because for this new active screenbuffer, they are not set. It's completely ridiculous but we need to live with that (on ReactOS we still don't have this behaviour). Modified: trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Sep 14 00:43:43 2014 @@ -355,6 +355,8 @@ _snwprintf(FileName, MAX_PATH, L"memdump%lu.txt", DumpNumber); ++DumpNumber; + DPRINT1("Creating memory dump file '%S'...\n", FileName); + /* Always create the dump file */ hFile = CreateFileW(FileName, GENERIC_WRITE, @@ -415,6 +417,8 @@ /* Close the file */ CloseHandle(hFile); + + DPRINT1("Memory dump done\n"); } DWORD WINAPI PumpConsoleInput(LPVOID Parameter); Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sun Sep 14 00:43:43 2014 @@ -942,6 +942,16 @@ return Result; } +static VOID VgaSetActiveScreenBuffer(HANDLE ScreenBuffer) +{ + /* Set the active buffer */ + SetConsoleActiveScreenBuffer(ScreenBuffer); + + /* Reinitialize the VDM menu */ + DestroyVdmMenu(); + CreateVdmMenu(ScreenBuffer); +} + static BOOL VgaEnterGraphicsMode(PCOORD Resolution) { DWORD i; @@ -999,7 +1009,7 @@ ZeroMemory(ConsoleFramebuffer, BitmapInfo->bmiHeader.biSizeImage); /* Set the active buffer */ - SetConsoleActiveScreenBuffer(GraphicsConsoleBuffer); + VgaSetActiveScreenBuffer(GraphicsConsoleBuffer); /* Set the graphics mode palette */ SetConsolePalette(GraphicsConsoleBuffer, @@ -1018,7 +1028,7 @@ ReleaseMutex(ConsoleMutex); /* Switch back to the default console text buffer */ - // SetConsoleActiveScreenBuffer(TextConsoleBuffer); + // VgaSetActiveScreenBuffer(TextConsoleBuffer); /* Cleanup the video data */ CloseHandle(ConsoleMutex); @@ -1034,7 +1044,7 @@ DPRINT1("VgaEnterTextMode\n"); /* Switch to the text buffer */ - SetConsoleActiveScreenBuffer(TextConsoleBuffer); + VgaSetActiveScreenBuffer(TextConsoleBuffer); /* Adjust the text framebuffer if we changed the resolution */ if (TextResolution.X != Resolution->X || @@ -1950,7 +1960,7 @@ SMALL_RECT ConRect; /* Restore the old screen buffer */ - SetConsoleActiveScreenBuffer(TextConsoleBuffer); + VgaSetActiveScreenBuffer(TextConsoleBuffer); /* Restore the original console size */ ConRect.Left = 0; @@ -1988,7 +1998,7 @@ /***/ VgaResetPalette(); /***/ /* Switch to the text buffer */ - SetConsoleActiveScreenBuffer(TextConsoleBuffer); + VgaSetActiveScreenBuffer(TextConsoleBuffer); /* Clear the VGA memory */ VgaClearMemory(); Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Sep 14 00:43:43 2014 @@ -119,7 +119,7 @@ } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); } -static VOID +/*static*/ VOID CreateVdmMenu(HANDLE ConOutHandle) { hConsoleMenu = ConsoleMenuControl(ConOutHandle, @@ -132,7 +132,7 @@ DrawMenuBar(GetConsoleWindow()); } -static VOID +/*static*/ VOID DestroyVdmMenu(VOID) { UINT i = 0; Modified: trunk/reactos/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.h?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.h [iso-8859-1] Sun Sep 14 00:43:43 2014 @@ -48,6 +48,11 @@ VOID DisplayMessage(LPCWSTR Format, ...); +/*static*/ VOID +CreateVdmMenu(HANDLE ConOutHandle); +/*static*/ VOID +DestroyVdmMenu(VOID); + #endif // _NTVDM_H_ /* EOF */

1 0

[aandrejevic] 64136: [NTVDM] Implement motion counters in the mouse BIOS.
by aandrejevic＠svn.reactos.org 13 Sep '14

13 Sep '14

Author: aandrejevic Date: Sat Sep 13 21:50:23 2014 New Revision: 64136 URL: http://svn.reactos.org/svn/reactos?rev=64136&view=rev Log: [NTVDM] Implement motion counters in the mouse BIOS. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Sat Sep 13 21:50:23 2014 @@ -85,8 +85,11 @@ /* Reset Driver */ case 0x00: { + SHORT i; + DriverEnabled = TRUE; DriverState.ShowCount = 0; + DriverState.ButtonState = 0; /* Set the default text cursor */ DriverState.TextCursor.ScreenMask = 0xFFFF; /* Display everything */ @@ -130,6 +133,18 @@ DriverState.GraphicsCursor.CursorMask[14] = 0x0030; // 0000000000110000 DriverState.GraphicsCursor.CursorMask[15] = 0x0000; // 0000000000000000 + /* Initialize the counters */ + DriverState.HorizCount = DriverState.VertCount = 0; + + for (i = 0; i < NUM_MOUSE_BUTTONS; i++) + { + DriverState.PressCount[i] = DriverState.ReleaseCount[i] = 0; + } + + /* Initialize the resolution */ + DriverState.MickeysPerCellHoriz = 8; + DriverState.MickeysPerCellVert = 16; + /* Return mouse information */ setAX(0xFFFF); // Hardware & driver installed setBX(NUM_MOUSE_BUTTONS); @@ -240,6 +255,27 @@ break; } + /* Read Motion Counters */ + case 0x0B: + { + setCX(DriverState.HorizCount); + setDX(DriverState.VertCount); + + /* Reset the counters */ + DriverState.HorizCount = DriverState.VertCount = 0; + + break; + } + + /* Define Mickey/Pixel Ratio */ + case 0x0F: + { + DriverState.MickeysPerCellHoriz = getCX(); + DriverState.MickeysPerCellVert = getDX(); + + break; + } + /* Return Driver Storage Requirements */ case 0x15: { @@ -289,7 +325,15 @@ VOID MouseBiosUpdatePosition(PCOORD NewPosition) { - if (DriverEnabled && (DriverState.ShowCount > 0)) + SHORT DeltaX = NewPosition->X - DriverState.Position.X; + SHORT DeltaY = NewPosition->Y - DriverState.Position.Y; + + if (!DriverEnabled) return; + + DriverState.HorizCount += (DeltaX * (SHORT)DriverState.MickeysPerCellHoriz) / 8; + DriverState.VertCount += (DeltaY * (SHORT)DriverState.MickeysPerCellVert) / 8; + + if (DriverState.ShowCount > 0) { EraseMouseCursor(); DriverState.Position = *NewPosition; Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h [iso-8859-1] Sat Sep 13 21:50:23 2014 @@ -35,6 +35,10 @@ COORD LastPress[NUM_MOUSE_BUTTONS]; WORD ReleaseCount[NUM_MOUSE_BUTTONS]; COORD LastRelease[NUM_MOUSE_BUTTONS]; + SHORT HorizCount; + SHORT VertCount; + WORD MickeysPerCellHoriz; + WORD MickeysPerCellVert; struct {

1 0

[hbelusca] 64135: [NTVDM]: Return mouse information for INT 33h, AX=00h. Needed for apps that check for the mouse.
by hbelusca＠svn.reactos.org 13 Sep '14

13 Sep '14

Author: hbelusca Date: Sat Sep 13 20:37:56 2014 New Revision: 64135 URL: http://svn.reactos.org/svn/reactos?rev=64135&view=rev Log: [NTVDM]: Return mouse information for INT 33h, AX=00h. Needed for apps that check for the mouse. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Sat Sep 13 20:37:56 2014 @@ -130,6 +130,10 @@ DriverState.GraphicsCursor.CursorMask[14] = 0x0030; // 0000000000110000 DriverState.GraphicsCursor.CursorMask[15] = 0x0000; // 0000000000000000 + /* Return mouse information */ + setAX(0xFFFF); // Hardware & driver installed + setBX(NUM_MOUSE_BUTTONS); + break; }

1 0

[hbelusca] 64134: Fix a typo.
by hbelusca＠svn.reactos.org 13 Sep '14

13 Sep '14

Author: hbelusca Date: Sat Sep 13 20:18:02 2014 New Revision: 64134 URL: http://svn.reactos.org/svn/reactos?rev=64134&view=rev Log: Fix a typo. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Sep 13 20:18:02 2014 @@ -1662,7 +1662,7 @@ /* Decrement the entry count */ InterlockedDecrement(&KdbEntryCount); - /* HACK: Raise back to old IRWL */ + /* HACK: Raise back to old IRQL */ KeRaiseIrql(OldIrql, &OldIrql); /* Leave critical section */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs