Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Aug 27 23:05:51 2016 New Revision: 72478 URL: http://svn.reactos.org/svn/reactos?rev=72478&view=rev Log: - Fix GCC build. Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Sat Aug 27 23:05:51 2016 @@ -52,7 +52,9 @@ static VOID FASTCALL IpsCallback(ULONGLONG ElapsedTime) { +#ifdef IPS_DISPLAY static INT NumCalls = 0; +#endif ULONGLONG NewIps = 10ULL * (CurrentCycleCount - LastCycles) / ElapsedTime; CurrentIps = (CurrentIps + NewIps) >> 1;

8 years, 4 months

[aandrejevic] 72477: [NTVDM] Move the framebuffer update to the start of the display cycle to reduce tearing. Stabilize the IPS calculation.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Aug 27 21:55:34 2016 New Revision: 72477 URL: http://svn.reactos.org/svn/reactos?rev=72477&view=rev Log: [NTVDM] Move the framebuffer update to the start of the display cycle to reduce tearing. Stabilize the IPS calculation. Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/clock.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Sat Aug 27 21:55:34 2016 @@ -38,8 +38,6 @@ /* VARIABLES ******************************************************************/ static LIST_ENTRY Timers; -static ULONGLONG Cycles = 0ULL; -static ULONGLONG CurrentIps = 20000000ULL; // 20 MIPS is a good estimate static LARGE_INTEGER StartPerfCount, Frequency; // static ULONG StartTickCount; static LARGE_INTEGER Counter; @@ -47,17 +45,28 @@ static ULONGLONG LastCycles = 0ULL; static PHARDWARE_TIMER IpsTimer; +ULONGLONG CurrentCycleCount = 0ULL; +ULONGLONG CurrentIps = 20000000ULL; // 20 MIPS is a good estimate + /* PRIVATE FUNCTIONS **********************************************************/ static VOID FASTCALL IpsCallback(ULONGLONG ElapsedTime) { - CurrentIps = (Cycles - LastCycles) / ElapsedTime; + static INT NumCalls = 0; + + ULONGLONG NewIps = 10ULL * (CurrentCycleCount - LastCycles) / ElapsedTime; + CurrentIps = (CurrentIps + NewIps) >> 1; #ifdef IPS_DISPLAY - DPRINT1("NTVDM: %I64u Instructions Per Second\n", CurrentIps); + NumCalls++; + if (NumCalls == 10) + { + DPRINT1("NTVDM: %I64u Instructions Per Second\n", CurrentIps); + NumCalls = 0; + } #endif - LastCycles = Cycles; + LastCycles = CurrentCycleCount; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -81,7 +90,7 @@ for (i = 0; VdmRunning && CpuRunning && (i < STEPS_PER_CYCLE); i++) { CpuStep(); - ++Cycles; + ++CurrentCycleCount; } Entry = Timers.Flink; @@ -205,16 +214,6 @@ } } -ULONGLONG GetCycleCount(VOID) -{ - return Cycles; -} - -ULONGLONG GetCycleSpeed(VOID) -{ - return CurrentIps; -} - BOOLEAN ClockInitialize(VOID) { InitializeListHead(&Timers); @@ -231,7 +230,7 @@ /* Find the starting tick count */ // StartTickCount = GetTickCount(); - IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(1), IpsCallback); + IpsTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(10), IpsCallback); if (IpsTimer == NULL) { wprintf(L"FATAL: Cannot create IPS timer.\n"); Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] Sat Aug 27 21:55:34 2016 @@ -33,20 +33,21 @@ /* FUNCTIONS ******************************************************************/ +extern ULONGLONG CurrentCycleCount; +extern ULONGLONG CurrentIps; + PHARDWARE_TIMER CreateHardwareTimer ( ULONG Flags, ULONGLONG Delay, /* nanoseconds */ PHARDWARE_TIMER_PROC Callback ); + VOID EnableHardwareTimer(PHARDWARE_TIMER Timer); VOID DisableHardwareTimer(PHARDWARE_TIMER Timer); VOID SetHardwareTimerDelay(PHARDWARE_TIMER Timer, ULONGLONG NewDelay); VOID DestroyHardwareTimer(PHARDWARE_TIMER Timer); -ULONGLONG GetCycleCount(VOID); -ULONGLONG GetCycleSpeed(VOID); - VOID ClockUpdate(VOID); BOOLEAN ClockInitialize(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Aug 27 21:55:34 2016 @@ -1104,8 +1104,8 @@ { BYTE Result = 0; BOOLEAN Vsync, Hsync; - ULONGLONG Cycles = GetCycleCount(); - ULONG CyclesPerMicrosecond = (ULONG)((GetCycleSpeed() + 500000ULL) / 1000000ULL); + ULONGLONG Cycles = CurrentCycleCount; + ULONG CyclesPerMicrosecond = (ULONG)((CurrentIps + 500000ULL) / 1000000ULL); ULONG Dots = (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & 1) ? 9 : 8; ULONG Clock = VgaGetClockFrequency() / 1000000; ULONG HblankStart, HblankEnd; @@ -1624,38 +1624,29 @@ { ULONG VerticalTotal = VgaCrtcRegisters[VGA_CRTC_VERT_TOTAL_REG]; ULONG VerticalRetraceStart = VgaCrtcRegisters[VGA_CRTC_START_VERT_RETRACE_REG]; - ULONG VerticalRetraceEnd; - BOOLEAN BeforeVSyncStart, BeforeVSyncEnd; - ULONG CurrentCycleCount = GetCycleCount(); + BOOLEAN BeforeVSync; ULONG ElapsedCycles = CurrentCycleCount - HorizontalRetraceCycle; ULONG Dots = (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & 1) ? 9 : 8; ULONG HorizTotalDots = ((ULONG)VgaCrtcRegisters[VGA_CRTC_HORZ_TOTAL_REG] + 5) * Dots; ULONG HSyncsPerSecond = VgaGetClockFrequency() / HorizTotalDots; - ULONG HSyncs = (ElapsedCycles * HSyncsPerSecond) / GetCycleSpeed(); + ULONG HSyncs = (ElapsedCycles * HSyncsPerSecond + (CurrentIps >> 1)) / CurrentIps; UNREFERENCED_PARAMETER(ElapsedTime); if (HSyncs == 0) HSyncs = 1; - + VerticalTotal |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VT8) << 8; VerticalTotal |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VT9) << 4; VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS8) << 6; VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS9) << 2; - VerticalRetraceEnd = VerticalRetraceStart + (VgaCrtcRegisters[VGA_CRTC_END_VERT_RETRACE_REG] & 0x0F); - /* Set the cycle */ HorizontalRetraceCycle = CurrentCycleCount; /* Increment the scanline counter, but make sure we don't skip any part of the vertical retrace */ - BeforeVSyncStart = (ScanlineCounter < VerticalRetraceStart); - BeforeVSyncEnd = (ScanlineCounter < VerticalRetraceEnd); + BeforeVSync = (ScanlineCounter < VerticalRetraceStart); ScanlineCounter += HSyncs; - if (BeforeVSyncStart && ScanlineCounter >= VerticalRetraceStart) ScanlineCounter = VerticalRetraceStart; - else if (BeforeVSyncEnd && ScanlineCounter >= VerticalRetraceEnd) ScanlineCounter = VerticalRetraceEnd; - - /* The scanline counter wraps around */ - ScanlineCounter %= VerticalTotal; + if (BeforeVSync && ScanlineCounter >= VerticalRetraceStart) ScanlineCounter = VerticalRetraceStart; if (ScanlineCounter == VerticalRetraceStart) { @@ -1673,8 +1664,9 @@ + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); } - if (ScanlineCounter == VerticalRetraceEnd) - { + if (ScanlineCounter > VerticalTotal) + { + ScanlineCounter = 0; VgaVerticalRetrace(); } }

8 years, 4 months

[dchapyshev] 72476: [RTL] - Implement IS_TEXT_UNICODE_REVERSE_ASCII16, IS_TEXT_UNICODE_REVERSE_STATISTICS flags - Fix IS_TEXT_UNICODE_STATISTICS * It fixes 2 tests for RtlIsTextUnicode function. No...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Aug 27 20:18:18 2016 New Revision: 72476 URL: http://svn.reactos.org/svn/reactos?rev=72476&view=rev Log: [RTL] - Implement IS_TEXT_UNICODE_REVERSE_ASCII16, IS_TEXT_UNICODE_REVERSE_STATISTICS flags - Fix IS_TEXT_UNICODE_STATISTICS * It fixes 2 tests for RtlIsTextUnicode function. Now all rtlstr in winetest are passed successfully Modified: trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Sat Aug 27 20:18:18 2016 @@ -1245,6 +1245,12 @@ const WCHAR *s = buf; int i; unsigned int flags = MAXULONG, out_flags = 0; + UCHAR last_lo_byte = 0; + UCHAR last_hi_byte = 0; + ULONG hi_byte_diff = 0; + ULONG lo_byte_diff = 0; + ULONG weight = 3; + ULONG lead_byte = 0; if (len < sizeof(WCHAR)) { @@ -1279,19 +1285,47 @@ if (*s == 0xFEFF) out_flags |= IS_TEXT_UNICODE_SIGNATURE; if (*s == 0xFFFE) out_flags |= IS_TEXT_UNICODE_REVERSE_SIGNATURE; + for (i = 0; i < len; i++) + { + UCHAR lo_byte = LOBYTE(s[i]); + UCHAR hi_byte = HIBYTE(s[i]); + + lo_byte_diff += max(lo_byte, last_lo_byte) - min(lo_byte, last_lo_byte); + hi_byte_diff += max(hi_byte, last_hi_byte) - min(hi_byte, last_hi_byte); + + last_lo_byte = lo_byte; + last_hi_byte = hi_byte; + } + + if (NlsMbCodePageTag) + { + for (i = 0; i < len; i++) + { + if (NlsLeadByteInfo[s[i]]) + { + ++lead_byte; + ++i; + } + } + + if (lead_byte) + { + weight = (len / 2) - 1; + + if (lead_byte < (weight / 3)) + weight = 3; + else if (lead_byte < ((weight * 2) / 3)) + weight = 2; + else + weight = 1; + } + } + /* apply some statistical analysis */ - if (flags & IS_TEXT_UNICODE_STATISTICS) - { - int stats = 0; - - /* FIXME: checks only for ASCII characters in the unicode stream */ - for (i = 0; i < len; i++) - { - if (s[i] <= 255) stats++; - } - - if (stats > len / 2) - out_flags |= IS_TEXT_UNICODE_STATISTICS; + if ((flags & IS_TEXT_UNICODE_STATISTICS) && + ((weight * hi_byte_diff) < lo_byte_diff)) + { + out_flags |= IS_TEXT_UNICODE_STATISTICS; } /* Check for unicode NULL chars */ @@ -1328,6 +1362,16 @@ out_flags |= IS_TEXT_UNICODE_REVERSE_CONTROLS; break; } + } + + if (hi_byte_diff && !lo_byte_diff) + { + out_flags |= IS_TEXT_UNICODE_REVERSE_ASCII16; + } + + if ((weight * lo_byte_diff) < hi_byte_diff) + { + out_flags |= IS_TEXT_UNICODE_REVERSE_STATISTICS; } }

8 years, 4 months

[hbelusca] 72475: [HAL] Update the PCI hardware IDs database. Extracted from the pci.ids database from http://pci-ids.ucw.cz/ from 2016-08-26 03:15:02 Maintained by Albert Pool, Martin Mares, and o...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 27 19:12:11 2016 New Revision: 72475 URL: http://svn.reactos.org/svn/reactos?rev=72475&view=rev Log: [HAL] Update the PCI hardware IDs database. Extracted from the pci.ids database from http://pci-ids.ucw.cz/ from 2016-08-26 03:15:02 Maintained by Albert Pool, Martin Mares, and other volunteers from the PCI ID Project at http://pci-ids.ucw.cz/. CORE-11903 #resolve Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Modified: trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_…

8 years, 4 months

[aandrejevic] 72474: [NTVDM:SVGA] Properly implement the vertical retrace interval. The starting address and the scanline size are calculated at the start, and the actual update is performed at the...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Aug 27 17:10:08 2016 New Revision: 72474 URL: http://svn.reactos.org/svn/reactos?rev=72474&view=rev Log: [NTVDM:SVGA] Properly implement the vertical retrace interval. The starting address and the scanline size are calculated at the start, and the actual update is performed at the end. This allows software to change the pixel panning and some other parameters during the vertical retrace. Also, normalize the CRTC register names. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Sat Aug 27 17:10:08 2016 @@ -210,11 +210,11 @@ /* Unlock CRTC registers 0-7 */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_END_HORZ_BLANKING_REG); IOWriteB(VGA_CRTC_DATA , IOReadB(VGA_CRTC_DATA) | 0x80); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_VERT_RETRACE_END_REG); + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_END_VERT_RETRACE_REG); IOWriteB(VGA_CRTC_DATA , IOReadB(VGA_CRTC_DATA) & ~0x80); // Make sure they remain unlocked Registers->CRT[VGA_CRTC_END_HORZ_BLANKING_REG] |= 0x80; - Registers->CRT[VGA_CRTC_VERT_RETRACE_END_REG] &= ~0x80; + Registers->CRT[VGA_CRTC_END_VERT_RETRACE_REG] &= ~0x80; /* Write the CRTC registers */ for (i = 0; i < SVGA_CRTC_MAX_REG; i++) @@ -564,7 +564,7 @@ default: { - DPRINT("VESA INT 0x10, AH = 0x05, Unknown subfunction: %02X", getBH()); + DPRINT("VESA INT 0x10, AL = 0x05, Unknown subfunction: %02X", getBH()); } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sat Aug 27 17:10:08 2016 @@ -2195,11 +2195,11 @@ /* Unlock CRTC registers 0-7 */ IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_END_HORZ_BLANKING_REG); IOWriteB(VGA_CRTC_DATA , IOReadB(VGA_CRTC_DATA) | 0x80); - IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_VERT_RETRACE_END_REG); + IOWriteB(VGA_CRTC_INDEX, VGA_CRTC_END_VERT_RETRACE_REG); IOWriteB(VGA_CRTC_DATA , IOReadB(VGA_CRTC_DATA) & ~0x80); // Make sure they remain unlocked Registers->CRT[VGA_CRTC_END_HORZ_BLANKING_REG] |= 0x80; - Registers->CRT[VGA_CRTC_VERT_RETRACE_END_REG] &= ~0x80; + Registers->CRT[VGA_CRTC_END_VERT_RETRACE_REG] &= ~0x80; /* Write the CRTC registers */ for (i = 0; i < VGA_CRTC_MAX_REG; i++) Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Aug 27 17:10:08 2016 @@ -272,10 +272,11 @@ // static VGA_REGISTERS VgaRegisters; -static ULONGLONG VerticalRetraceCycle = 0ULL; static ULONGLONG HorizontalRetraceCycle = 0ULL; -static PHARDWARE_TIMER VSyncTimer; static PHARDWARE_TIMER HSyncTimer; +static DWORD ScanlineCounter = 0; +static DWORD StartAddressLatch = 0; +static DWORD ScanlineSizeLatch = 0; static BOOLEAN NeedsUpdate = FALSE; static BOOLEAN ModeChanged = FALSE; @@ -731,17 +732,8 @@ { SHORT i, j, k; DWORD AddressSize = VgaGetAddressSize(); - DWORD ScanlineSize = ((DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] - + (((DWORD)VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_OFFSET_BIT8) << 4)) * 2; - BYTE PresetRowScan = VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F; + DWORD Address = StartAddressLatch; BYTE BytePanning = (VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3; - DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], - VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) - + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT16) << 16) - + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BITS1718) << 15) - + ((VgaCrtcRegisters[SVGA_CRTC_OVERLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT19) << 12) - + PresetRowScan * ScanlineSize - + BytePanning; WORD LineCompare = VgaCrtcRegisters[VGA_CRTC_LINE_COMPARE_REG] | ((VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_LC8) << 4); BYTE PixelShift = VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F; @@ -816,11 +808,11 @@ /* Apply horizontal pixel panning */ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { - X = j + (PixelShift >> 1); + X = j + ((PixelShift >> 1) & 0x03); } else { - X = j + PixelShift; + X = j + ((PixelShift < 8) ? PixelShift : -1); } /* Check the shifting mode */ @@ -1014,7 +1006,7 @@ if (!(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) || (i & 1)) { /* Move to the next scanline */ - Address += ScanlineSize; + Address += ScanlineSizeLatch; } } @@ -1064,7 +1056,7 @@ } /* Move to the next scanline */ - Address += ScanlineSize; + Address += ScanlineSizeLatch; } } } @@ -1116,16 +1108,15 @@ ULONG CyclesPerMicrosecond = (ULONG)((GetCycleSpeed() + 500000ULL) / 1000000ULL); ULONG Dots = (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & 1) ? 9 : 8; ULONG Clock = VgaGetClockFrequency() / 1000000; - ULONG HorizTotalDots = ((ULONG)VgaCrtcRegisters[VGA_CRTC_HORZ_TOTAL_REG] + 5) * Dots; - ULONG VblankStart, VblankEnd, HblankStart, HblankEnd; - ULONG HblankDuration, VblankDuration; - - /* Calculate the vertical blanking duration in cycles */ - VblankStart = VgaCrtcRegisters[VGA_CRTC_START_VERT_BLANKING_REG] & 0x7F; - VblankEnd = VgaCrtcRegisters[VGA_CRTC_END_VERT_BLANKING_REG] & 0x7F; - if (VblankEnd < VblankStart) VblankEnd |= 0x80; - VblankDuration = ((VblankEnd - VblankStart) * HorizTotalDots - * CyclesPerMicrosecond + (Clock >> 1)) / Clock; + ULONG HblankStart, HblankEnd; + ULONG HblankDuration; + ULONG VerticalRetraceStart = VgaCrtcRegisters[VGA_CRTC_START_VERT_RETRACE_REG]; + ULONG VerticalRetraceEnd; + + VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS8) << 6; + VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS9) << 2; + + VerticalRetraceEnd = VerticalRetraceStart + (VgaCrtcRegisters[VGA_CRTC_END_VERT_RETRACE_REG] & 0x0F); /* Calculate the horizontal blanking duration in cycles */ HblankStart = VgaCrtcRegisters[VGA_CRTC_START_HORZ_BLANKING_REG] & 0x1F; @@ -1134,15 +1125,11 @@ HblankDuration = ((HblankEnd - HblankStart) * Dots * CyclesPerMicrosecond + (Clock >> 1)) / Clock; - Vsync = (Cycles - VerticalRetraceCycle) < (ULONGLONG)VblankDuration; + Vsync = ScanlineCounter >= VerticalRetraceStart && ScanlineCounter <= VerticalRetraceEnd; Hsync = (Cycles - HorizontalRetraceCycle) < (ULONGLONG)HblankDuration; /* Reset the AC latch */ VgaAcLatch = FALSE; - - /* Reverse the polarity, if needed */ - if (VgaMiscRegister & VGA_MISC_VSYNCP) Vsync = !Vsync; - if (VgaMiscRegister & VGA_MISC_HSYNCP) Hsync = !Hsync; /* Set a flag if there is a vertical or horizontal retrace */ if (Vsync || Hsync) Result |= VGA_STAT_DD; @@ -1591,13 +1578,8 @@ SvgaHdrCounter = 0; } -static VOID FASTCALL VgaVerticalRetrace(ULONGLONG ElapsedTime) -{ - UNREFERENCED_PARAMETER(ElapsedTime); - - /* Set the vertical retrace cycle */ - VerticalRetraceCycle = GetCycleCount(); - +static inline VOID VgaVerticalRetrace(VOID) +{ /* If nothing has changed, just return */ // if (!ModeChanged && !CursorChanged && !PaletteChanged && !NeedsUpdate) // return; @@ -1640,10 +1622,61 @@ static VOID FASTCALL VgaHorizontalRetrace(ULONGLONG ElapsedTime) { + ULONG VerticalTotal = VgaCrtcRegisters[VGA_CRTC_VERT_TOTAL_REG]; + ULONG VerticalRetraceStart = VgaCrtcRegisters[VGA_CRTC_START_VERT_RETRACE_REG]; + ULONG VerticalRetraceEnd; + BOOLEAN BeforeVSyncStart, BeforeVSyncEnd; + ULONG CurrentCycleCount = GetCycleCount(); + ULONG ElapsedCycles = CurrentCycleCount - HorizontalRetraceCycle; + ULONG Dots = (VgaSeqRegisters[VGA_SEQ_CLOCK_REG] & 1) ? 9 : 8; + ULONG HorizTotalDots = ((ULONG)VgaCrtcRegisters[VGA_CRTC_HORZ_TOTAL_REG] + 5) * Dots; + ULONG HSyncsPerSecond = VgaGetClockFrequency() / HorizTotalDots; + ULONG HSyncs = (ElapsedCycles * HSyncsPerSecond) / GetCycleSpeed(); + UNREFERENCED_PARAMETER(ElapsedTime); + if (HSyncs == 0) HSyncs = 1; + + VerticalTotal |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VT8) << 8; + VerticalTotal |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VT9) << 4; + + VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS8) << 6; + VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS9) << 2; + + VerticalRetraceEnd = VerticalRetraceStart + (VgaCrtcRegisters[VGA_CRTC_END_VERT_RETRACE_REG] & 0x0F); /* Set the cycle */ - HorizontalRetraceCycle = GetCycleCount(); + HorizontalRetraceCycle = CurrentCycleCount; + + /* Increment the scanline counter, but make sure we don't skip any part of the vertical retrace */ + BeforeVSyncStart = (ScanlineCounter < VerticalRetraceStart); + BeforeVSyncEnd = (ScanlineCounter < VerticalRetraceEnd); + ScanlineCounter += HSyncs; + if (BeforeVSyncStart && ScanlineCounter >= VerticalRetraceStart) ScanlineCounter = VerticalRetraceStart; + else if (BeforeVSyncEnd && ScanlineCounter >= VerticalRetraceEnd) ScanlineCounter = VerticalRetraceEnd; + + /* The scanline counter wraps around */ + ScanlineCounter %= VerticalTotal; + + if (ScanlineCounter == VerticalRetraceStart) + { + /* Save the scanline size */ + ScanlineSizeLatch = ((DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] + + (((DWORD)VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_OFFSET_BIT8) << 4)) * 2; + + /* Save the starting address */ + StartAddressLatch = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], + VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT16) << 16) + + ((VgaCrtcRegisters[SVGA_CRTC_EXT_DISPLAY_REG] & SVGA_CRTC_EXT_ADDR_BITS1718) << 15) + + ((VgaCrtcRegisters[SVGA_CRTC_OVERLAY_REG] & SVGA_CRTC_EXT_ADDR_BIT19) << 12) + + (VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F) * ScanlineSizeLatch + + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); + } + + if (ScanlineCounter == VerticalRetraceEnd) + { + VgaVerticalRetrace(); + } } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -1706,7 +1739,7 @@ VOID VgaRefreshDisplay(VOID) { - VgaVerticalRetrace(0); + VgaVerticalRetrace(); } VOID FASTCALL VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size) @@ -1803,13 +1836,11 @@ /* * These values can also be computed in the following way, but using the table seems to be faster: * - * ColorCompareBytes = VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG]; - * ColorCompareBytes |= (ColorCompareBytes << 7) | (ColorCompareBytes << 14) | (ColorCompareBytes << 21); + * ColorCompareBytes = VgaGcRegisters[VGA_GC_COLOR_COMPARE_REG] * 0x000204081; * ColorCompareBytes &= 0x01010101; * ColorCompareBytes = (ColorCompareBytes << 8) - ColorCompareBytes; * - * ColorIgnoreBytes = VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG]; - * ColorIgnoreBytes |= (ColorIgnoreBytes << 7) | (ColorIgnoreBytes << 14) | (ColorIgnoreBytes << 21); + * ColorIgnoreBytes = VgaGcRegisters[VGA_GC_COLOR_IGNORE_REG] * 0x000204081; * ColorIgnoreBytes &= 0x01010101; * ColorIgnoreBytes = (ColorIgnoreBytes << 8) - ColorIgnoreBytes; */ @@ -1959,7 +1990,6 @@ RegisterIoPort(0x3D9, VgaReadPort, VgaWritePort); // CGA_PAL_CTRL_REG HSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(31469), VgaHorizontalRetrace); - VSyncTimer = CreateHardwareTimer(HARDWARE_TIMER_ENABLED, HZ_TO_NS(60), VgaVerticalRetrace); /* Return success */ return TRUE; @@ -1970,7 +2000,6 @@ /* Do a final display refresh */ VgaRefreshDisplay(); - DestroyHardwareTimer(VSyncTimer); DestroyHardwareTimer(HSyncTimer); /* Leave the current video mode */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Sat Aug 27 17:10:08 2016 @@ -215,8 +215,8 @@ VGA_CRTC_START_ADDR_LOW_REG, VGA_CRTC_CURSOR_LOC_HIGH_REG, VGA_CRTC_CURSOR_LOC_LOW_REG, - VGA_CRTC_VERT_RETRACE_START_REG, - VGA_CRTC_VERT_RETRACE_END_REG, + VGA_CRTC_START_VERT_RETRACE_REG, + VGA_CRTC_END_VERT_RETRACE_REG, VGA_CRTC_VERT_DISP_END_REG, VGA_CRTC_OFFSET_REG, VGA_CRTC_UNDERLINE_REG,

8 years, 4 months

[jgardou] 72473: [NTOS/MM] - Addendum to r72472 : address nodes are not VADs for the base section AVL table CORE-11900

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Aug 27 13:22:17 2016 New Revision: 72473 URL: http://svn.reactos.org/svn/reactos?rev=72473&view=rev Log: [NTOS/MM] - Addendum to r72472 : address nodes are not VADs for the base section AVL table CORE-11900 Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Sat Aug 27 13:22:17 2016 @@ -378,7 +378,7 @@ /* Free the node from ReactOS view as well */ Vad = (PMMVAD_LONG)Node; - if (Vad->u.VadFlags.Spare == 0) + if ((Table != &MmSectionBasedRoot) && (Vad->u.VadFlags.Spare == 0)) { PMEMORY_AREA MemoryArea; PEPROCESS Process;

8 years, 4 months

[jgardou] 72472: [NTOS/MM] - Keep the control area as being created through the whole creation process in MmCreateArm3Section - Use the segment length to find a suitable place for SEC_BASED section...

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Aug 27 13:17:10 2016 New Revision: 72472 URL: http://svn.reactos.org/svn/reactos?rev=72472&view=rev Log: [NTOS/MM] - Keep the control area as being created through the whole creation process in MmCreateArm3Section - Use the segment length to find a suitable place for SEC_BASED sections - Properly remove the global section node when deleting a based section CORE-11900 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Aug 27 13:17:10 2016 @@ -1564,6 +1564,9 @@ if (AllocationAttributes & SEC_RESERVE) ControlArea->u.Flags.Reserve = 1; if (AllocationAttributes & SEC_COMMIT) ControlArea->u.Flags.Commit = 1; + /* We just allocated it */ + ControlArea->u.Flags.BeingCreated = 1; + /* The subsection follows, write the mask, PTE count and point back to the CA */ Subsection = (PSUBSECTION)(ControlArea + 1); Subsection->ControlArea = ControlArea; @@ -2565,6 +2568,7 @@ /* Set the size here, and read the control area */ Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; ControlArea = NewSegment->ControlArea; + ASSERT(ControlArea->u.Flags.BeingCreated == 1); } /* Did we already have a segment? */ @@ -2663,6 +2667,60 @@ ASSERT(KernelCall == FALSE); NewSection->u.Flags.UserReference = TRUE; + /* Is this a "based" allocation, in which all mappings are identical? */ + if (AllocationAttributes & SEC_BASED) + { + /* Lock the VAD tree during the search */ + KeAcquireGuardedMutex(&MmSectionBasedMutex); + + /* Is it a brand new ControArea ? */ + if (ControlArea->u.Flags.BeingCreated == 1) + { + ASSERT(ControlArea->u.Flags.Based == 1); + /* Then we must find a global address, top-down */ + Status = MiFindEmptyAddressRangeDownBasedTree((SIZE_T)ControlArea->Segment->SizeOfSegment, + (ULONG_PTR)MmHighSectionBase, + _64K, + &MmSectionBasedRoot, + (ULONG_PTR*)&ControlArea->Segment->BasedAddress); + + if (!NT_SUCCESS(Status)) + { + /* No way to find a valid range. */ + KeReleaseGuardedMutex(&MmSectionBasedMutex); + ControlArea->u.Flags.Based = 0; + NewSection->u.Flags.Based = 0; + ObDereferenceObject(NewSection); + return Status; + } + + /* Compute the ending address and insert it into the VAD tree */ + NewSection->Address.StartingVpn = (ULONG_PTR)ControlArea->Segment->BasedAddress; + NewSection->Address.EndingVpn = NewSection->Address.StartingVpn + NewSection->SizeOfSection.LowPart - 1; + MiInsertBasedSection(NewSection); + } + else + { + /* FIXME : Should we deny section creation if SEC_BASED is not set ? Can we have two different section objects on the same based address ? Investigate !*/ + ASSERT(FALSE); + } + + KeReleaseGuardedMutex(&MmSectionBasedMutex); + } + + /* The control area is not being created anymore */ + if (ControlArea->u.Flags.BeingCreated == 1) + { + /* Acquire the PFN lock while we set control area flags */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Take off the being created flag, and then release the lock */ + ControlArea->u.Flags.BeingCreated = 0; + NewSection->u.Flags.BeingCreated = 0; + + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + /* Migrate the attribute into a flag */ if (AllocationAttributes & SEC_NO_CHANGE) NewSection->u.Flags.NoChange = TRUE; @@ -2670,40 +2728,6 @@ if (!(SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) { NewSection->u.Flags.CopyOnWrite = TRUE; - } - - /* Is this a "based" allocation, in which all mappings are identical? */ - if (AllocationAttributes & SEC_BASED) - { - /* Convert the flag, and make sure the section isn't too big */ - NewSection->u.Flags.Based = TRUE; - if ((ULONGLONG)NewSection->SizeOfSection.QuadPart > - (ULONG_PTR)MmHighSectionBase) - { - DPRINT1("BASED section is too large\n"); - ObDereferenceObject(NewSection); - return STATUS_NO_MEMORY; - } - - /* Lock the VAD tree during the search */ - KeAcquireGuardedMutex(&MmSectionBasedMutex); - - /* Find an address top-down */ - Status = MiFindEmptyAddressRangeDownBasedTree(NewSection->SizeOfSection.LowPart, - (ULONG_PTR)MmHighSectionBase, - _64K, - &MmSectionBasedRoot, - &NewSection->Address.StartingVpn); - ASSERT(NT_SUCCESS(Status)); - - /* Compute the ending address and insert it into the VAD tree */ - NewSection->Address.EndingVpn = NewSection->Address.StartingVpn + - NewSection->SizeOfSection.LowPart - - 1; - MiInsertBasedSection(NewSection); - - /* Finally release the lock */ - KeReleaseGuardedMutex(&MmSectionBasedMutex); } /* Write down if this was a kernel call */ @@ -3141,6 +3165,14 @@ KIRQL OldIrql; SectionObject = (PSECTION)ObjectBody; + + if (SectionObject->u.Flags.Based == 1) + { + /* Remove the node from the global section address tree */ + KeAcquireGuardedMutex(&MmSectionBasedMutex); + MiRemoveNode(&SectionObject->Address, &MmSectionBasedRoot); + KeReleaseGuardedMutex(&MmSectionBasedMutex); + } /* Lock the PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock);

8 years, 4 months

[tfaber] 72471: [USBHUB] - Fix memory leaks in failure case of CreateUsbChildDeviceObject. Patch by Vardan Mikayelyan, merged from r72366.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Aug 27 11:29:42 2016 New Revision: 72471 URL: http://svn.reactos.org/svn/reactos?rev=72471&view=rev Log: [USBHUB] - Fix memory leaks in failure case of CreateUsbChildDeviceObject. Patch by Vardan Mikayelyan, merged from r72366. Modified: trunk/reactos/ (props changed) trunk/reactos/drivers/usb/usbhub/ (props changed) trunk/reactos/drivers/usb/usbhub/fdo.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 27 11:29:42 2016 @@ -1,6 +1,7 @@ /branches/GSoC_2011/GSoC_Network:51548 /branches/GSoC_2011/GSoC_TcpIpDriver:51550 /branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_2016/USB:72366 /branches/GSoC_Network:51545-51546 /branches/cmake-bringup:50484,50693,50719,51544-52564 /branches/condrv_restructure:63104-65657 Propchange: trunk/reactos/drivers/usb/usbhub/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 27 11:29:42 2016 @@ -4,6 +4,7 @@ /branches/GSoC_2011/GSoC_TcpIpDriver/drivers/usb/usbhub_new:51550 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub:51551-53074,53076-53119 /branches/GSoC_2011/TcpIpDriver/drivers/usb/usbhub_new:51551-53074,53076-53119 +/branches/GSoC_2016/USB/drivers/usb/usbhub:72366 /branches/GSoC_Network/drivers/usb/usbhub:51545-51546 /branches/GSoC_Network/drivers/usb/usbhub_new:51545-51546 /branches/cmake-bringup/drivers/usb/usbhub:50484,50693,50719,51544-52564 Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Aug 27 11:29:42 2016 @@ -1358,6 +1358,21 @@ // if (UsbChildExtension->FullConfigDesc) ExFreePool(UsbChildExtension->FullConfigDesc); + + // + // Free ID buffers if they were allocated in CreateDeviceIds() + // + if (UsbChildExtension->usCompatibleIds.Buffer) + ExFreePool(UsbChildExtension->usCompatibleIds.Buffer); + + if (UsbChildExtension->usDeviceId.Buffer) + ExFreePool(UsbChildExtension->usDeviceId.Buffer); + + if (UsbChildExtension->usHardwareIds.Buffer) + ExFreePool(UsbChildExtension->usHardwareIds.Buffer); + + if (UsbChildExtension->usInstanceId.Buffer) + ExFreePool(UsbChildExtension->usInstanceId.Buffer); // // Delete the device object

8 years, 4 months

[jimtabor] 72470: [NtUser] - Fix crash when there are no system cursors created. See CORE-11899.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Aug 26 23:43:19 2016 New Revision: 72470 URL: http://svn.reactos.org/svn/reactos?rev=72470&view=rev Log: [NtUser] - Fix crash when there are no system cursors created. See CORE-11899. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Fri Aug 26 23:43:19 2016 @@ -230,7 +230,7 @@ IntSystemSetCursor(PCURICON_OBJECT pcurNew) { PCURICON_OBJECT pcurOld = UserSetCursor(pcurNew, FALSE); - UserReferenceObject(pcurNew); + if (pcurNew) UserReferenceObject(pcurNew); if (pcurOld) UserDereferenceObject(pcurOld); return pcurOld; }

8 years, 4 months

[jgardou] 72469: [NTOS/MM] - Fix ZeroBits check in NtMapViewOfSection - Implement handling MEM_DOS_LIM AllocationType This fixes all but a few NtMapViewOfSection (due to some temp file not being re...

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Aug 26 21:15:06 2016 New Revision: 72469 URL: http://svn.reactos.org/svn/reactos?rev=72469&view=rev Log: [NTOS/MM] - Fix ZeroBits check in NtMapViewOfSection - Implement handling MEM_DOS_LIM AllocationType This fixes all but a few NtMapViewOfSection (due to some temp file not being removed) wine tests + tests from 72468 Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Fri Aug 26 21:15:06 2016 @@ -1269,19 +1269,24 @@ ULONG QuotaCharge = 0, QuotaExcess = 0; PMMPTE PointerPte, LastPte; MMPTE TempPte; + ULONG Granularity = MM_VIRTMEM_GRANULARITY; + DPRINT("Mapping ARM3 data section\n"); /* Get the segment for this section */ Segment = ControlArea->Segment; +#ifdef _M_IX86 + /* ALlow being less restrictive on x86. */ + if (AllocationType & MEM_DOS_LIM) + Granularity = PAGE_SIZE; +#endif + /* One can only reserve a file-based mapping, not shared memory! */ if ((AllocationType & MEM_RESERVE) && !(ControlArea->FilePointer)) { return STATUS_INVALID_PARAMETER_9; } - - /* This flag determines alignment, but ARM3 does not yet support it */ - ASSERT((AllocationType & MEM_DOS_LIM) == 0); /* First, increase the map count. No purging is supported yet */ Status = MiCheckPurgeAndUpMapCount(ControlArea, FALSE); @@ -1432,7 +1437,7 @@ if (*BaseAddress != NULL) { /* Just align what the caller gave us */ - StartAddress = ROUND_UP((ULONG_PTR)*BaseAddress, _64K); + StartAddress = ALIGN_DOWN_BY((ULONG_PTR)*BaseAddress, Granularity); } else if (Section->Address.StartingVpn != 0) { @@ -1449,7 +1454,7 @@ &StartAddress, ViewSizeInPages * PAGE_SIZE, MAXULONG_PTR >> ZeroBits, - MM_VIRTMEM_GRANULARITY, + Granularity, AllocationType); if (!NT_SUCCESS(Status)) { @@ -3447,13 +3452,13 @@ ACCESS_MASK DesiredAccess; ULONG ProtectionMask; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - - /* Check for invalid zero bits */ - if (ZeroBits > 21) // per-arch? - { - DPRINT1("Invalid zero bits\n"); - return STATUS_INVALID_PARAMETER_4; - } +#ifdef _M_IX86 + static const ULONG ValidAllocationType = (MEM_TOP_DOWN | MEM_LARGE_PAGES | + MEM_DOS_LIM | SEC_NO_CHANGE | MEM_RESERVE); +#else + static const ULONG ValidAllocationType = (MEM_TOP_DOWN | MEM_LARGE_PAGES | + SEC_NO_CHANGE | MEM_RESERVE); +#endif /* Check for invalid inherit disposition */ if ((InheritDisposition > ViewUnmap) || (InheritDisposition < ViewShare)) @@ -3463,8 +3468,7 @@ } /* Allow only valid allocation types */ - if ((AllocationType & ~(MEM_TOP_DOWN | MEM_LARGE_PAGES | MEM_DOS_LIM | - SEC_NO_CHANGE | MEM_RESERVE))) + if (AllocationType & ~ValidAllocationType) { DPRINT1("Invalid allocation type\n"); return STATUS_INVALID_PARAMETER_9; @@ -3478,13 +3482,6 @@ return STATUS_INVALID_PAGE_PROTECTION; } - /* Check for non-allocation-granularity-aligned BaseAddress */ - if (BaseAddress && (*BaseAddress != ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY))) - { - DPRINT("BaseAddress is not at 64-kilobyte address boundary."); - return STATUS_MAPPED_ALIGNMENT; - } - /* Now convert the protection mask into desired section access mask */ DesiredAccess = MmMakeSectionAccess[ProtectionMask & 0x7]; @@ -3520,6 +3517,33 @@ _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; + + /* Check for invalid zero bits */ + if (ZeroBits && SafeBaseAddress) + { + if ((((ULONG_PTR)SafeBaseAddress << ZeroBits) >> ZeroBits) != (ULONG_PTR)SafeBaseAddress) + { + DPRINT1("Invalid zero bits\n"); + return STATUS_INVALID_PARAMETER_4; + } + } + + if (!(AllocationType & MEM_DOS_LIM)) + { + /* Check for non-allocation-granularity-aligned BaseAddress */ + if (SafeBaseAddress != ALIGN_DOWN_POINTER_BY(SafeBaseAddress, MM_VIRTMEM_GRANULARITY)) + { + DPRINT("BaseAddress is not at 64-kilobyte address boundary."); + return STATUS_MAPPED_ALIGNMENT; + } + + /* Do the same for the section offset */ + if (SafeSectionOffset.LowPart != ALIGN_DOWN_BY(SafeSectionOffset.LowPart, MM_VIRTMEM_GRANULARITY)) + { + DPRINT("SectionOffset is not at 64-kilobyte address boundary."); + return STATUS_MAPPED_ALIGNMENT; + } + } /* Check for kernel-mode address */ if (SafeBaseAddress > MM_HIGHEST_VAD_ADDRESS)

8 years, 4 months

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

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 August 2016