Ros-diffs October 2020

ros-diffs@reactos.org

22 participants
156 discussions

[reactos] 01/01: [NTOS:MM] Print debugging information in case CORE-16449 happens.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef1c7266213037760a29b… commit ef1c7266213037760a29b26a057ff92fa2ac283a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Oct 8 08:39:21 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Oct 8 08:59:46 2020 +0200 [NTOS:MM] Print debugging information in case CORE-16449 happens. --- ntoskrnl/mm/ARM3/sysldr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 68b2a126089..c66f06c4fe8 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2409,7 +2409,14 @@ MiSetSystemCodeProtection( TempPte = *PointerPte; /* Make sure it's valid */ - ASSERT(TempPte.u.Hard.Valid == 1); + if (TempPte.u.Hard.Valid != 1) + { + DPRINT1("CORE-16449: FirstPte=%p, LastPte=%p, Protection=%lx\n", FirstPte, LastPte, Protection); + DPRINT1("CORE-16449: PointerPte=%p, TempPte=%lx\n", PointerPte, TempPte.u.Long); + DPRINT1("CORE-16449: Please issue the 'mod' and 'bt' (KDBG) or 'lm' and 'kp' (WinDbg) commands. Then report this in Jira.\n"); + ASSERT(TempPte.u.Hard.Valid == 1); + break; + } /* Update the protection */ TempPte.u.Hard.Write = BooleanFlagOn(Protection, IMAGE_SCN_MEM_WRITE);

3 years, 11 months

[reactos] 01/01: [BOOTDATA][FONTS] Add vgaoem.fon font (#3272)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=383ea7d92bf1e38a042f7… commit 383ea7d92bf1e38a042f7b130f9f4ee00c1a827e Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Tue Oct 6 16:39:14 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 6 23:39:14 2020 +0900 [BOOTDATA][FONTS] Add vgaoem.fon font (#3272) Converted from the XFree vga.bdf font. This is needed for Vista+ x64 Winload. ReactOS x64 now boots with Vista x64 Winload out of the box (like Windows Server 2003 x64). Tested with winload.exe from Vista x64 RTM (6.0.6000.16386) and winload.efi from Server 2008 x64 Beta 3 (6.0.6001.16497). --- boot/bootdata/hivesys.inf | 1 + media/fonts/CMakeLists.txt | 1 + media/fonts/doc/vgaoem/LICENSE.txt | 23 +++++++++++++++++++++++ media/fonts/vgaoem.fon | Bin 0 -> 5728 bytes 4 files changed, 25 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index eea43abf7a1..5e201a59a71 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -992,6 +992,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","28606",0x00000000,"c_28606 HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","ACP",0x00000000,"1252" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","OEMCP",0x00000000,"437" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","MACCP",0x00000000,"10000" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","OEMHAL",0x00000000,"vgaoem.fon" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","932",2,"F040-F9FC" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage\EUDCCodeRange","936",2,"AAA1-AFFE,F8A1-FEFE,A140-A7A0" diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index ef0284283c6..2bb1a844709 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -65,6 +65,7 @@ list(APPEND FONT_FILES verdanaz.ttf verdanai.ttf verdana.ttf + vgaoem.fon wingding.ttf) foreach(item ${FONT_FILES}) diff --git a/media/fonts/doc/vgaoem/LICENSE.txt b/media/fonts/doc/vgaoem/LICENSE.txt new file mode 100644 index 00000000000..23fa07a5fe1 --- /dev/null +++ b/media/fonts/doc/vgaoem/LICENSE.txt @@ -0,0 +1,23 @@ +Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. \ No newline at end of file diff --git a/media/fonts/vgaoem.fon b/media/fonts/vgaoem.fon new file mode 100644 index 00000000000..25c7544dd18 Binary files /dev/null and b/media/fonts/vgaoem.fon differ

3 years, 11 months

[reactos] 01/01: [BROWSEUI] Remove '\1' from AutoComplete list (#3264)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=957d07436bd0e4e36743c… commit 957d07436bd0e4e36743c63797b52237a8fec702 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 6 17:44:20 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 6 17:44:20 2020 +0900 [BROWSEUI] Remove '\1' from AutoComplete list (#3264) Delete "backslash one" (indicates SW_ values) from auto-completion list. CORE-9281 --- dll/win32/browseui/ACLCustomMRU.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/ACLCustomMRU.cpp b/dll/win32/browseui/ACLCustomMRU.cpp index 83c8dfc55db..c1081cbf7d4 100644 --- a/dll/win32/browseui/ACLCustomMRU.cpp +++ b/dll/win32/browseui/ACLCustomMRU.cpp @@ -33,12 +33,22 @@ STDMETHODIMP CACLCustomMRU::Next(ULONG celt, LPWSTR *rgelt, ULONG *pceltFetched) if (INT(m_ielt) >= m_MRUData.GetSize()) return S_FALSE; - size_t cb = (m_MRUData[m_ielt].GetLength() + 1) * sizeof(WCHAR); + CStringW str = m_MRUData[m_ielt]; + + if (!m_bTypedURLs) + { + // Erase the last "\\1" etc. (indicates SW_* value) + INT ich = str.ReverseFind(L'\\'); + if (ich >= 0) + str = str.Left(ich); + } + + size_t cb = (str.GetLength() + 1) * sizeof(WCHAR); LPWSTR psz = (LPWSTR)CoTaskMemAlloc(cb); if (!psz) return S_FALSE; - CopyMemory(psz, (LPCWSTR)m_MRUData[m_ielt], cb); + CopyMemory(psz, (LPCWSTR)str, cb); *rgelt = psz; *pceltFetched = 1; ++m_ielt;

3 years, 11 months

[reactos] 01/01: [BOOTDATA] Comment out biosinfo.inf (#3266)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0689455bb3e66f89b64ae… commit 0689455bb3e66f89b64aecefc2367efd454b9c16 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Mon Oct 5 23:20:03 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 5 23:20:03 2020 +0200 [BOOTDATA] Comment out biosinfo.inf (#3266) This entry is unused as there is no biosinfo.inf anywhere yet, and it only breaks boot with NTLDR. --- boot/bootdata/hivesys.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index e64bbb6bb11..eea43abf7a1 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -5,7 +5,7 @@ Signature = "$Windows NT$" HKLM,"SYSTEM\CurrentControlSet\Control","CurrentUser",2,"USERNAME" HKLM,"SYSTEM\CurrentControlSet\Control","WaitToKillServiceTimeout",2,"20000" -HKLM,"SYSTEM\CurrentControlSet\Control\Biosinfo","InfName",2,"biosinfo.inf" +;HKLM,"SYSTEM\CurrentControlSet\Control\Biosinfo","InfName",2,"biosinfo.inf" HKLM,"SYSTEM\CurrentControlSet\Control\PnP",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\Video",,0x00000012

3 years, 11 months

[reactos] 02/02: [WINLOGON] Display the shutdown message popup dialog on the current input desktop. (#3259) CORE-17050

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ff9b0ff7ec95f3b8cb83… commit 0ff9b0ff7ec95f3b8cb833b450815a08af4d5c1d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 4 01:31:31 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 5 02:26:03 2020 +0200 [WINLOGON] Display the shutdown message popup dialog on the current input desktop. (#3259) CORE-17050 Display the shutdown message popup dialog on the current input desktop, and periodically monitor for any change of the input desktop. When the latter changes, close the dialog and recreate it on the new input desktop. In addition, retain the current dialog position and restore it when the dialog is recreated on the new desktop. --- base/system/winlogon/shutdown.c | 175 ++++++++++++++++++++++++++++++++++------ 1 file changed, 150 insertions(+), 25 deletions(-) diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index 044a416fe6f..5190ad0faa2 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -5,6 +5,7 @@ * PURPOSE: System shutdown dialog * PROGRAMMERS: Edward Bronsten <tanki.alpha5056(a)gmail.com> * Eric Kohl + * Hermes Belusca-Maito */ /* INCLUDES ******************************************************************/ @@ -26,11 +27,15 @@ typedef struct _SYS_SHUTDOWN_PARAMS { PWSTR pszMessage; ULONG dwTimeout; + + HDESK hShutdownDesk; + WCHAR DesktopName[512]; + WINDOWPLACEMENT wpPos; + + BOOLEAN bShuttingDown; BOOLEAN bRebootAfterShutdown; BOOLEAN bForceAppsClosed; DWORD dwReason; - - BOOLEAN bShuttingDown; } SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; /* GLOBALS *******************************************************************/ @@ -46,12 +51,6 @@ DoSystemShutdown( { BOOL Success; - if (pShutdownParams->pszMessage) - { - HeapFree(GetProcessHeap(), 0, pShutdownParams->pszMessage); - pShutdownParams->pszMessage = NULL; - } - /* If shutdown has been cancelled, bail out now */ if (!pShutdownParams->bShuttingDown) return TRUE; @@ -74,17 +73,67 @@ OnTimer( IN HWND hwndDlg, IN PSYS_SHUTDOWN_PARAMS pShutdownParams) { + HDESK hInputDesktop; + BOOL bSuccess; + DWORD dwSize; + INT iSeconds, iMinutes, iHours, iDays; WCHAR szFormatBuffer[32]; WCHAR szBuffer[32]; - INT iSeconds, iMinutes, iHours, iDays; + WCHAR DesktopName[512]; if (!pShutdownParams->bShuttingDown) { /* Shutdown has been cancelled, close the dialog and bail out */ + EndDialog(hwndDlg, IDABORT); + return; + } + + /* + * Check whether the input desktop has changed. If so, close the dialog, + * and let the shutdown thread recreate it on the new desktop. + */ + + // TODO: Investigate: It would be great if we could also compare with + // our internally maintained desktop handles, before calling that heavy + // comparison. + // (Note that we cannot compare handles with arbitrary input desktop, + // since OpenInputDesktop() creates new handle instances everytime.) + + hInputDesktop = OpenInputDesktop(0, FALSE, GENERIC_ALL); + if (!hInputDesktop) + { + /* No input desktop but we have a dialog: kill it */ + ERR("OpenInputDesktop() failed, error 0x%lx\n", GetLastError()); EndDialog(hwndDlg, 0); return; } + bSuccess = GetUserObjectInformationW(hInputDesktop, + UOI_NAME, + DesktopName, + sizeof(DesktopName), + &dwSize); + if (!bSuccess) + { + ERR("GetUserObjectInformationW(0x%p) failed, error 0x%lx\n", + hInputDesktop, GetLastError()); + } + CloseDesktop(hInputDesktop); + + if (bSuccess && (wcscmp(DesktopName, pShutdownParams->DesktopName) != 0)) + { + TRACE("Input desktop has changed: '%S' --> '%S'\n", + pShutdownParams->DesktopName, DesktopName); + + /* Save the original dialog position to be restored later */ + pShutdownParams->wpPos.length = sizeof(pShutdownParams->wpPos); + GetWindowPlacement(hwndDlg, &pShutdownParams->wpPos); + /* Close the dialog */ + EndDialog(hwndDlg, IDCANCEL); + return; + } + + /* Update the shutdown timeout */ if (pShutdownParams->dwTimeout < SECONDS_PER_DAY) { iSeconds = (INT)pShutdownParams->dwTimeout; @@ -108,9 +157,8 @@ OnTimer( if (pShutdownParams->dwTimeout == 0) { - /* Close the dialog and perform the system shutdown */ + /* Close the dialog and let the shutdown thread perform the system shutdown */ EndDialog(hwndDlg, 0); - DoSystemShutdown(pShutdownParams); return; } @@ -128,15 +176,16 @@ ShutdownDialogProc( { PSYS_SHUTDOWN_PARAMS pShutdownParams; - pShutdownParams = (PSYS_SHUTDOWN_PARAMS)GetWindowLongPtr(hwndDlg, DWLP_USER); + pShutdownParams = (PSYS_SHUTDOWN_PARAMS)GetWindowLongPtrW(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: { pShutdownParams = (PSYS_SHUTDOWN_PARAMS)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pShutdownParams); + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)pShutdownParams); + /* Display the shutdown message */ if (pShutdownParams->pszMessage) { SetDlgItemTextW(hwndDlg, @@ -144,10 +193,18 @@ ShutdownDialogProc( pShutdownParams->pszMessage); } + /* Remove the Close menu item */ DeleteMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); - SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); - PostMessage(hwndDlg, WM_TIMER, 0, 0); + /* Position the window (initial position, or restore from old) */ + if (pShutdownParams->wpPos.length == sizeof(pShutdownParams->wpPos)) + SetWindowPlacement(hwndDlg, &pShutdownParams->wpPos); + + SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, + SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + + /* Initialize the timer */ + PostMessageW(hwndDlg, WM_TIMER, 0, 0); SetTimer(hwndDlg, SHUTDOWN_TIMER_ID, 1000, NULL); break; } @@ -175,15 +232,77 @@ InitiateSystemShutdownThread( IN LPVOID lpParameter) { PSYS_SHUTDOWN_PARAMS pShutdownParams; - INT_PTR status; + HDESK hInputDesktop; + DWORD dwSize; + INT_PTR res; pShutdownParams = (PSYS_SHUTDOWN_PARAMS)lpParameter; - status = DialogBoxParamW(hAppInstance, - MAKEINTRESOURCEW(IDD_SYSSHUTDOWN), - NULL, - ShutdownDialogProc, - (LPARAM)pShutdownParams); + /* Default to initial dialog position */ + pShutdownParams->wpPos.length = 0; + + /* Continuously display the shutdown dialog on the current input desktop */ + while (TRUE) + { + /* Retrieve the current input desktop */ + hInputDesktop = OpenInputDesktop(0, FALSE, GENERIC_ALL); + if (!hInputDesktop) + { + /* No input desktop on the current WinSta0, just shut down */ + ERR("OpenInputDesktop() failed, error 0x%lx\n", GetLastError()); + break; + } + + /* Remember it for checking desktop changes later */ + pShutdownParams->hShutdownDesk = hInputDesktop; + if (!GetUserObjectInformationW(pShutdownParams->hShutdownDesk, + UOI_NAME, + pShutdownParams->DesktopName, + sizeof(pShutdownParams->DesktopName), + &dwSize)) + { + ERR("GetUserObjectInformationW(0x%p) failed, error 0x%lx\n", + pShutdownParams->hShutdownDesk, GetLastError()); + } + + /* Assign the desktop to the current thread */ + SetThreadDesktop(hInputDesktop); + + /* Display the shutdown dialog on the current input desktop */ + res = DialogBoxParamW(hAppInstance, + MAKEINTRESOURCEW(IDD_SYSSHUTDOWN), + NULL, + ShutdownDialogProc, + (LPARAM)pShutdownParams); + + /* Close the desktop */ + CloseDesktop(hInputDesktop); + + /* + * Check why the dialog has been closed. + * + * - If it failed to be created (returned -1), don't care about + * re-creating it, and proceed directly to shutdown. + * + * - If it closed unexpectedly (returned != 1), check whether a + * shutdown is in progress. If the shutdown has been cancelled, + * just bail out; if a shutdown is in progress and the timeout + * is 0, bail out and proceed to shutdown. + * + * - If the dialog has closed because the input desktop changed, + * loop again and recreate it on the new desktop. + */ + if ((res == -1) || (res != IDCANCEL) || + !(pShutdownParams->bShuttingDown && (pShutdownParams->dwTimeout > 0))) + { + break; + } + } + + /* Reset dialog information */ + pShutdownParams->hShutdownDesk = NULL; + ZeroMemory(&pShutdownParams->DesktopName, sizeof(pShutdownParams->DesktopName)); + ZeroMemory(&pShutdownParams->wpPos, sizeof(pShutdownParams->wpPos)); if (pShutdownParams->pszMessage) { @@ -191,11 +310,17 @@ InitiateSystemShutdownThread( pShutdownParams->pszMessage = NULL; } - if (status >= 0) - return ERROR_SUCCESS; + if (pShutdownParams->bShuttingDown) + { + /* Perform the system shutdown */ + if (DoSystemShutdown(pShutdownParams)) + return ERROR_SUCCESS; + else + return GetLastError(); + } pShutdownParams->bShuttingDown = FALSE; - return GetLastError(); + return ERROR_SUCCESS; } @@ -225,7 +350,7 @@ StartSystemShutdown( if (_InterlockedCompareExchange8((volatile char*)&g_ShutdownParams.bShuttingDown, TRUE, FALSE) == TRUE) return ERROR_SHUTDOWN_IN_PROGRESS; - if (pMessage && pMessage->Length && pMessage->Buffer) + if ((dwTimeout != 0) && pMessage && pMessage->Length && pMessage->Buffer) { g_ShutdownParams.pszMessage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,

3 years, 11 months

[reactos] 01/02: [WINLOGON] Minor formatting only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be7bfc813d32d6614bad5… commit be7bfc813d32d6614bad52ffb31e5be952667f4b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 4 01:01:46 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 5 02:26:02 2020 +0200 [WINLOGON] Minor formatting only. Add also original author's name (from original PR #458). --- base/system/winlogon/shutdown.c | 48 +++++++++++++++++++---------------------- base/system/winlogon/winlogon.h | 12 +++++------ 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index f708b9690a4..044a416fe6f 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS Winlogon * FILE: base/system/winlogon/shutdown.c * PURPOSE: System shutdown dialog - * PROGRAMMERS: alpha5056 <alpha5056(a)users.noreply.github.com> + * PROGRAMMERS: Edward Bronsten <tanki.alpha5056(a)gmail.com> + * Eric Kohl */ /* INCLUDES ******************************************************************/ @@ -19,7 +20,6 @@ #define SECONDS_PER_DAY 86400 #define SECONDS_PER_DECADE 315360000 - /* STRUCTS *******************************************************************/ typedef struct _SYS_SHUTDOWN_PARAMS @@ -33,12 +33,10 @@ typedef struct _SYS_SHUTDOWN_PARAMS BOOLEAN bShuttingDown; } SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; - /* GLOBALS *******************************************************************/ SYS_SHUTDOWN_PARAMS g_ShutdownParams; - /* FUNCTIONS *****************************************************************/ static @@ -70,12 +68,11 @@ DoSystemShutdown( return Success; } - static VOID OnTimer( - HWND hwndDlg, - PSYS_SHUTDOWN_PARAMS pShutdownParams) + IN HWND hwndDlg, + IN PSYS_SHUTDOWN_PARAMS pShutdownParams) { WCHAR szFormatBuffer[32]; WCHAR szBuffer[32]; @@ -120,15 +117,14 @@ OnTimer( pShutdownParams->dwTimeout--; } - static INT_PTR CALLBACK ShutdownDialogProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { PSYS_SHUTDOWN_PARAMS pShutdownParams; @@ -172,12 +168,11 @@ ShutdownDialogProc( return TRUE; } - static DWORD WINAPI InitiateSystemShutdownThread( - LPVOID lpParameter) + IN LPVOID lpParameter) { PSYS_SHUTDOWN_PARAMS pShutdownParams; INT_PTR status; @@ -213,14 +208,13 @@ TerminateSystemShutdown(VOID) return ERROR_SUCCESS; } - DWORD StartSystemShutdown( - PUNICODE_STRING lpMessage, - ULONG dwTimeout, - BOOLEAN bForceAppsClosed, - BOOLEAN bRebootAfterShutdown, - ULONG dwReason) + IN PUNICODE_STRING pMessage, + IN ULONG dwTimeout, + IN BOOLEAN bForceAppsClosed, + IN BOOLEAN bRebootAfterShutdown, + IN ULONG dwReason) { HANDLE hThread; @@ -231,11 +225,11 @@ StartSystemShutdown( if (_InterlockedCompareExchange8((volatile char*)&g_ShutdownParams.bShuttingDown, TRUE, FALSE) == TRUE) return ERROR_SHUTDOWN_IN_PROGRESS; - if (lpMessage && lpMessage->Length && lpMessage->Buffer) + if (pMessage && pMessage->Length && pMessage->Buffer) { g_ShutdownParams.pszMessage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - lpMessage->Length + sizeof(UNICODE_NULL)); + pMessage->Length + sizeof(UNICODE_NULL)); if (g_ShutdownParams.pszMessage == NULL) { g_ShutdownParams.bShuttingDown = FALSE; @@ -243,8 +237,8 @@ StartSystemShutdown( } wcsncpy(g_ShutdownParams.pszMessage, - lpMessage->Buffer, - lpMessage->Length / sizeof(WCHAR)); + pMessage->Buffer, + pMessage->Length / sizeof(WCHAR)); } else { @@ -256,7 +250,8 @@ StartSystemShutdown( g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown; g_ShutdownParams.dwReason = dwReason; - /* If dwTimeout is zero perform an immediate system shutdown, otherwise display the countdown shutdown dialog */ + /* If dwTimeout is zero perform an immediate system shutdown, + * otherwise display the countdown shutdown dialog. */ if (g_ShutdownParams.dwTimeout == 0) { if (DoSystemShutdown(&g_ShutdownParams)) @@ -264,7 +259,8 @@ StartSystemShutdown( } else { - hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, (PVOID)&g_ShutdownParams, 0, NULL); + hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, + &g_ShutdownParams, 0, NULL); if (hThread) { CloseHandle(hThread); diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index 5d819374289..20231e35515 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -327,17 +327,17 @@ GetSetupType(VOID); BOOL RunSetup(VOID); -/* shutdown.h*/ +/* shutdown.h */ DWORD TerminateSystemShutdown(VOID); DWORD StartSystemShutdown( - PUNICODE_STRING lpMessage, - ULONG dwTimeout, - BOOLEAN bForceAppsClosed, - BOOLEAN bRebootAfterShutdown, - ULONG dwReason); + IN PUNICODE_STRING pMessage, + IN ULONG dwTimeout, + IN BOOLEAN bForceAppsClosed, + IN BOOLEAN bRebootAfterShutdown, + IN ULONG dwReason); /* winlogon.c */ BOOL

3 years, 11 months

[reactos] 02/02: [NTDLL:CSR] Perform more thorough validation of the parameters in CsrAllocateCaptureBuffer().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d86301f72bb562b89c8df… commit d86301f72bb562b89c8dfa63781b764742317f8b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 5 02:15:14 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 5 02:22:45 2020 +0200 [NTDLL:CSR] Perform more thorough validation of the parameters in CsrAllocateCaptureBuffer(). Complements commit 7e2db773. - Validate the argument count. - Validate the total buffer size: the total size of the header plus the pointer-offset array and the provided buffer, together with the alignment padding for each argument, must be less than MAXLONG aligned to 4-byte boundary. --- dll/ntdll/csr/capture.c | 35 ++++++++++++++++++++++++++++------- dll/ntdll/csr/connect.c | 2 +- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dll/ntdll/csr/capture.c b/dll/ntdll/csr/capture.c index 759f74bcdf9..1a388d467a4 100644 --- a/dll/ntdll/csr/capture.c +++ b/dll/ntdll/csr/capture.c @@ -91,13 +91,35 @@ CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, IN ULONG BufferSize) { PCSR_CAPTURE_BUFFER CaptureBuffer; + ULONG OffsetsArraySize; + ULONG MaximumSize; - /* Validate size */ - if (BufferSize >= MAXLONG) return NULL; + /* Validate the argument count. Note that on server side, CSRSRV + * limits the count to MAXUSHORT; here we are a bit more lenient. */ + if (ArgumentCount > (MAXLONG / sizeof(ULONG_PTR))) + return NULL; + + OffsetsArraySize = ArgumentCount * sizeof(ULONG_PTR); + + /* + * Validate the total buffer size. + * The total size of the header plus the pointer-offset array and the + * provided buffer, together with the alignment padding for each argument, + * must be less than MAXLONG aligned to 4-byte boundary. + */ + MaximumSize = (MAXLONG & ~3) - FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray); + if (OffsetsArraySize >= MaximumSize) + return NULL; + MaximumSize -= OffsetsArraySize; + if (BufferSize >= MaximumSize) + return NULL; + MaximumSize -= BufferSize; + if ((ArgumentCount * 3) + 3 >= MaximumSize) + return NULL; /* Add the size of the header and of the pointer-offset array */ BufferSize += FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + - (ArgumentCount * sizeof(ULONG_PTR)); + OffsetsArraySize; /* Add the size of the alignment padding for each argument */ BufferSize += ArgumentCount * 3; @@ -113,13 +135,12 @@ CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, CaptureBuffer->Size = BufferSize; CaptureBuffer->PointerCount = 0; - /* Initialize all the offsets */ - RtlZeroMemory(CaptureBuffer->PointerOffsetsArray, - ArgumentCount * sizeof(ULONG_PTR)); + /* Initialize the pointer-offset array */ + RtlZeroMemory(CaptureBuffer->PointerOffsetsArray, OffsetsArraySize); /* Point to the start of the free buffer */ CaptureBuffer->BufferEnd = (PVOID)((ULONG_PTR)CaptureBuffer->PointerOffsetsArray + - ArgumentCount * sizeof(ULONG_PTR)); + OffsetsArraySize); /* Return the address of the buffer */ return CaptureBuffer; diff --git a/dll/ntdll/csr/connect.c b/dll/ntdll/csr/connect.c index 213b48b9457..f9d007b701f 100644 --- a/dll/ntdll/csr/connect.c +++ b/dll/ntdll/csr/connect.c @@ -407,7 +407,7 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) ((ULONG_PTR)CaptureBuffer + CsrPortMemoryDelta); - /* Lock the buffer. */ + /* Lock the buffer */ CaptureBuffer->BufferEnd = NULL; /*

3 years, 11 months

[reactos] 01/02: [NTDLL:CSR] Fix a bug in the calculation of the capture buffer size in CsrAllocateCaptureBuffer().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3fa53f818639ef765cde… commit b3fa53f818639ef765cde4d294215d558433cc38 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 5 02:01:52 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 5 02:22:43 2020 +0200 [NTDLL:CSR] Fix a bug in the calculation of the capture buffer size in CsrAllocateCaptureBuffer(). Take the alignment padding for each argument into account, **BEFORE** doing the final size alignment on a 4-byte boundary. Thus, the capture buffer size value is properly aligned, and passes the validation tests on the server side (in CSRSRV!CsrCaptureArguments), see commit 7e2db773. This bug was put in evidence in x64 builds where the memory alignments were more tight than in the x86 builds. --- dll/ntdll/csr/capture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/ntdll/csr/capture.c b/dll/ntdll/csr/capture.c index 1f1e6956e55..759f74bcdf9 100644 --- a/dll/ntdll/csr/capture.c +++ b/dll/ntdll/csr/capture.c @@ -95,16 +95,16 @@ CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, /* Validate size */ if (BufferSize >= MAXLONG) return NULL; - /* Add the size of the header and for each offset to the pointers */ + /* Add the size of the header and of the pointer-offset array */ BufferSize += FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + (ArgumentCount * sizeof(ULONG_PTR)); - /* Align it to a 4-byte boundary */ - BufferSize = (BufferSize + 3) & ~3; - /* Add the size of the alignment padding for each argument */ BufferSize += ArgumentCount * 3; + /* Align it to a 4-byte boundary */ + BufferSize = (BufferSize + 3) & ~3; + /* Allocate memory from the port heap */ CaptureBuffer = RtlAllocateHeap(CsrPortHeap, HEAP_ZERO_MEMORY, BufferSize); if (CaptureBuffer == NULL) return NULL;

3 years, 11 months

[reactos] 01/01: [BROWSEUI] Fix assertion in CACLCustomMRU::AddMRUString

by Hirofumi Katayama

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14c18657bc9e70f8e9a74… commit 14c18657bc9e70f8e9a74116c9d35a3e4b4b96e5 Author: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 5 08:49:42 2020 +0900 Commit: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Oct 5 08:49:42 2020 +0900 [BROWSEUI] Fix assertion in CACLCustomMRU::AddMRUString CORE-9281 --- dll/win32/browseui/ACLCustomMRU.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/browseui/ACLCustomMRU.cpp b/dll/win32/browseui/ACLCustomMRU.cpp index c142397e86f..83c8dfc55db 100644 --- a/dll/win32/browseui/ACLCustomMRU.cpp +++ b/dll/win32/browseui/ACLCustomMRU.cpp @@ -204,11 +204,10 @@ HRESULT CACLCustomMRU::LoadMRUList(DWORD dwMax) HRESULT STDMETHODCALLTYPE CACLCustomMRU::AddMRUString(LPCWSTR pwszEntry) { - ATLASSERT(m_MRUData.GetSize() <= m_MRUList.GetLength()); - if (m_bTypedURLs) return E_FAIL; + ATLASSERT(m_MRUData.GetSize() <= m_MRUList.GetLength()); m_bDirty = true; CStringW NewElement = pwszEntry;

3 years, 11 months

[reactos] 04/04: [SHELL32][BROWSEUI] Fix usage of ILGetDisplayNameEx

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bac45efe5d163a199536c… commit bac45efe5d163a199536cbe00a65f80c59c8fbde Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 13 15:03:24 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 4 19:34:20 2020 +0200 [SHELL32][BROWSEUI] Fix usage of ILGetDisplayNameEx --- dll/win32/browseui/travellog.cpp | 2 +- dll/win32/shell32/CFolder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/travellog.cpp b/dll/win32/browseui/travellog.cpp index 275ec52ed89..cb14139f4f5 100644 --- a/dll/win32/browseui/travellog.cpp +++ b/dll/win32/browseui/travellog.cpp @@ -125,7 +125,7 @@ HRESULT CTravelEntry::GetToolTipText(IUnknown *punk, LPWSTR pwzText) const { HRESULT hResult; - hResult = ILGetDisplayNameEx(NULL, fPIDL, pwzText, ILGDN_NORMAL) ? S_OK : S_FALSE; + hResult = ILGetDisplayNameEx(NULL, fPIDL, pwzText, ILGDN_NORMAL) ? S_OK : E_FAIL; if (FAILED_UNEXPECTEDLY(hResult)) return hResult; diff --git a/dll/win32/shell32/CFolder.cpp b/dll/win32/shell32/CFolder.cpp index 3421ecbcc12..b3854a2a8c7 100644 --- a/dll/win32/shell32/CFolder.cpp +++ b/dll/win32/shell32/CFolder.cpp @@ -42,7 +42,7 @@ HRESULT STDMETHODCALLTYPE CFolder::get_Title(BSTR *pbs) return E_POINTER; WCHAR path[MAX_PATH+2] = {0}; - HRESULT hr = ILGetDisplayNameExW(NULL, m_idlist, path, ILGDN_INFOLDER); + HRESULT hr = ILGetDisplayNameExW(NULL, m_idlist, path, ILGDN_INFOLDER) ? S_OK : E_FAIL; if (FAILED_UNEXPECTEDLY(hr)) return hr;

3 years, 11 months

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 2020