Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSPAINT] Fix use of uninitialized variable on startup (#5140)

Browse source 
There was an exception in starting up of mspaint of Visual Studio 2019 build. CORE-18594, CORE-18867
This commit is contained in:
Katayama Hirofumi MZ 2023-03-10 07:31:31 +09:00 • committed by GitHub
parent 29d0deef13
commit 02c647802f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
base/applications/mspaint/winproc.cpp
View file

@ -72,17 +72,18 @@ void CMainWindow::alignChildrenToMainWindow()
h = clientRect.bottom - 3; h = clientRect.bottom - 3;
} }
RECT statusBarRect0; INT statusBarHeight = 0;
int statusBarBorders[3]; if (::IsWindowVisible(hStatusBar))
if (::IsWindow(hStatusBar))
{ {
::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); RECT Rect;
::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); INT borders[3];
::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&Rect);
::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&borders);
statusBarHeight = Rect.bottom - Rect.top + borders[1];
} }
int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1];
if (scrollboxWindow.IsWindow()) if (scrollboxWindow.IsWindow())
scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); scrollboxWindow.MoveWindow(x, y, w, h - statusBarHeight, TRUE);
if (paletteWindow.IsWindow()) if (paletteWindow.IsWindow())
paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); paletteWindow.MoveWindow(x, 9, 255, 32, TRUE);
} }