[MSPAINT] Shorten the license string that is displayed in ShellAbout() dialog. CORE-12356

[MPLAY32][REGEDIT][TASKMGR][WORDPAD][BROWSEUI]
Use NULL for empty handles / string pointers in ShellAbout() calls.
This commit is contained in:
Hermès Bélusca-Maïto 2020-01-24 23:40:32 +01:00
parent cefc378b0d
commit 15bc263b07
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
34 changed files with 35 additions and 35 deletions

View file

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

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Рисуване"
IDS_WINDOWTITLE "%s - рисуване"
IDS_INFOTITLE "Рисувач (Paint) за РеактОС"
IDS_INFOTEXT "Рисувач (Paint) за РеактОС е достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Достъпен под GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "Искате ли да запишете промените в %s?"
IDS_DEFAULTFILENAME "Без име.bmp"
IDS_MINIATURETITLE "Изображенийце"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Malování"
IDS_WINDOWTITLE "%s - Malování"
IDS_INFOTITLE "ReactOS Malování"
IDS_INFOTEXT "ReactOS Malování je dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)"
IDS_INFOTEXT "Dostupné pod licencí GNU Lesser General Public License (LGPL, viz. www.gnu.org)"
IDS_SAVEPROMPTTEXT "Chcete uložit provedené změny v %s?"
IDS_DEFAULTFILENAME "Bez názvu.bmp"
IDS_MINIATURETITLE "Miniatura"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint für ReactOS"
IDS_INFOTEXT "Paint für ReactOS steht unter der GNU Lesser General Public License (LGPL, siehe www.gnu.org)"
IDS_INFOTEXT "Unter der GNU Lesser General Public License stehen (LGPL, siehe www.gnu.org)"
IDS_SAVEPROMPTTEXT "Möchten Sie die Änderungen an %s speichern?"
IDS_DEFAULTFILENAME "Unbenannt.bmp"
IDS_MINIATURETITLE "Miniaturansicht"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint for ReactOS"
IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?"
IDS_DEFAULTFILENAME "Unnamed.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint for ReactOS"
IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "Do you want to save the changes to %s?"
IDS_DEFAULTFILENAME "Unnamed.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -197,7 +197,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint para ReactOS"
IDS_INFOTEXT "Paint para ReactOS está disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)"
IDS_INFOTEXT "Disponible bajo los términos de la GNU Lesser General Public License (LGPL, ver www.gnu.org)"
IDS_SAVEPROMPTTEXT "¿Guardar cambios a %s?"
IDS_DEFAULTFILENAME "Sin título.bmp"
IDS_MINIATURETITLE "Miniatura"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint ReactOS'ile"
IDS_INFOTEXT "Paint ReactOS'ile on saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)"
IDS_INFOTEXT "On saadaval ""GNU Lesser General Public License"" litsentsi all (LGPL, vaata www.gnu.org)"
IDS_SAVEPROMPTTEXT "Kas soovid salvesta muudatusi failis %s?"
IDS_DEFAULTFILENAME "Nimetu.bmp"
IDS_MINIATURETITLE "Miniatuur"

View file

@ -188,7 +188,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint para ReactOS"
IDS_INFOTEXT "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)"
IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, ver www.gnu.org)"
IDS_SAVEPROMPTTEXT "¿Guardar cambios cambios a %s?"
IDS_DEFAULTFILENAME "Izegabea.bmp"
IDS_MINIATURETITLE "Miniatura"

View file

@ -188,7 +188,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint pour ReactOS"
IDS_INFOTEXT "Paint pour ReactOS est mise à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)"
IDS_INFOTEXT "Mis à disposition sous la Licence publique générale limitée GNU (LGPL, voir www.gnu.org)"
IDS_SAVEPROMPTTEXT "Voulez-vous enregistrer les modifications de %s?"
IDS_DEFAULTFILENAME "Sans titre.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -191,7 +191,7 @@ BEGIN
IDS_PROGRAMNAME "צייר"
IDS_WINDOWTITLE "%s - צייר"
IDS_INFOTITLE "צייר עבור ReactOS"
IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "האם ברצונך לשמור את השינויים של %s?"
IDS_DEFAULTFILENAME "ללא שם.bmp"
IDS_MINIATURETITLE "ממוזער"

View file

@ -188,7 +188,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "ReactOS Paint"
IDS_INFOTEXT "A ReactOS Paint a GNU Lesser General Public License (LGPL) alatt érhetõ el (lásd www.gnu.org)"
IDS_INFOTEXT "A GNU Lesser General Public License (LGPL) alatt érhetõ el (lásd www.gnu.org)"
IDS_SAVEPROMPTTEXT "Kívánja menteni %s változásait?"
IDS_DEFAULTFILENAME "Névtelen.bmp"
IDS_MINIATURETITLE "Miniatúra"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint untuk ReactOS"
IDS_INFOTEXT "Paint untuk ReactOS tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Tersedia di bawah GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "Ingin menyimpan perubahan untuk %s?"
IDS_DEFAULTFILENAME "Tanpa Nama.bmp"
IDS_MINIATURETITLE "Miniatur"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint per ReactOS"
IDS_INFOTEXT "Paint per ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "Volete salvare le modifiche a %s?"
IDS_DEFAULTFILENAME "SenzaNome.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "ペイント"
IDS_WINDOWTITLE "%s - ペイント"
IDS_INFOTITLE "ReactOS ペイント"
IDS_INFOTEXT "ReactOS ペイントは GNU Lesser General Public License (LGPL, 詳細は www.gnu.org)の下で利用可能です。"
IDS_INFOTEXT "GNU Lesser General Public License (LGPL, 詳細は www.gnu.org) の下で利用可能です。"
IDS_SAVEPROMPTTEXT "%s の変更内容を保存しますか?"
IDS_DEFAULTFILENAME "無題.bmp"
IDS_MINIATURETITLE "縮小図"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint for ReactOS"
IDS_INFOTEXT "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Available under the GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?"
IDS_DEFAULTFILENAME "Naamloos.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint for ReactOS"
IDS_INFOTEXT "Paint for ReactOS er nå tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)"
IDS_INFOTEXT "Tilgjengelig under GNU Lesser General Public License (LGPL, se http://www.gnu.org/home.nb.html)"
IDS_SAVEPROMPTTEXT "Vil du lagre endringene til %s?"
IDS_DEFAULTFILENAME "Utennavn.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -197,7 +197,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint dla ReactOS"
IDS_INFOTEXT "Paint dla ReactOS jest dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)"
IDS_INFOTEXT "Dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)"
IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do %s?"
IDS_DEFAULTFILENAME "bez tytułu.bmp"
IDS_MINIATURETITLE "Miniatura"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint para ReactOS"
IDS_INFOTEXT "Paint para ReactOS está disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)"
IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)"
IDS_SAVEPROMPTTEXT "Salvar as alterações em %s?"
IDS_DEFAULTFILENAME "Imagem.bmp"
IDS_MINIATURETITLE "Miniatura"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint para ReactOS"
IDS_INFOTEXT "Paint para ReactOS está disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)"
IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)"
IDS_SAVEPROMPTTEXT "Pretende guardar as alterações a %s?"
IDS_DEFAULTFILENAME "Imagem.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -197,7 +197,7 @@ BEGIN
IDS_PROGRAMNAME "Pictare"
IDS_WINDOWTITLE "%s - Pictare"
IDS_INFOTITLE "Pictare pentru ReactOS"
IDS_INFOTEXT "Pictare pentru ReactOS este disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)"
IDS_INFOTEXT "Disponibilă sub licența GNU Lesser General Public (vedeți www.gnu.org)"
IDS_SAVEPROMPTTEXT "Doriți păstrarea modificărilor din %s?"
IDS_DEFAULTFILENAME "FărăNume.bmp"
IDS_MINIATURETITLE "Miniatură"

View file

@ -188,7 +188,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint для ReactOS"
IDS_INFOTEXT "Paint для ReactOS распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)"
IDS_INFOTEXT "Распространяется под лицензией GNU Lesser General Public License (LGPL, см. www.gnu.org)"
IDS_SAVEPROMPTTEXT "Сохранить изменения в %s?"
IDS_DEFAULTFILENAME "Безымянный.bmp"
IDS_MINIATURETITLE "Эскиз"

View file

@ -197,7 +197,7 @@ BEGIN
IDS_PROGRAMNAME "Skicár"
IDS_WINDOWTITLE "%s - Skicár"
IDS_INFOTITLE "Skicár systému ReactOS"
IDS_INFOTEXT "Skicár systému ReactOS je dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)"
IDS_INFOTEXT "Dostupný za podmienok GNU Lesser General Public License (LGPL, viď www.gnu.org)"
IDS_SAVEPROMPTTEXT "Chcete uložiť vykonané zmeny do %s?"
IDS_DEFAULTFILENAME "Bez názvu.bmp"
IDS_MINIATURETITLE "Miniature"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint për ReactOS"
IDS_INFOTEXT "Paint pë ReactOS ësht i disponueshem nën GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_INFOTEXT "Ësht i disponueshme nën GNU Lesser General Public License (LGPL, see www.gnu.org)"
IDS_SAVEPROMPTTEXT "A doni të ruani ndryshimet tek %s?"
IDS_DEFAULTFILENAME "Unnamed.bmp"
IDS_MINIATURETITLE "Miniaturë"

View file

@ -188,7 +188,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint för ReactOS"
IDS_INFOTEXT "Paint för ReactOS är tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)"
IDS_INFOTEXT "Tillgänglig under GNU Lesser General Public License (LGPL, se www.gnu.org)"
IDS_SAVEPROMPTTEXT "Vill du spara ändringarna till %s?"
IDS_DEFAULTFILENAME "Namnlös.bmp"
IDS_MINIATURETITLE "Miniatyr"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "ReactOS için Paint"
IDS_INFOTEXT "ReactOS için Paint, GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altında vardır."
IDS_INFOTEXT "GNU Kısıtlı Genel Kamu Lisansı (LGPL, bakınız: www.gnu.org) altında vardır."
IDS_SAVEPROMPTTEXT "%s için yapılan değişiklikleri saklamak ister misiniz?"
IDS_DEFAULTFILENAME "Adsız.bmp"
IDS_MINIATURETITLE "Küçük Resim"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Paint"
IDS_WINDOWTITLE "%s - Paint"
IDS_INFOTITLE "Paint для ReactOS"
IDS_INFOTEXT "Paint для ReactOS доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)"
IDS_INFOTEXT "Доступний згідно з GNU Lesser General Public License (LGPL, дивіться www.gnu.org)"
IDS_SAVEPROMPTTEXT "Зберегти зміни до %s?"
IDS_DEFAULTFILENAME "Без_імені.bmp"
IDS_MINIATURETITLE "Мініатюра"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "Vẽ"
IDS_WINDOWTITLE "%s - Vẽ"
IDS_INFOTITLE "Trình Vẽ cho ReactOS"
IDS_INFOTEXT "Trình Vẽ cho ReactOS được cung cấp theo điều lệ trong GNU Lesser General Public License (LGPL, xem www.gnu.org)"
IDS_INFOTEXT "Được cung cấp theo điều lệ trong GNU Lesser General Public License (LGPL, xem www.gnu.org)"
IDS_SAVEPROMPTTEXT "Bạn có muốn lưu lại những thay đổi trong %s?"
IDS_DEFAULTFILENAME "Khongten.bmp"
IDS_MINIATURETITLE "Ảnh nhỏ"

View file

@ -197,7 +197,7 @@ BEGIN
IDS_PROGRAMNAME "画图"
IDS_WINDOWTITLE "%s - 画图"
IDS_INFOTITLE "ReactOS 画图"
IDS_INFOTEXT "ReactOS 画图是在 GNU LGPL 许可证下发布的 (详见 www.gnu.org)"
IDS_INFOTEXT "GNU LGPL 许可证下发布的 (详见 www.gnu.org)"
IDS_SAVEPROMPTTEXT "您想把改变保存到 %s 吗?"
IDS_DEFAULTFILENAME "未命名.bmp"
IDS_MINIATURETITLE "缩略图"

View file

@ -196,7 +196,7 @@ BEGIN
IDS_PROGRAMNAME "畫圖"
IDS_WINDOWTITLE "%s - 畫圖"
IDS_INFOTITLE "ReactOS 畫圖"
IDS_INFOTEXT "ReactOS 畫圖是在 GNU LGPL 下發佈的 (詳見 www.gnu.org)"
IDS_INFOTEXT "GNU LGPL 下發佈的 (詳見 www.gnu.org)"
IDS_SAVEPROMPTTEXT "您想把改變保存到 %s 嗎?"
IDS_DEFAULTFILENAME "未命名.bmp"
IDS_MINIATURETITLE "縮圖"

View file

@ -26,7 +26,7 @@ void ShowAboutBox(HWND hWnd)
{
WCHAR AppStr[255];
LoadStringW(hInst, IDS_APP_TITLE, AppStr, COUNT_OF(AppStr));
ShellAboutW(hWnd, AppStr, L"", LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REGEDIT)));
ShellAboutW(hWnd, AppStr, NULL, LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REGEDIT)));
}
/* EOF */

View file

@ -28,6 +28,6 @@ void OnAbout(void)
HICON taskmgrIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER));
LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR));
ShellAboutW(hMainWnd, szTaskmgr, 0, taskmgrIcon);
ShellAboutW(hMainWnd, szTaskmgr, NULL, taskmgrIcon);
DeleteObject(taskmgrIcon);
}

View file

@ -1000,8 +1000,8 @@ static void DialogOpenFile(void)
static void dialog_about(void)
{
HICON icon = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED);
ShellAboutW(hMainWnd, wszAppTitle, 0, icon);
HICON icon = LoadImageW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED);
ShellAboutW(hMainWnd, wszAppTitle, NULL, icon);
}
static INT_PTR CALLBACK formatopts_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

View file

@ -3590,7 +3590,7 @@ LRESULT CShellBrowser::OnDisconnectNetworkDrive(WORD wNotifyCode, WORD wID, HWND
LRESULT CShellBrowser::OnAboutReactOS(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled)
{
ShellAbout(m_hWnd, _T("ReactOS"), _T(""), NULL);
ShellAbout(m_hWnd, _T("ReactOS"), NULL, NULL);
return 0;
}