Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-15 09:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[REACTOS] Do not free shared icon for ShellAbout() calls (#5519)

Browse source 
CORE-18369
This commit is contained in:
Serge Gautherie 2023-08-09 11:53:13 +02:00 committed by GitHub
parent 815d55c378
commit 016acd170d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 25 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
base/applications/calc/winmain.c
View file

@ -1945,9 +1945,9 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
hInstance,
MAKEINTRESOURCE(IDI_CALC),
IMAGE_ICON,
GetSystemMetrics(SM_CXICON),
GetSystemMetrics(SM_CYICON),
0);
0,
0,
LR_DEFAULTSIZE | LR_SHARED);
calc.hSmIcon = LoadImage(
hInstance,
@ -1955,7 +1955,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON),
GetSystemMetrics(SM_CYSMICON),
0);
LR_SHARED);
do {
/* ignore hwnd: dialogs are already visible! */
@ -1985,12 +1985,6 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
save_config();
} while (calc.action != IDC_STATIC);
if (calc.hBgIcon != NULL)
DestroyIcon(calc.hBgIcon);
if (calc.hSmIcon != NULL)
DestroyIcon(calc.hSmIcon);
stop_rpn_engine();
Theme_Stop();

6
base/applications/clipbrd/clipbrd.c
View file

@ -248,13 +248,11 @@ static int OnCommand(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case CMD_ABOUT:
{
HICON hIcon;
WCHAR szTitle[MAX_STRING_LEN];
hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIPBRD_ICON));
LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle));
ShellAboutW(Globals.hMainWnd, szTitle, NULL, hIcon);
DeleteObject(hIcon);
ShellAboutW(Globals.hMainWnd, szTitle, NULL,
LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(CLIPBRD_ICON)));
break;
}

5
base/applications/mplay32/mplay32.c
View file

@ -1439,9 +1439,8 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
case IDM_ABOUT:
{
HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
ShellAbout(hwnd, szAppTitle, NULL, mplayIcon);
DeleteObject(mplayIcon);
ShellAbout(hwnd, szAppTitle, NULL,
LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)));
break;
}

6
base/applications/mscutils/eventvwr/eventvwr.c
View file

@ -3640,13 +3640,11 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case IDM_ABOUT:
{
HICON hIcon;
WCHAR szCopyright[MAX_LOADSTRING];
hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_EVENTVWR));
LoadStringW(hInst, IDS_COPYRIGHT, szCopyright, ARRAYSIZE(szCopyright));
ShellAboutW(hWnd, szTitle, szCopyright, hIcon);
DeleteObject(hIcon);
ShellAboutW(hWnd, szTitle, szCopyright,
LoadIconW(hInst, MAKEINTRESOURCEW(IDI_EVENTVWR)));
break;
}

6
base/applications/mscutils/servman/mainwnd.c
View file

@ -382,7 +382,6 @@ MainWndCommand(PMAIN_WND_INFO Info,
{
WCHAR szAppName[256];
WCHAR szAppAuthors[256];
HICON hIcon;
UNREFERENCED_PARAMETER(hControl);
@ -597,9 +596,8 @@ MainWndCommand(PMAIN_WND_INFO Info,
LoadStringW(hInstance, IDS_APPNAME, szAppName, _countof(szAppName));
LoadStringW(hInstance, IDS_APPAUTHORS, szAppAuthors, _countof(szAppAuthors));
hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON));
ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, hIcon);
DestroyIcon(hIcon);
ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors,
LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON)));
break;
}

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

@ -599,13 +599,12 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
{
case IDM_HELPINFO:
{
HICON paintIcon = LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON));
TCHAR infotitle[100];
TCHAR infotext[200];
LoadString(g_hinstExe, IDS_INFOTITLE, infotitle, _countof(infotitle));
LoadString(g_hinstExe, IDS_INFOTEXT, infotext, _countof(infotext));
ShellAbout(m_hWnd, infotitle, infotext, paintIcon);
DeleteObject(paintIcon);
ShellAbout(m_hWnd, infotitle, infotext,
LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON)));
break;
}
case IDM_HELPHELPTOPICS:

11
base/applications/osk/main.c
View file

@ -138,19 +138,14 @@ DWORD WINAPI OSK_WarningDlgThread(LPVOID lpParameter)
VOID OSK_About(VOID)
{
WCHAR szAuthors[MAX_PATH];
HICON OSKIcon;
/* Load the icon */
OSKIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
/* Load the strings into the "About" dialog */
LoadStringW(Globals.hInstance, IDS_AUTHORS, szAuthors, _countof(szAuthors));
/* Load the icon */
/* Finally, execute the "About" dialog by using the Shell routine */
ShellAboutW(Globals.hMainWnd, Globals.szTitle, szAuthors, OSKIcon);
/* Once done, destroy the icon */
DestroyIcon(OSKIcon);
ShellAboutW(Globals.hMainWnd, Globals.szTitle, szAuthors,
LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED));
}
/***********************************************************************

6
base/applications/rapps/gui.cpp
View file

@ -469,13 +469,11 @@ CMainWindow::ShowAboutDlg()
{
CStringW szApp;
CStringW szAuthors;
HICON hIcon;
szApp.LoadStringW(IDS_APPTITLE);
szAuthors.LoadStringW(IDS_APP_AUTHORS);
hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
ShellAboutW(m_hWnd, szApp, szAuthors, hIcon);
DestroyIcon(hIcon);
ShellAboutW(m_hWnd, szApp, szAuthors,
LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)));
}
VOID

6
base/applications/sndrec32/sndrec32.cpp
View file

@ -432,7 +432,6 @@ WndProc(HWND hWnd,
HFONT oldfont;
long long slid_samp = 0;
WCHAR szAppName[100];
HICON hIcon;
/* Checking for global pointers to buffer and io audio devices */
if ((!AUD_IN) || (!AUD_OUT) || (!AUD_BUF))
@ -598,9 +597,8 @@ WndProc(HWND hWnd,
case ID_ABOUT:
LoadStringW(hInst, IDS_APP_TITLE, szAppName, _countof(szAppName));
hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REACTOS_SNDREC32));
ShellAboutW(hWnd, szAppName, NULL, hIcon);
DestroyIcon(hIcon);
ShellAboutW(hWnd, szAppName, NULL,
LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REACTOS_SNDREC32)));
break;
case ID_FILE_SAVEAS:

5
base/applications/taskmgr/about.c
View file

@ -10,9 +10,8 @@
void OnAbout(void)
{
WCHAR szTaskmgr[128];
HICON taskmgrIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER));
LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR));
ShellAboutW(hMainWnd, szTaskmgr, NULL, taskmgrIcon);
DeleteObject(taskmgrIcon);
ShellAboutW(hMainWnd, szTaskmgr, NULL,
LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER)));
}

7
dll/win32/devmgr/devmgmt/MainWindow.cpp
View file

@ -653,16 +653,13 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam,
{
CAtlStringW szAppName;
CAtlStringW szAppAuthors;
HICON hIcon;
if (!szAppName.LoadStringW(g_hThisInstance, IDS_APPNAME))
szAppName = L"ReactOS Device Manager";
if (!szAppAuthors.LoadStringW(g_hThisInstance, IDS_APP_AUTHORS))
szAppAuthors = L"";
hIcon = LoadIconW(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON));
ShellAboutW(m_hMainWnd, szAppName, szAppAuthors, hIcon);
if (hIcon)
DestroyIcon(hIcon);
ShellAboutW(m_hMainWnd, szAppName, szAppAuthors,
LoadIconW(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)));
// Set focus back to the treeview
m_DeviceView->SetFocus();