Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[hbelusca] 72993: [CONSRV] - Call TermGetLargestConsoleWindowSize to obtain the largest console window size allowed on the system, and use it for GetConsoleScreenBufferInfo and for SetConsoleWindow...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 18 23:51:59 2016 New Revision: 72993 URL: http://svn.reactos.org/svn/reactos?rev=72993&view=rev Log: [CONSRV] - Call TermGetLargestConsoleWindowSize to obtain the largest console window size allowed on the system, and use it for GetConsoleScreenBufferInfo and for SetConsoleWindowInfo too, where it is used to check if the given user window size is not too large. - Improve GuiGetLargestConsoleWindowSize for multi-monitor situations. - Remove the redundant definition of GetScreenBufferSizeUnits in guiterm.c (it already exists in conwnd.c). Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/settings.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] Tue Oct 18 23:51:59 2016 @@ -112,6 +112,10 @@ DummyGetLargestConsoleWindowSize(IN OUT PTERMINAL This, PCOORD pSize) { + /* Return a standard size */ + if (!pSize) return; + pSize->X = 80; + pSize->Y = 25; } static BOOL NTAPI Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Oct 18 23:51:59 2016 @@ -1065,6 +1065,8 @@ OUT PCOORD MaximumViewSize, OUT PWORD Attributes) { + COORD LargestWindowSize; + if (Console == NULL || Buffer == NULL || ScreenBufferSize == NULL || CursorPosition == NULL || ViewOrigin == NULL || ViewSize == NULL || MaximumViewSize == NULL || Attributes == NULL) @@ -1081,8 +1083,14 @@ *ViewSize = Buffer->ViewSize; *Attributes = Buffer->ScreenDefaultAttrib; - // FIXME: Refine the computation - *MaximumViewSize = Buffer->ScreenBufferSize; + /* + * Retrieve the largest possible console window size, taking + * into account the size of the console screen buffer. + */ + TermGetLargestConsoleWindowSize(Console, &LargestWindowSize); + LargestWindowSize.X = min(LargestWindowSize.X, Buffer->ScreenBufferSize.X); + LargestWindowSize.Y = min(LargestWindowSize.Y, Buffer->ScreenBufferSize.Y); + *MaximumViewSize = LargestWindowSize; return STATUS_SUCCESS; } @@ -1216,6 +1224,7 @@ IN PSMALL_RECT WindowRect) { SMALL_RECT CapturedWindowRect; + COORD LargestWindowSize; if (Console == NULL || Buffer == NULL || WindowRect == NULL) return STATUS_INVALID_PARAMETER; @@ -1227,7 +1236,7 @@ if (!Absolute) { - /* Relative positions given. Transform them to absolute ones */ + /* Relative positions are given, transform them to absolute ones */ CapturedWindowRect.Left += Buffer->ViewOrigin.X; CapturedWindowRect.Top += Buffer->ViewOrigin.Y; CapturedWindowRect.Right += Buffer->ViewOrigin.X + Buffer->ViewSize.X - 1; @@ -1248,6 +1257,19 @@ return STATUS_INVALID_PARAMETER; } + /* + * Forbid window sizes larger than the largest allowed console window size, + * taking into account the size of the console screen buffer. + */ + TermGetLargestConsoleWindowSize(Console, &LargestWindowSize); + LargestWindowSize.X = min(LargestWindowSize.X, Buffer->ScreenBufferSize.X); + LargestWindowSize.Y = min(LargestWindowSize.Y, Buffer->ScreenBufferSize.Y); + if ((CapturedWindowRect.Right - CapturedWindowRect.Left + 1 > LargestWindowSize.X) || + (CapturedWindowRect.Bottom - CapturedWindowRect.Top + 1 > LargestWindowSize.Y)) + { + return STATUS_INVALID_PARAMETER; + } + /* Shift the window rectangle coordinates if 'Left' or 'Top' are negative */ if (CapturedWindowRect.Left < 0) { @@ -1260,11 +1282,9 @@ CapturedWindowRect.Top = 0; } - if ((CapturedWindowRect.Right >= Buffer->ScreenBufferSize.X) || - (CapturedWindowRect.Bottom >= Buffer->ScreenBufferSize.Y)) - { - return STATUS_INVALID_PARAMETER; - } + /* Clip the window rectangle to the screen buffer */ + CapturedWindowRect.Right = min(CapturedWindowRect.Right , Buffer->ScreenBufferSize.X); + CapturedWindowRect.Bottom = min(CapturedWindowRect.Bottom, Buffer->ScreenBufferSize.Y); Buffer->ViewOrigin.X = CapturedWindowRect.Left; Buffer->ViewOrigin.Y = CapturedWindowRect.Top; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Tue Oct 18 23:51:59 2016 @@ -174,6 +174,12 @@ if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; + + /* + * Retrieve the largest possible console window size, without + * taking into account the size of the console screen buffer + * (thus differs from ConDrvGetConsoleScreenBufferInfo). + */ TermGetLargestConsoleWindowSize(Console, &GetLargestWindowSizeRequest->Size); ConSrvReleaseScreenBuffer(Buff, TRUE); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Tue Oct 18 23:51:59 2016 @@ -172,8 +172,8 @@ } - -static VOID +/* NOTE: Also used in guiterm.c */ +/* static */ VOID GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer, IN PGUI_CONSOLE_DATA GuiData, OUT PUINT WidthUnit, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Tue Oct 18 23:51:59 2016 @@ -56,29 +56,12 @@ /* FUNCTIONS ******************************************************************/ -static VOID +/* NOTE: Defined in conwnd.c */ +VOID GetScreenBufferSizeUnits(IN PCONSOLE_SCREEN_BUFFER Buffer, IN PGUI_CONSOLE_DATA GuiData, OUT PUINT WidthUnit, - OUT PUINT HeightUnit) -{ - if (Buffer == NULL || GuiData == NULL || - WidthUnit == NULL || HeightUnit == NULL) - { - return; - } - - if (GetType(Buffer) == TEXTMODE_BUFFER) - { - *WidthUnit = GuiData->CharWidth ; - *HeightUnit = GuiData->CharHeight; - } - else /* if (GetType(Buffer) == GRAPHICS_BUFFER) */ - { - *WidthUnit = 1; - *HeightUnit = 1; - } -} + OUT PUINT HeightUnit); VOID GuiConsoleMoveWindow(PGUI_CONSOLE_DATA GuiData) @@ -817,13 +800,9 @@ /* Change the current palette */ if (ActiveBuffer->PaletteHandle == NULL) - { hPalette = GuiData->hSysPalette; - } else - { hPalette = ActiveBuffer->PaletteHandle; - } DPRINT("GuiSetActiveScreenBuffer using palette 0x%p\n", hPalette); @@ -937,9 +916,7 @@ } if (hIcon == NULL) - { return FALSE; - } if (hIcon != GuiData->hIcon) { @@ -976,41 +953,60 @@ { PGUI_CONSOLE_DATA GuiData = This->Context; PCONSOLE_SCREEN_BUFFER ActiveBuffer; - RECT WorkArea; - LONG width, height; + HMONITOR hMonitor; + MONITORINFO MonitorInfo; + LONG Width, Height; UINT WidthUnit, HeightUnit; if (!pSize) return; - if (!SystemParametersInfoW(SPI_GETWORKAREA, 0, &WorkArea, 0)) - { - DPRINT1("SystemParametersInfoW failed - What to do ??\n"); - return; + /* + * Retrieve the monitor that is mostly covered by the current console window; + * default to primary monitor otherwise. + */ + MonitorInfo.cbSize = sizeof(MonitorInfo); + hMonitor = MonitorFromWindow(GuiData->hWindow, MONITOR_DEFAULTTOPRIMARY); + if (hMonitor && GetMonitorInfoW(hMonitor, &MonitorInfo)) + { + /* Retrieve the width and height of the client area of this monitor */ + Width = MonitorInfo.rcWork.right - MonitorInfo.rcWork.left; + Height = MonitorInfo.rcWork.bottom - MonitorInfo.rcWork.top; + } + else + { + /* + * Retrieve the width and height of the client area for a full-screen + * window on the primary display monitor. + */ + Width = GetSystemMetrics(SM_CXFULLSCREEN); + Height = GetSystemMetrics(SM_CYFULLSCREEN); + + // RECT WorkArea; + // SystemParametersInfoW(SPI_GETWORKAREA, 0, &WorkArea, 0); + // Width = WorkArea.right; + // Height = WorkArea.bottom; } ActiveBuffer = GuiData->ActiveBuffer; +#if 0 + // NOTE: This would be surprising if we wouldn't have an associated buffer... if (ActiveBuffer) - { +#endif GetScreenBufferSizeUnits(ActiveBuffer, GuiData, &WidthUnit, &HeightUnit); - } +#if 0 else - { - /* Default: text mode */ - WidthUnit = GuiData->CharWidth ; - HeightUnit = GuiData->CharHeight; - } - - width = WorkArea.right; - height = WorkArea.bottom; - - width -= (2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE))); - height -= (2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION)); - - if (width < 0) width = 0; - if (height < 0) height = 0; - - pSize->X = (SHORT)(width / (int)WidthUnit ) /* HACK */ + 2; - pSize->Y = (SHORT)(height / (int)HeightUnit) /* HACK */ + 1; + /* Default: graphics mode */ + WidthUnit = HeightUnit = 1; +#endif + + Width -= (2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE))); + Height -= (2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION)); + + if (Width < 0) Width = 0; + if (Height < 0) Height = 0; + + pSize->X = (SHORT)(Width / (int)WidthUnit ) /* HACK */ + 2; + pSize->Y = (SHORT)(Height / (int)HeightUnit) /* HACK */ + 1; } static BOOL NTAPI Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Tue Oct 18 23:51:59 2016 @@ -51,6 +51,9 @@ /* Apply cursor size */ ActiveBuffer->CursorInfo.bVisible = (ConsoleInfo->CursorSize != 0); ActiveBuffer->CursorInfo.dwSize = min(max(ConsoleInfo->CursorSize, 0), 100); + + // FIXME: Check ConsoleInfo->WindowSize with respect to + // TermGetLargestConsoleWindowSize(...). if (GetType(ActiveBuffer) == TEXTMODE_BUFFER) {

8 years, 2 months

[hbelusca] 72992: [CONSRV]: Code style changes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 18 23:45:19 2016 New Revision: 72992 URL: http://svn.reactos.org/svn/reactos?rev=72992&view=rev Log: [CONSRV]: Code style changes only. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Tue Oct 18 23:45:19 2016 @@ -137,7 +137,7 @@ GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - ghDefaultCursor = LoadCursorW(NULL, IDC_ARROW); + ghDefaultCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW)); WndClass.cbSize = sizeof(WNDCLASSEXW); WndClass.lpszClassName = GUI_CONWND_CLASS; @@ -476,7 +476,7 @@ ShowScrollBar(GuiData->hWindow, SB_HORZ, FALSE); } - /* Resize the window */ + /* Resize the window */ SetWindowPos(GuiData->hWindow, NULL, 0, 0, Width, Height, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOCOPYBITS); // NOTE: The SWP_NOCOPYBITS flag can be replaced by a subsequent call @@ -1342,15 +1342,15 @@ if ((GuiData->OldCursor.x != Buff->CursorPosition.X) || (GuiData->OldCursor.y != Buff->CursorPosition.Y)) { - SCROLLINFO xScroll; + SCROLLINFO sInfo; int OldScrollX = -1, OldScrollY = -1; int NewScrollX = -1, NewScrollY = -1; - xScroll.cbSize = sizeof(xScroll); - xScroll.fMask = SIF_POS; + sInfo.cbSize = sizeof(sInfo); + sInfo.fMask = SIF_POS; // Capture the original position of the scroll bars and save them. - if (GetScrollInfo(GuiData->hWindow, SB_HORZ, &xScroll)) OldScrollX = xScroll.nPos; - if (GetScrollInfo(GuiData->hWindow, SB_VERT, &xScroll)) OldScrollY = xScroll.nPos; + if (GetScrollInfo(GuiData->hWindow, SB_HORZ, &sInfo)) OldScrollX = sInfo.nPos; + if (GetScrollInfo(GuiData->hWindow, SB_VERT, &sInfo)) OldScrollY = sInfo.nPos; // If we successfully got the info for the horizontal scrollbar if (OldScrollX >= 0) @@ -1405,13 +1405,13 @@ SW_INVALIDATE); if (NewScrollX >= 0) { - xScroll.nPos = NewScrollX; - SetScrollInfo(GuiData->hWindow, SB_HORZ, &xScroll, TRUE); + sInfo.nPos = NewScrollX; + SetScrollInfo(GuiData->hWindow, SB_HORZ, &sInfo, TRUE); } if (NewScrollY >= 0) { - xScroll.nPos = NewScrollY; - SetScrollInfo(GuiData->hWindow, SB_VERT, &xScroll, TRUE); + sInfo.nPos = NewScrollY; + SetScrollInfo(GuiData->hWindow, SB_VERT, &sInfo, TRUE); } UpdateWindow(GuiData->hWindow); // InvalidateRect(GuiData->hWindow, NULL, FALSE); @@ -1555,7 +1555,7 @@ USHORT OldY = Buff->ViewOrigin.Y; UINT WidthUnit, HeightUnit; - /* We now modify either Buff->ViewOrigin.X or Buff->ViewOrigin.Y */ + /* We now modify Buff->ViewOrigin */ *pOriginXY = sInfo.nPos; GetScreenBufferSizeUnits(Buff, GuiData, &WidthUnit, &HeightUnit); @@ -2115,8 +2115,8 @@ windx = (ActiveBuffer->ScreenBufferSize.X) * WidthUnit + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); windy = (ActiveBuffer->ScreenBufferSize.Y) * HeightUnit + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); - if (ActiveBuffer->ViewSize.X < ActiveBuffer->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar - if (ActiveBuffer->ViewSize.Y < ActiveBuffer->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar + if (ActiveBuffer->ViewSize.X < ActiveBuffer->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // Window currently has a horizontal scrollbar + if (ActiveBuffer->ViewSize.Y < ActiveBuffer->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // Window currently has a vertical scrollbar minMaxInfo->ptMaxTrackSize.x = windx; minMaxInfo->ptMaxTrackSize.y = windy; @@ -2134,7 +2134,7 @@ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; - if ((GuiData->WindowSizeLock == FALSE) && + if (!GuiData->WindowSizeLock && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) { PCONSOLE_SCREEN_BUFFER Buff = GuiData->ActiveBuffer; @@ -2149,8 +2149,8 @@ windy = HIWORD(lParam); /* Compensate for existing scroll bars (because lParam values do not accommodate scroll bar) */ - if (Buff->ViewSize.X < Buff->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar - if (Buff->ViewSize.Y < Buff->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar + if (Buff->ViewSize.X < Buff->ScreenBufferSize.X) windy += GetSystemMetrics(SM_CYHSCROLL); // Window currently has a horizontal scrollbar + if (Buff->ViewSize.Y < Buff->ScreenBufferSize.Y) windx += GetSystemMetrics(SM_CXVSCROLL); // Window currently has a vertical scrollbar charx = windx / (int)WidthUnit ; chary = windy / (int)HeightUnit; @@ -2159,9 +2159,9 @@ if ((windx % WidthUnit ) >= (WidthUnit / 2)) ++charx; if ((windy % HeightUnit) >= (HeightUnit / 2)) ++chary; - /* Compensate for added scroll bars in new window */ - if (charx < (DWORD)Buff->ScreenBufferSize.X) windy -= GetSystemMetrics(SM_CYHSCROLL); // new window will have a horizontal scroll bar - if (chary < (DWORD)Buff->ScreenBufferSize.Y) windx -= GetSystemMetrics(SM_CXVSCROLL); // new window will have a vertical scroll bar + /* Compensate for added scroll bars in window */ + if (charx < (DWORD)Buff->ScreenBufferSize.X) windy -= GetSystemMetrics(SM_CYHSCROLL); // Window will have a horizontal scroll bar + if (chary < (DWORD)Buff->ScreenBufferSize.Y) windx -= GetSystemMetrics(SM_CXVSCROLL); // Window will have a vertical scroll bar charx = windx / (int)WidthUnit ; chary = windy / (int)HeightUnit;

8 years, 2 months

[pschweitzer] 72991: [PSDK] Replace error codes that don't even exist in MS headers (but they are referenced on MSDN?!) Replace their usage in code

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Oct 18 20:32:50 2016 New Revision: 72991 URL: http://svn.reactos.org/svn/reactos?rev=72991&view=rev Log: [PSDK] Replace error codes that don't even exist in MS headers (but they are referenced on MSDN?!) Replace their usage in code Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/sdk/include/psdk/winerror.h Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Oct 18 20:32:50 2016 @@ -3855,7 +3855,7 @@ LONG ErrorCode; if (maxBytes >= (1024*1024)) - return ERROR_TRANSFER_TOO_LONG; + return ERROR_MORE_DATA; *ldwTotsize = 0; @@ -3919,7 +3919,7 @@ LONG ErrorCode; if (maxBytes >= (1024*1024)) - return ERROR_TRANSFER_TOO_LONG; + return ERROR_MORE_DATA; *ldwTotsize = 0; Modified: trunk/reactos/sdk/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winerror.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] Tue Oct 18 20:32:50 2016 @@ -272,13 +272,13 @@ #define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217 #define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218 #define ERROR_INVALID_EXITROUTINE_RING 219 -#define ERROR_GETBUF_FAILED 220 -#define ERROR_FLUSHBUF_FAILED 221 -#define ERROR_TRANSFER_TOO_LONG 222 -#define ERROR_FORCENOSWAP_FAILED 223 -#define ERROR_SMG_NO_TARGET_WINDOW 224 +#define ERROR_FILE_CHECKED_OUT 220 +#define ERROR_CHECKOUT_REQUIRED 221 +#define ERROR_BAD_FILE_TYPE 222 +#define ERROR_FILE_TOO_LARGE 223 +#define ERROR_FORMS_AUTH_REQUIRED 224 #define ERROR_NO_CHILDREN 228 -#define ERROR_INVALID_SCREEN_GROUP 229 +#define ERROR_PIPE_LOCAL 229 #define ERROR_BAD_PIPE 230 #define ERROR_PIPE_BUSY 231 #define ERROR_NO_DATA 232

8 years, 2 months

[jgardou] 72990: [NTOS/MM] - Let the zero page thread decide itself whether it is active or not. - Raise the low memory limit for our good old balancer - Allow the balancer thread to wait for a pag...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 18 20:19:00 2016 New Revision: 72990 URL: http://svn.reactos.org/svn/reactos?rev=72990&view=rev Log: [NTOS/MM] - Let the zero page thread decide itself whether it is active or not. - Raise the low memory limit for our good old balancer - Allow the balancer thread to wait for a page to be freed, with a lower limit than for "regular" page faults - Let ARM3 notify RosMm when a page gets freed CORE-12047 #comment Whole patch got in in r72988, 72989 and 72990 Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Oct 18 20:19:00 2016 @@ -64,7 +64,6 @@ CHAR MI_PFN_CURRENT_PROCESS_NAME[16] = "None yet"; /* FUNCTIONS ******************************************************************/ - static VOID MiIncrementAvailablePages( @@ -597,6 +596,9 @@ return PageIndex; } +/* HACK for keeping legacy Mm alive */ +extern BOOLEAN MmRosNotifyAvailablePage(PFN_NUMBER PageFrameIndex); + VOID NTAPI MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) @@ -624,6 +626,13 @@ ASSERT(Pfn1->u4.VerifierAllocation == 0); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + /* HACK HACK HACK : Feed the page to legacy Mm */ + if (MmRosNotifyAvailablePage(PageFrameIndex)) + { + DPRINT1("Legacy Mm eating ARM3 page!.\n"); + return; + } + /* Get the free page list and increment its count */ ListHead = &MmFreePageListHead; ASSERT_LIST_INVARIANT(ListHead); @@ -695,7 +704,6 @@ if ((ListHead->Total >= 8) && !(MmZeroingPageThreadActive)) { /* Set the event */ - MmZeroingPageThreadActive = TRUE; KeSetEvent(&MmZeroingPageEvent, IO_NO_INCREMENT, FALSE); } Modified: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/zeropage.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] Tue Oct 18 20:19:00 2016 @@ -68,6 +68,8 @@ NULL, NULL); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + MmZeroingPageThreadActive = TRUE; + while (TRUE) { if (!MmFreePageListHead.Total) Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Tue Oct 18 20:19:00 2016 @@ -59,7 +59,7 @@ MiNrTotalPages = NrAvailablePages; /* Set up targets. */ - MiMinimumAvailablePages = 128; + MiMinimumAvailablePages = 256; MiMinimumPagesPerRun = 256; if ((NrAvailablePages + NrSystemPages) >= 8192) { @@ -96,9 +96,6 @@ NTAPI MmReleasePageMemoryConsumer(ULONG Consumer, PFN_NUMBER Page) { - PMM_ALLOCATION_REQUEST Request; - PLIST_ENTRY Entry; - if (Page == 0) { DPRINT1("Tried to release page zero.\n"); @@ -109,22 +106,9 @@ { if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if ((Entry = ExInterlockedRemoveHeadList(&AllocationListHead, &AllocationListLock)) == NULL) - { - MmDereferencePage(Page); - } - else - { - Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); - MiZeroPhysicalPage(Page); - Request->Page = Page; - KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); - } - } - else - { - MmDereferencePage(Page); - } + } + + MmDereferencePage(Page); return(STATUS_SUCCESS); } @@ -261,7 +245,7 @@ /* * Allocate always memory for the non paged pool and for the pager thread. */ - if ((Consumer == MC_SYSTEM) || MiIsBalancerThread()) + if ((Consumer == MC_SYSTEM) /* || MiIsBalancerThread() */) { Page = MmAllocPage(Consumer); if (Page == 0) @@ -278,7 +262,8 @@ /* * Make sure we don't exceed global targets. */ - if (MmAvailablePages < MiMinimumAvailablePages) + if (((MmAvailablePages < MiMinimumAvailablePages) && !MiIsBalancerThread()) + || (MmAvailablePages < (MiMinimumAvailablePages / 2))) { MM_ALLOCATION_REQUEST Request; @@ -418,6 +403,46 @@ } } +BOOLEAN MmRosNotifyAvailablePage(PFN_NUMBER Page) +{ + PLIST_ENTRY Entry; + PMM_ALLOCATION_REQUEST Request; + PMMPFN Pfn1; + + /* Make sure the PFN lock is held */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + if (!MiMinimumAvailablePages) + { + /* Dirty way to know if we were initialized. */ + return FALSE; + } + + Entry = ExInterlockedRemoveHeadList(&AllocationListHead, &AllocationListLock); + if (!Entry) + return FALSE; + + Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); + MiZeroPhysicalPage(Page); + Request->Page = Page; + + Pfn1 = MiGetPfnEntry(Page); + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u3.e1.PageLocation = ActiveAndValid; + + /* This marks the PFN as a ReactOS PFN */ + Pfn1->u4.AweAllocation = TRUE; + + /* Allocate the extra ReactOS Data and zero it out */ + Pfn1->u1.SwapEntry = 0; + Pfn1->RmapListHead = NULL; + + KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); + + return TRUE; +} + VOID INIT_FUNCTION NTAPI

8 years, 2 months

[jgardou] 72989: [NTOS/MM] Miscellaneous fixes for legacy Mm section implementation - Always allocate a private page for IMAGE_SCN_CNT_UNINITIALIZED_DATA - Make sure a shared page is present before...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 18 20:01:18 2016 New Revision: 72989 URL: http://svn.reactos.org/svn/reactos?rev=72989&view=rev Log: [NTOS/MM] Miscellaneous fixes for legacy Mm section implementation - Always allocate a private page for IMAGE_SCN_CNT_UNINITIALIZED_DATA - Make sure a shared page is present before writing on a COW mapping and making a private copy. - Fix a race condition : when paging out a file section, old Mm lists all of the process maps, removing them one after the other and lowering the page reference count in the process. Sometimes a page fault occur in the process, the mapping is added, but the page refcount is not bumped because it requires locking the corresponding segment. Manage page refcount under segment lock. CORE-12047 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Oct 18 20:01:18 2016 @@ -1366,39 +1366,45 @@ HasSwapEntry = MmIsPageSwapEntry(Process, Address); - if (HasSwapEntry) + /* See if we should use a private page */ + if ((HasSwapEntry) || (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) { SWAPENTRY DummyEntry; /* * Is it a wait entry? */ - MmGetPageFileMapping(Process, Address, &SwapEntry); - - if (SwapEntry == MM_WAIT_ENTRY) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - MiWaitForPageEvent(NULL, NULL); - MmLockAddressSpace(AddressSpace); - return STATUS_MM_RESTART_OPERATION; - } - - /* - * Must be private page we have swapped out. - */ - - /* - * Sanity check - */ - if (Segment->Flags & MM_PAGEFILE_SEGMENT) - { - DPRINT1("Found a swaped out private page in a pagefile section.\n"); - KeBugCheck(MEMORY_MANAGEMENT); + if (HasSwapEntry) + { + MmGetPageFileMapping(Process, Address, &SwapEntry); + + if (SwapEntry == MM_WAIT_ENTRY) + { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + MiWaitForPageEvent(NULL, NULL); + MmLockAddressSpace(AddressSpace); + return STATUS_MM_RESTART_OPERATION; + } + + /* + * Must be private page we have swapped out. + */ + + /* + * Sanity check + */ + if (Segment->Flags & MM_PAGEFILE_SEGMENT) + { + DPRINT1("Found a swaped out private page in a pagefile section.\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + MmDeletePageFileMapping(Process, Address, &SwapEntry); } MmUnlockSectionSegment(Segment); - MmDeletePageFileMapping(Process, Address, &SwapEntry); + + /* Tell everyone else we are serving the fault. */ MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockAddressSpace(AddressSpace); @@ -1411,12 +1417,16 @@ KeBugCheck(MEMORY_MANAGEMENT); } - Status = MmReadFromSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmReadFromSwapPage failed, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } + if (HasSwapEntry) + { + Status = MmReadFromSwapPage(SwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmReadFromSwapPage failed, status = %x\n", Status); + KeBugCheck(MEMORY_MANAGEMENT); + } + } + MmLockAddressSpace(AddressSpace); MmDeletePageFileMapping(Process, PAddress, &DummyEntry); Status = MmCreateVirtualMapping(Process, @@ -1434,7 +1444,8 @@ /* * Store the swap entry for later use. */ - MmSetSavedSwapEntryPage(Page, SwapEntry); + if (HasSwapEntry) + MmSetSavedSwapEntryPage(Page, SwapEntry); /* * Add the page to the process's working set @@ -1536,15 +1547,9 @@ return(Status); } - /* - * Mark the offset within the section as having valid, in-memory - * data - */ + /* Lock both segment and process address space while we proceed. */ MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); - Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmSetPageEntrySectionSegment(Segment, &Offset, Entry); - MmUnlockSectionSegment(Segment); MmDeletePageFileMapping(Process, PAddress, &FakeSwapEntry); DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", @@ -1562,6 +1567,11 @@ ASSERT(MmIsPagePresent(Process, PAddress)); MmInsertRmap(Page, Process, Address); + /* Set this section offset has being backed by our new page. */ + Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); + MmSetPageEntrySectionSegment(Segment, &Offset, Entry); + MmUnlockSectionSegment(Segment); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); return(STATUS_SUCCESS); @@ -1571,6 +1581,16 @@ SWAPENTRY SwapEntry; SwapEntry = SWAPENTRY_FROM_SSE(Entry); + + /* See if a page op is running on this segment. */ + if (SwapEntry == MM_WAIT_ENTRY) + { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + MiWaitForPageEvent(NULL, NULL); + MmLockAddressSpace(AddressSpace); + return STATUS_MM_RESTART_OPERATION; + } /* * Release all our locks and read in the page from disk @@ -1609,6 +1629,24 @@ DPRINT1("Someone changed ppte entry while we slept (%x vs %x)\n", Entry, Entry1); KeBugCheck(MEMORY_MANAGEMENT); } + + /* + * Save the swap entry. + */ + MmSetSavedSwapEntryPage(Page, SwapEntry); + + /* Map the page into the process address space */ + Status = MmCreateVirtualMapping(Process, + PAddress, + Region->Protect, + &Page, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + MmInsertRmap(Page, Process, Address); /* * Mark the offset within the section as having valid, in-memory @@ -1618,36 +1656,14 @@ MmSetPageEntrySectionSegment(Segment, &Offset, Entry); MmUnlockSectionSegment(Segment); - /* - * Save the swap entry. - */ - MmSetSavedSwapEntryPage(Page, SwapEntry); - Status = MmCreateVirtualMapping(Process, - PAddress, - Region->Protect, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmInsertRmap(Page, Process, Address); MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); return(STATUS_SUCCESS); } else { - /* - * If the section offset is already in-memory and valid then just - * take another reference to the page - */ - + /* We already have a page on this section offset. Map it into the process address space. */ Page = PFN_FROM_SSE(Entry); - - MmSharePageEntrySectionSegment(Segment, &Offset); - MmUnlockSectionSegment(Segment); Status = MmCreateVirtualMapping(Process, PAddress, @@ -1660,6 +1676,11 @@ KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, Address); + + /* Take a reference on it */ + MmSharePageEntrySectionSegment(Segment, &Offset); + MmUnlockSectionSegment(Segment); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); return(STATUS_SUCCESS); @@ -1682,9 +1703,16 @@ PMM_REGION Region; ULONG_PTR Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - SWAPENTRY SwapEntry; DPRINT("MmAccessFaultSectionView(%p, %p, %p)\n", AddressSpace, MemoryArea, Address); + + /* Make sure we have a page mapping for this address. */ + Status = MmNotPresentFaultSectionView(AddressSpace, MemoryArea, Address, TRUE); + if (!NT_SUCCESS(Status)) + { + /* This is invalid access ! */ + return Status; + } /* * Check if the page has already been set readwrite @@ -1708,15 +1736,6 @@ &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); ASSERT(Region != NULL); - /* - * Lock the segment - */ - MmLockSectionSegment(Segment); - - OldPage = MmGetPfnForProcess(Process, Address); - Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - - MmUnlockSectionSegment(Segment); /* * Check if we are doing COW @@ -1729,48 +1748,23 @@ return(STATUS_ACCESS_VIOLATION); } + /* Get the page mapping this section offset. */ + MmLockSectionSegment(Segment); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + + /* Get the current page mapping for the process */ + ASSERT(MmIsPagePresent(Process, PAddress)); + OldPage = MmGetPfnForProcess(Process, PAddress); + ASSERT(OldPage != 0); + if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != OldPage) { + MmUnlockSectionSegment(Segment); /* This is a private page. We must only change the page protection. */ - MmSetPageProtect(Process, Address, Region->Protect); + MmSetPageProtect(Process, PAddress, Region->Protect); return(STATUS_SUCCESS); } - - if(OldPage == 0) - DPRINT("OldPage == 0!\n"); - - /* - * Get or create a pageop - */ - MmLockSectionSegment(Segment); - Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - - /* - * Wait for any other operations to complete - */ - if (Entry == SWAPENTRY_FROM_SSE(MM_WAIT_ENTRY)) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - MiWaitForPageEvent(NULL, NULL); - /* - * Restart the operation - */ - MmLockAddressSpace(AddressSpace); - DPRINT("Address 0x%p\n", Address); - return(STATUS_MM_RESTART_OPERATION); - } - - MmDeleteRmap(OldPage, Process, PAddress); - MmDeleteVirtualMapping(Process, PAddress, NULL, NULL); - MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); - - /* - * Release locks now we have the pageop - */ - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); /* * Allocate a page @@ -1789,12 +1783,18 @@ */ MiCopyFromUserPage(NewPage, OldPage); - MmLockAddressSpace(AddressSpace); + /* + * Unshare the old page. + */ + DPRINT("Swapping page (Old %x New %x)\n", OldPage, NewPage); + MmDeleteVirtualMapping(Process, PAddress, NULL, NULL); + MmDeleteRmap(OldPage, Process, PAddress); + MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE, NULL); + MmUnlockSectionSegment(Segment); /* * Set the PTE to point to the new page */ - MmDeletePageFileMapping(Process, PAddress, &SwapEntry); Status = MmCreateVirtualMapping(Process, PAddress, Region->Protect, @@ -1806,15 +1806,7 @@ KeBugCheck(MEMORY_MANAGEMENT); return(Status); } - - /* - * Unshare the old page. - */ - DPRINT("Swapping page (Old %x New %x)\n", OldPage, NewPage); MmInsertRmap(NewPage, Process, PAddress); - MmLockSectionSegment(Segment); - MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE, NULL); - MmUnlockSectionSegment(Segment); MiSetPageEvent(Process, Address); DPRINT("Address 0x%p\n", Address); @@ -2147,6 +2139,9 @@ else { ULONG_PTR OldEntry; + + MmLockSectionSegment(Context.Segment); + /* * For non-private pages if the page wasn't direct mapped then * set it back into the section segment entry so we don't loose @@ -2163,7 +2158,6 @@ Address); // If we got here, the previous entry should have been a wait Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmLockSectionSegment(Context.Segment); OldEntry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset); ASSERT(OldEntry == 0 || OldEntry == MAKE_SWAP_SSE(MM_WAIT_ENTRY)); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); @@ -2202,6 +2196,7 @@ } else { + MmLockSectionSegment(Context.Segment); Status = MmCreateVirtualMapping(Process, Address, MemoryArea->Protect, @@ -2213,6 +2208,7 @@ Address); Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); + MmUnlockSectionSegment(Context.Segment); } MmUnlockAddressSpace(AddressSpace); MiSetPageEvent(NULL, NULL);

8 years, 2 months

[jgardou] 72988: [NTOS/MM] - Do not allocate zeroed pagefile entries for legacy Mm CORE-12047

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 18 19:55:22 2016 New Revision: 72988 URL: http://svn.reactos.org/svn/reactos?rev=72988&view=rev Log: [NTOS/MM] - Do not allocate zeroed pagefile entries for legacy Mm CORE-12047 Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Tue Oct 18 19:55:22 2016 @@ -279,7 +279,7 @@ NTAPI MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) { - return MiReadPageFile(Page, FILE_FROM_ENTRY(SwapEntry), OFFSET_FROM_ENTRY(SwapEntry)); + return MiReadPageFile(Page, FILE_FROM_ENTRY(SwapEntry), OFFSET_FROM_ENTRY(SwapEntry) - 1); } NTSTATUS @@ -450,7 +450,7 @@ MiFreeSwapPages--; KeReleaseSpinLock(&PagingFileListLock, oldIrql); - entry = ENTRY_FROM_FILE_OFFSET(i, off); + entry = ENTRY_FROM_FILE_OFFSET(i, off + 1); return(entry); } }

8 years, 2 months

[jgardou] 72987: [FASTFAT] - Acquire Paging IO Resource shared when performing paged writes Greenlighted by Pierre and tests. CORE-12184 #resolve

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Oct 18 19:28:16 2016 New Revision: 72987 URL: http://svn.reactos.org/svn/reactos?rev=72987&view=rev Log: [FASTFAT] - Acquire Paging IO Resource shared when performing paged writes Greenlighted by Pierre and tests. CORE-12184 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Tue Oct 18 19:28:16 2016 @@ -880,7 +880,7 @@ Resource = &Fcb->MainResource; } - if (Fcb->Flags & FCB_IS_PAGE_FILE) + if ((Fcb->Flags & FCB_IS_PAGE_FILE) || (IrpContext->Irp->Flags & IRP_PAGING_IO)) { if (!ExAcquireResourceSharedLite(Resource, BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)))

8 years, 2 months

[pschweitzer] 72986: [PSDK] Make DECLARE_CONST_UNICODE_STRING() work with something else than MSVC

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Oct 18 18:28:45 2016 New Revision: 72986 URL: http://svn.reactos.org/svn/reactos?rev=72986&view=rev Log: [PSDK] Make DECLARE_CONST_UNICODE_STRING() work with something else than MSVC Modified: trunk/reactos/sdk/include/xdk/ntdef.template.h Modified: trunk/reactos/sdk/include/xdk/ntdef.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/ntdef.temp… ============================================================================== --- trunk/reactos/sdk/include/xdk/ntdef.template.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/ntdef.template.h [iso-8859-1] Tue Oct 18 18:28:45 2016 @@ -223,6 +223,7 @@ sizeof(s) / sizeof(_RTL_CONSTANT_STRING_type_check(s)), \ _RTL_CONSTANT_STRING_remove_const_macro(s) } +#ifdef _MSC_VER #define DECLARE_UNICODE_STRING_SIZE(_var, _size) \ WCHAR _var ## _buffer[_size]; \ __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ @@ -234,6 +235,15 @@ __pragma(warning(push)) __pragma(warning(disable:4221)) __pragma(warning(disable:4204)) \ const UNICODE_STRING _var = { sizeof(_string) - sizeof(WCHAR), sizeof(_string), (PWCH)_var##_buffer } \ __pragma(warning(pop)) +#else +#define DECLARE_UNICODE_STRING_SIZE(_var, _size) \ + WCHAR _var ## _buffer[_size]; \ + UNICODE_STRING _var = { 0, (_size) * sizeof(WCHAR) , _var ## _buffer } + +#define DECLARE_CONST_UNICODE_STRING(_var, _string) \ + const WCHAR _var##_buffer[] = _string; \ + const UNICODE_STRING _var = { sizeof(_string) - sizeof(WCHAR), sizeof(_string), (PWCH)_var##_buffer } +#endif #define DECLARE_GLOBAL_CONST_UNICODE_STRING(_var, _str) \ extern const __declspec(selectany) UNICODE_STRING _var = RTL_CONSTANT_STRING(_str)

8 years, 2 months

[hbelusca] 72985: [KERNEL32_APITEST]: SetConsoleWindowInfo test: - Improve the checks done for the tests; - Add a new test (Test7) that tests the allowed console window sizes wrt. the csbi.dwMaximu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 18 17:44:23 2016 New Revision: 72985 URL: http://svn.reactos.org/svn/reactos?rev=72985&view=rev Log: [KERNEL32_APITEST]: SetConsoleWindowInfo test: - Improve the checks done for the tests; - Add a new test (Test7) that tests the allowed console window sizes wrt. the csbi.dwMaximumWindowSize size. Modified: trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c Modified: trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCons… ============================================================================== --- trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c [iso-8859-1] Tue Oct 18 17:44:23 2016 @@ -166,14 +166,19 @@ ok(Success, "Getting SB info\n"); if (Success) { - ok(csbi2.srWindow.Left == 0, "srWindow.Left = %d, expected 0\n", csbi2.srWindow.Left); - ok(csbi2.srWindow.Top == 0, "srWindow.Top = %d, expected 0\n", csbi2.srWindow.Top); - - /* NOTE that here we compare against the old csbi data! */ - ok(csbi2.srWindow.Right == csbi.dwSize.X - 2, "srWindow.Right = %d, expected %d\n", - csbi2.srWindow.Right, csbi.dwSize.X - 2); - ok(csbi2.srWindow.Bottom == csbi.dwSize.Y - 2, "srWindow.Bottom = %d, expected %d\n", - csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); + ConRect.Right -= ConRect.Left; + ConRect.Left = 0; + ConRect.Bottom -= ConRect.Top; + ConRect.Top = 0; + + ok(csbi2.srWindow.Left == ConRect.Left, "srWindow.Left = %d, expected %d\n", + csbi2.srWindow.Left, ConRect.Left); + ok(csbi2.srWindow.Top == ConRect.Top, "srWindow.Top = %d, expected %d\n", + csbi2.srWindow.Top, ConRect.Top); + ok(csbi2.srWindow.Right == ConRect.Right, "srWindow.Right = %d, expected %d\n", + csbi2.srWindow.Right, ConRect.Right); + ok(csbi2.srWindow.Bottom == ConRect.Bottom, "srWindow.Bottom = %d, expected %d\n", + csbi2.srWindow.Bottom, ConRect.Bottom); } /* Test 3: Similar to Test 2, but set the Right/Bottom members too large @@ -195,13 +200,13 @@ if (Success) { /* NOTE that here we compare against the old csbi data! */ - ok(csbi2.srWindow.Left == 0, "srWindow(2).Left = %d, expected equal to %d\n", + ok(csbi2.srWindow.Left == 0, "srWindow.Left = %d, expected %d\n", csbi2.srWindow.Left, 0); - ok(csbi2.srWindow.Top == 0, "srWindow(2).Top = %d, expected equal to %d\n", + ok(csbi2.srWindow.Top == 0, "srWindow.Top = %d, expected %d\n", csbi2.srWindow.Top, 0); - ok(csbi2.srWindow.Right == csbi.dwSize.X - 2, "srWindow(2).Right = %d, expected equal to %d\n", + ok(csbi2.srWindow.Right == csbi.dwSize.X - 2, "srWindow.Right = %d, expected %d\n", csbi2.srWindow.Right, csbi.dwSize.X - 2); - ok(csbi2.srWindow.Bottom == csbi.dwSize.Y - 2, "srWindow(2).Bottom = %d, expected equal to %d\n", + ok(csbi2.srWindow.Bottom == csbi.dwSize.Y - 2, "srWindow.Bottom = %d, expected %d\n", csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); } @@ -224,14 +229,16 @@ ok(Success, "Getting SB info\n"); if (Success) { - ok(csbi2.srWindow.Left == 0, "srWindow.Left = %d, expected 0\n", csbi2.srWindow.Left); - ok(csbi2.srWindow.Top == 0, "srWindow.Top = %d, expected 0\n", csbi2.srWindow.Top); + ok(csbi2.srWindow.Left == 0, "srWindow.Left = %d, expected %d\n", + csbi2.srWindow.Left, 0); + ok(csbi2.srWindow.Top == 0, "srWindow.Top = %d, expected %d\n", + csbi2.srWindow.Top, 0); /* NOTE that here we compare against the old csbi data! */ ok(csbi2.srWindow.Right == csbi.dwSize.X - 2, "srWindow.Right = %d, expected %d\n", - csbi2.srWindow.Right, csbi.dwSize.X - 2); + csbi2.srWindow.Right, csbi.dwSize.X - 2); ok(csbi2.srWindow.Bottom == csbi.dwSize.Y - 2, "srWindow.Bottom = %d, expected %d\n", - csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); + csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); } /* Test 5: Set Right/Bottom members strictly smaller than Left/Top members @@ -248,7 +255,7 @@ ERROR_INVALID_PARAMETER, dwLastError); /* Test 6: Set Left/Top members equal to the Right/Bottom members respectively - * (succeeds, disagrees with MSDN) */ + * (succeeds, disagrees with MSDN) */ ConRect.Left = ConRect.Right = 2; ConRect.Top = ConRect.Bottom = 5; SetLastError(0xdeadbeef); @@ -262,11 +269,82 @@ ok(Success, "Getting SB info\n"); if (Success) { - ok(csbi2.srWindow.Left == 2, "srWindow.Left = %d, expected 2\n", csbi2.srWindow.Left); - ok(csbi2.srWindow.Right == 2, "srWindow.Right = %d, expected 2\n", csbi2.srWindow.Right); - - ok(csbi2.srWindow.Top == 5, "srWindow.Top = %d, expected 5\n", csbi2.srWindow.Top); - ok(csbi2.srWindow.Bottom == 5, "srWindow.Bottom = %d, expected 5\n", csbi2.srWindow.Bottom); + ok(csbi2.srWindow.Left == ConRect.Left, "srWindow.Left = %d, expected %d\n", + csbi2.srWindow.Left, ConRect.Left); + ok(csbi2.srWindow.Top == ConRect.Top, "srWindow.Top = %d, expected %d\n", + csbi2.srWindow.Top, ConRect.Top); + ok(csbi2.srWindow.Right == ConRect.Right, "srWindow.Right = %d, expected %d\n", + csbi2.srWindow.Right, ConRect.Right); + ok(csbi2.srWindow.Bottom == ConRect.Bottom, "srWindow.Bottom = %d, expected %d\n", + csbi2.srWindow.Bottom, ConRect.Bottom); + } + + /* + * Test 7: Test how large can the console window be, for a given + * screen buffer size. For that we set the console screen buffer + * to a really large size, hoping that its corresponding window size + * is larger than the computer screen. The permitted maximum window + * size specified in csbi.dwMaximumWindowSize should be a boundary. + */ + Resolution.X = 500; + Resolution.Y = 500; + ResizeTextConsole(hConOut, &csbi, Resolution, NULL); + /* Be sure that csbi.dwMaximumWindowSize is strictly smaller + * than the console screen buffer size, for our matters... */ + ok((csbi.dwMaximumWindowSize.X < Resolution.X) && (csbi.dwMaximumWindowSize.Y < Resolution.Y), + "dwMaximumWindowSize = {%d, %d} was expected to be smaller than Resolution = {%d, %d}\n", + csbi.dwMaximumWindowSize.X, csbi.dwMaximumWindowSize.Y, Resolution.X, Resolution.Y); + + /* Now try to set first the console window to a size smaller than the maximum size */ + ConRect.Left = ConRect.Top = 0; + ConRect.Right = csbi.dwMaximumWindowSize.X - 1; + ConRect.Bottom = csbi.dwMaximumWindowSize.Y - 1; + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(Success, "Setting console wnd info should have succeeded!\n"); + ok(dwLastError != ERROR_INVALID_PARAMETER, "GetLastError: %lu\n", dwLastError); + + /* Check the new reported window size rect */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi2); + ok(Success, "Getting SB info\n"); + if (Success) + { + ok(csbi2.srWindow.Left == ConRect.Left, "srWindow.Left = %d, expected %d\n", + csbi2.srWindow.Left, ConRect.Left); + ok(csbi2.srWindow.Top == ConRect.Top, "srWindow.Top = %d, expected %d\n", + csbi2.srWindow.Top, ConRect.Top); + ok(csbi2.srWindow.Right == ConRect.Right, "srWindow.Right = %d, expected %d\n", + csbi2.srWindow.Right, ConRect.Right); + ok(csbi2.srWindow.Bottom == ConRect.Bottom, "srWindow.Bottom = %d, expected %d\n", + csbi2.srWindow.Bottom, ConRect.Bottom); + } + + /* And now try to set the console window to a size larger than the maximum size. + * The SetConsoleWindowInfo call should fail */ + ConRect.Left = ConRect.Top = 0; + ConRect.Right = csbi.dwMaximumWindowSize.X + 1; + ConRect.Bottom = csbi.dwMaximumWindowSize.Y + 1; + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(!Success, "Setting console wnd info should have failed!\n"); + ok(dwLastError == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", + ERROR_INVALID_PARAMETER, dwLastError); + + /* Check the new reported window size rect */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi2); + ok(Success, "Getting SB info\n"); + if (Success) + { + ok(csbi2.srWindow.Left == 0, "srWindow.Left = %d, expected %d\n", + csbi2.srWindow.Left, 0); + ok(csbi2.srWindow.Top == 0, "srWindow.Top = %d, expected %d\n", + csbi2.srWindow.Top, 0); + ok(csbi2.srWindow.Right == csbi.dwMaximumWindowSize.X - 1, "srWindow.Right = %d, expected %d\n", + csbi2.srWindow.Right, csbi.dwMaximumWindowSize.X - 1); + ok(csbi2.srWindow.Bottom == csbi.dwMaximumWindowSize.Y - 1, "srWindow.Bottom = %d, expected %d\n", + csbi2.srWindow.Bottom, csbi.dwMaximumWindowSize.Y - 1); }

8 years, 2 months

[hbelusca] 72984: [CONSRV]: Fixes for SetConsoleWindowInfo, where one notices that again the MSDN documentation on SetConsoleWindowInfo is partially wrong. This makes all the kernel32_apitest:SetCo...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 18 17:16:57 2016 New Revision: 72984 URL: http://svn.reactos.org/svn/reactos?rev=72984&view=rev Log: [CONSRV]: Fixes for SetConsoleWindowInfo, where one notices that again the MSDN documentation on SetConsoleWindowInfo is partially wrong. This makes all the kernel32_apitest:SetConsoleWindowInfo tests pass now. Also, notify the console window about the size change. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Oct 18 17:16:57 2016 @@ -1225,7 +1225,7 @@ CapturedWindowRect = *WindowRect; - if (Absolute == FALSE) + if (!Absolute) { /* Relative positions given. Transform them to absolute ones */ CapturedWindowRect.Left += Buffer->ViewOrigin.X; @@ -1234,12 +1234,34 @@ CapturedWindowRect.Bottom += Buffer->ViewOrigin.Y + Buffer->ViewSize.Y - 1; } - /* See MSDN documentation on SetConsoleWindowInfo about the performed checks */ - if ( (CapturedWindowRect.Left < 0) || (CapturedWindowRect.Top < 0) || - (CapturedWindowRect.Right >= Buffer->ScreenBufferSize.X) || - (CapturedWindowRect.Bottom >= Buffer->ScreenBufferSize.Y) || - (CapturedWindowRect.Right <= CapturedWindowRect.Left) || - (CapturedWindowRect.Bottom <= CapturedWindowRect.Top) ) + /* + * The MSDN documentation on SetConsoleWindowInfo is partially wrong about + * the performed checks this API performs. While it is correct that the + * 'Right'/'Bottom' members cannot be strictly smaller than the 'Left'/'Top' + * members, they can be equal. + * Also, if the 'Left' or 'Top' members are negative, this is automatically + * corrected for, and the window rectangle coordinates are shifted accordingly. + */ + if ((CapturedWindowRect.Right < CapturedWindowRect.Left) || + (CapturedWindowRect.Bottom < CapturedWindowRect.Top)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Shift the window rectangle coordinates if 'Left' or 'Top' are negative */ + if (CapturedWindowRect.Left < 0) + { + CapturedWindowRect.Right -= CapturedWindowRect.Left; + CapturedWindowRect.Left = 0; + } + if (CapturedWindowRect.Top < 0) + { + CapturedWindowRect.Bottom -= CapturedWindowRect.Top; + CapturedWindowRect.Top = 0; + } + + if ((CapturedWindowRect.Right >= Buffer->ScreenBufferSize.X) || + (CapturedWindowRect.Bottom >= Buffer->ScreenBufferSize.Y)) { return STATUS_INVALID_PARAMETER; } @@ -1250,7 +1272,7 @@ Buffer->ViewSize.X = CapturedWindowRect.Right - CapturedWindowRect.Left + 1; Buffer->ViewSize.Y = CapturedWindowRect.Bottom - CapturedWindowRect.Top + 1; - // TermResizeTerminal(Console); + TermResizeTerminal(Console); return STATUS_SUCCESS; }

8 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
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 October 2016