Ros-diffs September 2021

ros-diffs@reactos.org

25 participants
144 discussions

[reactos] 01/02: [SETUPLIB] CreateFreeLoaderReactOSEntries(): Fix 'VBoxDebug' typo

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d01afbc9d2e4674978f5… commit 6d01afbc9d2e4674978f5a209cdc324858c8423a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Sep 3 23:10:42 2021 +0300 [SETUPLIB] CreateFreeLoaderReactOSEntries(): Fix 'VBoxDebug' typo Match newer 84c2695. Addendum to 69512e2 (r65813). --- base/setup/lib/bootsup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index e8d6c884bff..1d03d07e2d0 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -85,7 +85,7 @@ CreateFreeLoaderReactOSEntries( #ifdef _WINKD_ /* ReactOS_VBoxDebug */ // BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_VBoxDebug"); - BootEntry->FriendlyName = L"\"ReactOS (VBoxDebug)\""; + BootEntry->FriendlyName = L"\"ReactOS (VBox Debug)\""; Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=VBOX /SOS"; AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_VBoxDebug")); #endif

3 years

[reactos] 01/01: [MSI] Fix dialog.c showing two taskbar panes on Cancel (#3861)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81358d08f0865224a1119… commit 81358d08f0865224a11194909a84ae8fa0b10c40 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Jul 29 20:56:24 2021 -0500 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Sep 3 22:54:22 2021 +0300 [MSI] Fix dialog.c showing two taskbar panes on Cancel (#3861) Only show the main dialog pane on taskbar when executing a Cancel dialog. Assign previous window handle as a parent when creating Cancel dialog box. CORE-17702 --- dll/win32/msi/dialog.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 7a8417ff70c..01da9e048ff 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -171,6 +171,10 @@ static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; static DWORD uiThreadId; static HWND hMsiHiddenWindow; +#ifdef __REACTOS__ +static HANDLE hPrevious = NULL; +#endif + static LPWSTR msi_get_window_text( HWND hwnd ) { UINT sz, r; @@ -3819,6 +3823,9 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, case WM_DESTROY: dialog->hwnd = NULL; +#ifdef __REACTOS__ + hPrevious = NULL; +#endif return 0; case WM_NOTIFY: return msi_dialog_onnotify( dialog, lParam ); @@ -3854,15 +3861,26 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; +#ifdef __REACTOS__ + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hPrevious, NULL, NULL, dialog ); +#else hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog ); +#endif + if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name )); return ERROR_FUNCTION_FAILED; } +#ifdef __REACTOS__ + hPrevious = hwnd; +#endif + ShowWindow( hwnd, SW_SHOW ); /* UpdateWindow( hwnd ); - and causes the transparent static controls not to paint */

3 years

[reactos] 01/01: [UXTHEME][NTUSER] Fix flashing of scrollbar when scrolling (#3868)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=236649c626f97c68a9d0a… commit 236649c626f97c68a9d0a6709a1bb342681b2aa0 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Jul 31 08:16:03 2021 -0500 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Sep 3 22:34:26 2021 +0300 [UXTHEME][NTUSER] Fix flashing of scrollbar when scrolling (#3868) Based on a patch by I_Kill_Bugs. --- dll/win32/uxtheme/themehooks.c | 24 ++++++++++++++++++++ sdk/include/psdk/winuser.h | 1 + win32ss/user/ntuser/scrollbar.c | 49 +++++++++++++++++++++++++++++++++-------- 3 files changed, 65 insertions(+), 9 deletions(-) diff --git a/dll/win32/uxtheme/themehooks.c b/dll/win32/uxtheme/themehooks.c index 583fce34d4f..f9c045cea67 100644 --- a/dll/win32/uxtheme/themehooks.c +++ b/dll/win32/uxtheme/themehooks.c @@ -576,6 +576,29 @@ dodefault: return g_user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi); } +INT WINAPI ThemeSetScrollInfo(HWND hWnd, int fnBar, LPCSCROLLINFO lpsi, BOOL bRedraw) +{ + PWND_DATA pwndData; + SCROLLINFO siout; + LPSCROLLINFO lpsiout = &siout; + BOOL IsThemed = FALSE; + + pwndData = ThemeGetWndData(hWnd); + + if (!pwndData) + goto dodefault; + + if (pwndData->hthemeScrollbar) + IsThemed = TRUE; + + memcpy(&siout, lpsi, sizeof(SCROLLINFO)); + if (IsThemed) + siout.fMask |= SIF_THEMED; + +dodefault: + return g_user32ApiHook.SetScrollInfo(hWnd, fnBar, lpsiout, bRedraw); +} + /********************************************************************** * Exports */ @@ -611,6 +634,7 @@ ThemeInitApiHook(UAPIHK State, PUSERAPIHOOK puah) puah->SetWindowRgn = ThemeSetWindowRgn; puah->GetScrollInfo = ThemeGetScrollInfo; + puah->SetScrollInfo = ThemeSetScrollInfo; UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT); UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE); diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 7e1a9ff2eb3..487140761fc 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -1221,6 +1221,7 @@ extern "C" { #define SIF_RANGE 1 #define SIF_DISABLENOSCROLL 8 #define SIF_TRACKPOS 16 +#define SIF_THEMED 128 /* REACTOS Specific Only */ #define SWP_DRAWFRAME 32 #define SWP_FRAMECHANGED 32 #define SWP_HIDEWINDOW 128 diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index 75d499b25e6..359bc923f5b 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -276,6 +276,7 @@ co_IntGetScrollInfo(PWND Window, INT nBar, PSBDATA pSBData, LPSCROLLINFO lpsi) ASSERT_REFS_CO(Window); + lpsi->fMask &= ~SIF_THEMED; // Remove Theme bit if(!SBID_IS_VALID(nBar)) { EngSetLastError(ERROR_INVALID_PARAMETER); @@ -334,6 +335,7 @@ NEWco_IntGetScrollInfo( UINT Mask; PSBTRACK pSBTrack = pWnd->head.pti->pSBTrack; + lpsi->fMask &= ~SIF_THEMED; // Remove Theme bit if (!SBID_IS_VALID(nBar)) { EngSetLastError(ERROR_INVALID_PARAMETER); @@ -511,7 +513,7 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) EngSetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (lpsi->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL | SIF_PREVIOUSPOS)) + if ((lpsi->fMask & ~SIF_THEMED) & ~(SIF_ALL | SIF_DISABLENOSCROLL | SIF_PREVIOUSPOS)) { EngSetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -611,7 +613,7 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) } } else /* Show and enable scroll-bar only if no page only changed. */ - if (lpsi->fMask != SIF_PAGE) + if ((lpsi->fMask & ~SIF_THEMED) != SIF_PAGE) { if ((nBar != SB_CTL) && bChangeParams) { @@ -643,20 +645,49 @@ co_IntSetScrollInfo(PWND Window, INT nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) return lpsi->fMask & SIF_PREVIOUSPOS ? OldPos : pSBData->pos; /* SetWindowPos() already did the painting */ if (bRedraw) { - if (action & SA_SSI_REPAINT_ARROWS) - { // Redraw the entire bar. + if (!(lpsi->fMask & SIF_THEMED)) /* Not Using Themes */ + { + TRACE("Not using themes.\n"); + if (action & SA_SSI_REPAINT_ARROWS) + { + // Redraw the entire bar. + RECTL UpdateRect = psbi->rcScrollBar; + UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; + UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; + co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); + } + else + { + // Redraw only the interior part of the bar. + IntRefeshScrollInterior(Window, nBar, psbi); + } + } + else /* Using Themes */ + { RECTL UpdateRect = psbi->rcScrollBar; + TRACE("Using themes.\n"); UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; + /* Just paint the interior and not the arrows. */ + if (!(action & SA_SSI_REPAINT_ARROWS)) + { + if (nBar == SB_HORZ) + { + UpdateRect.left += psbi->dxyLineButton; + UpdateRect.right -= psbi->dxyLineButton; + } + if (nBar == SB_VERT) + { + UpdateRect.top += psbi->dxyLineButton; + UpdateRect.bottom -= psbi->dxyLineButton; + } + } co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); } - else - { - // Redraw only the interior part of the bar. - IntRefeshScrollInterior(Window, nBar, psbi); - } } // FIXME: Arrows /* else if( action & SA_SSI_REPAINT_ARROWS ) {

3 years

[reactos] 01/01: [TASKMGR] Handles: Get number only, skip data

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=515e0cf38f8d07e59bb00… commit 515e0cf38f8d07e59bb003f930eb08d33dc5f85d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Aug 11 16:57:21 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Sep 3 22:14:07 2021 +0300 [TASKMGR] Handles: Get number only, skip data --- base/applications/taskmgr/perfdata.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index a19c0cb0d97..7eb1d90fd5d 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -44,7 +44,7 @@ LARGE_INTEGER liOldSystemTime = {{0,0}}; SYSTEM_PERFORMANCE_INFORMATION SystemPerfInfo; SYSTEM_BASIC_INFORMATION SystemBasicInfo; SYSTEM_FILECACHE_INFORMATION SystemCacheInfo; -SYSTEM_HANDLE_INFORMATION SystemHandleInfo; +ULONG SystemNumberOfHandles; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorTimeInfo = NULL; PSID SystemUserSid = NULL; @@ -186,7 +186,7 @@ void PerfDataRefresh(void) SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; SYSTEM_TIMEOFDAY_INFORMATION SysTimeInfo; SYSTEM_FILECACHE_INFORMATION SysCacheInfo; - LPBYTE SysHandleInfoData; + SYSTEM_HANDLE_INFORMATION SysHandleInfoData; PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SysProcessorTimeInfo; double CurrentKernelTime; PSECURITY_DESCRIPTOR ProcessSD; @@ -221,22 +221,14 @@ void PerfDataRefresh(void) } /* Get handle information - * We don't know how much data there is so just keep - * increasing the buffer size until the call succeeds + * Number of handles is enough, no need for data array. */ - BufferSize = 0; - do - { - BufferSize += 0x10000; - SysHandleInfoData = (LPBYTE)HeapAlloc(GetProcessHeap(), 0, BufferSize); - - status = NtQuerySystemInformation(SystemHandleInformation, SysHandleInfoData, BufferSize, &ulSize); - - if (status == STATUS_INFO_LENGTH_MISMATCH) { - HeapFree(GetProcessHeap(), 0, SysHandleInfoData); - } - - } while (status == STATUS_INFO_LENGTH_MISMATCH); + status = NtQuerySystemInformation(SystemHandleInformation, &SysHandleInfoData, sizeof(SysHandleInfoData), NULL); + /* On unexpected error, reuse previous value. + * STATUS_SUCCESS (0-1 handle) should never happen. + */ + if (status != STATUS_INFO_LENGTH_MISMATCH) + SysHandleInfoData.NumberOfHandles = SystemNumberOfHandles; /* Get process information * We don't know how much data there is so just keep @@ -279,8 +271,7 @@ void PerfDataRefresh(void) /* * Save system handle info */ - memcpy(&SystemHandleInfo, SysHandleInfoData, sizeof(SYSTEM_HANDLE_INFORMATION)); - HeapFree(GetProcessHeap(), 0, SysHandleInfoData); + SystemNumberOfHandles = SysHandleInfoData.NumberOfHandles; for (CurrentKernelTime=0, Idx=0; Idx<(ULONG)SystemBasicInfo.NumberOfProcessors; Idx++) { CurrentKernelTime += Li2Double(SystemProcessorTimeInfo[Idx].KernelTime); @@ -1106,7 +1097,7 @@ ULONG PerfDataGetSystemHandleCount(void) EnterCriticalSection(&PerfDataCriticalSection); - HandleCount = SystemHandleInfo.NumberOfHandles; + HandleCount = SystemNumberOfHandles; LeaveCriticalSection(&PerfDataCriticalSection);

3 years

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 September 2021