Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [APPWIZ] Display a message box in case of failure (#913)
by Bișoc George 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb499cd1fd700f311c391… commit cb499cd1fd700f311c391d2ca43bad8e35dd4fba Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Oct 8 14:36:40 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 14:36:40 2018 +0200 [APPWIZ] Display a message box in case of failure (#913) When the downloading process of Gecko fails, display a warning message box. --- dll/cpl/appwiz/addons.c | 6 ++++-- dll/cpl/appwiz/lang/bg-BG.rc | 1 + dll/cpl/appwiz/lang/cs-CZ.rc | 1 + dll/cpl/appwiz/lang/de-DE.rc | 1 + dll/cpl/appwiz/lang/el-GR.rc | 1 + dll/cpl/appwiz/lang/en-US.rc | 1 + dll/cpl/appwiz/lang/es-ES.rc | 1 + dll/cpl/appwiz/lang/et-EE.rc | 1 + dll/cpl/appwiz/lang/fr-FR.rc | 1 + dll/cpl/appwiz/lang/he-IL.rc | 1 + dll/cpl/appwiz/lang/it-IT.rc | 1 + dll/cpl/appwiz/lang/ja-JP.rc | 1 + dll/cpl/appwiz/lang/no-NO.rc | 1 + dll/cpl/appwiz/lang/pl-PL.rc | 1 + dll/cpl/appwiz/lang/pt-BR.rc | 1 + dll/cpl/appwiz/lang/ro-RO.rc | 1 + dll/cpl/appwiz/lang/ru-RU.rc | 1 + dll/cpl/appwiz/lang/sk-SK.rc | 1 + dll/cpl/appwiz/lang/sq-AL.rc | 1 + dll/cpl/appwiz/lang/tr-TR.rc | 1 + dll/cpl/appwiz/lang/uk-UA.rc | 1 + dll/cpl/appwiz/lang/zh-CN.rc | 1 + dll/cpl/appwiz/lang/zh-TW.rc | 1 + dll/cpl/appwiz/resource.h | 1 + 24 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index beec6a799b..c2fb28d2ad 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -351,6 +351,7 @@ static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; static DWORD WINAPI download_proc(PVOID arg) { + WCHAR message[256]; WCHAR tmp_dir[MAX_PATH], tmp_file[MAX_PATH]; HRESULT hres; @@ -362,12 +363,13 @@ static DWORD WINAPI download_proc(PVOID arg) hres = URLDownloadToFileW(NULL, GeckoUrl, tmp_file, 0, &InstallCallback); if(FAILED(hres)) { ERR("URLDownloadToFile failed: %08x\n", hres); + if (LoadStringW(hApplet, IDS_DWL_FAILED, message, sizeof(message) / sizeof(WCHAR))) { + MessageBoxW(NULL, message, NULL, MB_ICONERROR); + } } else { if(sha_check(tmp_file)) { install_file(tmp_file); }else { - WCHAR message[256]; - if(LoadStringW(hApplet, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) { MessageBoxW(NULL, message, NULL, MB_ICONERROR); } diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index f1a883b21b..06c00ea539 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index 3b60b303ca..f680584e0a 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -84,6 +84,7 @@ BEGIN IDS_INSTALLING "Instalace..." IDS_INVALID_SHA "Stažený soubor má neplatný kontrolní součet. Instalace poškozeného souboru bude přerušena." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index 7dca52c8fa..af95ea7a34 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Installiere..." IDS_INVALID_SHA "Die heruntergeladene Datei hat eine unerwartete Prüfsumme. Abbruch der Installation aufgrund beschädigter Datei." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index d747592d19..51b48c935a 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index e5d9516b17..38b19d5d19 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 949de044c3..9f55f9674a 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -85,6 +85,7 @@ BEGIN IDS_INSTALLING "Instalando..." IDS_INVALID_SHA "La suma de verificación del archivo descargado no coincide. Se ha cancelado la instalación del archivo corrupto." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 6d41c1bbd1..95e422bca5 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -86,6 +86,7 @@ BEGIN IDS_INSTALLING "Paigaldamine..." IDS_INVALID_SHA "Kontrollsumma ei kattu. Paigaldamine katkestatud korrupteerinud faili tõttu." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index 6c942eeeb3..1aeb4989e0 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Installation..." IDS_INVALID_SHA "La somme de contrôle du fichier téléchargé est erronée. Abandon de l'installation du fichier corrompu." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index 145a093bd5..2ff33619e0 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -80,6 +80,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index f7b388cebf..3c886aed37 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Installando..." IDS_INVALID_SHA "Checksum imprevisto del file scaricato. Interruzione installazione del file danneggiato." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index c70ab86ff4..ba852629cd 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "インストール中..." IDS_INVALID_SHA "ダウンロードしたファイルのチェックサムが合致しません。壊れたファイルのインストールを中止しています。" IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 26295693e1..fd37b67a2d 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 8eda5f3aba..c48e2a0f70 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -88,6 +88,7 @@ BEGIN IDS_INSTALLING "Instalowanie..." IDS_INVALID_SHA "Nieoczekiwana suma kontrolna ściągniętego pliku. Przerwanie instalacji uszkodzonego pliku." IDS_NEW_INTERNET_SHORTCUT "Nowy skrót internetowy" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Nie można utworzyć skrótu internetowego." IDS_CANTMAKESHORTCUT "Nie można utworzyć skrótu." END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index cbfebd02c4..9d72434002 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -81,6 +81,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index d009d84519..77fa5e2635 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -85,6 +85,7 @@ BEGIN IDS_INSTALLING "În curs de instalare…" IDS_INVALID_SHA "Suma de control a fișierului descărcat nu corespunde. Deoarece fișierul a fost corupt, instalarea trebuie abandonată." IDS_NEW_INTERNET_SHORTCUT "Creare scurtătură la Internet" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Eșec în crearea scurtăturii la Internet." IDS_CANTMAKESHORTCUT "Eșec în crearea scurtăturii." END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index aae79bc685..4c7e2fd1b7 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -79,6 +79,7 @@ BEGIN IDS_INSTALLING "Установка..." IDS_INVALID_SHA "Ошибка контрольной суммы загруженного файла. Прерывание установки поврежденного файла." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index 5fb25dd6d9..e17a74484f 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -83,6 +83,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index 4bdac0270e..cc374b659a 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -83,6 +83,7 @@ BEGIN IDS_INSTALLING "Instalim..." IDS_INVALID_SHA "Kontroll i papritur ne shkarkimin e skedarit. Duke lënë instalimin e dokumentave të korruptuar." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index 8c9f6573b9..3e3c2b3ade 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -81,6 +81,7 @@ BEGIN IDS_INSTALLING "Kuruluyor..." IDS_INVALID_SHA "İndirilen kütüğün sağlama toplamı beklenmeyen. Bozuk kütüğün kurulumu iptal ediliyor." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index 94d1d23ef4..36c8a2afa5 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -87,6 +87,7 @@ BEGIN IDS_INSTALLING "Installing..." IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index 4be6c8bcef..a8d9a7a3ee 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -88,6 +88,7 @@ BEGIN IDS_INSTALLING "正在安装..." IDS_INVALID_SHA "下载的文件校验和错误。中止安装已损坏的文件。" IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index b123d0f91e..d3090e83a6 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -86,6 +86,7 @@ BEGIN IDS_INSTALLING "安裝中..." IDS_INVALID_SHA "意外的下載了的檔案的校驗和。中止安裝已損壞的檔案。" IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" + IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." END diff --git a/dll/cpl/appwiz/resource.h b/dll/cpl/appwiz/resource.h index 3df2999642..c4119aa4bc 100644 --- a/dll/cpl/appwiz/resource.h +++ b/dll/cpl/appwiz/resource.h @@ -29,6 +29,7 @@ #define IDS_DOWNLOADING 14 #define IDS_INSTALLING 15 #define IDS_INVALID_SHA 16 +#define IDS_DWL_FAILED 17 /* Controls */ #define IDC_SHORTCUT_LOCATION 107

1 0

03/03: [SYSDM] Fix IDC_ROSVERSION in Romanian translation
by Stanislav Motylkov 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab9baa2d09244f2205809… commit ab9baa2d09244f220580957d047d458be319a450 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Sep 30 15:42:08 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 14:34:11 2018 +0200 [SYSDM] Fix IDC_ROSVERSION in Romanian translation --- dll/cpl/sysdm/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 376f8abc82..cae3c86887 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -17,7 +17,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 - LTEXT "Versiune", IDC_STATIC, 10, 153, 30, 9 + LTEXT "Versiune", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 LTEXT "Timp de operare:", IDC_STATIC, 4, 158, 86, 9 LTEXT "", IDC_UPTIME, 10, 170, 116, 9

1 0

02/03: [SYSDM] Add system uptime information
by Stanislav Motylkov 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3779c2e7707d032c5565c… commit 3779c2e7707d032c5565c8c0f8a9a5fe16a679f8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Sep 29 22:42:58 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 14:34:11 2018 +0200 [SYSDM] Add system uptime information --- dll/cpl/sysdm/general.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ dll/cpl/sysdm/lang/bg-BG.rc | 3 ++ dll/cpl/sysdm/lang/cs-CZ.rc | 3 ++ dll/cpl/sysdm/lang/da-DK.rc | 3 ++ dll/cpl/sysdm/lang/de-DE.rc | 3 ++ dll/cpl/sysdm/lang/el-GR.rc | 3 ++ dll/cpl/sysdm/lang/en-US.rc | 3 ++ dll/cpl/sysdm/lang/es-ES.rc | 3 ++ dll/cpl/sysdm/lang/fr-FR.rc | 3 ++ dll/cpl/sysdm/lang/he-IL.rc | 3 ++ dll/cpl/sysdm/lang/hu-HU.rc | 3 ++ dll/cpl/sysdm/lang/id-ID.rc | 3 ++ dll/cpl/sysdm/lang/it-IT.rc | 3 ++ dll/cpl/sysdm/lang/ja-JP.rc | 3 ++ dll/cpl/sysdm/lang/nl-NL.rc | 3 ++ dll/cpl/sysdm/lang/no-NO.rc | 3 ++ dll/cpl/sysdm/lang/pl-PL.rc | 3 ++ dll/cpl/sysdm/lang/ro-RO.rc | 3 ++ dll/cpl/sysdm/lang/ru-RU.rc | 3 ++ dll/cpl/sysdm/lang/sk-SK.rc | 3 ++ dll/cpl/sysdm/lang/sq-AL.rc | 3 ++ dll/cpl/sysdm/lang/sv-SE.rc | 3 ++ dll/cpl/sysdm/lang/tr-TR.rc | 3 ++ dll/cpl/sysdm/lang/uk-UA.rc | 3 ++ dll/cpl/sysdm/lang/zh-CN.rc | 3 ++ dll/cpl/sysdm/lang/zh-TW.rc | 3 ++ dll/cpl/sysdm/resource.h | 3 ++ 27 files changed, 148 insertions(+) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 032a4b1aaf..555db444d0 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -551,6 +551,75 @@ static VOID GetSystemVersion(HWND hwnd) HeapFree(GetProcessHeap(), 0, pwszStr); } +ULONGLONG GetSecondsQPC(VOID) +{ + LARGE_INTEGER Counter, Frequency; + + QueryPerformanceCounter(&Counter); + QueryPerformanceFrequency(&Frequency); + + return Counter.QuadPart / Frequency.QuadPart; +} + +ULONGLONG GetSeconds(VOID) +{ + ULONGLONG (WINAPI * pGetTickCount64)(VOID); + ULONGLONG Ticks64; + HMODULE hModule = GetModuleHandleW(L"kernel32.dll"); + + pGetTickCount64 = (PVOID)GetProcAddress(hModule, "GetTickCount64"); + if (pGetTickCount64) + { + return pGetTickCount64() / 1000; + } + + hModule = LoadLibraryW(L"kernel32_vista.dll"); + + if (!hModule) + { + return GetSecondsQPC(); + } + + pGetTickCount64 = (PVOID)GetProcAddress(hModule, "GetTickCount64"); + + if (pGetTickCount64) + { + Ticks64 = pGetTickCount64() / 1000; + } + else + { + Ticks64 = GetSecondsQPC(); + } + + FreeLibrary(hModule); + return Ticks64; +} + +VOID GetSystemUptime(HWND hwnd) +{ + HWND hRosUptime; + WCHAR szBuf[64], szStr[64]; + ULONG cSeconds; + + hRosUptime = GetDlgItem(hwnd, IDC_UPTIME); + if (!hRosUptime) + { + return; + } + if (!LoadStringW(hApplet, IDS_UPTIME_FORMAT, szStr, _countof(szStr))) + { + return; + } + cSeconds = GetSeconds(); + StringCchPrintfW(szBuf, _countof(szBuf), szStr, + cSeconds / (60*60*24), + (cSeconds / (60*60)) % 24, + (cSeconds / 60) % 60, + cSeconds % 60); + + SetWindowTextW(hRosUptime, szBuf); +} + /* Property page dialog callback */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -571,6 +640,7 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWLP_WNDPROC, (LONG_PTR)RosImageProc); GetSystemInformation(hwndDlg); GetSystemVersion(hwndDlg); + GetSystemUptime(hwndDlg); break; case WM_DESTROY: diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index e69cd2f66c..96db6e7343 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Версия:", IDC_ROSVERSION, 10, 137, 131, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Машина:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "ПБ памет" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Променлива" IDS_VALUE "Стойност" IDS_NO_DUMP "(Няма)" diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 09a89ce993..211d769dd6 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -15,6 +15,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Verze", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -286,6 +288,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Proměnná" IDS_VALUE "Hodnota" IDS_NO_DUMP "(Není)" diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 5f782255e8..d660f446ed 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB of RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index eb70c4f565..db8e9ba9b8 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -19,6 +19,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Computer:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -290,6 +292,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Wert" IDS_NO_DUMP "(Keine)" diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index bb758e9e8f..74259359d0 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Έκδοση", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Υπολογιστής:", IDC_STATIC, 124, 116, 44, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB μνήμης RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Μεταβλητή" IDS_VALUE "Τιμή" IDS_NO_DUMP "(Κανένα)" diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 83b5e42aee..ef2df155fb 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB of RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 7c1e82cdd2..a55bcd75b3 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -12,6 +12,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versión", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Equipo:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -283,6 +285,7 @@ BEGIN IDS_PETABYTE "PB de RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Valor" IDS_NO_DUMP "(Ninguno)" diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index e5112a79f4..4c25ba6d5b 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "Po de RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Valeur" IDS_NO_DUMP "(Aucun)" diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index e815affb3a..6a41211008 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -12,6 +12,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "גרסה", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "מכונה:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -283,6 +285,7 @@ BEGIN IDS_PETABYTE "PB זיכרון פיזי" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "משתנה" IDS_VALUE "ערך" IDS_NO_DUMP "(ללא)" diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 591c7ec1e7..ee43a6bb9b 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -12,6 +12,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Verzió", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Számítógép:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -283,6 +285,7 @@ BEGIN IDS_PETABYTE "PB of RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 3e1bb63e5a..c8b0fe9d40 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versi", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Mesin:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variabel" IDS_VALUE "Nilai" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 7d2b742d06..76d2154ce0 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versione", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Tempo di Avvio Sistema:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Macchina:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB di RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Giorno, %02u:%02u:%02u" IDS_VARIABLE "Variabile" IDS_VALUE "Valore" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 7bc405ef37..41149b8be0 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "マシン:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "可変" IDS_VALUE "値" IDS_NO_DUMP "(なし)" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index c70cedcf73..17f3564649 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versie", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB of RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 80ae8816c6..d34b317747 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versjon", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Maskin:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB Systemminne" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variabel" IDS_VALUE "Verdi" IDS_NO_DUMP "(Ingen)" diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index eaec406c73..e355aed3c6 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -19,6 +19,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Wersja", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Czas pracy systemu:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Komputer:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -290,6 +292,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u dni, %02u:%02u:%02u" IDS_VARIABLE "Zmienna" IDS_VALUE "Wartość" IDS_NO_DUMP "(Brak)" diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index f9160e6d16..376f8abc82 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -19,6 +19,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versiune", IDC_STATIC, 10, 153, 30, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Timp de operare:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Calculator:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -290,6 +292,7 @@ BEGIN IDS_PETABYTE "Po de memorie" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u zile, %02u:%02u:%02u" IDS_VARIABLE "Variabilă" IDS_VALUE "Valoare" IDS_NO_DUMP "(Fără fișier de depanare)" diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index fc7bfe6a26..4e5c6ee52f 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Версия", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Время работы системы:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Компьютер:", IDC_STATIC, 124, 116, 40, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "Пб ОЗУ" IDS_MEGAHERTZ "МГц" IDS_GIGAHERTZ "ГГц" + IDS_UPTIME_FORMAT "%u дней, %02u:%02u:%02u" IDS_VARIABLE "Переменная" IDS_VALUE "Значение" IDS_NO_DUMP "(Нет)" diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index fcb33ae3ea..0422408d73 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -18,6 +18,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Verzia", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -289,6 +291,7 @@ BEGIN IDS_PETABYTE "PB pamäte RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Premenná" IDS_VALUE "Hodnota" IDS_NO_DUMP "(Žiadne)" diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 2591773f82..6cc6143829 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -10,6 +10,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versioni", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Makinë:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -281,6 +283,7 @@ BEGIN IDS_PETABYTE "PB e RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variablë" IDS_VALUE "Vlera" IDS_NO_DUMP "(Asnjë)" diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 0ae2afcefe..546a589377 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -12,6 +12,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Dator:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -283,6 +285,7 @@ BEGIN IDS_PETABYTE "PB RAM" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Variabel" IDS_VALUE "Värde" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index fc38a8c6c0..f5b2a45c5e 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -12,6 +12,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Sürüm:", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Makine:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -283,6 +285,7 @@ BEGIN IDS_PETABYTE "PB Bellek" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Değişken" IDS_VALUE "Değer" IDS_NO_DUMP "(Yok)" diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 4051101889..b567946151 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -18,6 +18,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Версія", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 36, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -289,6 +291,7 @@ BEGIN IDS_PETABYTE "Пб ОЗП" IDS_MEGAHERTZ "МГц" IDS_GIGAHERTZ "ГГц" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "Змінна" IDS_VALUE "Значення" IDS_NO_DUMP "(Немає)" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index af07acbd7d..b47fbc501d 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -13,6 +13,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "计算机:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -284,6 +286,7 @@ BEGIN IDS_PETABYTE "PB 内存" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "变量" IDS_VALUE "值" IDS_NO_DUMP "(无)" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 403d0178de..c2ca25f64b 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -12,6 +12,8 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "System Uptime:", IDC_STATIC, 4, 158, 86, 9 + LTEXT "", IDC_UPTIME, 10, 170, 116, 9 LTEXT "計算機:", IDC_STATIC, 124, 116, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 @@ -283,6 +285,7 @@ BEGIN IDS_PETABYTE "PB內存" IDS_MEGAHERTZ "MHz" IDS_GIGAHERTZ "GHz" + IDS_UPTIME_FORMAT "%u Days, %02u:%02u:%02u" IDS_VARIABLE "變量" IDS_VALUE "值" IDS_NO_DUMP "(無)" diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index e999b8c73d..26645d023f 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -52,6 +52,8 @@ #define IDS_MEGAHERTZ 90 #define IDS_GIGAHERTZ 91 +#define IDS_UPTIME_FORMAT 92 + /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100 #define IDC_MACHINELINE1 101 @@ -64,6 +66,7 @@ #define IDC_ROSIMG 108 #define IDC_ROSHOMEPAGE_LINK 109 #define IDC_ROSVERSION 110 +#define IDC_UPTIME 111 /* Propsheet - hardware */ #define IDD_PROPPAGEHARDWARE 300

1 0

01/03: [SYSDM] Make MHz and GHz strings translatable
by Stanislav Motylkov 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80d26b1646832f6631655… commit 80d26b1646832f6631655ba86be9a2eda3935f52 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Sep 29 19:49:52 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 14:34:11 2018 +0200 [SYSDM] Make MHz and GHz strings translatable --- dll/cpl/sysdm/general.c | 14 +++++++++++--- dll/cpl/sysdm/lang/bg-BG.rc | 2 ++ dll/cpl/sysdm/lang/cs-CZ.rc | 2 ++ dll/cpl/sysdm/lang/da-DK.rc | 2 ++ dll/cpl/sysdm/lang/de-DE.rc | 2 ++ dll/cpl/sysdm/lang/el-GR.rc | 2 ++ dll/cpl/sysdm/lang/en-US.rc | 2 ++ dll/cpl/sysdm/lang/es-ES.rc | 2 ++ dll/cpl/sysdm/lang/fr-FR.rc | 2 ++ dll/cpl/sysdm/lang/he-IL.rc | 2 ++ dll/cpl/sysdm/lang/hu-HU.rc | 2 ++ dll/cpl/sysdm/lang/id-ID.rc | 2 ++ dll/cpl/sysdm/lang/it-IT.rc | 2 ++ dll/cpl/sysdm/lang/ja-JP.rc | 2 ++ dll/cpl/sysdm/lang/nl-NL.rc | 2 ++ dll/cpl/sysdm/lang/no-NO.rc | 2 ++ dll/cpl/sysdm/lang/pl-PL.rc | 2 ++ dll/cpl/sysdm/lang/ro-RO.rc | 2 ++ dll/cpl/sysdm/lang/ru-RU.rc | 2 ++ dll/cpl/sysdm/lang/sk-SK.rc | 2 ++ dll/cpl/sysdm/lang/sq-AL.rc | 2 ++ dll/cpl/sysdm/lang/sv-SE.rc | 2 ++ dll/cpl/sysdm/lang/tr-TR.rc | 2 ++ dll/cpl/sysdm/lang/uk-UA.rc | 2 ++ dll/cpl/sysdm/lang/zh-CN.rc | 2 ++ dll/cpl/sysdm/lang/zh-TW.rc | 2 ++ dll/cpl/sysdm/resource.h | 3 +++ 27 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 85f83fa642..032a4b1aaf 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -389,7 +389,7 @@ static VOID MakeFloatValueString(DOUBLE* dFloatValue, LPTSTR szOutput, LPTSTR sz static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) { - TCHAR szBuf[64]; + TCHAR szBuf[64], szHz[16]; DWORD BufSize = sizeof(DWORD); DWORD Type = REG_SZ; PROCESSOR_POWER_INFORMATION ppi; @@ -405,12 +405,20 @@ static VOID SetProcSpeed(HWND hwnd, HKEY hKey, LPTSTR Value, UINT uID) { if (ppi.CurrentMhz < 1000) { - wsprintf(szBuf, _T("%lu MHz"), ppi.CurrentMhz); + if (!LoadString(hApplet, IDS_MEGAHERTZ, szHz, _countof(szHz))) + { + return; + } + StringCchPrintf(szBuf, _countof(szBuf), _T("%lu %s"), ppi.CurrentMhz, szHz); } else { double flt = ppi.CurrentMhz / 1000.0; - MakeFloatValueString(&flt, szBuf, _T("GHz")); + if (!LoadString(hApplet, IDS_GIGAHERTZ, szHz, _countof(szHz))) + { + return; + } + MakeFloatValueString(&flt, szBuf, szHz); } SetDlgItemText(hwnd, uID, szBuf); diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 44ae767c11..e69cd2f66c 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "ГБ памет" IDS_TERABYTE "ТБ памет" IDS_PETABYTE "ПБ памет" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Променлива" IDS_VALUE "Стойност" IDS_NO_DUMP "(Няма)" diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index e1ff1acb27..09a89ce993 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -284,6 +284,8 @@ BEGIN IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" IDS_PETABYTE "PB RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Proměnná" IDS_VALUE "Hodnota" IDS_NO_DUMP "(Není)" diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 15379b67a8..5f782255e8 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB of RAM" IDS_TERABYTE "TB of RAM" IDS_PETABYTE "PB of RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 81ba510fff..eb70c4f565 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -288,6 +288,8 @@ BEGIN IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" IDS_PETABYTE "PB RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variable" IDS_VALUE "Wert" IDS_NO_DUMP "(Keine)" diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 188dcb9b7c..bb758e9e8f 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB μνήμης RAM" IDS_TERABYTE "TB μνήμης RAM" IDS_PETABYTE "PB μνήμης RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Μεταβλητή" IDS_VALUE "Τιμή" IDS_NO_DUMP "(Κανένα)" diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 06ee1b548c..83b5e42aee 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB of RAM" IDS_TERABYTE "TB of RAM" IDS_PETABYTE "PB of RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index ab0ae13000..7c1e82cdd2 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -281,6 +281,8 @@ BEGIN IDS_GIGABYTE "GB de RAM" IDS_TERABYTE "TB de RAM" IDS_PETABYTE "PB de RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variable" IDS_VALUE "Valor" IDS_NO_DUMP "(Ninguno)" diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index e77c923a74..e5112a79f4 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "Go de RAM" IDS_TERABYTE "To de RAM" IDS_PETABYTE "Po de RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variable" IDS_VALUE "Valeur" IDS_NO_DUMP "(Aucun)" diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index a9c6a48ad3..e815affb3a 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -281,6 +281,8 @@ BEGIN IDS_GIGABYTE "GB זיכרון פיזי" IDS_TERABYTE "TB זיכרון פיזי" IDS_PETABYTE "PB זיכרון פיזי" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "משתנה" IDS_VALUE "ערך" IDS_NO_DUMP "(ללא)" diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 59de855670..591c7ec1e7 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -281,6 +281,8 @@ BEGIN IDS_GIGABYTE "GB of RAM" IDS_TERABYTE "TB of RAM" IDS_PETABYTE "PB of RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 0b10792430..3e1bb63e5a 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" IDS_PETABYTE "PB RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variabel" IDS_VALUE "Nilai" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index d1a71a3f70..7d2b742d06 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB di RAM" IDS_TERABYTE "TB di RAM" IDS_PETABYTE "PB di RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variabile" IDS_VALUE "Valore" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 080d29cf46..7bc405ef37 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" IDS_PETABYTE "PB RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "可変" IDS_VALUE "値" IDS_NO_DUMP "(なし)" diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 5e77f27bc5..c70cedcf73 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB of RAM" IDS_TERABYTE "TB of RAM" IDS_PETABYTE "PB of RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 3eab75bf21..80ae8816c6 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB Systemminne" IDS_TERABYTE "TB Systemminne" IDS_PETABYTE "PB Systemminne" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variabel" IDS_VALUE "Verdi" IDS_NO_DUMP "(Ingen)" diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 722d3f2737..eaec406c73 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -288,6 +288,8 @@ BEGIN IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" IDS_PETABYTE "PB RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Zmienna" IDS_VALUE "Wartość" IDS_NO_DUMP "(Brak)" diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 1ffee8680f..f9160e6d16 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -288,6 +288,8 @@ BEGIN IDS_GIGABYTE "Go de memorie" IDS_TERABYTE "To de memorie" IDS_PETABYTE "Po de memorie" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variabilă" IDS_VALUE "Valoare" IDS_NO_DUMP "(Fără fișier de depanare)" diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index addfb917c5..fc7bfe6a26 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "Гб ОЗУ" IDS_TERABYTE "Тб ОЗУ" IDS_PETABYTE "Пб ОЗУ" + IDS_MEGAHERTZ "МГц" + IDS_GIGAHERTZ "ГГц" IDS_VARIABLE "Переменная" IDS_VALUE "Значение" IDS_NO_DUMP "(Нет)" diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 9c89994b2d..fcb33ae3ea 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -287,6 +287,8 @@ BEGIN IDS_GIGABYTE "GB pamäte RAM" IDS_TERABYTE "TB pamäte RAM" IDS_PETABYTE "PB pamäte RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Premenná" IDS_VALUE "Hodnota" IDS_NO_DUMP "(Žiadne)" diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 1df47f00ad..2591773f82 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -279,6 +279,8 @@ BEGIN IDS_GIGABYTE "GB e RAM" IDS_TERABYTE "TB e RAM" IDS_PETABYTE "PB e RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variablë" IDS_VALUE "Vlera" IDS_NO_DUMP "(Asnjë)" diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 7a198c9c6c..0ae2afcefe 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -281,6 +281,8 @@ BEGIN IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" IDS_PETABYTE "PB RAM" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Variabel" IDS_VALUE "Värde" IDS_NO_DUMP "(None)" diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 12a3138e10..fc38a8c6c0 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -281,6 +281,8 @@ BEGIN IDS_GIGABYTE "GB Bellek" IDS_TERABYTE "TB Bellek" IDS_PETABYTE "PB Bellek" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "Değişken" IDS_VALUE "Değer" IDS_NO_DUMP "(Yok)" diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index e358d7de2c..4051101889 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -287,6 +287,8 @@ BEGIN IDS_GIGABYTE "Гб ОЗП" IDS_TERABYTE "Тб ОЗП" IDS_PETABYTE "Пб ОЗП" + IDS_MEGAHERTZ "МГц" + IDS_GIGAHERTZ "ГГц" IDS_VARIABLE "Змінна" IDS_VALUE "Значення" IDS_NO_DUMP "(Немає)" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 6db5d7d9ad..af07acbd7d 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -282,6 +282,8 @@ BEGIN IDS_GIGABYTE "GB 内存" IDS_TERABYTE "TB 内存" IDS_PETABYTE "PB 内存" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "变量" IDS_VALUE "值" IDS_NO_DUMP "(无)" diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 5846c9893a..403d0178de 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -281,6 +281,8 @@ BEGIN IDS_GIGABYTE "GB內存" IDS_TERABYTE "TB內存" IDS_PETABYTE "PB內存" + IDS_MEGAHERTZ "MHz" + IDS_GIGAHERTZ "GHz" IDS_VARIABLE "變量" IDS_VALUE "值" IDS_NO_DUMP "(無)" diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 1535d8b5a5..e999b8c73d 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -49,6 +49,9 @@ #define IDS_HWPROFILE_PROFILE 88 #define IDS_HWPROFILE_WARNING 89 +#define IDS_MEGAHERTZ 90 +#define IDS_GIGAHERTZ 91 + /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100 #define IDC_MACHINELINE1 101

1 0

01/01: [SHELL32] Finally fix the icon location path (un)expansion for shell links, and explain why I originally used SHExpandEnvironmentStringsW(). CORE-14009 CORE-14982
by Hermès Bélusca-Maïto 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cbac3d049c7b3b1e6833… commit 2cbac3d049c7b3b1e6833ab092a8a2cff9a7771f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 8 00:42:02 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 00:50:38 2018 +0200 [SHELL32] Finally fix the icon location path (un)expansion for shell links, and explain why I originally used SHExpandEnvironmentStringsW(). CORE-14009 CORE-14982 --- dll/win32/shell32/CShellLink.cpp | 71 +++++++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 16 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 92f62961cf..fa1adab35f 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -143,6 +143,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/* + * Allows to define whether or not Windows-compatible behaviour + * should be adopted when setting and retrieving icon location paths. + * See CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT iIcon) + * for more details. + */ +#define ICON_LINK_WINDOWS_COMPAT + #define SHLINK_LOCAL 0 #define SHLINK_REMOTE 1 @@ -1715,7 +1723,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIcon uFlags |= GIL_FORSHORTCUT; if (uFlags & GIL_DEFAULTICON) - return E_FAIL; + return S_FALSE; hr = GetIconLocation(pszIconFile, cchMax, piIndex); if (FAILED(hr) || pszIconFile[0] == UNICODE_NULL) @@ -1849,15 +1857,12 @@ BOOL PathFullyUnExpandEnvStringsW( HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT iIcon) { HRESULT hr = E_FAIL; - WCHAR szUnExpIconPath[MAX_PATH]; - BOOL bSuccess; + WCHAR szIconPath[MAX_PATH]; TRACE("(%p)->(path=%s iicon=%u)\n", this, debugstr_w(pszIconPath), iIcon); if (pszIconPath) { - /* Try to fully unexpand the icon path */ - /* * Check whether the user-given file path contains unexpanded * environment variables. If so, create a target environment block. @@ -1868,16 +1873,35 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i * refer to the same place even if the would-be corresponding * environment variable could change). */ - // FIXME: http://stackoverflow.com/questions/2976489/ishelllinkseticonlocation-transl… - // if (PathFullyUnExpandEnvStringsW(pszIconPath, szUnExpIconPath, _countof(szUnExpIconPath))) - bSuccess = PathUnExpandEnvStringsW(pszIconPath, szUnExpIconPath, _countof(szUnExpIconPath)); - if (bSuccess && wcscmp(pszIconPath, szUnExpIconPath) != 0) +#ifdef ICON_LINK_WINDOWS_COMPAT + /* Try to fully unexpand the icon path */ + // if (PathFullyUnExpandEnvStringsW(pszIconPath, szIconPath, _countof(szIconPath))) + BOOL bSuccess = PathUnExpandEnvStringsW(pszIconPath, szIconPath, _countof(szIconPath)); + if (bSuccess && wcscmp(pszIconPath, szIconPath) != 0) +#else + /* + * In some situations, described in http://stackoverflow.com/questions/2976489/ishelllinkseticonlocation-transl… + * the result of PathUnExpandEnvStringsW() could be wrong, and instead + * one would have to store the actual provided icon location path, while + * creating an icon environment block ONLY if that path already contains + * environment variables. This is what the present case is trying to implement. + */ + SHExpandEnvironmentStringsW(pszIconPath, szIconPath, _countof(szIconPath)); + if (wcscmp(pszIconPath, szIconPath) != 0) +#endif { - /* Unexpansion succeeded, so we need an icon environment block */ + /* + * The user-given file path contains unexpanded environment + * variables, so we need an icon environment block. + */ EXP_SZ_LINK buffer; LPEXP_SZ_LINK pInfo; - pszIconPath = szUnExpIconPath; +#ifdef ICON_LINK_WINDOWS_COMPAT + /* Make pszIconPath point to the unexpanded path */ + LPCWSTR pszOrgIconPath = pszIconPath; + pszIconPath = szIconPath; +#endif pInfo = (LPEXP_SZ_LINK)SHFindDataBlock(m_pDBList, EXP_SZ_ICON_SIG); if (pInfo) { @@ -1902,8 +1926,8 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i buffer.dwSignature = EXP_SZ_ICON_SIG; } - lstrcpynW(pInfo->szwTarget, szUnExpIconPath, _countof(pInfo->szwTarget)); - WideCharToMultiByte(CP_ACP, 0, szUnExpIconPath, -1, + lstrcpynW(pInfo->szwTarget, pszIconPath, _countof(pInfo->szwTarget)); + WideCharToMultiByte(CP_ACP, 0, pszIconPath, -1, pInfo->szTarget, _countof(pInfo->szTarget), NULL, NULL); hr = S_OK; @@ -1911,16 +1935,31 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i hr = AddDataBlock(pInfo); if (hr == S_OK) m_Header.dwFlags |= SLDF_HAS_EXP_ICON_SZ; + +#ifdef ICON_LINK_WINDOWS_COMPAT + /* Set pszIconPath back to the original one */ + pszIconPath = pszOrgIconPath; +#else + /* Now, make pszIconPath point to the expanded path */ + pszIconPath = szIconPath; +#endif } else { - /* Unexpansion failed, so we need to remove any icon environment block */ + /* + * The user-given file path does not contain unexpanded environment + * variables, so we need to remove any icon environment block. + */ m_Header.dwFlags &= ~SLDF_HAS_EXP_ICON_SZ; RemoveDataBlock(EXP_SZ_ICON_SIG); + + /* pszIconPath points to the user path */ } } - /* Store the original icon path location (this one may contain unexpanded environment strings) */ +#ifdef ICON_LINK_WINDOWS_COMPAT + /* Store the original icon path location (may contain unexpanded environment strings) */ +#endif if (pszIconPath) { m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION; @@ -2404,7 +2443,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetPath(LPCWSTR pszFile) if (hr == S_OK) m_Header.dwFlags |= SLDF_HAS_EXP_SZ; - /* Now, make pszFile point to the expanded buffer */ + /* Now, make pszFile point to the expanded path */ pszFile = szPath; } else

1 0

02/02: [SHELL32] Fix a potential buffer overrun.
by Eric Kohl 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e20a3e5b58f3f30e31b0… commit 1e20a3e5b58f3f30e31b0360ce318c7b5196e770 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 7 22:53:30 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 7 22:56:16 2018 +0200 [SHELL32] Fix a potential buffer overrun. Patch by Kudratov Olimjon. CORE-8545 --- dll/win32/shell32/CShellLink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index d6d12efe0a..92f62961cf 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -519,7 +519,7 @@ static LPWSTR Stream_LoadPath(LPCSTR p, DWORD maxlen) { UINT len = 0; - while (p[len] && len < maxlen) + while (len < maxlen && p[len]) len++; UINT wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0);

1 0

01/02: [CRT] Fix two obvious typos in _mbbtype().
by Eric Kohl 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb7292b287221f820e77c… commit bb7292b287221f820e77c2434bcc652dbb484ae6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 7 22:44:54 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 7 22:56:14 2018 +0200 [CRT] Fix two obvious typos in _mbbtype(). Patch by Kudratov Olimjon. CORE-8545 --- sdk/lib/crt/mbstring/mbbtype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/crt/mbstring/mbbtype.c b/sdk/lib/crt/mbstring/mbbtype.c index e1a21bd9bc..14775ea8f0 100644 --- a/sdk/lib/crt/mbstring/mbbtype.c +++ b/sdk/lib/crt/mbstring/mbbtype.c @@ -25,7 +25,7 @@ int _mbbtype(unsigned char c , int type) { return _MBC_TRAIL; } - else if (( c >= 0x20 && c >= 0x7E ) || ( c >= 0xA1 && c <= 0xDF ) || + else if (( c >= 0x20 && c <= 0x7E ) || ( c >= 0xA1 && c <= 0xDF ) || ( c >= 0x81 && c <= 0x9F ) || ( c >= 0xE0 && c <= 0xFC ) ) return _MBC_ILLEGAL; else @@ -36,7 +36,7 @@ int _mbbtype(unsigned char c , int type) } else if ( (c >= 0x81 && c <= 0x9F ) || ( c >= 0xE0 && c <= 0xFC) ) return _MBC_LEAD; - else if (( c >= 0x20 && c >= 0x7E ) || ( c >= 0xA1 && c <= 0xDF ) || + else if (( c >= 0x20 && c <= 0x7E ) || ( c >= 0xA1 && c <= 0xDF ) || ( c >= 0x81 && c <= 0x9F ) || ( c >= 0xE0 && c <= 0xFC ) ) return _MBC_ILLEGAL; else

1 0

01/01: [TRANSLATION] Update Simplified Chinese translation. (#912)
by Luo Yufan 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b70ef2ee565bacca08ed8… commit b70ef2ee565bacca08ed8cc4967ec9fa1982bd86 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Mon Oct 8 02:44:00 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 7 20:44:00 2018 +0200 [TRANSLATION] Update Simplified Chinese translation. (#912) --- dll/cpl/openglcfg/lang/zh-CN.rc | 30 ++++++++++++++++++++++++++++++ dll/cpl/openglcfg/openglcfg.rc | 3 +++ dll/shellext/deskmon/lang/zh-CN.rc | 9 +++++---- dll/shellext/zipfldr/lang/zh-CN.rc | 6 +++--- dll/win32/shell32/lang/zh-CN.rc | 10 +++++----- dll/win32/syssetup/lang/zh-CN.rc | 19 +++++++++---------- media/inf/shortcuts.inf | 6 +++--- 7 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dll/cpl/openglcfg/lang/zh-CN.rc b/dll/cpl/openglcfg/lang/zh-CN.rc new file mode 100644 index 0000000000..771406dc05 --- /dev/null +++ b/dll/cpl/openglcfg/lang/zh-CN.rc @@ -0,0 +1,30 @@ +/* Created by Luo Yufan (njlyf2011(a)hotmail.com) 2018-10-06 */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "常规" +FONT 9, "宋体" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "渲染器设置", -1, 5, 25, 230, 90 + LTEXT "渲染器(&R):", -1, 15, 42, 37, 10 + COMBOBOX IDC_RENDERER, 55, 40, 160, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "这将覆盖图形驱动程序的默认设置! 您可以选择""默认""恢复默认设置", -1, 15, 60, 210, 40 + GROUPBOX "调试", -1, 5, 125, 230, 90 + LTEXT "调试频道:", -1, 15, 142, 65, 10 + COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Enables/disables debug output from opengl32.\n\nWARNING: Choosing ""Set"" or ""Clear"" will overwrite the content of the DEBUGCHANNEL environment variable!", -1, 15, 165, 210, 40 +END + +STRINGTABLE +BEGIN + IDS_RENDERER_DEFAULT "系统默认" + IDS_RENDERER_RSWR "ReactOS 软件实现" + IDS_CPLNAME "OpenGL 设置" + IDS_CPLDESCRIPTION "设置 OpenGL 渲染器" + IDS_DEBUG_SET "Set" + IDS_DEBUG_CLEAR "Clear" + IDS_DEBUG_DNM "请勿修改" +END diff --git a/dll/cpl/openglcfg/openglcfg.rc b/dll/cpl/openglcfg/openglcfg.rc index b58173d422..4f1cb75ca3 100644 --- a/dll/cpl/openglcfg/openglcfg.rc +++ b/dll/cpl/openglcfg/openglcfg.rc @@ -39,3 +39,6 @@ IDI_CPLICON ICON "resources/openglcfg.ico" #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif diff --git a/dll/shellext/deskmon/lang/zh-CN.rc b/dll/shellext/deskmon/lang/zh-CN.rc index d75b23773d..00e989fc94 100644 --- a/dll/shellext/deskmon/lang/zh-CN.rc +++ b/dll/shellext/deskmon/lang/zh-CN.rc @@ -1,21 +1,22 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) 2018-10-06 */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_MONITOR DIALOGEX 0, 0, 252, 226 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "萤幕机" +CAPTION "监视器" FONT 9, "宋体", 0, 0, 0x0 BEGIN - GROUPBOX "萤幕机类型", -1, 7, 3, 237, 52 + GROUPBOX "监视器类型", -1, 7, 3, 237, 52 ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "属性(&P)", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED - GROUPBOX "萤幕机设置", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + GROUPBOX "监视器设置", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "屏幕刷新率:(&S)", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "隐藏该萤幕机无法显示的模式(&H)", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "隐藏该显示器无法显示的模式(&H)", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index dc0870577a..1914a37bfe 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "选择目标文件夹" -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +FONT 9, "宋体", 400, 0, 0x0 BEGIN LTEXT "选择目标文件夹",IDC_STATIC,6,12,174,8 EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL @@ -23,7 +23,7 @@ END IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "解压完成" -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +FONT 9, "宋体", 400, 0, 0x0 BEGIN LTEXT "文件已经被解压至下列目录：",IDC_STATIC,6,12,222,18 LTEXT "目标文件夹",IDC_DESTDIR,6,36,222,8 @@ -34,7 +34,7 @@ END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "确认替换文件" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 9, "宋体", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "是(&Y)",IDYES,6,36,62,14 PUSHBUTTON "取消",IDCANCEL,204,36,62,14 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 8b732b6a4d..00c6a6ab9d 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -89,11 +89,11 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE - MENUITEM "&Move here", IDM_MOVEHERE - MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM "复制到此处(&C)", IDM_COPYHERE + MENUITEM "移动到此处(&M)", IDM_MOVEHERE + MENUITEM "在此创建快捷方式(&s)", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "取消", 0 END END @@ -167,7 +167,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "宋体" BEGIN - LTEXT "为你带来 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOS 提供方：", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index b488a33881..48c6e84d5b 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -1,4 +1,4 @@ -/* Improved by Luo Yufan 2017-01-05 (njlyf2011(a)hotmail.com) */ +/* Improved by Luo Yufan 2018-10-06 (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -9,7 +9,7 @@ FONT 9, "宋体" BEGIN LTEXT "欢迎使用 ReactOS 安装程序。", IDC_WELCOMETITLE, 115, 8, 195, 24 LTEXT "安装程序将在您的计算机上安装 ReactOS 操作系统。\n它需要搜集有关您的和计算机的信息，\n以便正确安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 - LTEXT "要继续，请单击“下一步”。.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "若要继续，请单击“下一步”。", IDC_STATIC, 115, 169, 195, 17 END IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 @@ -17,10 +17,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序 " FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "ReactOS 开发者就以下的自由软件项目表示感谢。在构建 ReactOS 时使用了其中的代码 :", IDC_STATIC, 15, 7, 286, 19 + LTEXT "ReactOS 开发者感谢以下自由软件项目。在构建 ReactOS 时使用了其中的代码 :", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS 是基于 GPL 许可证发布的，因此如果您需要二次开发或重新发布 ReactOS (或部分)必须遵循 GPL 许可证。", IDC_STATIC, 15, 110, 227, 19 - PUSHBUTTON "查看 GPL(&V)...", IDC_VIEWGPL, 245, 110, 65, 15 + LTEXT "ReactOS 基于 GPL 许可证发布，因此如果您需要二次开发或重新发布 ReactOS 的部分或全部，必须遵循 GPL 许可。", IDC_STATIC, 15, 110, 227, 19 LTEXT "请单击“下一步”继续安装。", IDC_STATIC, 15, 136, 195, 17 END @@ -106,7 +105,7 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "正在完成 ReactOS 安装 " +CAPTION "正在完成 ReactOS 安装" FONT 9, "宋体" BEGIN LTEXT "正在完成 ReactOS 安装程序", IDC_FINISHTITLE,115, 8, 195, 24 @@ -135,8 +134,8 @@ END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Settings" -FONT 8, "MS Shell Dlg" +CAPTION "高级设置" +FONT 9, "宋体" BEGIN RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 LTEXT "reports per second", -1, 169, 35, 54, 8 @@ -147,7 +146,7 @@ BEGIN LTEXT "packets", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 72, 10 + AUTOCHECKBOX "快速初始化(&F)", IDC_PS2MOUSEFASTINIT, 124, 97, 72, 10 PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END @@ -187,7 +186,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" - IDS_MACHINE_OWNER_NAME "所有者" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 69fd403a29..02fe9ada2f 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1,4 +1,4 @@ -[Version] +[Version] Signature = $Windows NT$ ClassGUID = {00000000-0000-0000-0000-000000000000} @@ -1465,7 +1465,7 @@ ENTERTAINMENT=娱乐 COMMUNICATIONS=通讯 GAMES=游戏 -README_TITLE=请先读我 +README_TITLE=自述文件 README_DESC=ReactOS 自述文件 CMD_TITLE=命令提示符 @@ -1501,7 +1501,7 @@ KBSWITCH_TITLE=键盘布局切换器 KBSWITCH_DESC=启动键盘布局切换器 REGEDIT_TITLE=注册表编辑器 REGEDIT_DESC=启动注册表编辑器 -DXDIAG_TITLE=ReactX 诊断 +DXDIAG_TITLE=ReactX 诊断程序 DXDIAG_DESC=启动 ReactX 诊断程序 MAGNIFY_TITLE=放大镜 MAGNIFY_DESC=放大镜

1 0

03/03: [USER32] Fix the ICO_ExtractIconExW() helper with respect to what is found with the user32_apitest:PrivateExtractIcons test. CORE-15150
by Hermès Bélusca-Maïto 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40737bdddb384bd2842c0… commit 40737bdddb384bd2842c0cc3f6cacf3f4295731f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 7 20:30:00 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 7 20:32:42 2018 +0200 [USER32] Fix the ICO_ExtractIconExW() helper with respect to what is found with the user32_apitest:PrivateExtractIcons test. CORE-15150 --- win32ss/user/user32/misc/exticon.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index 8b65d83430..d3e18b0891 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -24,6 +24,10 @@ #include <user32.h> +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + /* Start of Hack section */ WINE_DEFAULT_DEBUG_CHANNEL(icon); @@ -275,13 +279,24 @@ static UINT ICO_ExtractIconExW( LPBYTE peimage; HANDLE fmapping; DWORD fsizeh,fsizel; +#ifdef __REACTOS__ + WCHAR szExpandedExePath[MAX_PATH]; +#endif WCHAR szExePath[MAX_PATH]; DWORD dwSearchReturn; TRACE("%s, %d, %d %p 0x%08x\n", debugstr_w(lpszExeFileName), nIconIndex, nIcons, pIconId, flags); - dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, sizeof(szExePath) / sizeof(szExePath[0]), szExePath, NULL); - if ((dwSearchReturn == 0) || (dwSearchReturn > sizeof(szExePath) / sizeof(szExePath[0]))) +#ifdef __REACTOS__ + if (RetPtr) + *RetPtr = NULL; + + if (ExpandEnvironmentStringsW(lpszExeFileName, szExpandedExePath, ARRAY_SIZE(szExpandedExePath))) + lpszExeFileName = szExpandedExePath; +#endif + + dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, ARRAY_SIZE(szExePath), szExePath, NULL); + if ((dwSearchReturn == 0) || (dwSearchReturn > ARRAY_SIZE(szExePath))) { WARN("File %s not found or path too long\n", debugstr_w(lpszExeFileName)); return -1;

1 0

02/03: [USER32_APITEST] Add a test for PrivateExtractIcons(A/W) that shows that this API can accept unexpanded file paths. CORE-15150
by Hermès Bélusca-Maïto 07 Oct '18

07 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57a9fca04b2c2f2ec3f45… commit 57a9fca04b2c2f2ec3f45220782110f79bfe26f2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 7 20:27:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 7 20:32:26 2018 +0200 [USER32_APITEST] Add a test for PrivateExtractIcons(A/W) that shows that this API can accept unexpanded file paths. CORE-15150 --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + .../rostests/apitests/user32/PrivateExtractIcons.c | 51 ++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + 3 files changed, 54 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 6b1ad32939..4d901a4c9d 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -22,6 +22,7 @@ list(APPEND SOURCE LoadImage.c LookupIconIdFromDirectoryEx.c NextDlgItem.c + PrivateExtractIcons.c RealGetWindowClass.c RedrawWindow.c RegisterClassEx.c diff --git a/modules/rostests/apitests/user32/PrivateExtractIcons.c b/modules/rostests/apitests/user32/PrivateExtractIcons.c new file mode 100644 index 0000000000..b2b3ef33de --- /dev/null +++ b/modules/rostests/apitests/user32/PrivateExtractIcons.c @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for PrivateExtractIcons + * PROGRAMMER: Hermes Belusca-Maito + */ + +#include "precomp.h" + +static struct +{ + PCWSTR FilePath; + UINT cIcons; // Return value from PrivateExtractIconsW + BOOL bhIconValid; // Whether or not the returned icon handle is not NULL. +} IconTests[] = +{ + /* Executables with icons */ + {L"notepad.exe", 1, TRUE}, + {L"%SystemRoot%\\System32\\cmd.exe", 1, TRUE}, + + /* Executable without icon */ + {L"%SystemRoot%\\System32\\autochk.exe", 0, FALSE}, + + /* Existing file */ + {L"%SystemRoot%\\System32\\shell32.dll", 1, TRUE}, + + /* Non-existing files */ + {L"%SystemRoot%\\non-existent-file.sdf", 0xFFFFFFFF, FALSE}, +}; + +START_TEST(PrivateExtractIcons) +{ + HICON ahIcon; + UINT i, aIconId, cIcons; + + for (i = 0; i < _countof(IconTests); ++i) + { + /* Always test extraction of the FIRST icon (index 0) */ + ahIcon = (HICON)0xdeadbeef; + aIconId = 0xdeadbeef; + cIcons = PrivateExtractIconsW(IconTests[i].FilePath, 0, 16, 16, &ahIcon, &aIconId, 1, 0); + ok(cIcons == IconTests[i].cIcons, "PrivateExtractIconsW(%u): got %u, expected %u\n", i, cIcons, IconTests[i].cIcons); + ok(ahIcon != (HICON)0xdeadbeef, "PrivateExtractIconsW(%u): icon not set\n", i); + ok((IconTests[i].bhIconValid && ahIcon) || (!IconTests[i].bhIconValid && !ahIcon), + "PrivateExtractIconsW(%u): icon expected to be %s, but got 0x%p\n", + i, IconTests[i].bhIconValid ? "valid" : "not valid", ahIcon); + ok(aIconId != 0xdeadbeef, "PrivateExtractIconsW(%u): id not set\n", i); + if (ahIcon && ahIcon != (HICON)0xdeadbeef) + DestroyIcon(ahIcon); + } +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index f5214b8bd2..86a1bdbc84 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -24,6 +24,7 @@ extern void func_InitializeLpkHooks(void); extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); extern void func_NextDlgItem(void); +extern void func_PrivateExtractIcons(void); extern void func_RealGetWindowClass(void); extern void func_RedrawWindow(void); extern void func_RegisterHotKey(void); @@ -65,6 +66,7 @@ const struct test winetest_testlist[] = { "LoadImage", func_LoadImage }, { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx }, { "NextDlgItem", func_NextDlgItem }, + { "PrivateExtractIcons", func_PrivateExtractIcons }, { "RealGetWindowClass", func_RealGetWindowClass }, { "RedrawWindow", func_RedrawWindow }, { "RegisterHotKey", func_RegisterHotKey },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs