Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[aandrejevic] 72498: [NTVDM:SVGA] Don't forget to adapt the console attaching code to the new transposed video memory, and certainly don't forget to make sure the ScanlineSizeLatch and StartAddress...
by aandrejevic＠svn.reactos.org 29 Aug '16

29 Aug '16

Author: aandrejevic Date: Mon Aug 29 04:31:02 2016 New Revision: 72498 URL: http://svn.reactos.org/svn/reactos?rev=72498&view=rev Log: [NTVDM:SVGA] Don't forget to adapt the console attaching code to the new transposed video memory, and certainly don't forget to make sure the ScanlineSizeLatch and StartAddressLatch have the correct values before calling VgaVerticalRetrace. Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] Mon Aug 29 04:31:02 2016 @@ -395,10 +395,10 @@ CurrentAddr = LOWORD((Address + j) * AddressSize); /* Store the character in plane 0 */ - VgaMemory[CurrentAddr] = CharBuff[i * TextResolution.X + j].Char.AsciiChar; + VgaMemory[CurrentAddr * VGA_NUM_BANKS] = CharBuff[i * TextResolution.X + j].Char.AsciiChar; /* Store the attribute in plane 1 */ - VgaMemory[CurrentAddr + VGA_BANK_SIZE] = (BYTE)CharBuff[i * TextResolution.X + j].Attributes; + VgaMemory[CurrentAddr * VGA_NUM_BANKS + 1] = (BYTE)CharBuff[i * TextResolution.X + j].Attributes; } /* Move to the next scanline */ 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] Mon Aug 29 04:31:02 2016 @@ -1765,6 +1765,19 @@ VOID VgaRefreshDisplay(VOID) { + /* 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); + VgaVerticalRetrace(); } @@ -1960,7 +1973,7 @@ UINT i, j; ASSERT(Height <= VGA_MAX_FONT_HEIGHT); - for (i = 0 ; i < VGA_FONT_CHARACTERS; i++) + for (i = 0; i < VGA_FONT_CHARACTERS; i++) { /* Write the character */ for (j = 0; j < Height; j++)

1 0

[jgardou] 72497: [NTOS/MM] - Shuffle parameter chacks in NtMapViewOfSection to make kmtest pass more of them - Restore previously lost check on ZeroBits against 21. Use the architecture specific de...
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 21:07:51 2016 New Revision: 72497 URL: http://svn.reactos.org/svn/reactos?rev=72497&view=rev Log: [NTOS/MM] - Shuffle parameter chacks in NtMapViewOfSection to make kmtest pass more of them - Restore previously lost check on ZeroBits against 21. Use the architecture specific define - Better check for ZeroBits and ViewSize 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] Sun Aug 28 21:07:51 2016 @@ -3550,14 +3550,40 @@ } _SEH2_END; + /* Check for kernel-mode address */ + if (SafeBaseAddress > MM_HIGHEST_VAD_ADDRESS) + { + DPRINT1("Kernel base not allowed\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check for range entering kernel-mode */ + if (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)SafeBaseAddress) < SafeViewSize) + { + DPRINT1("Overflowing into kernel base not allowed\n"); + return STATUS_INVALID_PARAMETER_3; + } + /* Check for invalid zero bits */ - if (ZeroBits && SafeBaseAddress) - { - if ((((ULONG_PTR)SafeBaseAddress << ZeroBits) >> ZeroBits) != (ULONG_PTR)SafeBaseAddress) + if (ZeroBits) + { + if (ZeroBits > MI_MAX_ZERO_BITS) { DPRINT1("Invalid zero bits\n"); return STATUS_INVALID_PARAMETER_4; } + + if ((((ULONG_PTR)SafeBaseAddress << ZeroBits) >> ZeroBits) != (ULONG_PTR)SafeBaseAddress) + { + DPRINT1("Invalid zero bits\n"); + return STATUS_INVALID_PARAMETER_4; + } + + if (((((ULONG_PTR)SafeBaseAddress + SafeViewSize) << ZeroBits) >> ZeroBits) != ((ULONG_PTR)SafeBaseAddress + SafeViewSize)) + { + DPRINT1("Invalid zero bits\n"); + return STATUS_INVALID_PARAMETER_4; + } } if (!(AllocationType & MEM_DOS_LIM)) @@ -3575,27 +3601,6 @@ DPRINT("SectionOffset is not at 64-kilobyte address boundary."); return STATUS_MAPPED_ALIGNMENT; } - } - - /* Check for kernel-mode address */ - if (SafeBaseAddress > MM_HIGHEST_VAD_ADDRESS) - { - DPRINT1("Kernel base not allowed\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* Check for range entering kernel-mode */ - if (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)SafeBaseAddress) < SafeViewSize) - { - DPRINT1("Overflowing into kernel base not allowed\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* Check for invalid zero bits */ - if (((ULONG_PTR)SafeBaseAddress + SafeViewSize) > (0xFFFFFFFF >> ZeroBits)) // arch? - { - DPRINT1("Invalid zero bits\n"); - return STATUS_INVALID_PARAMETER_4; } /* Reference the process */

1 0

[aandrejevic] 72496: [NTVDM:BIOS] Implement mode 0x5F, otherwise known as VESA mode 0x101 (640x480 256 colors).
by aandrejevic＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: aandrejevic Date: Sun Aug 28 20:15:03 2016 New Revision: 72496 URL: http://svn.reactos.org/svn/reactos?rev=72496&view=rev Log: [NTVDM:BIOS] Implement mode 0x5F, otherwise known as VESA mode 0x101 (640x480 256 colors). Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c 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] Sun Aug 28 20:15:03 2016 @@ -23,6 +23,87 @@ #include "io.h" /* PRIVATE VARIABLES **********************************************************/ + +static const VBE_MODE_INFO VbeMode_640x480x256_Info = +{ + /* Attributes */ + VBE_MODE_SUPPORTED + | VBE_MODE_OPTIONAL_INFO + // | VBE_MODE_BIOS_SUPPORT + | VBE_MODE_COLOR + | VBE_MODE_GRAPHICS, + + /* Window A attributes */ + VBE_WINDOW_EXISTS | VBE_WINDOW_READABLE | VBE_WINDOW_WRITABLE, + /* Window B attributes */ + 0, + + 16, /* Window granularity, in KB */ + 64, /* Window size, in KB */ + 0xA000, /* Window A segment, or zero if not supported */ + 0x0000, /* Window B segment, or zero if not supported */ + 0x00000000, /* Window position function pointer */ + 800, /* Bytes per scanline */ + 640, /* Width */ + 480, /* Height */ + 8, /* Character cell width */ + 16, /* Character cell height */ + 1, /* Number of memory planes */ + 8, /* Bits per pixel */ + 1, /* Number of banks */ + VBE_MODEL_PACKED, /* Memory model */ + 0, /* Bank size */ + 11, /* Number of image pages */ + 0, /* Reserved field */ + 0, /* Red mask size */ + 0, /* Red field position */ + 0, /* Green mask size */ + 0, /* Green field position */ + 0, /* Blue mask size */ + 0, /* Blue field position */ + 0, /* Reserved mask size */ + 0, /* Reserved field position */ + 0, /* Direct color info */ +}; + +static SVGA_REGISTERS VbeMode_640x480x256_Registers = +{ + /* Miscellaneous Register */ + 0x63, + + /* Hidden Register */ + 0x00, + + /* Sequencer Registers */ + { + 0x03, 0x21, 0x0F, 0x00, 0x0E, 0x00, 0x12, 0x11, 0x00, 0x00, 0x18, 0x58, + 0x58, 0x58, 0x58, 0x98, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x2D + }, + + /* CRTC Registers */ + { + 0x5F, 0x4F, 0x4F, 0x80, 0x52, 0x1E, 0x0B, 0x3E, 0x00, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xEA, 0x2C, 0xDF, 0x50, 0x40, 0xDF, 0x0B, 0xC3, + 0xFF, 0x00, 0x00, 0x22, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, + 0x80, 0x00, 0x20, 0xB8 + }, + + /* GC Registers */ + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x0F, 0xFF, 0x00, 0x00, 0x20, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 + }, + + /* AC Registers */ + { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, + 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00 + } +}; static const VBE_MODE_INFO VbeMode_800x600x256_Info = { @@ -114,7 +195,7 @@ { 0x5C, 0x103 , &VbeMode_800x600x256_Info, &VbeMode_800x600x256_Registers }, { 0x5D, 0x104 , NULL /* TODO */ , NULL /* TODO */ }, { 0x5E, 0x100 , NULL /* TODO */ , NULL /* TODO */ }, - { 0x5F, 0x101 , NULL /* TODO */ , NULL /* TODO */ }, + { 0x5F, 0x101 , &VbeMode_640x480x256_Info, &VbeMode_640x480x256_Registers }, { 0x60, 0x105 , NULL /* TODO */ , NULL /* TODO */ }, { 0x64, 0x111 , NULL /* TODO */ , NULL /* TODO */ }, { 0x65, 0x114 , NULL /* TODO */ , NULL /* TODO */ },

1 0

[jgardou] 72495: [WIN32SS/USER32] - Do not mask exceptions from WndProc. If this makes programs crash, fine, fix it, but DON'T HIDE BUGS. - Use a wrappper (like wine does) to handle procs with bad ...
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 20:04:01 2016 New Revision: 72495 URL: http://svn.reactos.org/svn/reactos?rev=72495&view=rev Log: [WIN32SS/USER32] - Do not mask exceptions from WndProc. If this makes programs crash, fine, fix it, but DON'T HIDE BUGS. - Use a wrappper (like wine does) to handle procs with bad calling conventions ROSTESTS-155 : Please retest, user32 got in the way and masked the exception handler the wine test installed Added: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S (with props) Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Sun Aug 28 20:04:01 2016 @@ -64,8 +64,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/user32_stubs.c include/user32.h) +if(ARCH STREQUAL "i386") + list(APPEND ASM_SOURCE + windows/wndproc_fixup.S) +endif() + +add_asm_files(user32_asm ${ASM_SOURCE}) + add_library(user32 SHARED ${SOURCE} + ${user32_asm} user32.rc ${CMAKE_CURRENT_BINARY_DIR}/user32.def) Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sun Aug 28 20:04:01 2016 @@ -12,6 +12,22 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); + + +#ifdef __i386__ +/* For bad applications which provide bad (non stdcall) WndProc */ +extern +__cdecl +LRESULT +CALL_EXTERN_WNDPROC( + WNDPROC WndProc, + HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam); +#else +# define CALL_EXTERN_WNDPROC(proc, h, m, w, l) proc(h, m, w, l) +#endif /* From wine: */ /* flag for messages that contain pointers */ @@ -1448,15 +1464,7 @@ if (PreResult) goto Exit; - _SEH2_TRY // wine does this. - { - Result = WndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); if (Hook && MsgOverride) { @@ -1497,15 +1505,7 @@ if (PreResult) goto Exit; - _SEH2_TRY - { - Result = WndProc(hWnd, Msg, wParam, lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); if (Hook && MsgOverride) { @@ -1585,15 +1585,7 @@ if (PreResult) goto Exit; - _SEH2_TRY - { - Result = WndProc(hWnd, Msg, wParam, lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); if (Hook && MsgOverride) { @@ -1641,16 +1633,7 @@ if (PreResult) goto Exit; - _SEH2_TRY - { - Result = WndProc(UnicodeMsg.hwnd, UnicodeMsg.message, - UnicodeMsg.wParam, UnicodeMsg.lParam); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); - } - _SEH2_END; + Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); if (Hook && MsgOverride) { Added: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S (added) +++ trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S [iso-8859-1] Sun Aug 28 20:04:01 2016 @@ -0,0 +1,56 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS user32.dll + * FILE: win32ss/user/user32/windows/wndproc_fixup.S + * PURPOSE: Messages + * PROGRAMMER: JÃ©rÃ´me Gardou jerome.gardou(a)reactos.org + * LICENCE : LGPL, copyright Alexandre Julliard + */ + +#include <asm.inc> +#include <ks386.inc> + +/* Some applications provide invalid callbacks which don't follow the stdcall convention */ + +.code + +/* + * __cdecl + * LRESULT + * CALL_EXTERN_WNDPROC( + * WNDPROC WndProc, + * HWND hWnd, + * UINT Msg, + * WPARAM wParam, + * LPARAM lParam); + */ +PUBLIC _CALL_EXTERN_WNDPROC +FUNC _CALL_EXTERN_WNDPROC + FPO 0, 0, 0, 0, 0, FRAME_FPO + + push ebp + mov ebp, esp + + push edi + push esi + push ebp + + sub esp, 12 + + push dword ptr [ebp + 24] + push dword ptr [ebp + 20] + push dword ptr [ebp + 16] + push dword ptr [ebp + 12] + mov eax, dword ptr [ebp + 8] + + call eax + + lea esp, dword ptr [ebp - 12] + pop ebx + pop esi + pop edi + + leave + ret + +ENDFUNC Propchange: trunk/reactos/win32ss/user/user32/windows/wndproc_fixup.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 72494: [NTOS/MM] - Do not assert on transitions PTEs, we handle them just fine ROSTESTS-155
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 19:59:13 2016 New Revision: 72494 URL: http://svn.reactos.org/svn/reactos?rev=72494&view=rev Log: [NTOS/MM] - Do not assert on transitions PTEs, we handle them just fine ROSTESTS-155 Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Aug 28 19:59:13 2016 @@ -194,9 +194,8 @@ /* Attached processes can't expand their stack */ if (KeIsAttachedProcess()) return STATUS_ACCESS_VIOLATION; - /* No support for transition PTEs yet */ - ASSERT(((TempPte.u.Soft.Transition == 1) && - (TempPte.u.Soft.Prototype == 0)) == FALSE); + /* No support for prototype PTEs yet */ + ASSERT(TempPte.u.Soft.Prototype == 0); /* Remove the guard page bit, and return a guard page violation */ TempPte.u.Soft.Protection = ProtectionMask & ~MM_GUARDPAGE;

1 0

[jgardou] 72493: [NTOS/MM] - Properly chain events when reading a page from disk, aka don't wait on events allocated on the stack of another thread - Use proper type pointers, compilers sometimes h...
by jgardou＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: jgardou Date: Sun Aug 28 19:53:27 2016 New Revision: 72493 URL: http://svn.reactos.org/svn/reactos?rev=72493&view=rev Log: [NTOS/MM] - Properly chain events when reading a page from disk, aka don't wait on events allocated on the stack of another thread - Use proper type pointers, compilers sometimes help making things right Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Aug 28 19:53:27 2016 @@ -882,10 +882,10 @@ PFN_NUMBER Page; NTSTATUS Status; MMPTE TempPte = *PointerPte; - KEVENT Event; PMMPFN Pfn1; ULONG PageFileIndex = TempPte.u.Soft.PageFileLow; ULONG_PTR PageFileOffset = TempPte.u.Soft.PageFileHigh; + ULONG Protection = TempPte.u.Soft.Protection; /* Things we don't support yet */ ASSERT(CurrentProcess > HYDRA_PROCESS); @@ -911,16 +911,10 @@ ASSERT(Pfn1->u1.Event == NULL); ASSERT(Pfn1->u3.e1.ReadInProgress == 0); ASSERT(Pfn1->u3.e1.WriteInProgress == 0); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Pfn1->u1.Event = &Event; Pfn1->u3.e1.ReadInProgress = 1; /* We must write the PTE now as the PFN lock will be released while performing the IO operation */ - TempPte.u.Soft.Transition = 1; - TempPte.u.Soft.PageFileLow = 0; - TempPte.u.Soft.Prototype = 0; - TempPte.u.Trans.PageFrameNumber = Page; + MI_MAKE_TRANSITION_PTE(&TempPte, Page, Protection); MI_WRITE_INVALID_PTE(PointerPte, TempPte); @@ -934,7 +928,6 @@ *OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Nobody should have changed that while we were not looking */ - ASSERT(Pfn1->u1.Event == &Event); ASSERT(Pfn1->u3.e1.ReadInProgress == 1); ASSERT(Pfn1->u3.e1.WriteInProgress == 0); @@ -946,27 +939,29 @@ Pfn1->u1.ReadStatus = Status; } - /* This is now a nice and normal PFN */ - Pfn1->u1.Event = NULL; + /* And the PTE can finally be valid */ + MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, Protection, Page); + MI_WRITE_VALID_PTE(PointerPte, TempPte); + Pfn1->u3.e1.ReadInProgress = 0; - - /* And the PTE can finally be valid */ - MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, TempPte.u.Trans.Protection, Page); - MI_WRITE_VALID_PTE(PointerPte, TempPte); - - /* Waiters gonna wait */ - KeSetEvent(&Event, IO_NO_INCREMENT, FALSE); + /* Did someone start to wait on us while we proceeded ? */ + if (Pfn1->u1.Event) + { + /* Tell them we're done */ + KeSetEvent(Pfn1->u1.Event, IO_NO_INCREMENT, FALSE); + } return Status; } NTSTATUS NTAPI -MiResolveTransitionFault(IN PVOID FaultingAddress, +MiResolveTransitionFault(IN BOOLEAN StoreInstruction, + IN PVOID FaultingAddress, IN PMMPTE PointerPte, IN PEPROCESS CurrentProcess, IN KIRQL OldIrql, - OUT PVOID *InPageBlock) + OUT PKEVENT **InPageBlock) { PFN_NUMBER PageFrameIndex; PMMPFN Pfn1; @@ -999,11 +994,11 @@ ASSERT(Pfn1->u4.InPageError == 0); /* See if we should wait before terminating the fault */ - if (Pfn1->u3.e1.ReadInProgress == 1) - { - DPRINT1("The page is currently being read!\n"); - ASSERT(Pfn1->u1.Event != NULL); - *InPageBlock = Pfn1->u1.Event; + if ((Pfn1->u3.e1.ReadInProgress == 1) + || ((Pfn1->u3.e1.WriteInProgress == 1) && StoreInstruction)) + { + DPRINT1("The page is currently in a page transition !\n"); + *InPageBlock = &Pfn1->u1.Event; if (PointerPte == Pfn1->PteAddress) { DPRINT1("And this if for this particular PTE.\n"); @@ -1061,7 +1056,7 @@ } } - /* Build the transition PTE -- maybe a macro? */ + /* Build the final PTE */ ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(PointerPte->u.Trans.Prototype == 0); ASSERT(PointerPte->u.Trans.Transition == 1); @@ -1107,7 +1102,7 @@ PMMPFN Pfn1; PFN_NUMBER PageFrameIndex; NTSTATUS Status; - PVOID InPageBlock = NULL; + PKEVENT* InPageBlock = NULL; ULONG Protection; /* Must be called with an invalid, prototype PTE, with the PFN lock held */ @@ -1256,7 +1251,8 @@ { /* Resolve the transition fault */ ASSERT(OldIrql != MM_NOIRQL); - Status = MiResolveTransitionFault(Address, + Status = MiResolveTransitionFault(StoreInstruction, + Address, PointerProtoPte, Process, OldIrql, @@ -1543,22 +1539,38 @@ /* Is this a transition PTE */ if (TempPte.u.Soft.Transition) { - PVOID InPageBlock = NULL; + PKEVENT* InPageBlock = NULL; + PKEVENT PreviousPageEvent; + KEVENT CurrentPageEvent; + /* Lock the PFN database */ LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Resolve */ - Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); + Status = MiResolveTransitionFault(StoreInstruction, Address, PointerPte, Process, LockIrql, &InPageBlock); ASSERT(NT_SUCCESS(Status)); + + if (InPageBlock != NULL) + { + /* Another thread is reading or writing this page. Put us into the waiting queue. */ + KeInitializeEvent(&CurrentPageEvent, NotificationEvent, FALSE); + PreviousPageEvent = *InPageBlock; + *InPageBlock = &CurrentPageEvent; + } /* And now release the lock and leave*/ KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); if (InPageBlock != NULL) { - /* The page is being paged in by another process */ - KeWaitForSingleObject(InPageBlock, WrPageIn, KernelMode, FALSE, NULL); + KeWaitForSingleObject(&CurrentPageEvent, WrPageIn, KernelMode, FALSE, NULL); + + /* Let's the chain go on */ + if (PreviousPageEvent) + { + KeSetEvent(PreviousPageEvent, IO_NO_INCREMENT, FALSE); + } } ASSERT(OldIrql == KeGetCurrentIrql());

1 0

[dchapyshev] 72492: [NTOS:EX] - Remove duplicate checks
by dchapyshev＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: dchapyshev Date: Sun Aug 28 19:28:41 2016 New Revision: 72492 URL: http://svn.reactos.org/svn/reactos?rev=72492&view=rev Log: [NTOS:EX] - Remove duplicate checks Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Aug 28 19:28:41 2016 @@ -1192,8 +1192,6 @@ { NumberOfHandles += ObGetProcessHandleCount(Process); Process = PsGetNextProcess(Process); - - if ((Process == SystemProcess) || (Process == NULL)) break; } while ((Process != SystemProcess) && (Process != NULL)); @@ -1263,8 +1261,6 @@ KeLeaveCriticalRegion(); Process = PsGetNextProcess(Process); - - if ((Process == SystemProcess) || (Process == NULL)) break; } while ((Process != SystemProcess) && (Process != NULL));

1 0

[dchapyshev] 72491: [NTOS] - Use ExpLookupHandleTableEntry function for enumerate handles of process - Filling handle information - Setting ReqSize value before check of the size * Fixes 2 tests nt...
by dchapyshev＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: dchapyshev Date: Sun Aug 28 19:18:28 2016 New Revision: 72491 URL: http://svn.reactos.org/svn/reactos?rev=72491&view=rev Log: [NTOS] - Use ExpLookupHandleTableEntry function for enumerate handles of process - Filling handle information - Setting ReqSize value before check of the size * Fixes 2 tests ntdll_winetest info Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Aug 28 19:18:28 2016 @@ -1167,11 +1167,13 @@ /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { - PEPROCESS pr, syspr; - ULONG curSize, i = 0; - ULONG hCount = 0; - - PSYSTEM_HANDLE_INFORMATION Shi = + PEPROCESS Process; + PEPROCESS SystemProcess; + ULONG CurrentSize; + ULONG NumberOfHandles = 0; + ULONG Index; + + PSYSTEM_HANDLE_INFORMATION HandleInformation = (PSYSTEM_HANDLE_INFORMATION) Buffer; DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); @@ -1182,68 +1184,92 @@ return STATUS_INFO_LENGTH_MISMATCH; } - DPRINT("SystemHandleInformation 1\n"); - /* First Calc Size from Count. */ - syspr = PsGetNextProcess(NULL); - pr = syspr; + SystemProcess = PsGetNextProcess(NULL); + Process = SystemProcess; do { - hCount = hCount + ObGetProcessHandleCount(pr); - pr = PsGetNextProcess(pr); - - if ((pr == syspr) || (pr == NULL)) break; - } - while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) - { - ObDereferenceObject(pr); - } - - DPRINT("SystemHandleInformation 2\n"); - - curSize = sizeof(SYSTEM_HANDLE_INFORMATION) + - ((sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * hCount) - - (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO))); - - Shi->NumberOfHandles = hCount; - - if (curSize > Size) - { - *ReqSize = curSize; - return (STATUS_INFO_LENGTH_MISMATCH); - } - - DPRINT("SystemHandleInformation 3\n"); + NumberOfHandles += ObGetProcessHandleCount(Process); + Process = PsGetNextProcess(Process); + + if ((Process == SystemProcess) || (Process == NULL)) break; + } + while ((Process != SystemProcess) && (Process != NULL)); + + if (Process != NULL) ObDereferenceObject(Process); + + CurrentSize = sizeof(SYSTEM_HANDLE_INFORMATION) + + ((sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * NumberOfHandles) - + (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO))); + + HandleInformation->NumberOfHandles = NumberOfHandles; + + *ReqSize = CurrentSize; + + if (CurrentSize > Size) return STATUS_INFO_LENGTH_MISMATCH; /* Now get Handles from all processes. */ - syspr = PsGetNextProcess(NULL); - pr = syspr; + SystemProcess = PsGetNextProcess(NULL); + Process = SystemProcess; + + Index = 0; do { - int Count = 0, HandleCount; - - HandleCount = ObGetProcessHandleCount(pr); - - for (Count = 0; HandleCount > 0 ; HandleCount--) - { - Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG_PTR)pr->UniqueProcessId; - Count++; - i++; - } - - pr = PsGetNextProcess(pr); - - if ((pr == syspr) || (pr == NULL)) break; - } - while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) ObDereferenceObject(pr); - - DPRINT("SystemHandleInformation 4\n"); + PHANDLE_TABLE_ENTRY HandleTableEntry; + EXHANDLE Handle; + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Set the initial value and loop the entries */ + Handle.Value = 0; + while ((HandleTableEntry = ExpLookupHandleTableEntry(Process->ObjectTable, Handle))) + { + /* Validate the entry */ + if ((HandleTableEntry) && + (HandleTableEntry->Object) && + (HandleTableEntry->NextFreeTableEntry != -2)) + { + /* Lock the entry */ + if (ExpLockHandleTableEntry(Process->ObjectTable, HandleTableEntry)) + { + POBJECT_HEADER ObjectHeader; + + ObjectHeader = (POBJECT_HEADER)(((ULONG_PTR) HandleTableEntry->Object) & ~OBJ_HANDLE_ATTRIBUTES); + + /* Filling handle information */ + HandleInformation->Handles[Index].UniqueProcessId = (USHORT)(ULONG_PTR) Process->UniqueProcessId; + HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; + HandleInformation->Handles[Index].ObjectTypeIndex = (UCHAR) ObjectHeader->Type->Index; + HandleInformation->Handles[Index].HandleAttributes = HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; + HandleInformation->Handles[Index].HandleValue = (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; + HandleInformation->Handles[Index].Object = &ObjectHeader->Body; + HandleInformation->Handles[Index].GrantedAccess = HandleTableEntry->GrantedAccess; + + /* Unlock it */ + ExUnlockHandleTableEntry(Process->ObjectTable, HandleTableEntry); + + ++Index; + } + } + + /* Go to the next entry */ + Handle.Value += sizeof(HANDLE); + } + + /* Leave the critical region and return callback result */ + KeLeaveCriticalRegion(); + + Process = PsGetNextProcess(Process); + + if ((Process == SystemProcess) || (Process == NULL)) break; + } + while ((Process != SystemProcess) && (Process != NULL)); + + if (Process != NULL) ObDereferenceObject(Process); + return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sun Aug 28 19:18:28 2016 @@ -466,6 +466,20 @@ IN PVOID Context ); +PHANDLE_TABLE_ENTRY +NTAPI +ExpLookupHandleTableEntry( + IN PHANDLE_TABLE HandleTable, + IN EXHANDLE Handle +); + +BOOLEAN +NTAPI +ExpLockHandleTableEntry( + IN PHANDLE_TABLE HandleTable, + IN PHANDLE_TABLE_ENTRY HandleTableEntry +); + /* PSEH EXCEPTION HANDLING **************************************************/ LONG

1 0

[tfaber] 72490: [NTOS:MM] - Add MmSysPteIndex, MmSysPteTables and MmSysPteListBySizeCount to make WinDbg's !sysptes extension happy
by tfaber＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: tfaber Date: Sun Aug 28 18:03:41 2016 New Revision: 72490 URL: http://svn.reactos.org/svn/reactos?rev=72490&view=rev Log: [NTOS:MM] - Add MmSysPteIndex, MmSysPteTables and MmSysPteListBySizeCount to make WinDbg's !sysptes extension happy Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Sun Aug 28 18:03:41 2016 @@ -25,6 +25,15 @@ ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; ULONG MmTotalSystemPtes; ULONG MiNumberOfExtraSystemPdes; +const ULONG MmSysPteIndex[5] = { 1, 2, 4, 8, 16 }; +const UCHAR MmSysPteTables[] = { 0, // 1 + 0, // 1 + 1, // 2 + 2, 2, // 4 + 3, 3, 3, 3, // 8 + 4, 4, 4, 4, 4, 4, 4, 4 // 16 + }; +LONG MmSysPteListBySizeCount[5]; /* PRIVATE FUNCTIONS **********************************************************/

1 0

[aandrejevic] 72489: [NTVDM:SVGA] Fix the refresh rate calculation, again.
by aandrejevic＠svn.reactos.org 28 Aug '16

28 Aug '16

Author: aandrejevic Date: Sun Aug 28 16:17:14 2016 New Revision: 72489 URL: http://svn.reactos.org/svn/reactos?rev=72489&view=rev Log: [NTVDM:SVGA] Fix the refresh rate calculation, again. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c 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] Sun Aug 28 16:17:14 2016 @@ -1118,6 +1118,22 @@ VerticalRetraceEnd = VerticalRetraceStart + (VgaCrtcRegisters[VGA_CRTC_END_VERT_RETRACE_REG] & 0x0F); + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + VerticalRetraceStart <<= 1; + VerticalRetraceEnd <<= 1; + } + else + { + VerticalRetraceStart *= MaximumScanLine; + VerticalRetraceEnd *= MaximumScanLine; + } + } + /* Calculate the horizontal blanking duration in cycles */ HblankStart = VgaCrtcRegisters[VGA_CRTC_START_HORZ_BLANKING_REG] & 0x1F; HblankEnd = VgaCrtcRegisters[VGA_CRTC_END_HORZ_BLANKING_REG] & 0x1F; @@ -1644,15 +1660,18 @@ VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS8) << 6; VerticalRetraceStart |= (VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_VRS9) << 2; - if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) - { - VerticalRetraceStart <<= 1; - VerticalTotal <<= 1; - } - else - { - VerticalRetraceStart *= MaximumScanLine; - VerticalTotal *= MaximumScanLine; + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + VerticalRetraceStart <<= 1; + VerticalTotal <<= 1; + } + else + { + VerticalRetraceStart *= MaximumScanLine; + VerticalTotal *= MaximumScanLine; + } } /* Set the cycle */

1 0

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

Jump to page:

2025

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