Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [RAPPS] Romanian translation update
by Bișoc George 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71899c4290799b1b4a229… commit 71899c4290799b1b4a229ac1fb5227181219863a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jan 3 10:25:25 2018 +0100 [RAPPS] Romanian translation update Quick update covering the latest commit - CORE-13789. --- base/applications/rapps/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index d13d72a2f1..7fa8a95972 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -219,7 +219,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Eșec la scrierea pe disc. Una din cauze poate fi atingerea limitei de capacitate." IDS_SELECT_ALL "Selectează/Deselectează Toate" IDS_INSTALL_SELECTED "Instalează selecționate" - IDS_SELECTEDFORINST "Selected for installation" + IDS_SELECTEDFORINST "Selectate pentru instalare" END STRINGTABLE

1 0

[reactos] 01/02: [RAPPS] Italian translation update
by Bișoc George 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e1f4184fe2cc92440541… commit 7e1f4184fe2cc92440541e65eeef35756a7eceec Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jan 3 10:23:51 2018 +0100 [RAPPS] Italian translation update Quick-update covering the latest commit - CORE-13789. --- base/applications/rapps/lang/it-IT.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 9c7008dade..739f9312cc 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -210,7 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito." IDS_SELECT_ALL "Seleziona/Deseleziona Tutte" IDS_INSTALL_SELECTED "Installa le selezionate" - IDS_SELECTEDFORINST "Selected for installation" + IDS_SELECTEDFORINST "Selezionate per l'installazione" END STRINGTABLE

1 0

[reactos] 01/01: [RAPPS] update translation de-DE.rc for CORE-13789
by Joachim Henze 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1522d1cf67c283b4df6ca… commit 1522d1cf67c283b4df6ca94c1468851e507fa543 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 3 09:48:31 2018 +0100 [RAPPS] update translation de-DE.rc for CORE-13789 --- base/applications/rapps/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 4182c8c1a4..dc99a4584d 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -210,7 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Schreibfehler. Prüfen Sie die Kapazität des Datenträgers!" IDS_SELECT_ALL "Alle/Keine" IDS_INSTALL_SELECTED "Ausgewählte Installieren" - IDS_SELECTEDFORINST "Selected for installation" + IDS_SELECTEDFORINST "Zur Installation ausgewählt" END STRINGTABLE

1 0

[reactos] 01/01: [RAPPS] Make selection global
by Alexander Shaposhnikov 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58f8fa9ec89c9f7ae2ffd… commit 58f8fa9ec89c9f7ae2ffde7870d17fd4313ab21d Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Tue Jan 2 22:45:59 2018 +0200 [RAPPS] Make selection global - Added a 'Selected for installation' category that shows what was selected. Selection is now kept between categories. - New string is added to resources. ru-RU.rc and uk-UA.rc strings are translated. CORE-13789 --- base/applications/rapps/available.cpp | 42 ++++++++++++++++++----------- base/applications/rapps/gui.cpp | 40 ++++++++++++++++++++++++--- base/applications/rapps/include/available.h | 2 ++ base/applications/rapps/include/defines.h | 3 ++- base/applications/rapps/include/resource.h | 2 ++ base/applications/rapps/lang/bg-BG.rc | 1 + base/applications/rapps/lang/cs-CZ.rc | 1 + base/applications/rapps/lang/de-DE.rc | 1 + base/applications/rapps/lang/en-US.rc | 1 + base/applications/rapps/lang/es-ES.rc | 1 + base/applications/rapps/lang/fr-FR.rc | 1 + base/applications/rapps/lang/he-IL.rc | 1 + base/applications/rapps/lang/it-IT.rc | 1 + base/applications/rapps/lang/ja-JP.rc | 1 + base/applications/rapps/lang/no-NO.rc | 1 + base/applications/rapps/lang/pl-PL.rc | 1 + base/applications/rapps/lang/pt-BR.rc | 1 + base/applications/rapps/lang/ro-RO.rc | 1 + base/applications/rapps/lang/ru-RU.rc | 1 + base/applications/rapps/lang/sk-SK.rc | 1 + base/applications/rapps/lang/sq-AL.rc | 1 + base/applications/rapps/lang/sv-SE.rc | 1 + base/applications/rapps/lang/tr-TR.rc | 1 + base/applications/rapps/lang/uk-UA.rc | 1 + base/applications/rapps/lang/zh-CN.rc | 1 + base/applications/rapps/lang/zh-TW.rc | 1 + base/applications/rapps/rapps.rc | 1 + 27 files changed, 92 insertions(+), 19 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index b396e1dbb7..19101cef14 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -19,12 +19,9 @@ // CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) - : m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) + : m_IsSelected(FALSE), m_LicenseType(LICENSE_NONE), m_sFileName(sFileNameParam), + m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) { - m_LicenseType = LICENSE_NONE; - - m_sFileName = sFileNameParam; - RetrieveGeneralInfo(); } @@ -355,17 +352,15 @@ BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc) m_InfoList.AddTail(Info); skip_if_cached: - if (Info->m_Category == FALSE) - continue; - - if (EnumType != Info->m_Category && EnumType != ENUM_ALL_AVAILABLE) - continue; - - Info->RefreshAppInfo(); - - if (lpEnumProc) - lpEnumProc(Info, m_Strings.szAppsPath.GetString()); + if (EnumType == Info->m_Category + || EnumType == ENUM_ALL_AVAILABLE + || (EnumType == ENUM_CAT_SELECTED && Info->m_IsSelected)) + { + Info->RefreshAppInfo(); + if (lpEnumProc) + lpEnumProc(Info, m_Strings.szAppsPath.GetString()); + } } while (FindNextFileW(hFind, &FindFileData) != 0); FindClose(hFind); @@ -407,6 +402,23 @@ ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindInfoList(const return result; } +ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::GetSelected() const +{ + ATL::CSimpleArray<CAvailableApplicationInfo> result; + POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); + CAvailableApplicationInfo* Info; + + while (CurrentListPosition != NULL) + { + Info = m_InfoList.GetNext(CurrentListPosition); + if (Info->m_IsSelected) + { + result.Add(*Info); + } + } + return result; +} + const ATL::CStringW& CAvailableApps::GetFolderPath() const { return m_Strings.szPath; diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 62d1a1961b..4118acbca5 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -542,6 +542,30 @@ public: if (bHasCheckboxes) { SetItemState(item, INDEXTOSTATEIMAGEMASK((fCheck) ? 2 : 1), LVIS_STATEIMAGEMASK); + SetSelected(item, fCheck); + } + } + + VOID SetSelected(INT item, BOOL value) + { + if (item < 0) + { + for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL)) + { + CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i); + if (pAppInfo) + { + pAppInfo->m_IsSelected = value; + } + } + } + else + { + CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(item); + if (pAppInfo) + { + pAppInfo->m_IsSelected = value; + } } } @@ -735,6 +759,8 @@ private: AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); + AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST); + hRootItemAvailable = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); AddCategory(hRootItemAvailable, IDS_CAT_AUDIO, IDI_CAT_AUDIO); AddCategory(hRootItemAvailable, IDS_CAT_VIDEO, IDI_CAT_VIDEO); @@ -1081,6 +1107,10 @@ private: case IDS_CAT_VIDEO: UpdateApplicationsList(ENUM_CAT_VIDEO); break; + + case IDS_SELECTEDFORINST: + UpdateApplicationsList(ENUM_CAT_SELECTED); + break; } } @@ -1153,7 +1183,7 @@ private: /* Check if the item is checked */ if ((pnic->uNewState & LVIS_STATEIMAGEMASK) && !bUpdating) { - BOOL checked = ListView_GetCheckState(pnic->hdr.hwndFrom, pnic->iItem); + BOOL checked = m_ListView->GetCheckState(pnic->iItem); /* FIXME: HAX! - preventing decremention below zero as a safeguard for ReactOS In ReactOS this action is triggered whenever user changes *selection*, but should be only when *checkbox* state toggled @@ -1165,6 +1195,10 @@ private: : ((nSelectedApps > 0) ? -1 : 0); + + /* Update item's selection status */ + m_ListView->SetSelected(pnic->iItem, checked); + UpdateStatusBarText(); } } @@ -1399,7 +1433,7 @@ private: { if (nSelectedApps > 0) { - CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems()); + CDownloadManager::DownloadListOfApplications(m_AvailableApps.GetSelected()); UpdateApplicationsList(-1); } else if (CDownloadManager::DownloadApplication(m_ListView->GetSelectedData())) @@ -1541,6 +1575,7 @@ private: ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->m_szVersion.GetString())); ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->m_szDesc.GetString())); + ListView_SetCheckState(hListView, Index, Info->m_IsSelected); return TRUE; } @@ -1565,7 +1600,6 @@ private: bUpdating = TRUE; m_ListView->SetRedraw(FALSE); - nSelectedApps = 0; if (EnumType < 0) { EnumType = SelectedEnumType; diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 1e9a1df63b..adf4c73aec 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -25,6 +25,7 @@ inline BOOL IsLicenseType(INT x) struct CAvailableApplicationInfo { INT m_Category; + BOOL m_IsSelected; LicenseType m_LicenseType; ATL::CStringW m_szName; ATL::CStringW m_szRegName; @@ -106,6 +107,7 @@ public: CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const; ATL::CSimpleArray<CAvailableApplicationInfo> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; + ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const; const ATL::CStringW& GetFolderPath() const; const ATL::CStringW& GetAppPath() const; diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index 7934e96b23..159bcdc504 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -50,13 +50,14 @@ enum AppsCategories ENUM_CAT_DRIVERS, ENUM_CAT_LIBS, ENUM_CAT_OTHER, + ENUM_CAT_SELECTED, ENUM_ALL_INSTALLED, ENUM_INSTALLED_APPLICATIONS = 31, ENUM_UPDATES = 32, ENUM_INSTALLED_MIN = ENUM_ALL_INSTALLED, ENUM_INSTALLED_MAX = ENUM_UPDATES, ENUM_AVAILABLE_MIN = ENUM_ALL_AVAILABLE, - ENUM_AVAILABLE_MAX = ENUM_CAT_OTHER, + ENUM_AVAILABLE_MAX = ENUM_CAT_SELECTED, }; inline BOOL IsAvailableEnum(INT x) diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 9dd6764a47..b035f02807 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -13,6 +13,7 @@ #define IDI_CATEGORY 19 #define IDI_UPDATE_DB 20 #define IDI_CHECK_ALL 21 +#define IDI_SELECTEDFORINST 22 /* Icons for categories */ #define IDI_CAT_AUDIO 50 @@ -108,6 +109,7 @@ #define IDS_SELECT_ALL 126 #define IDS_INSTALL_SELECTED 127 #define IDS_UNABLE_TO_INSTALL 128 +#define IDS_SELECTEDFORINST 129 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 4b5fe9acf8..b9fb94f09f 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -214,6 +214,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 2ac4d2e26a..52ad40bdd2 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -215,6 +215,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index d86a0513e2..4182c8c1a4 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Schreibfehler. Prüfen Sie die Kapazität des Datenträgers!" IDS_SELECT_ALL "Alle/Keine" IDS_INSTALL_SELECTED "Ausgewählte Installieren" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 048344532d..82a6aa0937 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 1467f24cef..97bf043e33 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -213,6 +213,7 @@ BEGIN IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index c438ecc0e4..59b9291ce1 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Impossible d'écrire sur le disque. Votre disque pourrait être plein." IDS_SELECT_ALL "Sélectionner/Désélectionner tout" IDS_INSTALL_SELECTED "Installer les sélectionnés" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 9df4d56199..b1498345c9 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 0af2db3da7..9c7008dade 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito." IDS_SELECT_ALL "Seleziona/Deseleziona Tutte" IDS_INSTALL_SELECTED "Installa le selezionate" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 53bf912e22..7b5df0b7c8 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index aea5c416cb..aa7bbb1bb8 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -209,6 +209,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 5f3214d998..9dc447ce66 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -218,6 +218,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Nie można zapisać na dysku. Dysk może być pełny." IDS_SELECT_ALL "Zaznacz/Odznacz Wszystko" IDS_INSTALL_SELECTED "Instaluj Zaznaczone" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 8f1fe5015e..47e495d390 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index b3886d5f4a..d13d72a2f1 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -219,6 +219,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Eșec la scrierea pe disc. Una din cauze poate fi atingerea limitei de capacitate." IDS_SELECT_ALL "Selectează/Deselectează Toate" IDS_INSTALL_SELECTED "Instalează selecționate" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 97c6a328e6..5f0788c9b6 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -210,6 +210,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Не удалось записать данные на диск. Возможно, недостаточно свободного места на диске." IDS_SELECT_ALL "Выбрать все" IDS_INSTALL_SELECTED "Установить выбранное" + IDS_SELECTEDFORINST "Выбрано для установки" END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index c65e4b6ec8..fa324aaf4a 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -215,6 +215,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 9d9f72c6a0..1656ce58e5 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -214,6 +214,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 223e54c099..4bfaa9a23c 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -217,6 +217,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 34f0c693e5..c3a49db6c3 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Diske yazılamıyor. Disk dolu olabilir." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 4b6325da8f..97aa1a6f27 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -218,6 +218,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Записк на диск неможливий. Можливо, на диску недостатньо містця." IDS_SELECT_ALL "Вибрати все" IDS_INSTALL_SELECTED "Встановити обране" + IDS_SELECTEDFORINST "Обрані для встановлення" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index a482d8ecb4..2ab1e036dd 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "无法写入磁盘。磁盘可能已满。" IDS_SELECT_ALL "全选/全反选" IDS_INSTALL_SELECTED "安装已选中的" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 236eee3b90..2636d7e4a1 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -212,6 +212,7 @@ BEGIN IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." IDS_SELECT_ALL "Select/Deselect All" IDS_INSTALL_SELECTED "Install Selected" + IDS_SELECTEDFORINST "Selected for installation" END STRINGTABLE diff --git a/base/applications/rapps/rapps.rc b/base/applications/rapps/rapps.rc index d200e179be..4d4c796c2e 100644 --- a/base/applications/rapps/rapps.rc +++ b/base/applications/rapps/rapps.rc @@ -40,6 +40,7 @@ IDI_CAT_OTHER ICON "res/cats/other.ico" IDI_CAT_SCIENCE ICON "res/cats/science.ico" IDI_CAT_TOOLS ICON "res/cats/tools.ico" IDI_CAT_VIDEO ICON "res/cats/video.ico" +IDI_SELECTEDFORINST ICON "res/select.ico" /* Accelerators -- key bindings */ HOTKEYS ACCELERATORS

1 0

[reactos] 01/01: [DISKPART] Don't crash on input if user provided no command
by Pierre Schweitzer 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06abd3b48018981a069b1… commit 06abd3b48018981a069b1263f8a716fe16379197 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Jan 3 08:47:36 2018 +0100 [DISKPART] Don't crash on input if user provided no command CORE-14018 --- base/system/diskpart/interpreter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 4e22a6d646..59f75570ab 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -69,6 +69,10 @@ InterpretCmd(int argc, LPWSTR *argv) { PCOMMAND cmdptr; + /* If no args provided */ + if (argc < 1) + return TRUE; + /* First, determine if the user wants to exit or to use a comment */ if(wcsicmp(argv[0], L"exit") == 0)

1 0

[reactos] 02/02: [NTOS:INBV] Simplify a little bit the BootLogoFadeIn() function
by Hermes Belusca-Maito 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2be558e61b899a98d475… commit b2be558e61b899a98d47589cf7b9c80c8a33f694 Author: Hermes Belusca-Maito <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 27 17:14:02 2017 +0100 [NTOS:INBV] Simplify a little bit the BootLogoFadeIn() function - Use KeDelayExecutionThread() instead of KeStallExecutionProcessor(). - Fix magic values and add comments. - Fix structure name. --- ntoskrnl/inbv/inbv.c | 115 +++++++++++++++++++++++---------------- ntoskrnl/include/internal/inbv.h | 2 +- 2 files changed, 69 insertions(+), 48 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 40e015771c..cb6af3e4bf 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -48,9 +48,25 @@ static PUCHAR ResourceList[1 + IDB_MAX_RESOURCE]; // First entry == NULL, follow * Change this to modify progress bar behaviour */ #define ROT_BAR_DEFAULT_MODE RB_PROGRESS_BAR + +/* + * Values for PltRotBarStatus: + * - PltRotBarStatus == 1, do palette fading-in (done elsewhere in ReactOS); + * - PltRotBarStatus == 2, do rotation bar animation; + * - PltRotBarStatus == 3, stop the animation thread. + * - Any other value is ignored and the animation thread continues to run. + */ +typedef enum _ROT_BAR_STATUS +{ + RBS_FADEIN = 1, + RBS_ANIMATE, + RBS_STOP_ANIMATE, + RBS_STATUS_MAX +} ROT_BAR_STATUS; + static BOOLEAN RotBarThreadActive = FALSE; -static ROT_BAR_TYPE RotBarSelection; -static ULONG PltRotBarStatus; +static ROT_BAR_TYPE RotBarSelection = RB_UNSPECIFIED; +static ROT_BAR_STATUS PltRotBarStatus = 0; static UCHAR RotBarBuffer[24 * 9]; static UCHAR RotLineBuffer[640 * 6]; #endif @@ -109,7 +125,7 @@ typedef struct tagRGBQUAD static RGBQUAD MainPalette[16]; #define PALETTE_FADE_STEPS 15 -#define PALETTE_FADE_TIME 20 * 1000 /* 20ms */ +#define PALETTE_FADE_TIME (20 * 1000) /* 20 ms */ /** From bootvid/precomp.h **/ // @@ -143,52 +159,50 @@ BootLogoFadeIn(VOID) UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(MainPalette)]; PBITMAPINFOHEADER PaletteBitmap = (PBITMAPINFOHEADER)PaletteBitmapBuffer; LPRGBQUAD Palette = (LPRGBQUAD)(PaletteBitmapBuffer + sizeof(BITMAPINFOHEADER)); - ULONG Iteration, Index, ClrUsed; - /* Check if we're installed and we own it */ - if (InbvBootDriverInstalled && - (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) - { - /* Acquire the lock */ - InbvAcquireLock(); + LARGE_INTEGER Delay; + Delay.QuadPart = - (PALETTE_FADE_TIME * 10); - /* - * Build a bitmap containing the fade in palette. The palette entries - * are then processed in a loop and set using VidBitBlt function. - */ - ClrUsed = RTL_NUMBER_OF(MainPalette); - RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); - PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); - PaletteBitmap->biBitCount = 4; - PaletteBitmap->biClrUsed = ClrUsed; + /* Check if we are installed and we own the display */ + if (!InbvBootDriverInstalled || + (InbvDisplayState != INBV_DISPLAY_STATE_OWNED)) + { + return; + } - /* - * Main animation loop. - */ - for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) + /* + * Build a bitmap containing the fade-in palette. The palette entries + * are then processed in a loop and set using VidBitBlt function. + */ + ClrUsed = RTL_NUMBER_OF(MainPalette); + RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); + PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); + PaletteBitmap->biBitCount = 4; + PaletteBitmap->biClrUsed = ClrUsed; + + /* + * Main animation loop. + */ + for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) + { + for (Index = 0; Index < ClrUsed; Index++) { - for (Index = 0; Index < ClrUsed; Index++) - { - Palette[Index].rgbRed = (UCHAR) - (MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); - Palette[Index].rgbGreen = (UCHAR) - (MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); - Palette[Index].rgbBlue = (UCHAR) - (MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); - } - - VidBitBlt(PaletteBitmapBuffer, 0, 0); - - /* Wait for a bit */ - KeStallExecutionProcessor(PALETTE_FADE_TIME); + Palette[Index].rgbRed = (UCHAR) + (MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbGreen = (UCHAR) + (MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); + Palette[Index].rgbBlue = (UCHAR) + (MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); } - /* Release the lock */ + /* Do the animation */ + InbvAcquireLock(); + VidBitBlt(PaletteBitmapBuffer, 0, 0); InbvReleaseLock(); /* Wait for a bit */ - KeStallExecutionProcessor(PALETTE_FADE_TIME); + KeDelayExecutionThread(KernelMode, FALSE, &Delay); } } @@ -799,9 +813,9 @@ InbvRotationThread( InbvAcquireLock(); /* Unknown unexpected command */ - ASSERT(PltRotBarStatus <= 3); + ASSERT(PltRotBarStatus < RBS_STATUS_MAX); - if (PltRotBarStatus == 3) + if (PltRotBarStatus == RBS_STOP_ANIMATE) { /* Stop the thread */ InbvReleaseLock(); @@ -866,7 +880,8 @@ NTAPI INIT_FUNCTION InbvRotBarInit(VOID) { - PltRotBarStatus = 1; + PltRotBarStatus = RBS_FADEIN; + /* Perform other initialization if needed */ } #endif @@ -890,10 +905,10 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif #ifdef INBV_ROTBAR_IMPLEMENTED - /* Check if the system thread has already been created */ + /* Check if the animation thread has already been created */ if (RotBarThreadActive) { - /* Reset the progress bar */ + /* Yes, just reset the progress bar but keep the thread alive */ InbvAcquireLock(); RotBarSelection = RB_UNSPECIFIED; InbvReleaseLock(); @@ -994,7 +1009,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) /* * Save the main image palette and replace it with black palette, - * so that we can do fade in effect later. + * so that we can do fade-in effect later. */ BitmapInfoHeader = (PBITMAPINFOHEADER)Screen; Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); @@ -1045,6 +1060,11 @@ DisplayBootBitmap(IN BOOLEAN TextMode) InbvBufferToScreenBlt(Buffer, 0, 0, 22, 9, 24); } + /* + * Add a rotating bottom horizontal bar when using a progress bar, + * to show that ReactOS can be still alive when the bar does not + * appear to progress. + */ if (TempRotBarSelection == RB_PROGRESS_BAR) { LineBmp = InbvGetResourceAddress(IDB_ROTATING_LINE); @@ -1078,6 +1098,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) NULL); if (NT_SUCCESS(Status)) { + /* The thread has started, close the handle as we don't need it */ RotBarThreadActive = TRUE; ObCloseHandle(ThreadHandle, KernelMode); } @@ -1089,7 +1110,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) } #ifdef INBV_ROTBAR_IMPLEMENTED - /* Do we have a system thread? */ + /* Do we have the animation thread? */ if (RotBarThreadActive) { /* We do, initialize the progress bar */ @@ -1148,7 +1169,7 @@ FinalizeBootLogo(VOID) /* Reset progress bar and lock */ #ifdef INBV_ROTBAR_IMPLEMENTED - PltRotBarStatus = 3; + PltRotBarStatus = RBS_STOP_ANIMATE; RotBarThreadActive = FALSE; #endif InbvReleaseLock(); diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 9293828646..92de2cc83b 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -1,6 +1,6 @@ #pragma once -typedef struct _InbvProgressState +typedef struct _INBV_PROGRESS_STATE { ULONG Floor; ULONG Ceiling;

1 0

[reactos] 01/02: [NTOS:INBV] Implement rotation bar for boot screen
by Stanislav Motylkov 03 Jan '18

03 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd71fb5ec868c03b08adc… commit dd71fb5ec868c03b08adc52cbfbe3c0cd2e57e86 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Dec 14 15:49:15 2017 +0300 [NTOS:INBV] Implement rotation bar for boot screen CORE-10327 #resolve --- ntoskrnl/ex/init.c | 2 +- ntoskrnl/inbv/inbv.c | 182 +++++++++++++++++++++++++++++++++++++-- ntoskrnl/inbv/logo/line.bmp | Bin 0 -> 2038 bytes ntoskrnl/include/internal/inbv.h | 9 +- ntoskrnl/include/resource.h | 3 + ntoskrnl/ntoskrnl.rc | 1 + 6 files changed, 187 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 71f27efe60..e4ffdd63bd 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1382,7 +1382,7 @@ Phase1InitializationDiscard(IN PVOID Context) /* Setup the boot driver */ InbvEnableBootDriver(!NoGuiBoot); - InbvDriverInitialize(LoaderBlock, 18); + InbvDriverInitialize(LoaderBlock, IDB_MAX_RESOURCE); /* Check if GUI boot is enabled */ if (!NoGuiBoot) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 698e8bf380..40e015771c 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -27,7 +27,7 @@ /* * Enable this define when Inbv will support rotating progress bar. */ -// #define INBV_ROTBAR_IMPLEMENTED +#define INBV_ROTBAR_IMPLEMENTED static KSPIN_LOCK BootDriverLock; static KIRQL InbvOldIrql; @@ -41,12 +41,18 @@ static INBV_PROGRESS_STATE InbvProgressState; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters = NULL; static ULONG ResourceCount = 0; -static PUCHAR ResourceList[1 + IDB_CLUSTER_SERVER]; // First entry == NULL, followed by 'ResourceCount' entries. +static PUCHAR ResourceList[1 + IDB_MAX_RESOURCE]; // First entry == NULL, followed by 'ResourceCount' entries. #ifdef INBV_ROTBAR_IMPLEMENTED +/* + * Change this to modify progress bar behaviour + */ +#define ROT_BAR_DEFAULT_MODE RB_PROGRESS_BAR static BOOLEAN RotBarThreadActive = FALSE; static ROT_BAR_TYPE RotBarSelection; static ULONG PltRotBarStatus; +static UCHAR RotBarBuffer[24 * 9]; +static UCHAR RotLineBuffer[640 * 6]; #endif @@ -762,6 +768,108 @@ NtDisplayString(IN PUNICODE_STRING DisplayString) return STATUS_SUCCESS; } +#ifdef INBV_ROTBAR_IMPLEMENTED +static +VOID +NTAPI +InbvRotationThread( + _In_ PVOID Context) +{ + ULONG X, Y, Index, Total; + LARGE_INTEGER Delay = {{0}}; + + InbvAcquireLock(); + if (RotBarSelection == RB_SQUARE_CELLS) + { + Index = 0; + } + else + { + Index = 32; + } + X = ProgressBarLeft + 2; + Y = ProgressBarTop + 2; + InbvReleaseLock(); + + while (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) + { + /* Wait for a bit */ + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + + InbvAcquireLock(); + + /* Unknown unexpected command */ + ASSERT(PltRotBarStatus <= 3); + + if (PltRotBarStatus == 3) + { + /* Stop the thread */ + InbvReleaseLock(); + break; + } + + if (RotBarSelection == RB_SQUARE_CELLS) + { + Delay.QuadPart = -800000; // 80 ms + Total = 18; + Index %= Total; + + if (Index >= 3) + { + /* Fill previous bar position */ + VidSolidColorFill(X + ((Index - 3) * 8), Y, (X + ((Index - 3) * 8)) + 8 - 1, Y + 9 - 1, 0); + } + if (Index < Total - 1) + { + /* Draw the progress bar bit */ + if (Index < 2) + { + /* Appearing from the left */ + VidBufferToScreenBlt(RotBarBuffer + 8 * (2 - Index) / 2, X, Y, 22 - 8 * (2 - Index), 9, 24); + } + else if (Index >= Total - 3) + { + /* Hiding to the right */ + VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22 - 8 * (4 - (Total - Index)), 9, 24); + } + else + { + VidBufferToScreenBlt(RotBarBuffer, X + ((Index - 2) * 8), Y, 22, 9, 24); + } + } + Index++; + } + else if (RotBarSelection == RB_PROGRESS_BAR) + { + Delay.QuadPart = -600000; // 60 ms + Total = 640; + Index %= Total; + + /* Right part */ + VidBufferToScreenBlt(RotLineBuffer, Index, 474, 640 - Index, 6, 640); + if (Index > 0) + { + /* Left part */ + VidBufferToScreenBlt(RotLineBuffer + (640 - Index) / 2, 0, 474, Index - 2, 6, 640); + } + Index += 32; + } + + InbvReleaseLock(); + } + + PsTerminateSystemThread(STATUS_SUCCESS); +} + +VOID +NTAPI +INIT_FUNCTION +InbvRotBarInit(VOID) +{ + PltRotBarStatus = 1; +} +#endif + VOID NTAPI INIT_FUNCTION @@ -770,13 +878,15 @@ DisplayBootBitmap(IN BOOLEAN TextMode) PVOID Header = NULL, Footer = NULL, Screen = NULL; #ifdef INBV_ROTBAR_IMPLEMENTED - PVOID Bar = NULL; + UCHAR Buffer[24 * 9]; + PVOID Bar = NULL, LineBmp = NULL; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; + NTSTATUS Status; + HANDLE ThreadHandle = NULL; #endif #ifdef REACTOS_SKUS PVOID Text = NULL; - UCHAR Buffer[64]; #endif #ifdef INBV_ROTBAR_IMPLEMENTED @@ -871,6 +981,9 @@ DisplayBootBitmap(IN BOOLEAN TextMode) Bar = InbvGetResourceAddress(IDB_BAR_SERVER); #endif } +#else + /* Use default status bar */ + Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); #endif /* Make sure we have a logo */ @@ -893,7 +1006,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #ifdef INBV_ROTBAR_IMPLEMENTED /* Choose progress bar */ - TempRotBarSelection = RB_SQUARE_CELLS; + TempRotBarSelection = ROT_BAR_DEFAULT_MODE; #endif /* Set progress bar coordinates and display it */ @@ -920,13 +1033,57 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif #ifdef INBV_ROTBAR_IMPLEMENTED - /* Draw the progress bar bit */ - if (Bar) InbvBitBlt(Bar, 0, 0); + if (Bar) + { + /* Save previous screen pixels to buffer */ + InbvScreenToBufferBlt(Buffer, 0, 0, 22, 9, 24); + /* Draw the progress bar bit */ + InbvBitBlt(Bar, 0, 0); + /* Store it in global buffer */ + InbvScreenToBufferBlt(RotBarBuffer, 0, 0, 22, 9, 24); + /* Restore screen pixels */ + InbvBufferToScreenBlt(Buffer, 0, 0, 22, 9, 24); + } + + if (TempRotBarSelection == RB_PROGRESS_BAR) + { + LineBmp = InbvGetResourceAddress(IDB_ROTATING_LINE); + if (LineBmp) + { + /* Draw the line and store it in global buffer */ + InbvBitBlt(LineBmp, 0, 474); + InbvScreenToBufferBlt(RotLineBuffer, 0, 474, 640, 6, 640); + } + } + else + { + /* Hide the simple progress bar if not used */ + ShowProgressBar = FALSE; + } #endif /* Display the boot logo and fade it in */ BootLogoFadeIn(); +#ifdef INBV_ROTBAR_IMPLEMENTED + if (!RotBarThreadActive && TempRotBarSelection != RB_UNSPECIFIED) + { + /* Start the animation thread */ + Status = PsCreateSystemThread(&ThreadHandle, + 0, + NULL, + NULL, + NULL, + InbvRotationThread, + NULL); + if (NT_SUCCESS(Status)) + { + RotBarThreadActive = TRUE; + ObCloseHandle(ThreadHandle, KernelMode); + } + } +#endif + /* Set filter which will draw text display if needed */ InbvInstallDisplayStringFilter(DisplayFilter); } @@ -938,8 +1095,16 @@ DisplayBootBitmap(IN BOOLEAN TextMode) /* We do, initialize the progress bar */ InbvAcquireLock(); RotBarSelection = TempRotBarSelection; - // InbvRotBarInit(); + InbvRotBarInit(); InbvReleaseLock(); + + // FIXME: This was added to allow animation start before the processor hangs + if (TempRotBarSelection != RB_UNSPECIFIED) + { + LARGE_INTEGER Delay; + Delay.QuadPart = -3000000; // 300 ms + KeDelayExecutionThread(KernelMode, FALSE, &Delay); + } } #endif } @@ -984,6 +1149,7 @@ FinalizeBootLogo(VOID) /* Reset progress bar and lock */ #ifdef INBV_ROTBAR_IMPLEMENTED PltRotBarStatus = 3; + RotBarThreadActive = FALSE; #endif InbvReleaseLock(); } diff --git a/ntoskrnl/inbv/logo/line.bmp b/ntoskrnl/inbv/logo/line.bmp new file mode 100644 index 0000000000..d080cad7bb Binary files /dev/null and b/ntoskrnl/inbv/logo/line.bmp differ diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 84d44ba03a..9293828646 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -17,7 +17,8 @@ typedef struct _BT_PROGRESS_INDICATOR typedef enum _ROT_BAR_TYPE { RB_UNSPECIFIED, - RB_SQUARE_CELLS + RB_SQUARE_CELLS, + RB_PROGRESS_BAR } ROT_BAR_TYPE; VOID @@ -26,6 +27,12 @@ InbvUpdateProgressBar( IN ULONG Progress ); +VOID +NTAPI +InbvRotBarInit( + VOID +); + BOOLEAN NTAPI InbvDriverInitialize( diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index d58d7913f9..2f7c22b1cc 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -10,6 +10,7 @@ #define IDB_BAR_SERVER 4 #define IDB_BAR_WKSTA 8 #define IDB_BAR_HOME 9 +#define IDB_ROTATING_LINE 19 #define IDB_PROF_TEXT 10 #define IDB_HOME_TEXT 11 @@ -21,3 +22,5 @@ #define IDB_SERVER_FOOTER 15 #define IDB_STORAGE_SERVER 16 #define IDB_CLUSTER_SERVER 17 + +#define IDB_MAX_RESOURCE IDB_ROTATING_LINE diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index 93595d0a42..dbe2caccc0 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -39,3 +39,4 @@ IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" +IDB_ROTATING_LINE BITMAP "inbv/logo/line.bmp"

1 0

[reactos] 01/01: [REACTOS] Italian translation update. #255
by Bișoc George 02 Jan '18

02 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e2d8956a4189dd7d130d… commit 4e2d8956a4189dd7d130dfbeb74f8e03248b1af8 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Jan 2 18:41:50 2018 +0100 [REACTOS] Italian translation update. #255 --- base/setup/reactos/lang/it-IT.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/setup/reactos/lang/it-IT.rc b/base/setup/reactos/lang/it-IT.rc index 3575ef94d9..41b0e68f6b 100644 --- a/base/setup/reactos/lang/it-IT.rc +++ b/base/setup/reactos/lang/it-IT.rc @@ -16,9 +16,9 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "Installa ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + LTEXT "Installa una nuova coppia di ReactOS. Questo opzione non mantiene i tuoi file, le impostazioni e i programmi. E' possibile fare degli cambiamenti sul disco e partizioni.", IDC_INSTALLTEXT, 18, 18, 269, 25 AUTORADIOBUTTON "Aggiorna o ripara una installazione precedente di ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Aggiorna o ripara una coppia già installata di ReactOS. Questo opzione mantiene i tuoi file, le impostazioni e i programmi. Questo opzione è disponibile solo se ReactOS è già installato su questo computer.", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 7, 128, 297, 8 END @@ -125,13 +125,13 @@ BEGIN IDS_SUMMARYSUBTITLE "Lista delle proprietà della installazione da controllare prima che siano eseguite sul dispositivo di installazione" IDS_ABORTSETUP "ReactOS non è installato completamente sul computer. Se interropete l'installazione ora sarà necessario eseguire l'installazione di nuovo. Volete procedere?" IDS_ABORTSETUP2 "Volete interrompere l'installazione?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Impossibile trovare 'txtsetup.sif'\nL'installazione non può continuare." IDS_CAPTION "Installazione di ReactOS" END STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_TYPE "Type" + IDS_PARTITION_NAME "Nome" + IDS_PARTITION_SIZE "Dimensione" + IDS_PARTITION_TYPE "Tipo" END

1 0

[reactos] 01/01: [TRANSLATIONS] Simplified Chinese translation update. #251
by Luo Yufan 02 Jan '18

02 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2524a0b63604498a0acc3… commit 2524a0b63604498a0acc303ef539f758e0f6ae72 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Jan 3 01:39:24 2018 +0800 [TRANSLATIONS] Simplified Chinese translation update. #251 --- dll/cpl/desk/lang/zh-CN.rc | 16 ++++++++-------- dll/cpl/inetcpl/lang/zh-CN.rc | 20 ++++++++++---------- dll/cpl/main/lang/zh-CN.rc | 16 ++++++++-------- dll/cpl/powercfg/lang/zh-CN.rc | 8 ++++---- dll/shellext/acppage/lang/zh-CN.rc | 12 ++++++------ dll/win32/shell32/lang/zh-CN.rc | 22 +++++++++++----------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 380251a4f2..e01fa875bb 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_BACKGROUND DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | @@ -25,7 +25,7 @@ END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "屏幕保护程序" -FONT 9, "新細明體", 0, 0 +FONT 9, "宋体", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE GROUPBOX "屏幕保护程序(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 @@ -47,7 +47,7 @@ END IDD_APPEARANCE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "外观" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "视觉样式", IDC_STATIC, 7, 130, 104, 9 @@ -67,7 +67,7 @@ IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE CAPTION "高级外观" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "项目:", 8, 5, 160, 50, 9 @@ -98,7 +98,7 @@ IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE CAPTION "效果" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN CONTROL "为菜单和工具提示使用以下过渡效果(&U):", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 @@ -123,7 +123,7 @@ END IDD_SETTINGS DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "设置" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN LTEXT "拖动监视器图标以便与监视器的物理设置匹配。", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | @@ -144,7 +144,7 @@ END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "显示", -1, 7, 6, 237, 56, WS_GROUP LTEXT "字体大小:", -1, 14, 20, 222, 9 @@ -160,7 +160,7 @@ END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Display Settings" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 diff --git a/dll/cpl/inetcpl/lang/zh-CN.rc b/dll/cpl/inetcpl/lang/zh-CN.rc index 7cfa11425d..b272da8c80 100644 --- a/dll/cpl/inetcpl/lang/zh-CN.rc +++ b/dll/cpl/inetcpl/lang/zh-CN.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN IDS_CPL_NAME "互联网设置" - IDS_CPL_INFO "配置Wine互联网浏览器和相关的设置" + IDS_CPL_INFO "配置 WINE Internet Explorer 和相关设置" IDS_SEC_SETTINGS "区域的安全设置: " IDS_SEC_LEVEL0 "自定义" IDS_SEC_LEVEL1 "非常低" @@ -39,7 +39,7 @@ END /* "General" propsheet */ IDD_GENERAL DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "新細明體" +FONT 8, "宋体" CAPTION "常规" BEGIN @@ -61,13 +61,13 @@ END /* "Delete browsing history" dialog */ IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "新細明體" +FONT 8, "宋体" CAPTION "删除浏览历史记录" BEGIN - AUTOCHECKBOX "互联网临时文件\n缓存的网站页面、图像和证书的副本。", + AUTOCHECKBOX "Internet 临时文件\n缓存的网站页面、图像和证书的副本。", IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "小型文字檔案\n通过网站在您的计算机上保存文件存储用户首选项和登录信息。", + AUTOCHECKBOX "Cookies\n通过网站在您的计算机上保存文件存储用户首选项和登录信息。", IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE AUTOCHECKBOX "历史记录\n您进入的网站的列表。", IDC_DELETE_HISTORY, 10, 88, 230, 40, BS_TOP | BS_MULTILINE @@ -83,7 +83,7 @@ END /* "Security" propsheet */ IDD_SECURITY DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "新細明體" +FONT 8, "宋体" CAPTION "安全" BEGIN @@ -101,14 +101,14 @@ END /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "新細明體" +FONT 8, "宋体" CAPTION "内容" BEGIN GROUPBOX "证书", IDC_STATIC, 4, 4, 312, 50 - LTEXT "为您的个人身份，确定证书颁发机构和出版商使用证书。", + LTEXT "使用证书可正确标识您自己、证书颁发机构和颁发商的身份。", IDC_STATIC, 58, 14, 252, 18 - PUSHBUTTON "证书...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "出版者...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "证书(&C)...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "发行商(&B)...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END diff --git a/dll/cpl/main/lang/zh-CN.rc b/dll/cpl/main/lang/zh-CN.rc index 527fa134ca..7775973851 100644 --- a/dll/cpl/main/lang/zh-CN.rc +++ b/dll/cpl/main/lang/zh-CN.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "速度" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "字符重复", -1, 5, 5, 236, 135 ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15 @@ -35,14 +35,14 @@ END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "硬件" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN END IDD_CLICK_LOCK DIALOGEX 0, 0, 240, 78 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU CAPTION "单击锁定的设置" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN LTEXT "短", -1, 50, 35, 27, 10 LTEXT "长", -1, 157, 35, 27, 10 @@ -56,7 +56,7 @@ END IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "鼠标键" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "鼠标键配置", -1, 5, 5, 236, 70 CHECKBOX "切换主要和次要的按钮(&S)", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 156, 10 @@ -77,7 +77,7 @@ END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "指针" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "方案", -1, 5, 5, 181, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 12, 15, 167, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -94,7 +94,7 @@ END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU CAPTION "保存方案" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN LTEXT "将该光标方案另存为:", -1, 5, 5, 181, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -105,7 +105,7 @@ END IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "指针选项" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "移动", -1, 5, 5, 236, 60 LTEXT "选择指针移动速度(&C):", -1, 52, 15, 110, 10 @@ -134,7 +134,7 @@ END IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "轮" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "滚动", -1, 5, 5, 236, 80 ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32 diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc index 5be9b83aba..fef416c1ad 100644 --- a/dll/cpl/powercfg/lang/zh-CN.rc +++ b/dll/cpl/powercfg/lang/zh-CN.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_PROPPAGEPOWERSCHEMES DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "电源使用方案" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 209, 36 @@ -36,7 +36,7 @@ END IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "警报" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "电池不足警报", -1, 6, 7, 239, 104 AUTOCHECKBOX "当电量降低到以下水平时，发出电池不足警报(&L):", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP @@ -69,7 +69,7 @@ END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "高级" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20 LTEXT "请选择要使用的节能设置。", -1, 37, 6, 207, 20 @@ -89,7 +89,7 @@ END IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "休眠" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20 LTEXT "在计算机休眠时，它将内存中所有信息保存到硬盘上，然后关闭计算机。在退出休眠状态时，计算机会恢复到原来的状态。", -1, 37, 6, 210, 35 diff --git a/dll/shellext/acppage/lang/zh-CN.rc b/dll/shellext/acppage/lang/zh-CN.rc index 6a76bad4f1..74b4df42c5 100644 --- a/dll/shellext/acppage/lang/zh-CN.rc +++ b/dll/shellext/acppage/lang/zh-CN.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "兼容性" FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "如果您有问题在 ReactOS 中运行此程序，选择 ReactOS 应报告给应用程序的操作系统。\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "如果您在 ReactOS 中运行此程序出现问题，选择 ReactOS 应报告给应用程序的操作系统。\n请注意，这是一项正在进行的工作。", -1, 7, 7, 210, 31 GROUPBOX "兼容模式", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "用兼容模式运行这个程序:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED @@ -16,7 +16,7 @@ BEGIN CHECKBOX "在 640 x 480 屏幕分辨率运行", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "禁用视觉主题", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "编辑兼容模式...(&D)", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 - CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY + CONTROL "了解更多有关<A>程序兼容性</A>的信息。", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 @@ -35,8 +35,8 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" - IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." - IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" + IDS_TABTITLE "兼容模式" + IDS_FAILED_NETWORK "无法在上面设置兼容模式，因为这个程序在网络驱动器上。" + IDS_FAILED_PROTECTED "无法在上面设置兼容模式，因为这个程序是 ReactOS 的一部分。" + IDS_YOU_DID_NOT_ADD "目前没有此模式，你想要新建一个吗？" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 485f2da21d..71b8dc948a 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -383,10 +383,10 @@ CAPTION "回收站属性" FONT 9, "宋体", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "所选位置的设置", -1, 10, 72, 220, 70 + GROUPBOX "选定位置的设置", -1, 10, 72, 220, 70 RADIOBUTTON "自定义大小(&C):", 14001, 20, 90, 80, 10, WS_TABSTOP EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER - LTEXT "最大大小(MB)(&A):", -1, 20, 105, 70, 10 + LTEXT "最大值(MB)(&A):", -1, 20, 105, 70, 10 RADIOBUTTON "不将文件移入回收站，而是彻底删除。(&R)", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP AUTOCHECKBOX "显示删除确认对话框(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP END @@ -415,18 +415,18 @@ BEGIN GROUPBOX "任务", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 AUTORADIOBUTTON "在文件夹中显示常见任务(&F)", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "使用电脑经典文件夹(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10 + AUTORADIOBUTTON "使用 ReactOS 传统风格的文件夹(&I)", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10 GROUPBOX "浏览文件夹", -1, 7, 60, 249, 45, WS_TABSTOP CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20 AUTORADIOBUTTON "在同一窗口中打开每个文件夹(&M)", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "在其自己的窗口中打开每个文件夹(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 - GROUPBOX "单击项目，如下所示", -1, 7, 110, 249, 60 + AUTORADIOBUTTON "在不同窗口中打开不同的文件夹(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 + GROUPBOX "打开项目的方式", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "通过单击打开项目（指向时选定）(&s)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "强调符合我的浏览器的图标标题(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "仅当指向他们强调图标标题(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 - AUTORADIOBUTTON "双击要打开的项目（单单击可选择）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "还原默认值(&R)", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "根据浏览器设置给图标标题加下划线(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 + AUTORADIOBUTTON "仅当指向图标标题时加下划线(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + AUTORADIOBUTTON "双击要打开的项目（单击时选定）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 + PUSHBUTTON "还原为默认值(&R)", 14011, 180, 180, 60, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 @@ -714,7 +714,7 @@ BEGIN IDS_FILEOOP_DELETING "正在删除..." IDS_FILEOOP_FROM_TO "从 %1 到 %2" IDS_FILEOOP_FROM "从 %1" - IDS_FILEOOP_PREFLIGHT "印前检查" + IDS_FILEOOP_PREFLIGHT "正在准备" /* message box strings */ IDS_RESTART_TITLE "重新启动" @@ -859,7 +859,7 @@ BEGIN IDS_ADVANCED_HIDDEN "隐藏的文件和文件夹" IDS_ADVANCED_DONT_SHOW_HIDDEN "不显示隐藏的文件和文件夹" IDS_ADVANCED_SHOW_HIDDEN "显示隐藏的文件和文件夹" - IDS_ADVANCED_HIDE_FILE_EXT "隐藏已知文件类型的拓展名" + IDS_ADVANCED_HIDE_FILE_EXT "隐藏已知文件类型的扩展名" IDS_ADVANCED_SUPER_HIDDEN "隐藏受保护的操作系统文件 (推荐)" IDS_ADVANCED_DESKTOP_PROCESS "在单独的进程中打开文件夹窗口" IDS_ADVANCED_CLASSIC_VIEW_STATE "记住每个文件夹的视图设置"

1 0

[reactos] 01/01: [TRACERT] Rewrite tracert
by Ged Murphy 02 Jan '18

02 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=344f3672110c467cbb970… commit 344f3672110c467cbb97055b86cf798ff19ec211 Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Tue Jan 2 09:43:14 2018 +0000 [TRACERT] Rewrite tracert - Full rewrite. This commit replaces the old utility. - Use the new ICMP APIs instead of manually crafting ping requests using raw sockets. - Add support for additional languages (the previous utility was hardcoded) - Add support for IPv6 - Make the icmpapi header C++ compatible. (we don't appear to sync this with wine anymore.) - Now runs on Win10, is much more reliable, and brings the code somewhat into the 21st century. (It's currently missing source routing (-j), but as most routers disable this anyway, I'm not sure that it's worth adding) --- base/applications/network/tracert/CMakeLists.txt | 12 +- base/applications/network/tracert/lang/bg-BG.rc | 32 ++ base/applications/network/tracert/lang/cs-CZ.rc | 32 ++ base/applications/network/tracert/lang/de-DE.rc | 32 ++ base/applications/network/tracert/lang/en-US.rc | 32 ++ base/applications/network/tracert/lang/es-ES.rc | 32 ++ base/applications/network/tracert/lang/fr-FR.rc | 32 ++ base/applications/network/tracert/lang/it-IT.rc | 32 ++ base/applications/network/tracert/lang/pl-PL.rc | 32 ++ base/applications/network/tracert/lang/ro-RO.rc | 32 ++ base/applications/network/tracert/lang/ru-RU.rc | 32 ++ base/applications/network/tracert/lang/sq-AL.rc | 32 ++ base/applications/network/tracert/lang/sv-SE.rc | 32 ++ base/applications/network/tracert/lang/tr-TR.rc | 32 ++ base/applications/network/tracert/lang/uk-UA.rc | 32 ++ base/applications/network/tracert/lang/zh-CN.rc | 32 ++ base/applications/network/tracert/lang/zh-TW.rc | 32 ++ base/applications/network/tracert/resource.h | 16 + base/applications/network/tracert/tracert.c | 657 ----------------------- base/applications/network/tracert/tracert.cpp | 566 +++++++++++++++++++ base/applications/network/tracert/tracert.h | 81 --- base/applications/network/tracert/tracert.rc | 60 ++- sdk/include/psdk/icmpapi.h | 9 + 23 files changed, 1164 insertions(+), 749 deletions(-) diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt index ec605ed89a..132f7fc6de 100644 --- a/base/applications/network/tracert/CMakeLists.txt +++ b/base/applications/network/tracert/CMakeLists.txt @@ -1,11 +1,5 @@ -add_definitions(-D__USE_W32_SOCKETS) -add_executable(tracert tracert.c tracert.rc) -set_module_type(tracert win32cui) -add_importlibs(tracert ws2_32 msvcrt kernel32) - -if(MSVC) - add_importlibs(tracert ntdll) -endif() - +add_executable(tracert tracert.cpp tracert.rc) +set_module_type(tracert win32cui UNICODE) +add_importlibs(tracert ws2_32 iphlpapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET tracert DESTINATION reactos/system32 FOR all) diff --git a/base/applications/network/tracert/lang/bg-BG.rc b/base/applications/network/tracert/lang/bg-BG.rc new file mode 100644 index 0000000000..bf99e280f8 --- /dev/null +++ b/base/applications/network/tracert/lang/bg-BG.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/cs-CZ.rc b/base/applications/network/tracert/lang/cs-CZ.rc new file mode 100644 index 0000000000..1c82fc5dc3 --- /dev/null +++ b/base/applications/network/tracert/lang/cs-CZ.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/de-DE.rc b/base/applications/network/tracert/lang/de-DE.rc new file mode 100644 index 0000000000..bbe5e4dbec --- /dev/null +++ b/base/applications/network/tracert/lang/de-DE.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/en-US.rc b/base/applications/network/tracert/lang/en-US.rc new file mode 100644 index 0000000000..27b5961ca9 --- /dev/null +++ b/base/applications/network/tracert/lang/en-US.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/es-ES.rc b/base/applications/network/tracert/lang/es-ES.rc new file mode 100644 index 0000000000..8c69db16ac --- /dev/null +++ b/base/applications/network/tracert/lang/es-ES.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/fr-FR.rc b/base/applications/network/tracert/lang/fr-FR.rc new file mode 100644 index 0000000000..611a56490d --- /dev/null +++ b/base/applications/network/tracert/lang/fr-FR.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/it-IT.rc b/base/applications/network/tracert/lang/it-IT.rc new file mode 100644 index 0000000000..15b0ba30bf --- /dev/null +++ b/base/applications/network/tracert/lang/it-IT.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/pl-PL.rc b/base/applications/network/tracert/lang/pl-PL.rc new file mode 100644 index 0000000000..94e5ba6ceb --- /dev/null +++ b/base/applications/network/tracert/lang/pl-PL.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/ro-RO.rc b/base/applications/network/tracert/lang/ro-RO.rc new file mode 100644 index 0000000000..d5f2a88910 --- /dev/null +++ b/base/applications/network/tracert/lang/ro-RO.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/ru-RU.rc b/base/applications/network/tracert/lang/ru-RU.rc new file mode 100644 index 0000000000..1a000627a1 --- /dev/null +++ b/base/applications/network/tracert/lang/ru-RU.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/sq-AL.rc b/base/applications/network/tracert/lang/sq-AL.rc new file mode 100644 index 0000000000..d3dc494035 --- /dev/null +++ b/base/applications/network/tracert/lang/sq-AL.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/sv-SE.rc b/base/applications/network/tracert/lang/sv-SE.rc new file mode 100644 index 0000000000..6579325bdf --- /dev/null +++ b/base/applications/network/tracert/lang/sv-SE.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/tr-TR.rc b/base/applications/network/tracert/lang/tr-TR.rc new file mode 100644 index 0000000000..0ee1a09845 --- /dev/null +++ b/base/applications/network/tracert/lang/tr-TR.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/uk-UA.rc b/base/applications/network/tracert/lang/uk-UA.rc new file mode 100644 index 0000000000..9a2903c251 --- /dev/null +++ b/base/applications/network/tracert/lang/uk-UA.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/zh-CN.rc b/base/applications/network/tracert/lang/zh-CN.rc new file mode 100644 index 0000000000..61966e02b8 --- /dev/null +++ b/base/applications/network/tracert/lang/zh-CN.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/lang/zh-TW.rc b/base/applications/network/tracert/lang/zh-TW.rc new file mode 100644 index 0000000000..86ecc1c9f8 --- /dev/null +++ b/base/applications/network/tracert/lang/zh-TW.rc @@ -0,0 +1,32 @@ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN + IDS_USAGE "\r\n\ +Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ +Options:\r\n\ + -d Do not resolve addresses to hostnames.\r\n\ + -h maximum_hops Maximum number of hops to search for target.\r\n\ + -j host-list Loose source route along host-list.\r\n\ + -w timeout Wait timeout milliseconds for each reply.\r\n\ + -4 Force using IPv4.\r\n\ + -6 Force using IPv6.\r\n\ +\r\n" + + IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" + IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" + IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + + IDS_GEN_FAILURE "General failure.\r\n" + + IDS_HOP_COUNT "%1!3lu! %0\r\n" + IDS_HOP_TIME "%1!4lu! ms %0\r\n" + IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_TIMEOUT " * %0\r\n" + IDS_HOP_RES_INFO "%1 [%2]\r\n" + IDS_HOP_IP_INFO "%1\r\n" + IDS_REQ_TIMED_OUT "Request timed out.\r\n" + +END diff --git a/base/applications/network/tracert/resource.h b/base/applications/network/tracert/resource.h new file mode 100644 index 0000000000..5bb07ecd6e --- /dev/null +++ b/base/applications/network/tracert/resource.h @@ -0,0 +1,16 @@ +#pragma once + +#define IDS_USAGE 100 +#define IDS_INVALID_OPTION 101 +#define IDS_TRACE_INFO 102 +#define IDS_TRACE_COMPLETE 103 +#define IDS_UNABLE_RESOLVE 104 +#define IDS_GEN_FAILURE 105 + +#define IDS_HOP_COUNT 107 +#define IDS_HOP_TIME 108 +#define IDS_HOP_ZERO 109 +#define IDS_TIMEOUT 110 +#define IDS_HOP_RES_INFO 111 +#define IDS_HOP_IP_INFO 112 +#define IDS_REQ_TIMED_OUT 113 diff --git a/base/applications/network/tracert/tracert.c b/base/applications/network/tracert/tracert.c deleted file mode 100644 index 2a7fce0157..0000000000 --- a/base/applications/network/tracert/tracert.c +++ /dev/null @@ -1,657 +0,0 @@ - /* - * PROJECT: ReactOS trace route utility - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/network/tracert/tracert.c - * PURPOSE: Trace network paths through networks - * COPYRIGHT: Copyright 2006 - 2007 Ged Murphy <gedmurphy(a)reactos.org> - * - */ - -#include "tracert.h" - -//#define TRACERT_DBG - -CHAR cHostname[256]; // target hostname -CHAR cDestIP[18]; // target IP - -static VOID -DebugPrint(LPTSTR lpString, ...) -{ -#ifdef TRACERT_DBG - va_list args; - va_start(args, lpString); - _vtprintf(lpString, args); - va_end(args); -#else - UNREFERENCED_PARAMETER(lpString); -#endif -} - -static VOID -Usage(VOID) -{ - _tprintf(_T("\nUsage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name\n\n" - "Options:\n" - " -d Do not resolve addresses to hostnames.\n" - " -h maximum_hops Maximum number of hops to search for target.\n" - " -j host-list Loose source route along host-list.\n" - " -w timeout Wait timeout milliseconds for each reply.\n\n")); - - _tprintf(_T("NOTES\n-----\n" - "- Setting TTL values is not currently supported in ReactOS, so the trace will\n" - " jump straight to the destination. This feature will be implemented soon.\n" - "- Host info is not currently available in ReactOS and will fail with strange\n" - " results. Use -d to force it not to resolve IP's.\n" - "- For testing purposes, all should work as normal in a Windows environment\n\n")); -} - -static BOOL -ParseCmdline(int argc, - LPCTSTR argv[], - PAPPINFO pInfo) -{ - INT i; - - if (argc < 2) - { - Usage(); - return FALSE; - } - else - { - for (i = 1; i < argc; i++) - { - if (argv[i][0] == _T('-')) - { - switch (argv[i][1]) - { - case _T('d'): - pInfo->bResolveAddresses = FALSE; - break; - - case _T('h'): - _stscanf(argv[i+1], _T("%d"), &pInfo->iMaxHops); - break; - - case _T('j'): - _tprintf(_T("-j is not yet implemented.\n")); - break; - - case _T('w'): - _stscanf(argv[i+1], _T("%d"), &pInfo->iTimeOut); - break; - - default: - { - _tprintf(_T("%s is not a valid option.\n"), argv[i]); - Usage(); - return FALSE; - } - } - } - else - /* copy target address */ - _tcsncpy(cHostname, argv[i], 255); - } - } - - return TRUE; -} - -static WORD -CheckSum(PUSHORT data, - UINT size) -{ - DWORD dwSum = 0; - - while (size > 1) - { - dwSum += *data++; - size -= sizeof(USHORT); - } - - if (size) - dwSum += *(UCHAR*)data; - - dwSum = (dwSum >> 16) + (dwSum & 0xFFFF); - dwSum += (dwSum >> 16); - - return (USHORT)(~dwSum); -} - -static VOID -SetupTimingMethod(PAPPINFO pInfo) -{ - LARGE_INTEGER PerformanceCounterFrequency; - - /* check if performance counters are available */ - pInfo->bUsePerformanceCounter = QueryPerformanceFrequency(&PerformanceCounterFrequency); - - if (pInfo->bUsePerformanceCounter) - { - /* restrict execution to first processor on SMP systems */ - if (SetThreadAffinityMask(GetCurrentThread(), 1) == 0) - pInfo->bUsePerformanceCounter = FALSE; - - pInfo->TicksPerMs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000; - pInfo->TicksPerUs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000000; - } - else - { - pInfo->TicksPerMs.QuadPart = 1; - pInfo->TicksPerUs.QuadPart = 1; - } -} - -static BOOL -ResolveHostname(PAPPINFO pInfo) -{ - HOSTENT *hp; - ULONG addr; - - ZeroMemory(&pInfo->dest, sizeof(pInfo->dest)); - - /* if address is not a dotted decimal */ - if ((addr = inet_addr(cHostname))== INADDR_NONE) - { - if ((hp = gethostbyname(cHostname)) != 0) - { - //CopyMemory(&pInfo->dest.sin_addr, hp->h_addr, hp->h_length); - pInfo->dest.sin_addr = *((struct in_addr *)hp->h_addr); - pInfo->dest.sin_family = hp->h_addrtype; - } - else - { - _tprintf(_T("Unable to resolve target system name %s.\n"), cHostname); - return FALSE; - } - } - else - { - pInfo->dest.sin_addr.s_addr = addr; - pInfo->dest.sin_family = AF_INET; - } - - _tcscpy(cDestIP, inet_ntoa(pInfo->dest.sin_addr)); - - return TRUE; -} - -static LONGLONG -GetTime(PAPPINFO pInfo) -{ - LARGE_INTEGER Time; - - /* Get the system time using performance counters if available */ - if (pInfo->bUsePerformanceCounter) - { - if (QueryPerformanceCounter(&Time)) - { - return Time.QuadPart; - } - } - - /* otherwise fall back to GetTickCount */ - Time.u.LowPart = (DWORD)GetTickCount(); - Time.u.HighPart = 0; - - return (LONGLONG)Time.u.LowPart; -} - -static BOOL -SetTTL(SOCKET sock, - INT iTTL) -{ - if (setsockopt(sock, - IPPROTO_IP, - IP_TTL, - (const char *)&iTTL, - sizeof(iTTL)) == SOCKET_ERROR) - { - DebugPrint(_T("TTL setsockopt failed : %d. \n"), WSAGetLastError()); - return FALSE; - } - - return TRUE; -} - -static BOOL -CreateSocket(PAPPINFO pInfo) -{ - pInfo->icmpSock = WSASocket(AF_INET, - SOCK_RAW, - IPPROTO_ICMP, - 0, - 0, - 0); - - if (pInfo->icmpSock == INVALID_SOCKET) - { - INT err = WSAGetLastError(); - DebugPrint(_T("Could not create socket : %d.\n"), err); - - if (err == WSAEACCES) - { - _tprintf(_T("\n\nYou must have access to raw sockets (admin) to run this program!\n\n")); - } - - return FALSE; - } - - return TRUE; -} - -static VOID -PreparePacket(PAPPINFO pInfo, - USHORT iSeqNum) -{ - /* assemble ICMP echo request packet */ - pInfo->SendPacket->icmpheader.type = ECHO_REQUEST; - pInfo->SendPacket->icmpheader.code = 0; - pInfo->SendPacket->icmpheader.checksum = 0; - pInfo->SendPacket->icmpheader.id = (USHORT)GetCurrentProcessId(); - pInfo->SendPacket->icmpheader.seq = htons((USHORT)iSeqNum); - - /* calculate checksum of packet */ - pInfo->SendPacket->icmpheader.checksum = CheckSum((PUSHORT)&pInfo->SendPacket->icmpheader, - sizeof(ICMP_HEADER) + PACKET_SIZE); -} - -static INT -SendPacket(PAPPINFO pInfo) -{ - INT iSockRet; - - DebugPrint(_T("\nsending packet of %d bytes... "), PACKET_SIZE); - - /* get time packet was sent */ - pInfo->lTimeStart = GetTime(pInfo); - - iSockRet = sendto(pInfo->icmpSock, //socket - (char *)&pInfo->SendPacket->icmpheader,//buffer - sizeof(ICMP_HEADER) + PACKET_SIZE,//size of buffer - 0, //flags - (SOCKADDR *)&pInfo->dest, //destination - sizeof(pInfo->dest)); //address length - - if (iSockRet == SOCKET_ERROR) - { - if (WSAGetLastError() == WSAEACCES) - { - /* FIXME: Is this correct? */ - _tprintf(_T("\n\nYou must be an administrator to run this program!\n\n")); - WSACleanup(); - HeapFree(GetProcessHeap(), 0, pInfo); - exit(-1); - } - else - { - DebugPrint(_T("sendto failed %d\n"), WSAGetLastError()); - } - } - else - { - DebugPrint(_T("sent %d bytes\n"), iSockRet); - } - - return iSockRet; -} - -static BOOL -ReceivePacket(PAPPINFO pInfo) -{ - TIMEVAL timeVal; - FD_SET readFDS; - INT iSockRet = 0, iSelRet; - INT iFromLen; - BOOL bRet = FALSE; - - iFromLen = sizeof(pInfo->source); - - DebugPrint(_T("Receiving packet. Available buffer, %d bytes... "), MAX_PING_PACKET_SIZE); - - /* monitor icmpSock for incoming connections */ - FD_ZERO(&readFDS); - FD_SET(pInfo->icmpSock, &readFDS); - - /* set timeout values */ - timeVal.tv_sec = pInfo->iTimeOut / 1000; - timeVal.tv_usec = pInfo->iTimeOut % 1000; - - iSelRet = select(0, - &readFDS, - NULL, - NULL, - &timeVal); - - if (iSelRet == SOCKET_ERROR) - { - DebugPrint(_T("select() failed in sendPacket() %d\n"), WSAGetLastError()); - } - else if (iSelRet == 0) /* if socket timed out */ - { - _tprintf(_T(" * ")); - } - else if ((iSelRet != SOCKET_ERROR) && (iSelRet != 0)) - { - iSockRet = recvfrom(pInfo->icmpSock, // socket - (char *)pInfo->RecvPacket, // buffer - MAX_PING_PACKET_SIZE, // size of buffer - 0, // flags - (SOCKADDR *)&pInfo->source, // source address - &iFromLen); // address length - - if (iSockRet != SOCKET_ERROR) - { - /* get time packet was received */ - pInfo->lTimeEnd = GetTime(pInfo); - DebugPrint(_T("received %d bytes\n"), iSockRet); - bRet = TRUE; - } - else - { - DebugPrint(_T("recvfrom failed: %d\n"), WSAGetLastError()); - } - } - - return bRet; -} - -static INT -DecodeResponse(PAPPINFO pInfo) -{ - unsigned short header_len = pInfo->RecvPacket->h_len * 4; - - /* cast the received packet into an ECHO reply and a TTL Exceed and check the ID*/ - ECHO_REPLY_HEADER *IcmpHdr = (ECHO_REPLY_HEADER *)((char*)pInfo->RecvPacket + header_len); - - /* Make sure the reply is ok */ - if (PACKET_SIZE < header_len + ICMP_MIN_SIZE) - { - DebugPrint(_T("too few bytes from %s\n"), inet_ntoa(pInfo->dest.sin_addr)); - return -2; - } - - switch (IcmpHdr->icmpheader.type) - { - case TTL_EXCEEDED : - _tprintf(_T("%3ld ms"), (ULONG)((pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart)); - return 0; - - case ECHO_REPLY : - if (IcmpHdr->icmpheader.id != (USHORT)GetCurrentProcessId()) - { - /* FIXME: our network stack shouldn't allow this... */ - /* we've picked up a packet not related to this process probably from another local program. We ignore it */ - DebugPrint(_T("Rouge packet: header id %d, process id %d"), IcmpHdr->icmpheader.id, GetCurrentProcessId()); - return -1; - } - _tprintf(_T("%3ld ms"), (ULONG)((pInfo->lTimeEnd - pInfo->lTimeStart) / pInfo->TicksPerMs.QuadPart)); - return 1; - - case DEST_UNREACHABLE : - _tprintf(_T(" * ")); - return 2; - } - - return -3; -} - -static BOOL -AllocateBuffers(PAPPINFO pInfo) -{ - pInfo->SendPacket = (PECHO_REPLY_HEADER)HeapAlloc(GetProcessHeap(), - 0, - sizeof(ECHO_REPLY_HEADER) + PACKET_SIZE); - if (!pInfo->SendPacket) - return FALSE; - - pInfo->RecvPacket = (PIPv4_HEADER)HeapAlloc(GetProcessHeap(), - 0, - MAX_PING_PACKET_SIZE); - if (!pInfo->RecvPacket) - { - HeapFree(GetProcessHeap(), - 0, - pInfo->SendPacket); - - return FALSE; - } - - return TRUE; -} - -static INT -Driver(PAPPINFO pInfo) -{ - INT iHopCount = 1; // hop counter. default max is 30 - BOOL bFoundTarget = FALSE; // Have we reached our destination yet - INT iReceiveReturn; // ReceiveReturn return value - PECHO_REPLY_HEADER icmphdr; - INT iTTL = 1; - - INT ret = -1; - - //temps for getting host name - CHAR cHost[256]; - CHAR cServ[256]; - CHAR *ip; - - SetupTimingMethod(pInfo); - - if (AllocateBuffers(pInfo) && - ResolveHostname(pInfo) && - CreateSocket(pInfo)) - { - /* print tracing info to screen */ - _tprintf(_T("\nTracing route to %s [%s]\n"), cHostname, cDestIP); - _tprintf(_T("over a maximum of %d hop"), pInfo->iMaxHops); - pInfo->iMaxHops > 1 ? _tprintf(_T("s:\n\n")) : _tprintf(_T(":\n\n")); - - /* run until we hit either max hops, or find the target */ - while ((iHopCount <= pInfo->iMaxHops) && - (bFoundTarget == FALSE)) - { - USHORT iSeqNum = 0; - INT i; - - _tprintf(_T("%3d "), iHopCount); - - /* run 3 pings for each hop */ - for (i = 0; i < 3; i++) - { - if (SetTTL(pInfo->icmpSock, iTTL) == FALSE) - { - DebugPrint(_T("error in Setup()\n")); - return ret; - } - - PreparePacket(pInfo, iSeqNum); - - if (SendPacket(pInfo) != SOCKET_ERROR) - { - BOOL bAwaitPacket = FALSE; // indicates whether we have received a good packet - - do - { - /* Receive replies until we get a successful read, or a fatal error */ - if ((iReceiveReturn = ReceivePacket(pInfo)) < 0) - { - /* FIXME: consider moving this into ReceivePacket */ - /* check the seq num in the packet, if it's bad wait for another */ - WORD hdrLen = pInfo->RecvPacket->h_len * 4; - icmphdr = (ECHO_REPLY_HEADER *)((char*)&pInfo->RecvPacket + hdrLen); - if (icmphdr->icmpheader.seq != iSeqNum) - { - _tprintf(_T("bad sequence number!\n")); - continue; - } - } - - if (iReceiveReturn) - { - if (DecodeResponse(pInfo) < 0) - bAwaitPacket = TRUE; - } - - } while (bAwaitPacket); - } - - iSeqNum++; - _tprintf(_T(" ")); - } - - if(pInfo->bResolveAddresses) - { - INT iNameInfoRet; // getnameinfo return value - /* gethostbyaddr() and getnameinfo() are - * unimplemented in ROS at present. - * Alex has advised he will be implementing getnameinfo. - * I've used that for the time being for testing in Windows*/ - - //ip = inet_addr(inet_ntoa(source.sin_addr)); - //host = gethostbyaddr((char *)&ip, 4, 0); - - ip = inet_ntoa(pInfo->source.sin_addr); - - iNameInfoRet = getnameinfo((SOCKADDR *)&pInfo->source, - sizeof(SOCKADDR), - cHost, - 256, - cServ, - 256, - NI_NUMERICSERV); - if (iNameInfoRet == 0) - { - /* if IP address resolved to a hostname, - * print the IP address after it */ - if (lstrcmpA(cHost, ip) != 0) - _tprintf(_T("%s [%s]"), cHost, ip); - else - _tprintf(_T("%s"), cHost); - } - else - { - DebugPrint(_T("error: %d"), WSAGetLastError()); - DebugPrint(_T(" getnameinfo failed: %d"), iNameInfoRet); - _tprintf(_T("%s"), inet_ntoa(pInfo->source.sin_addr)); - } - - } - else - _tprintf(_T("%s"), inet_ntoa(pInfo->source.sin_addr)); - - _tprintf(_T("\n")); - - /* check if we've arrived at the target */ - if (strcmp(cDestIP, inet_ntoa(pInfo->source.sin_addr)) == 0) - bFoundTarget = TRUE; - else - { - iTTL++; - iHopCount++; - Sleep(500); - } - } - _tprintf(_T("\nTrace complete.\n")); - ret = 0; - } - - return ret; -} - -static VOID -Cleanup(PAPPINFO pInfo) -{ - if (pInfo->icmpSock) - closesocket(pInfo->icmpSock); - - WSACleanup(); - - if (pInfo->SendPacket) - HeapFree(GetProcessHeap(), - 0, - pInfo->SendPacket); - - if (pInfo->RecvPacket) - HeapFree(GetProcessHeap(), - 0, - pInfo->RecvPacket); -} - -#if defined(_UNICODE) && defined(__GNUC__) -static -#endif -int _tmain(int argc, LPCTSTR argv[]) -{ - PAPPINFO pInfo; - WSADATA wsaData; - int ret = -1; - - pInfo = (PAPPINFO)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(APPINFO)); - if (pInfo) - { - pInfo->bResolveAddresses = TRUE; - pInfo->iMaxHops = 30; - pInfo->iTimeOut = 1000; - - if (ParseCmdline(argc, argv, pInfo)) - { - if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) - { - DebugPrint(_T("WSAStartup failed.\n")); - } - else - { - ret = Driver(pInfo); - Cleanup(pInfo); - } - } - - HeapFree(GetProcessHeap(), - 0, - pInfo); - } - - return ret; -} - -#if defined(_UNICODE) && defined(__GNUC__) -/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ -int main( int argc, char **argv ) -{ - WCHAR **argvW; - int i, j, Ret = 1; - - if ((argvW = malloc(argc * sizeof(WCHAR*)))) - { - /* convert the arguments */ - for (i = 0, j = 0; i < argc; i++) - { - if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) - { - j++; - } - swprintf(argvW[i], L"%hs", argv[i]); - } - - if (j == 0) - { - /* no error converting the parameters, call wmain() */ - Ret = wmain(argc, (LPCTSTR *)argvW); - } - - /* free the arguments */ - for (i = 0; i < argc; i++) - { - if (argvW[i]) - free(argvW[i]); - } - free(argvW); - } - - return Ret; -} -#endif diff --git a/base/applications/network/tracert/tracert.cpp b/base/applications/network/tracert/tracert.cpp new file mode 100644 index 0000000000..ca14cc5345 --- /dev/null +++ b/base/applications/network/tracert/tracert.cpp @@ -0,0 +1,566 @@ +/* + * PROJECT: ReactOS trace route utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/network/tracert/tracert.cpp + * PURPOSE: Trace network paths through networks + * COPYRIGHT: Copyright 2018 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#ifdef __REACTOS__ +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#define _INC_WINDOWS +#include <stdio.h> +#include <stdlib.h> +#include <winsock2.h> +#else +#include <winsock2.h> +#include <Windows.h> +#endif +#include <ws2tcpip.h> +#include <iphlpapi.h> +#include <icmpapi.h> +#include <strsafe.h> +#include "resource.h" + +#define SIZEOF_ICMP_ERROR 8 +#define SIZEOF_IO_STATUS_BLOCK 8 +#define PACKET_SIZE 32 +#define MAX_IPADDRESS 32 +#define NUM_OF_PINGS 3 + +struct TraceInfo +{ + bool ResolveAddresses; + ULONG MaxHops; + ULONG Timeout; + WCHAR HostName[NI_MAXHOST]; + WCHAR TargetIP[MAX_IPADDRESS]; + int Family; + + HANDLE hIcmpFile; + PADDRINFOW Target; + +} Info = { 0 }; + + + +#ifndef USE_CONUTILS +static +INT +LengthOfStrResource( + _In_ HINSTANCE hInst, + _In_ UINT uID +) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) return -1; + + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, hrSrc)) && + (lpStr = (WCHAR*)LockResource(hRes))) + { + UINT x; + uID &= 0xF; + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + return (int)(*lpStr); + } + return -1; +} + +static +INT +AllocAndLoadString( + _In_ UINT uID, + _Out_ LPWSTR *lpTarget +) +{ + HMODULE hInst; + INT Length; + + hInst = GetModuleHandleW(NULL); + Length = LengthOfStrResource(hInst, uID); + if (Length++ > 0) + { + (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + Length * sizeof(WCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadStringW(hInst, uID, *lpTarget, Length))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } + } + return 0; +} + +static +INT +OutputText( + _In_ UINT uID, + ...) +{ + LPWSTR Format; + DWORD Ret = 0; + va_list lArgs; + + if (AllocAndLoadString(uID, &Format) > 0) + { + va_start(lArgs, uID); + + LPWSTR Buffer; + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + Format, + 0, + 0, + (LPWSTR)&Buffer, + 0, + &lArgs); + va_end(lArgs); + + if (Ret) + { + wprintf(Buffer); + LocalFree(Buffer); + } + LocalFree((HLOCAL)Format); + } + + return Ret; +} +#else +#define OutputText(Id, ...) ConResPrintf(StdOut, Id, __VA_ARGS__) +#endif //USE_CONUTILS + +static +VOID +Usage() +{ + OutputText(IDS_USAGE); +} + +static ULONG +GetULONG( + _In_z_ LPWSTR String +) +{ + ULONG Length; + Length = wcslen(String); + + ULONG i = 0; + while ((i < Length) && ((String[i] < L'0') || (String[i] > L'9'))) i++; + if ((i >= Length) || ((String[i] < L'0') || (String[i] > L'9'))) + { + return (ULONG)-1; + } + + LPWSTR StopString; + return wcstoul(&String[i], &StopString, 10); +} + +static bool +ResolveTarget() +{ + ADDRINFOW Hints; + ZeroMemory(&Hints, sizeof(Hints)); + Hints.ai_family = Info.Family; + Hints.ai_flags = AI_CANONNAME; + + int Status; + Status = GetAddrInfoW(Info.HostName, + NULL, + &Hints, + &Info.Target); + if (Status != 0) + { + return false; + } + + Status = GetNameInfoW(Info.Target->ai_addr, + Info.Target->ai_addrlen, + Info.TargetIP, + MAX_IPADDRESS, + NULL, + 0, + NI_NUMERICHOST); + if (Status != 0) + { + return false; + } + + return true; +} + +static bool +PrintHopInfo(_In_ PVOID Buffer) +{ + SOCKADDR_IN6 SockAddrIn6 = { 0 }; + SOCKADDR_IN SockAddrIn = { 0 }; + PSOCKADDR SockAddr; + socklen_t Size; + + if (Info.Family == AF_INET6) + { + PIPV6_ADDRESS_EX Ipv6Addr = (PIPV6_ADDRESS_EX)Buffer; + SockAddrIn6.sin6_family = AF_INET6; + CopyMemory(SockAddrIn6.sin6_addr.u.Word, Ipv6Addr->sin6_addr, sizeof(SockAddrIn6.sin6_addr)); + //SockAddrIn6.sin6_addr = Ipv6Addr->sin6_addr; + SockAddr = (PSOCKADDR)&SockAddrIn6; + Size = sizeof(SOCKADDR_IN6); + + } + else + { + IPAddr *Address = (IPAddr *)Buffer; + SockAddrIn.sin_family = AF_INET; + SockAddrIn.sin_addr.S_un.S_addr = *Address; + SockAddr = (PSOCKADDR)&SockAddrIn; + Size = sizeof(SOCKADDR_IN); + } + + INT Status; + bool Resolved = false; + WCHAR HostName[NI_MAXHOST]; + if (Info.ResolveAddresses) + { + Status = GetNameInfoW(SockAddr, + Size, + HostName, + NI_MAXHOST, + NULL, + 0, + NI_NAMEREQD); + if (Status == 0) + { + Resolved = true; + } + } + + WCHAR IpAddress[MAX_IPADDRESS]; + Status = GetNameInfoW(SockAddr, + Size, + IpAddress, + NI_MAXHOST, + NULL, + 0, + NI_NUMERICHOST); + if (Status == 0) + { + if (Resolved) + { + OutputText(IDS_HOP_RES_INFO, HostName, IpAddress); + } + else + { + OutputText(IDS_HOP_IP_INFO, IpAddress); + } + } + + return (Status == 0); +} + +static bool +DecodeResponse( + _In_ PVOID ReplyBuffer, + _In_ bool OutputHopAddress, + _Out_ bool& FoundTarget +) +{ + ULONG RoundTripTime; + PVOID AddressInfo; + ULONG Status; + + if (Info.Family == AF_INET6) + { + PICMPV6_ECHO_REPLY EchoReplyV6; + EchoReplyV6 = (PICMPV6_ECHO_REPLY)ReplyBuffer; + Status = EchoReplyV6->Status; + RoundTripTime = EchoReplyV6->RoundTripTime; + AddressInfo = &EchoReplyV6->Address; + } + else + { + PICMP_ECHO_REPLY EchoReplyV4; + EchoReplyV4 = (PICMP_ECHO_REPLY)ReplyBuffer; + Status = EchoReplyV4->Status; + RoundTripTime = EchoReplyV4->RoundTripTime; + AddressInfo = &EchoReplyV4->Address; + } + + switch (Status) + { + case IP_SUCCESS: + case IP_TTL_EXPIRED_TRANSIT: + if (RoundTripTime) + { + OutputText(IDS_HOP_TIME, RoundTripTime); + } + else + { + OutputText(IDS_HOP_ZERO); + } + break; + + case IP_DEST_HOST_UNREACHABLE: + OutputText(IDS_TIMEOUT); + break; + + case IP_REQ_TIMED_OUT: + OutputText(IDS_TIMEOUT); + break; + + case IP_GENERAL_FAILURE: + OutputText(IDS_GEN_FAILURE); + return false; + + default: + return false; + } + + if (OutputHopAddress) + { + if (Status == IP_SUCCESS) + { + FoundTarget = true; + } + if (Status == IP_TTL_EXPIRED_TRANSIT || Status == IP_SUCCESS) + { + PrintHopInfo(AddressInfo); + } + else if (Status == IP_REQ_TIMED_OUT) + { + OutputText(IDS_REQ_TIMED_OUT); + } + } + + return true; +} + +static bool +RunTraceRoute() +{ + bool Success = false; + Success = ResolveTarget(); + if (!Success) + { + OutputText(IDS_UNABLE_RESOLVE, Info.HostName); + return false; + } + + BYTE SendBuffer[PACKET_SIZE]; + ICMPV6_ECHO_REPLY ReplyBufferv6; +#ifdef _WIN64 + ICMP_ECHO_REPLY32 ReplyBufferv432; +#else + ICMP_ECHO_REPLY ReplyBufferv4; +#endif + PVOID ReplyBuffer; + + DWORD ReplySize = PACKET_SIZE + SIZEOF_ICMP_ERROR + SIZEOF_IO_STATUS_BLOCK; + if (Info.Family == AF_INET6) + { + ReplyBuffer = &ReplyBufferv6; + ReplySize += sizeof(ICMPV6_ECHO_REPLY); + } + else + { +#ifdef _WIN64 + ReplyBuffer = &ReplyBufferv432; + ReplySize += sizeof(ICMP_ECHO_REPLY32); +#else + ReplyBuffer = &ReplyBufferv4; + ReplySize += sizeof(ICMP_ECHO_REPLY); +#endif + } + + if (Info.Family == AF_INET6) + { + Info.hIcmpFile = Icmp6CreateFile(); + } + else + { + Info.hIcmpFile = IcmpCreateFile(); + } + if (Info.hIcmpFile == INVALID_HANDLE_VALUE) + { + FreeAddrInfoW(Info.Target); + return false; + } + + OutputText(IDS_TRACE_INFO, Info.HostName, Info.TargetIP, Info.MaxHops); + + IP_OPTION_INFORMATION IpOptionInfo; + ZeroMemory(&IpOptionInfo, sizeof(IpOptionInfo)); + + bool Quit = false; + ULONG HopCount = 1; + bool FoundTarget = false; + while ((HopCount <= Info.MaxHops) && (FoundTarget == false) && (Quit == false)) + { + OutputText(IDS_HOP_COUNT, HopCount); + + for (int Ping = 1; Ping <= NUM_OF_PINGS; Ping++) + { + IpOptionInfo.Ttl = static_cast<UCHAR>(HopCount); + + if (Info.Family == AF_INET6) + { + struct sockaddr_in6 Source; + + ZeroMemory(&Source, sizeof(Source)); + Source.sin6_family = AF_INET6; + + (void)Icmp6SendEcho2(Info.hIcmpFile, + NULL, + NULL, + NULL, + &Source, + (struct sockaddr_in6 *)Info.Target->ai_addr, + SendBuffer, + (USHORT)PACKET_SIZE, + &IpOptionInfo, + ReplyBuffer, + ReplySize, + Info.Timeout); + } + else + { + (void)IcmpSendEcho2(Info.hIcmpFile, + NULL, + NULL, + NULL, + ((PSOCKADDR_IN)Info.Target->ai_addr)->sin_addr.s_addr, + SendBuffer, + (USHORT)PACKET_SIZE, + &IpOptionInfo, + ReplyBuffer, + ReplySize, + Info.Timeout); + } + + if (DecodeResponse(ReplyBuffer, (Ping == NUM_OF_PINGS), FoundTarget) == false) + { + Quit = true; + break; + } + + if (FoundTarget) + { + Success = true; + break; + } + } + + HopCount++; + Sleep(100); + } + + OutputText(IDS_TRACE_COMPLETE); + + FreeAddrInfoW(Info.Target); + if (Info.hIcmpFile) + { + IcmpCloseHandle(Info.hIcmpFile); + } + + return Success; +} + +static bool +ParseCmdline(int argc, wchar_t *argv[]) +{ + if (argc < 2) + { + Usage(); + return false; + } + + for (int i = 1; i < argc; i++) + { + if (argv[i][0] == '-') + { + switch (argv[i][1]) + { + case 'd': + Info.ResolveAddresses = FALSE; + break; + + case 'h': + Info.MaxHops = GetULONG(argv[++i]); + break; + + case 'j': + printf("-j is not yet implemented.\n"); + return false; + + case 'w': + Info.Timeout = GetULONG(argv[++i]); + break; + + case '4': + Info.Family = AF_INET; + break; + + case '6': + Info.Family = AF_INET6; + break; + + default: + { + OutputText(IDS_INVALID_OPTION, argv[i]); + Usage(); + return false; + } + } + } + else + { + StringCchCopyW(Info.HostName, NI_MAXHOST, argv[i]); + break; + } + } + + return true; +} + +EXTERN_C +int wmain(int argc, wchar_t *argv[]) +{ + Info.ResolveAddresses = true; + Info.MaxHops = 30; + Info.Timeout = 4000; + Info.Family = AF_UNSPEC; + + if (!ParseCmdline(argc, argv)) + { + return 1; + } + + WSADATA WsaData; + if (WSAStartup(MAKEWORD(2, 2), &WsaData)) + { + return 1; + } + + bool Success; + Success = RunTraceRoute(); + + WSACleanup(); + + return Success ? 0 : 1; +} diff --git a/base/applications/network/tracert/tracert.h b/base/applications/network/tracert/tracert.h deleted file mode 100644 index 9026ae3a62..0000000000 --- a/base/applications/network/tracert/tracert.h +++ /dev/null @@ -1,81 +0,0 @@ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#define _INC_WINDOWS -#include <winsock2.h> -#include <tchar.h> -#include <stdio.h> -#include <stdlib.h> -#include <ws2tcpip.h> - -#define ECHO_REPLY 0 -#define DEST_UNREACHABLE 3 -#define ECHO_REQUEST 8 -#define TTL_EXCEEDED 11 - -#define MAX_PING_PACKET_SIZE 1024 -#define MAX_PING_DATA_SIZE (MAX_PING_PACKET_SIZE + sizeof(IPv4Header)) -#define PACKET_SIZE 32 -#define ICMP_MIN_SIZE 8 - -/* we need this for packets which have the 'dont fragment' - * bit set, as they can get quite large otherwise */ -#define MAX_REC_SIZE 200 - -/* pack the structures */ -#include <pshpack1.h> - -/* IPv4 Header, 20 bytes */ -typedef struct IPv4Header -{ - BYTE h_len:4; - BYTE version:4; - BYTE tos; - USHORT length; - USHORT id; - USHORT flag_frag; - BYTE ttl; - BYTE proto; - USHORT checksum; - ULONG source; - ULONG dest; -} IPv4_HEADER, *PIPv4_HEADER; - -/* ICMP Header, 8 bytes */ -typedef struct ICMPHeader -{ - BYTE type; - BYTE code; - USHORT checksum; - USHORT id; // not used in time exceeded - USHORT seq; // not used in time exceeded -} ICMP_HEADER, *PICMP_HEADER; - -/* ICMP Echo Reply Header */ -typedef struct EchoReplyHeader -{ - struct ICMPHeader icmpheader; -} ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER; - -#include <poppack.h> - -typedef struct _APPINFO -{ - SOCKET icmpSock; // socket descriptor - SOCKADDR_IN source, dest; // source and destination address info - PECHO_REPLY_HEADER SendPacket; // ICMP echo packet - PIPv4_HEADER RecvPacket; // return receive packet - - BOOL bUsePerformanceCounter; // whether to use the high res performance counter - LARGE_INTEGER TicksPerMs; // number of millisecs in relation to proc freq - LARGE_INTEGER TicksPerUs; // number of microsecs in relation to proc freq - LONGLONG lTimeStart; // send packet, timer start - LONGLONG lTimeEnd; // receive packet, timer end - - BOOL bResolveAddresses; // -d MS ping defaults to true. - INT iMaxHops; // -h Max number of hops before trace ends - INT iHostList; // -j Source route - INT iTimeOut; // -w time before packet times out - -} APPINFO, *PAPPINFO; diff --git a/base/applications/network/tracert/tracert.rc b/base/applications/network/tracert/tracert.rc index 96a08196b5..a39998756f 100644 --- a/base/applications/network/tracert/tracert.rc +++ b/base/applications/network/tracert/tracert.rc @@ -1,5 +1,61 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Traceroute" +#include <windef.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IP Traceroute" #define REACTOS_STR_INTERNAL_NAME "tracert" #define REACTOS_STR_ORIGINAL_FILENAME "tracert.exe" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)reactos.org)" #include <reactos/version.rc> + + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif diff --git a/sdk/include/psdk/icmpapi.h b/sdk/include/psdk/icmpapi.h index c8aae44aa3..8c6bcbd92a 100644 --- a/sdk/include/psdk/icmpapi.h +++ b/sdk/include/psdk/icmpapi.h @@ -21,6 +21,10 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H +#ifdef __cplusplus +extern "C" { +#endif + HANDLE WINAPI IcmpCreateFile( VOID ); @@ -91,4 +95,9 @@ Icmp6ParseReplies( DWORD ReplySize ); +#ifdef __cplusplus +} +#endif + + #endif /* __WINE_ICMPAPI_H */

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