Ros-diffs

ros-diffs@reactos.org

19 participants
81100 discussions

[reactos] 01/01: [MSPAINT] Update Romanian (ro-RO) translation (#5353)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e369caef4e92ee8da0bae… commit e369caef4e92ee8da0baee706601cc4faafe5ed4 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jul 3 15:24:21 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 15:24:21 2023 +0300 [MSPAINT] Update Romanian (ro-RO) translation (#5353) --- base/applications/mspaint/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 2a3775ca390..398201aec18 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -257,10 +257,10 @@ BEGIN IDS_ANGLE "Unghiul trebuie să fie între -89 și 89." IDS_LOADERRORTEXT "Fișierul %s nu poate fi încărcat." IDS_ENLARGEPROMPTTEXT "Imaginea din memorie este mai mare decât suprafața curent disponibilă în aplicație.\nDoriți să redimensionați suprafața de desen disponibilă?" - IDS_BOLD "Bold" - IDS_ITALIC "Italic" + IDS_BOLD "Îngroșat" + IDS_ITALIC "Cursiv" IDS_UNDERLINE "Subliniat" IDS_VERTICAL "Vertical" - IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." + IDS_PRINTRES "%d x %d pixeli/cm" + IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." END

1 year, 6 months

[reactos] 01/01: [IPCONFIG] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=489655a4148bb4bfb7251… commit 489655a4148bb4bfb725137b821efd7b8be4f463 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jul 3 15:20:02 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jul 3 15:20:02 2023 +0300 [IPCONFIG] Update Russian (ru-RU) translation --- base/applications/network/ipconfig/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index 7aed1e5210b..3b52fd4231d 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -90,8 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Адаптер ""%ls"" не доступен для DHCP.\n" IDS_DHCPNOADAPTER "Операция завершена с ошибкой, поскольку ни один адаптер\nне находился в состоянии, допустимом для её выполнения.\n" IDS_DHCPRELEASED "IP-адрес для адаптера ""%ls"" уже освобождён.\n" - IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " - IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " + IDS_DHCPRELEASEERROR "Произошла ошибка при освобождении интерфейса ""%ls"": " + IDS_DHCPRENEWERROR "Произошла ошибка при обновлении интерфейса ""%ls"": " END STRINGTABLE

1 year, 6 months

[reactos] 01/01: [IPCONFIG] Add error messages for Release and Renew and fix magic values

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb30050e1b506234f8e2f… commit eb30050e1b506234f8e2f218d83426da63cb0fe5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Jul 3 12:28:39 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jul 3 12:28:39 2023 +0200 [IPCONFIG] Add error messages for Release and Renew and fix magic values --- base/applications/network/ipconfig/ipconfig.c | 12 ++++++------ base/applications/network/ipconfig/lang/bg-BG.rc | 2 ++ base/applications/network/ipconfig/lang/de-DE.rc | 2 ++ base/applications/network/ipconfig/lang/el-GR.rc | 2 ++ base/applications/network/ipconfig/lang/en-US.rc | 2 ++ base/applications/network/ipconfig/lang/es-ES.rc | 2 ++ base/applications/network/ipconfig/lang/fr-FR.rc | 2 ++ base/applications/network/ipconfig/lang/id-ID.rc | 2 ++ base/applications/network/ipconfig/lang/it-IT.rc | 2 ++ base/applications/network/ipconfig/lang/no-NO.rc | 2 ++ base/applications/network/ipconfig/lang/pl-PL.rc | 2 ++ base/applications/network/ipconfig/lang/ro-RO.rc | 2 ++ base/applications/network/ipconfig/lang/ru-RU.rc | 2 ++ base/applications/network/ipconfig/lang/sk-SK.rc | 2 ++ base/applications/network/ipconfig/lang/sq-AL.rc | 2 ++ base/applications/network/ipconfig/lang/sv-SE.rc | 2 ++ base/applications/network/ipconfig/lang/tr-TR.rc | 2 ++ base/applications/network/ipconfig/lang/uk-UA.rc | 2 ++ base/applications/network/ipconfig/lang/zh-CN.rc | 2 ++ base/applications/network/ipconfig/lang/zh-TW.rc | 2 ++ base/applications/network/ipconfig/resource.h | 2 ++ 21 files changed, 46 insertions(+), 6 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 014a87d120c..389026974f7 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -457,19 +457,19 @@ PrintNodeType( { switch (NodeType) { - case 1: + case BROADCAST_NODETYPE: ConResPrintf(StdOut, IDS_NODETYPEBCAST); break; - case 2: + case PEER_TO_PEER_NODETYPE: ConResPrintf(StdOut, IDS_NODETYPEP2P); break; - case 4: + case MIXED_NODETYPE: ConResPrintf(StdOut, IDS_NODETYPEMIXED); break; - case 8: + case HYBRID_NODETYPE: ConResPrintf(StdOut, IDS_NODETYPEHYBRID); break; @@ -890,7 +890,7 @@ Release( ret = IpReleaseAddress(&AdapterMap); if (ret != NO_ERROR) { - _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), szFriendlyName); + ConResPrintf(StdOut, IDS_DHCPRELEASEERROR, szFriendlyName); DoFormatMessage(ret); } } @@ -988,7 +988,7 @@ Renew( ret = IpRenewAddress(&AdapterMap); if (ret != NO_ERROR) { - _tprintf(_T("\nAn error occured while renew interface %ls : "), szFriendlyName); + ConResPrintf(StdOut, IDS_DHCPRENEWERROR, szFriendlyName); DoFormatMessage(ret); } } diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index 505d454725f..d50fc62f278 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index 76313151a15..4737823e579 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -91,6 +91,8 @@ BEGIN IDS_DHCPNOTENABLED "Der Adapter %ls ist nicht für DHCP aktiviert.\n" IDS_DHCPNOADAPTER "Der Vorgang ist fehlgeschlagen, weil kein Adapter sich in einem für diesen\nVorgang zulässigen Zustand befindet.\n" IDS_DHCPRELEASED "Die IP-Adresse für den Adapter %ls wurde bereits freigegeben.\n" + IDS_DHCPRELEASEERROR "Beim Freigeben der Schnittstellen %ls ist folgender Fehler aufgetreten: " + IDS_DHCPRENEWERROR "Beim Aktualisieren der Schnittstelle %ls ist folgender Fehler aufgetreten: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index 77d3ab06a5d..0e739f436e6 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index d7d5b2ee05e..11baf3a89b8 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index 6049a922906..0416780ca56 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index d0f212dcdb1..3b7e36005e1 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -91,6 +91,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index f1230c23632..d7a6149a853 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index c0dfa9e3913..f96e1488573 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index e710a25f57f..6c08063cf40 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index 5860ea06fa8..b81bad80b0c 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -68,6 +68,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index bc24294c3d3..bfdb06b9a8f 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index c365b1d37f3..7aed1e5210b 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Адаптер ""%ls"" не доступен для DHCP.\n" IDS_DHCPNOADAPTER "Операция завершена с ошибкой, поскольку ни один адаптер\nне находился в состоянии, допустимом для её выполнения.\n" IDS_DHCPRELEASED "IP-адрес для адаптера ""%ls"" уже освобождён.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index 71bd81648c6..8335eeb2fb9 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index 8dc5e361839..120fcf45f72 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -89,6 +89,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index 24eea34eb75..8f0cd22fdb2 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index dfc2a5fec83..c720a6eb0c4 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index 63b33b1fe34..c94ffdb188b 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index 588851408bc..76b031627ba 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index 17272ed578f..0e1063ad894 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -90,6 +90,8 @@ BEGIN IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " + IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " END STRINGTABLE diff --git a/base/applications/network/ipconfig/resource.h b/base/applications/network/ipconfig/resource.h index 0395027b423..678e677f084 100644 --- a/base/applications/network/ipconfig/resource.h +++ b/base/applications/network/ipconfig/resource.h @@ -75,3 +75,5 @@ #define IDS_DHCPNOTENABLED 205 #define IDS_DHCPNOADAPTER 206 #define IDS_DHCPRELEASED 207 +#define IDS_DHCPRELEASEERROR 208 +#define IDS_DHCPRENEWERROR 209

1 year, 6 months

[reactos] 01/01: [IPHLPAPI] Formatting only, no functional change

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5360f542f5b26616673a… commit a5360f542f5b26616673a193c906f808160f29e9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Jul 3 00:38:41 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Jul 3 00:38:41 2023 +0200 [IPHLPAPI] Formatting only, no functional change - Strip inconsistent spaces from the spec file. - iphlpapi_main: Harmonize inconsistent and line-wasting function-comments and fix mixed space-tab-indentation. - ipstats_reactos.c: Compactify horizontally accordingly to the coding guidelines I am interested in that code for a backport, so I want it to be well-formatted. Ftr: IPHLPAPI was *forked* more than a decade ago from Wine. Therefore no diff ever was guarded within those files whenever we implemented anything here. --- dll/win32/iphlpapi/iphlpapi.spec | 118 +++++----- dll/win32/iphlpapi/iphlpapi_main.c | 205 +--------------- dll/win32/iphlpapi/ipstats_reactos.c | 443 +++++++++++++++++------------------ 3 files changed, 284 insertions(+), 482 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi.spec b/dll/win32/iphlpapi/iphlpapi.spec index 3151b5f40db..ea7d71a0fd5 100644 --- a/dll/win32/iphlpapi/iphlpapi.spec +++ b/dll/win32/iphlpapi/iphlpapi.spec @@ -1,84 +1,84 @@ -@ stdcall AddIPAddress( long long long ptr ptr ) +@ stdcall AddIPAddress(long long long ptr ptr) @ stub AllocateAndGetArpEntTableFromStack -@ stdcall AllocateAndGetIfTableFromStack( ptr long long long ) -@ stdcall AllocateAndGetIpAddrTableFromStack( ptr long long long ) -@ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long ) -@ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) -@ stdcall AllocateAndGetTcpExTable2FromStack( ptr long long long long long ) -@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long long ) -@ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) -@ stdcall AllocateAndGetUdpExTable2FromStack( ptr long long long long long ) -@ stdcall AllocateAndGetUdpExTableFromStack( ptr long long long long ) -@ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) +@ stdcall AllocateAndGetIfTableFromStack(ptr long long long) +@ stdcall AllocateAndGetIpAddrTableFromStack(ptr long long long) +@ stdcall AllocateAndGetIpForwardTableFromStack(ptr long long long) +@ stdcall AllocateAndGetIpNetTableFromStack(ptr long long long) +@ stdcall AllocateAndGetTcpExTable2FromStack(ptr long long long long long) +@ stdcall AllocateAndGetTcpExTableFromStack(ptr long long long long) +@ stdcall AllocateAndGetTcpTableFromStack(ptr long long long) +@ stdcall AllocateAndGetUdpExTable2FromStack(ptr long long long long long) +@ stdcall AllocateAndGetUdpExTableFromStack(ptr long long long long) +@ stdcall AllocateAndGetUdpTableFromStack(ptr long long long) @ stdcall CancelIPChangeNotify(ptr) @ stub CancelSecurityHealthChangeNotify -@ stdcall CreateIpForwardEntry( ptr ) -@ stdcall CreateIpNetEntry( ptr ) -@ stdcall CreateProxyArpEntry( long long long ) -@ stdcall DeleteIPAddress( long ) -@ stdcall DeleteIpForwardEntry( ptr ) -@ stdcall DeleteIpNetEntry( ptr ) -@ stdcall DeleteProxyArpEntry( long long long ) +@ stdcall CreateIpForwardEntry(ptr) +@ stdcall CreateIpNetEntry(ptr) +@ stdcall CreateProxyArpEntry(long long long) +@ stdcall DeleteIPAddress(long) +@ stdcall DeleteIpForwardEntry(ptr) +@ stdcall DeleteIpNetEntry(ptr) +@ stdcall DeleteProxyArpEntry(long long long) @ stdcall DisableMediaSense(ptr ptr) -@ stdcall EnableRouter( ptr ptr ) -@ stdcall FlushIpNetTable( long ) +@ stdcall EnableRouter(ptr ptr) +@ stdcall FlushIpNetTable(long) @ stub FlushIpNetTableFromStack -@ stdcall GetAdapterIndex( wstr ptr ) +@ stdcall GetAdapterIndex(wstr ptr) @ stdcall GetAdapterOrderMap() -@ stdcall GetAdaptersAddresses( long long ptr ptr ptr ) -@ stdcall GetAdaptersInfo( ptr ptr ) -@ stdcall GetBestInterface( long ptr ) +@ stdcall GetAdaptersAddresses(long long ptr ptr ptr) +@ stdcall GetAdaptersInfo(ptr ptr) +@ stdcall GetBestInterface(long ptr) @ stdcall GetBestInterfaceEx(ptr ptr) @ stub GetBestInterfaceFromStack -@ stdcall GetBestRoute( long long long ) +@ stdcall GetBestRoute(long long long) @ stub GetBestRouteFromStack -@ stdcall GetExtendedTcpTable( ptr ptr long long long long ) -@ stdcall GetExtendedUdpTable( ptr ptr long long long long ) -@ stdcall GetFriendlyIfIndex( long ) -@ stdcall GetIcmpStatistics( ptr ) +@ stdcall GetExtendedTcpTable(ptr ptr long long long long) +@ stdcall GetExtendedUdpTable(ptr ptr long long long long) +@ stdcall GetFriendlyIfIndex(long) +@ stdcall GetIcmpStatistics(ptr) @ stdcall GetIcmpStatisticsEx(ptr long) @ stub GetIcmpStatsFromStack @ stub GetIcmpStatsFromStackEx -@ stdcall GetIfEntry( ptr ) +@ stdcall GetIfEntry(ptr) @ stub GetIfEntryFromStack -@ stdcall GetIfTable( ptr ptr long ) +@ stdcall GetIfTable(ptr ptr long) @ stub GetIfTableFromStack @ stub GetIgmpList -@ stdcall GetInterfaceInfo( ptr ptr ) -@ stdcall GetIpAddrTable( ptr ptr long ) +@ stdcall GetInterfaceInfo(ptr ptr) +@ stdcall GetIpAddrTable(ptr ptr long) @ stub GetIpAddrTableFromStack @ stdcall GetIpErrorString(long ptr ptr) -@ stdcall GetIpForwardTable( ptr ptr long ) +@ stdcall GetIpForwardTable(ptr ptr long) @ stub GetIpForwardTableFromStack -@ stdcall GetIpNetTable( ptr ptr long ) +@ stdcall GetIpNetTable(ptr ptr long) @ stub GetIpNetTableFromStack -@ stdcall GetIpStatistics( ptr ) +@ stdcall GetIpStatistics(ptr) @ stdcall GetIpStatisticsEx(ptr long) @ stub GetIpStatsFromStack @ stub GetIpStatsFromStackEx -@ stdcall GetNetworkParams( ptr ptr ) -@ stdcall GetNumberOfInterfaces( ptr ) +@ stdcall GetNetworkParams(ptr ptr) +@ stdcall GetNumberOfInterfaces(ptr) @ stub GetOwnerModuleFromTcp6Entry -@ stdcall GetOwnerModuleFromTcpEntry ( ptr long ptr ptr ) +@ stdcall GetOwnerModuleFromTcpEntry(ptr long ptr ptr) @ stub GetOwnerModuleFromUdp6Entry -@ stdcall GetOwnerModuleFromUdpEntry ( ptr long ptr ptr ) -@ stdcall GetPerAdapterInfo( long ptr ptr ) -@ stdcall GetRTTAndHopCount( long ptr long ptr ) +@ stdcall GetOwnerModuleFromUdpEntry(ptr long ptr ptr) +@ stdcall GetPerAdapterInfo(long ptr ptr) +@ stdcall GetRTTAndHopCount(long ptr long ptr) @ stub GetTcpExTable2FromStack -@ stdcall GetTcpStatistics( ptr ) +@ stdcall GetTcpStatistics(ptr) @ stdcall GetTcpStatisticsEx(ptr long) @ stub GetTcpStatsFromStack @ stub GetTcpStatsFromStackEx -@ stdcall GetTcpTable( ptr ptr long ) +@ stdcall GetTcpTable(ptr ptr long) @ stub GetTcpTableFromStack @ stub GetUdpExTable2FromStack -@ stdcall GetUdpStatistics( ptr ) +@ stdcall GetUdpStatistics(ptr) @ stdcall GetUdpStatisticsEx(ptr long) @ stub GetUdpStatsFromStack @ stub GetUdpStatsFromStackEx -@ stdcall GetUdpTable( ptr ptr long ) +@ stdcall GetUdpTable(ptr ptr long) @ stub GetUdpTableFromStack -@ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) +@ stdcall GetUniDirectionalAdapterInfo(ptr ptr) @ stdcall Icmp6CreateFile() @ stdcall Icmp6ParseReplies(ptr long) @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @@ -102,8 +102,8 @@ @ stub InternalSetIpNetEntry @ stub InternalSetIpStats @ stub InternalSetTcpEntry -@ stdcall IpReleaseAddress( ptr ) -@ stdcall IpRenewAddress( ptr ) +@ stdcall IpReleaseAddress(ptr) +@ stdcall IpRenewAddress(ptr) @ stub IsLocalAddress @ stub NTPTimeToNTFileTime @ stub NTTimeToNTPTime @@ -112,8 +112,8 @@ @ stdcall NhGetInterfaceNameFromGuid(ptr ptr ptr long long) @ stdcall NhpAllocateAndGetInterfaceInfoFromStack(ptr ptr long ptr long) @ stub NhpGetInterfaceIndexFromStack -@ stdcall NotifyAddrChange( ptr ptr ) -@ stdcall NotifyRouteChange( ptr ptr ) +@ stdcall NotifyAddrChange(ptr ptr) +@ stdcall NotifyRouteChange(ptr ptr) @ stub NotifyRouteChangeEx @ stub NotifySecurityHealthChange @ stdcall _PfAddFiltersToInterface@24() @@ -136,22 +136,22 @@ @ stdcall SendARP(long long ptr ptr) @ stub SetAdapterIpAddress @ stub SetBlockRoutes -@ stdcall SetIfEntry( ptr ) +@ stdcall SetIfEntry(ptr) @ stub SetIfEntryToStack -@ stdcall SetIpForwardEntry( ptr ) -@ stdcall SetIpForwardEntryToStack( ptr ) +@ stdcall SetIpForwardEntry(ptr) +@ stdcall SetIpForwardEntryToStack(ptr) @ stub SetIpMultihopRouteEntryToStack -@ stdcall SetIpNetEntry( ptr ) +@ stdcall SetIpNetEntry(ptr) @ stub SetIpNetEntryToStack @ stub SetIpRouteEntryToStack -@ stdcall SetIpStatistics( ptr ) +@ stdcall SetIpStatistics(ptr) @ stub SetIpStatsToStack -@ stdcall SetIpTTL( long ) +@ stdcall SetIpTTL(long) @ stub SetProxyArpEntryToStack @ stub SetRouteWithRef -@ stdcall SetTcpEntry( ptr ) +@ stdcall SetTcpEntry(ptr) @ stub SetTcpEntryToStack -@ stdcall UnenableRouter( ptr ptr ) +@ stdcall UnenableRouter(ptr ptr) @ stub do_echo_rep @ stub do_echo_req @ stub register_icmp diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 377a1cbaa80..a2fccb2cf58 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -54,9 +54,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /****************************************************************** * AddIPAddress (IPHLPAPI.@) * - * * PARAMS - * * Address [In] * IpMask [In] * IfIndex [In] @@ -64,9 +62,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) * NTEInstance [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG NteContext, PULONG NteInstance) { @@ -75,9 +71,9 @@ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG DWORD getInterfaceGatewayByIndex(DWORD index) { - DWORD ndx, retVal = 0, numRoutes = getNumRoutes(); - RouteTable *table = getRouteTable(); - if (!table) return 0; + DWORD ndx, retVal = 0, numRoutes = getNumRoutes(); + RouteTable *table = getRouteTable(); + if (!table) return 0; for (ndx = 0; ndx < numRoutes; ndx++) { @@ -91,9 +87,7 @@ DWORD getInterfaceGatewayByIndex(DWORD index) /****************************************************************** * AllocateAndGetIfTableFromStack (IPHLPAPI.@) * - * * PARAMS - * * ppIfTable [Out] -- pointer into which the MIB_IFTABLE is * allocated and returned. * bOrder [In] -- passed to GetIfTable to order the table @@ -102,7 +96,6 @@ DWORD getInterfaceGatewayByIndex(DWORD index) * * RETURNS -- ERROR_INVALID_PARAMETER if ppIfTable is NULL, whatever * GetIfTable returns otherwise - * */ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, BOOL bOrder, HANDLE heap, DWORD flags) @@ -135,18 +128,14 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, /****************************************************************** * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) * - * * PARAMS - * * ppIpAddrTable [Out] * bOrder [In] -- passed to GetIpAddrTable to order the table * heap [In] -- heap from which the table is allocated * flags [In] -- flags to HeapAlloc * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, BOOL bOrder, HANDLE heap, DWORD flags) @@ -179,7 +168,6 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, /****************************************************************** * AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@) * - * * ppIpForwardTable [Out] -- pointer into which the MIB_IPFORWARDTABLE is * allocated and returned. * bOrder [In] -- passed to GetIfTable to order the table @@ -188,7 +176,6 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, * * RETURNS -- ERROR_INVALID_PARAMETER if ppIfTable is NULL, whatever * GetIpForwardTable returns otherwise - * */ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE * ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) @@ -221,18 +208,14 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE * /****************************************************************** * AllocateAndGetIpNetTableFromStack (IPHLPAPI.@) * - * * PARAMS - * * ppIpNetTable [Out] * bOrder [In] -- passed to GetIpNetTable to order the table * heap [In] -- heap from which the table is allocated * flags [In] -- flags to HeapAlloc * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags) @@ -265,18 +248,14 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, /****************************************************************** * AllocateAndGetTcpTableFromStack (IPHLPAPI.@) * - * * PARAMS - * * ppTcpTable [Out] * bOrder [In] -- passed to GetTcpTable to order the table * heap [In] -- heap from which the table is allocated * flags [In] -- flags to HeapAlloc * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags) @@ -309,9 +288,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, /****************************************************************** * AllocateAndGetTcpExTableFromStack (IPHLPAPI.@) * - * * PARAMS - * * ppTcpTable [Out] * bOrder [In] -- passed to GetExtendedTcpTable to order the table * heap [In] -- heap from which the table is allocated @@ -319,9 +296,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, * family [In] -- passed to GetExtendedTcpTable to select INET family * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) @@ -354,9 +329,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable, /****************************************************************** * AllocateAndGetTcpExTable2FromStack (IPHLPAPI.@) * - * * PARAMS - * * ppTcpTable [Out] * bOrder [In] -- passed to GetExtendedTcpTable to order the table * heap [In] -- heap from which the table is allocated @@ -365,9 +338,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable, * class [In] -- passed to GetExtendedTcpTable to select information * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, TCP_TABLE_CLASS class) @@ -400,18 +371,14 @@ DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable, /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * - * * PARAMS - * * ppUdpTable [Out] * bOrder [In] -- passed to GetUdpTable to order the table * heap [In] -- heap from which the table is allocated * flags [In] -- flags to HeapAlloc * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags) @@ -444,9 +411,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, /****************************************************************** * AllocateAndGetUdpExTableFromStack (IPHLPAPI.@) * - * * PARAMS - * * ppUdpTable [Out] * bOrder [In] -- passed to GetExtendedUdpTable to order the table * heap [In] -- heap from which the table is allocated @@ -454,9 +419,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, * family [In] -- passed to GetExtendedUdpTable to select INET family * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) @@ -489,9 +452,7 @@ DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable, /****************************************************************** * AllocateAndGetUdpExTable2FromStack (IPHLPAPI.@) * - * * PARAMS - * * ppUdpTable [Out] * bOrder [In] -- passed to GetExtendedUdpTable to order the table * heap [In] -- heap from which the table is allocated @@ -500,9 +461,7 @@ DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable, * class [In] -- passed to GetExtendedUdpTable to select information * * RETURNS - * * DWORD - * */ DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, UDP_TABLE_CLASS class) @@ -535,15 +494,11 @@ DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable, /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@) * - * * PARAMS - * * pRoute [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute) { @@ -554,15 +509,11 @@ DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute) /****************************************************************** * CreateIpNetEntry (IPHLPAPI.@) * - * * PARAMS - * * pArpEntry [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry) { @@ -576,17 +527,13 @@ DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry) /****************************************************************** * CreateProxyArpEntry (IPHLPAPI.@) * - * * PARAMS - * * dwAddress [In] * dwMask [In] * dwIfIndex [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) { @@ -601,15 +548,11 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) /****************************************************************** * DeleteIPAddress (IPHLPAPI.@) * - * * PARAMS - * * NTEContext [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI DeleteIPAddress(ULONG NTEContext) { @@ -621,15 +564,11 @@ DWORD WINAPI DeleteIPAddress(ULONG NTEContext) /****************************************************************** * DeleteIpForwardEntry (IPHLPAPI.@) * - * * PARAMS - * * pRoute [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute) { @@ -640,15 +579,11 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute) /****************************************************************** * DeleteIpNetEntry (IPHLPAPI.@) * - * * PARAMS - * * pArpEntry [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry) { @@ -662,17 +597,13 @@ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry) /****************************************************************** * DeleteProxyArpEntry (IPHLPAPI.@) * - * * PARAMS - * * dwAddress [In] * dwMask [In] * dwIfIndex [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) { @@ -686,16 +617,12 @@ DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) /****************************************************************** * EnableRouter (IPHLPAPI.@) * - * * PARAMS - * * pHandle [In/Out] * pOverlapped [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped) { @@ -711,15 +638,11 @@ DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped) /****************************************************************** * FlushIpNetTable (IPHLPAPI.@) * - * * PARAMS - * * dwIfIndex [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) { @@ -734,16 +657,12 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) /****************************************************************** * GetAdapterIndex (IPHLPAPI.@) * - * * PARAMS - * * AdapterName [In/Out] * IfIndex [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex) { @@ -757,16 +676,12 @@ DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex) /****************************************************************** * GetAdaptersInfo (IPHLPAPI.@) * - * * PARAMS - * * pAdapterInfo [In/Out] * pOutBufLen [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) { @@ -826,7 +741,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) winsEnabled = TRUE; RegCloseKey(hKey); } - TRACE("num of index is %lu\n", table->numIndexes); + TRACE("num of index is %lu\n", table->numIndexes); for (ndx = 0; ndx < table->numIndexes; ndx++) { PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx]; DWORD addrLen = sizeof(ptr->Address), type; @@ -893,16 +808,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) /****************************************************************** * GetBestInterface (IPHLPAPI.@) * - * * PARAMS - * * dwDestAddr [In] * pdwBestIfIndex [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) { @@ -926,17 +837,13 @@ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) /****************************************************************** * GetBestRoute (IPHLPAPI.@) * - * * PARAMS - * * dwDestAddr [In] * dwSourceAddr [In] * OUT [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDROW pBestRoute) { @@ -1015,10 +922,7 @@ static int TcpTableSorter(const void *a, const void *b) * RETURNS * Success: NO_ERROR * Failure: either ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER - * - * NOTES */ - DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved) { DWORD i, count, size; @@ -1402,7 +1306,6 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U return ret; } - static int UdpTableSorter(const void *a, const void *b) { int ret; @@ -1435,14 +1338,11 @@ static int UdpTableSorter(const void *a, const void *b) * RETURNS * Success: NO_ERROR * Failure: either ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER - * - * NOTES */ - DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, UDP_TABLE_CLASS TableClass, ULONG Reserved) { DWORD size; - DWORD ret = NO_ERROR; + DWORD ret = NO_ERROR; if (!pdwSize) { @@ -1550,15 +1450,11 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, U /****************************************************************** * GetFriendlyIfIndex (IPHLPAPI.@) * - * * PARAMS - * * IfIndex [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) { @@ -1573,15 +1469,11 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) /****************************************************************** * GetIcmpStatistics (IPHLPAPI.@) * - * * PARAMS - * * pStats [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats) { @@ -1597,15 +1489,11 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats) /****************************************************************** * GetIfEntry (IPHLPAPI.@) * - * * PARAMS - * * pIfRow [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) { @@ -1645,17 +1533,13 @@ static int IfTableSorter(const void *a, const void *b) /****************************************************************** * GetIfTable (IPHLPAPI.@) * - * * PARAMS - * * pIfTable [In/Out] * pdwSize [In/Out] * bOrder [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) { @@ -1713,16 +1597,12 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) /****************************************************************** * GetInterfaceInfo (IPHLPAPI.@) * - * * PARAMS - * * pIfTable [In/Out] * dwOutBufLen [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) { @@ -1801,17 +1681,13 @@ static int IpAddrTableSorter(const void *a, const void *b) /****************************************************************** * GetIpAddrTable (IPHLPAPI.@) * - * * PARAMS - * * pIpAddrTable [In/Out] * pdwSize [In/Out] * bOrder [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL bOrder) { @@ -1905,17 +1781,13 @@ static int IpForwardTableSorter(const void *a, const void *b) /****************************************************************** * GetIpForwardTable (IPHLPAPI.@) * - * * PARAMS - * * pIpForwardTable [In/Out] * pdwSize [In/Out] * bOrder [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSize, BOOL bOrder) { @@ -2005,17 +1877,13 @@ static int IpNetTableSorter(const void *a, const void *b) /****************************************************************** * GetIpNetTable (IPHLPAPI.@) * - * * PARAMS - * * pIpNetTable [In/Out] * pdwSize [In/Out] * bOrder [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOrder) { @@ -2065,15 +1933,11 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr /****************************************************************** * GetIpStatistics (IPHLPAPI.@) * - * * PARAMS - * * pStats [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats) { @@ -2083,16 +1947,12 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats) /****************************************************************** * GetIpStatisticsEx (IPHLPAPI.@) * - * * PARAMS - * * pStats [In/Out] * dwFamily [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily) { @@ -2107,16 +1967,12 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily) /****************************************************************** * GetNetworkParams (IPHLPAPI.@) * - * * PARAMS - * * pFixedInfo [In/Out] * pOutBufLen [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) { @@ -2260,15 +2116,11 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) /****************************************************************** * GetNumberOfInterfaces (IPHLPAPI.@) * - * * PARAMS - * * pdwNumIf [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) { @@ -2466,7 +2318,7 @@ static DWORD GetOwnerModuleFromTagEntry(DWORD OwningPid, DWORD OwningTag, TCPIP_ * NOTES * The type of data returned in Buffer is indicated by the value of the Class parameter. */ -DWORD WINAPI GetOwnerModuleFromTcpEntry( PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) +DWORD WINAPI GetOwnerModuleFromTcpEntry(PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) { /* If we have a service tag, that's a service connection */ if (pTcpEntry->OwningModuleInfo[0] != 0) @@ -2498,7 +2350,7 @@ DWORD WINAPI GetOwnerModuleFromTcpEntry( PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCP * NOTES * The type of data returned in Buffer is indicated by the value of the Class parameter. */ -DWORD WINAPI GetOwnerModuleFromUdpEntry( PMIB_UDPROW_OWNER_MODULE pUdpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) +DWORD WINAPI GetOwnerModuleFromUdpEntry(PMIB_UDPROW_OWNER_MODULE pUdpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) { /* If we have a service tag, that's a service connection */ if (pUdpEntry->OwningModuleInfo[0] != 0) @@ -2544,17 +2396,13 @@ static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, PWCHAR Server, /****************************************************************** * GetPerAdapterInfo (IPHLPAPI.@) * - * * PARAMS - * * IfIndex [In] * pPerAdapterInfo [In/Out] * pOutBufLen [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) { @@ -2618,18 +2466,14 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterIn /****************************************************************** * GetRTTAndHopCount (IPHLPAPI.@) * - * * PARAMS - * * DestIpAddress [In] * HopCount [In/Out] * MaxHops [In] * RTT [In/Out] * * RETURNS - * * BOOL - * */ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHops, PULONG RTT) { @@ -2643,16 +2487,12 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo /****************************************************************** * GetTcpStatisticsEx (IPHLPAPI.@) * - * * PARAMS - * * pStats [In/Out] * dwFamily [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily) { @@ -2667,15 +2507,11 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily) /****************************************************************** * GetTcpStatistics (IPHLPAPI.@) * - * * PARAMS - * * pStats [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats) { @@ -2707,23 +2543,19 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats) */ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) { - return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0); + return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0); } /****************************************************************** * GetUdpStatisticsEx (IPHLPAPI.@) * - * * PARAMS - * * pStats [In/Out] * dwFamily [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily) { @@ -2738,15 +2570,11 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily) /****************************************************************** * GetUdpStatistics (IPHLPAPI.@) * - * * PARAMS - * * pStats [In/Out] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats) { @@ -2757,21 +2585,17 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats) /****************************************************************** * GetUdpTable (IPHLPAPI.@) * - * * PARAMS - * * pUdpTable [In/Out] * pdwSize [In/Out] * bOrder [In] * * RETURNS - * * DWORD - * */ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) { - return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, AF_INET, UDP_TABLE_BASIC, 0); + return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, AF_INET, UDP_TABLE_BASIC, 0); } @@ -2812,7 +2636,6 @@ DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIP * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * */ DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { @@ -2984,7 +2807,6 @@ DWORD WINAPI SetIfEntry(PMIB_IFROW pIfRow) * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * */ DWORD WINAPI SetIpForwardEntry(PMIB_IPFORWARDROW pRoute) { @@ -3163,9 +2985,6 @@ PIP_ADAPTER_ORDER_MAP WINAPI GetAdapterOrderMap(VOID) return 0L; } -/* - * @implemented - */ #ifdef GetAdaptersAddressesV1 DWORD WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen) { @@ -3470,9 +3289,6 @@ DWORD GetInterfaceNameInternal(_In_ const GUID * pInterfaceGUID, return ERROR_SUCCESS; } -/* - * @implemented - */ DWORD WINAPI NhGetInterfaceNameFromDeviceGuid(_In_ const GUID * pInterfaceGUID, _Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName, @@ -3488,9 +3304,6 @@ NhGetInterfaceNameFromDeviceGuid(_In_ const GUID * pInterfaceGUID, return GetInterfaceNameInternal(pInterfaceGUID, pInterfaceName, pOutBufLen); } -/* - * @implemented - */ DWORD WINAPI NhGetInterfaceNameFromGuid(_In_ const GUID * pInterfaceGUID, _Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName, diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index 535264caeee..d5ceaacde88 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -108,14 +108,14 @@ NTSTATUS tdiGetMibForIpEntity req.ID.toi_id = IP_MIB_STATS_ID; req.ID.toi_entity = *ent; - status = DeviceIoControl( tcpFile, - IOCTL_TCP_QUERY_INFORMATION_EX, - &req, - sizeof(req), - entry, - sizeof(*entry), - &returnSize, - NULL ); + status = DeviceIoControl(tcpFile, + IOCTL_TCP_QUERY_INFORMATION_EX, + &req, + sizeof(req), + entry, + sizeof(*entry), + &returnSize, + NULL); TRACE("TdiGetMibForIpEntity() => status = 0x%08lx, entry = {\n" " ipsi_forwarding ............ %lu\n" @@ -153,16 +153,16 @@ NTSTATUS tdiGetRoutesForIpEntity TRACE("TdiGetRoutesForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", tcpFile, ent->tei_instance); - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - IP_MIB_ARPTABLE_ENTRY_ID, - CL_NL_ENTITY, - ent->tei_instance, - 0, - sizeof(IPRouteEntry), - (PVOID *)routes, - numRoutes); + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_MIB_ARPTABLE_ENTRY_ID, + CL_NL_ENTITY, + ent->tei_instance, + 0, + sizeof(IPRouteEntry), + (PVOID *)routes, + numRoutes); return status; } @@ -174,16 +174,16 @@ NTSTATUS tdiGetIpAddrsForIpEntity TRACE("TdiGetIpAddrsForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", tcpFile, ent->tei_instance); - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - IP_MIB_ADDRTABLE_ENTRY_ID, - CL_NL_ENTITY, - ent->tei_instance, - 0, - sizeof(IPAddrEntry), - (PVOID *)addrs, - numAddrs ); + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_MIB_ADDRTABLE_ENTRY_ID, + CL_NL_ENTITY, + ent->tei_instance, + 0, + sizeof(IPAddrEntry), + (PVOID *)addrs, + numAddrs); return status; } @@ -373,25 +373,26 @@ DWORD getNumRoutes(void) TRACE("called.\n"); - status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { + status = openTcpFile(&tcpFile, FILE_READ_DATA); + if (!NT_SUCCESS(status)) + { ERR("openTcpFile returned 0x%08lx\n", status); return 0; } - status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - if( !NT_SUCCESS(status) ) { + status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); + if (!NT_SUCCESS(status)) { ERR("tdiGetEntityIDSet returned 0x%08lx\n", status); closeTcpFile( tcpFile ); return 0; } - for( i = 0; i < numEntities; i++ ) { - if( isIpEntity( tcpFile, &entitySet[i] ) ) { + for (i = 0; i < numEntities; i++) { + if (isIpEntity(tcpFile, &entitySet[i])) { IPSNMPInfo isnmp; - memset( &isnmp, 0, sizeof( isnmp ) ); - status = tdiGetMibForIpEntity( tcpFile, &entitySet[i], &isnmp ); - if( !NT_SUCCESS(status) ) { + memset(&isnmp, 0, sizeof(isnmp)); + status = tdiGetMibForIpEntity(tcpFile, &entitySet[i], &isnmp); + if (!NT_SUCCESS(status)) { ERR("tdiGetMibForIpEntity returned 0x%08lx, for i = %d\n", status, i); numRoutes = 0; break; @@ -402,8 +403,8 @@ DWORD getNumRoutes(void) TRACE("numRoutes = %lu\n", numRoutes); - tdiFreeThingSet( entitySet ); - closeTcpFile( tcpFile ); + tdiFreeThingSet(entitySet); + closeTcpFile(tcpFile); return numRoutes; } @@ -427,17 +428,17 @@ RouteTable *getRouteTable(void) DWORD numRoutes = getNumRoutes(), routesAdded = 0; TDIEntityID ent; HANDLE tcpFile; - NTSTATUS status = openTcpFile( &tcpFile, FILE_READ_DATA ); + NTSTATUS status = openTcpFile(&tcpFile, FILE_READ_DATA); int i; - if( !NT_SUCCESS(status) ) + if (!NT_SUCCESS(status)) return 0; TRACE("GETTING ROUTE TABLE\n"); - out_route_table = HeapAlloc( GetProcessHeap(), 0, - sizeof(RouteTable) + - (sizeof(RouteEntry) * (numRoutes - 1)) ); + out_route_table = HeapAlloc(GetProcessHeap(), 0, + sizeof(RouteTable) + + (sizeof(RouteEntry) * (numRoutes - 1))); if (!out_route_table) { closeTcpFile(tcpFile); return NULL; @@ -445,28 +446,27 @@ RouteTable *getRouteTable(void) out_route_table->numRoutes = numRoutes; - for( i = 0; routesAdded < out_route_table->numRoutes; i++ ) { + for (i = 0; routesAdded < out_route_table->numRoutes; i++) { int j; IPRouteEntry *route_set; - getNthIpEntity( tcpFile, i, &ent ); - - tdiGetRoutesForIpEntity( tcpFile, &ent, &route_set, &numRoutes ); + getNthIpEntity(tcpFile, i, &ent); - if( !route_set ) { - closeTcpFile( tcpFile ); - HeapFree( GetProcessHeap(), 0, out_route_table ); + tdiGetRoutesForIpEntity(tcpFile, &ent, &route_set, &numRoutes); + if (!route_set) { + closeTcpFile(tcpFile); + HeapFree(GetProcessHeap(), 0, out_route_table); return 0; } TRACE("%lu routes in instance %d\n", numRoutes, i); #if 0 - HexDump( route_set, - sizeof( IPRouteEntry ) * - snmpInfo.ipsi_numroutes ); + HexDump(route_set, + sizeof(IPRouteEntry) * + snmpInfo.ipsi_numroutes); #endif - for( j = 0; j < numRoutes; j++ ) { + for (j = 0; j < numRoutes; j++) { int routeNum = j + routesAdded; out_route_table->routes[routeNum].dest = route_set[j].ire_dest; @@ -480,15 +480,13 @@ RouteTable *getRouteTable(void) route_set[j].ire_metric1; } - if( route_set ) tdiFreeThingSet( route_set ); + if (route_set) tdiFreeThingSet(route_set); routesAdded += numRoutes; } - closeTcpFile( tcpFile ); - + closeTcpFile(tcpFile); TRACE("status = 0x%08lx, out_route_table = 0x%p\n", status, out_route_table); - return out_route_table; } @@ -504,39 +502,39 @@ DWORD getNumArpEntries(void) TRACE("called.\n"); - status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { + status = openTcpFile(&tcpFile, FILE_READ_DATA); + if (!NT_SUCCESS(status)) + { ERR("openTcpFile returned 0x%08lx\n", status); return 0; } - status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - - for( i = 0; i < numEntities; i++ ) { - if( isInterface( &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) ) { - - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - IP_MIB_ARPTABLE_ENTRY_ID, - AT_ENTITY, - entitySet[i].tei_instance, - 0, - sizeof(MIB_IPNETROW), - (PVOID *)&IpArpTable, - &returnSize ); - - if( status == STATUS_SUCCESS ) totalNumber += returnSize; - if( IpArpTable ) { - tdiFreeThingSet( IpArpTable ); - IpArpTable = NULL; - } - } + status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); + + for (i = 0; i < numEntities; i++) { + if (isInterface(&entitySet[i]) && hasArp(tcpFile, &entitySet[i])) + { + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_MIB_ARPTABLE_ENTRY_ID, + AT_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(MIB_IPNETROW), + (PVOID *)&IpArpTable, + &returnSize); + + if (status == STATUS_SUCCESS) totalNumber += returnSize; + if (IpArpTable) { + tdiFreeThingSet(IpArpTable); + IpArpTable = NULL; + } + } } - closeTcpFile( tcpFile ); - if( entitySet ) tdiFreeThingSet( entitySet ); + closeTcpFile(tcpFile); + if (entitySet) tdiFreeThingSet(entitySet); return totalNumber; } @@ -554,50 +552,47 @@ PMIB_IPNETTABLE getArpTable(void) totalNumber = getNumArpEntries(); - status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { + status = openTcpFile(&tcpFile, FILE_READ_DATA); + if (!NT_SUCCESS(status)) + { ERR("openTcpFile returned 0x%08lx\n", status); return 0; } - IpArpTable = HeapAlloc - ( GetProcessHeap(), 0, - sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber) ); + IpArpTable = HeapAlloc(GetProcessHeap(), 0, + sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber)); if (!IpArpTable) { closeTcpFile(tcpFile); return NULL; } - status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - - for( i = 0; i < numEntities; i++ ) { - if( isInterface( &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) ) { - - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - IP_MIB_ARPTABLE_ENTRY_ID, - AT_ENTITY, - entitySet[i].tei_instance, - 0, - sizeof(MIB_IPNETROW), - (PVOID *)&AdapterArpTable, - &returnSize ); - - if( status == STATUS_SUCCESS ) { - for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); + + for (i = 0; i < numEntities; i++) { + if (isInterface(&entitySet[i]) && hasArp(tcpFile, &entitySet[i])) + { + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_MIB_ARPTABLE_ENTRY_ID, + AT_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(MIB_IPNETROW), + (PVOID *)&AdapterArpTable, + &returnSize); + + if (status == STATUS_SUCCESS) { + for (TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++) IpArpTable->table[CurrIdx] = AdapterArpTable[TmpIdx]; - tdiFreeThingSet( AdapterArpTable ); + tdiFreeThingSet(AdapterArpTable); } } } - closeTcpFile( tcpFile ); - - tdiFreeThingSet( entitySet ); + closeTcpFile(tcpFile); + tdiFreeThingSet(entitySet); IpArpTable->dwNumEntries = CurrIdx; - return IpArpTable; } @@ -628,39 +623,39 @@ DWORD getNumUdpEntries(void) TRACE("called.\n"); - status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { + status = openTcpFile(&tcpFile, FILE_READ_DATA); + if (!NT_SUCCESS(status)) + { ERR("openTcpFile returned 0x%08lx\n", status); return 0; } - status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - - for( i = 0; i < numEntities; i++ ) { - if( entitySet[i].tei_entity == CL_TL_ENTITY && - hasArp( tcpFile, &entitySet[i] ) ) { - - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - IP_MIB_ARPTABLE_ENTRY_ID, - CL_TL_ENTITY, - entitySet[i].tei_instance, - 0, - sizeof(MIB_UDPROW), - (PVOID *)&IpUdpTable, - &returnSize ); - - if( status == STATUS_SUCCESS ) totalNumber += returnSize; - if( IpUdpTable ) { - tdiFreeThingSet( IpUdpTable ); - IpUdpTable = NULL; - } - } + status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); + + for (i = 0; i < numEntities; i++) { + if (entitySet[i].tei_entity == CL_TL_ENTITY && hasArp(tcpFile, &entitySet[i])) + { + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_MIB_ARPTABLE_ENTRY_ID, + CL_TL_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(MIB_UDPROW), + (PVOID *)&IpUdpTable, + &returnSize); + + if (status == STATUS_SUCCESS) totalNumber += returnSize; + if (IpUdpTable) { + tdiFreeThingSet(IpUdpTable); + IpUdpTable = NULL; + } + } } - closeTcpFile( tcpFile ); - if( entitySet ) tdiFreeThingSet( entitySet ); + closeTcpFile(tcpFile); + if (entitySet) tdiFreeThingSet(entitySet); return totalNumber; } @@ -678,52 +673,49 @@ PVOID getUdpTable(CLASS_TABLE Class) totalNumber = getNumUdpEntries(); - status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { + status = openTcpFile(&tcpFile, FILE_READ_DATA); + if (!NT_SUCCESS(status)) + { ERR("openTcpFile returned 0x%08lx\n", status); return 0; } - IpUdpTable = HeapAlloc - ( GetProcessHeap(), 0, - UdpTcpTableCall[Class].UdpOffset + (UdpTcpTableCall[Class].UdpSize * totalNumber) ); + IpUdpTable = HeapAlloc(GetProcessHeap(), 0, + UdpTcpTableCall[Class].UdpOffset + (UdpTcpTableCall[Class].UdpSize * totalNumber)); if (!IpUdpTable) { closeTcpFile(tcpFile); return NULL; } - status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - - for( i = 0; i < numEntities; i++ ) { - if( entitySet[i].tei_entity == CL_TL_ENTITY && - hasArp( tcpFile, &entitySet[i] ) ) { - - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - UdpTcpTableCall[Class].TOIID, - CL_TL_ENTITY, - entitySet[i].tei_instance, - 0, - UdpTcpTableCall[Class].UdpSize, - &AdapterUdpTable, - &returnSize ); - - if( status == STATUS_SUCCESS ) { - for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); + + for (i = 0; i < numEntities; i++) { + if (entitySet[i].tei_entity == CL_TL_ENTITY && hasArp(tcpFile, &entitySet[i])) + { + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + UdpTcpTableCall[Class].TOIID, + CL_TL_ENTITY, + entitySet[i].tei_instance, + 0, + UdpTcpTableCall[Class].UdpSize, + &AdapterUdpTable, + &returnSize); + + if (status == STATUS_SUCCESS) { + for (TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++) CopyMemory(Add2Ptr(IpUdpTable, UdpTcpTableCall[Class].UdpOffset + UdpTcpTableCall[Class].UdpSize * CurrIdx), Add2Ptr(AdapterUdpTable, UdpTcpTableCall[Class].UdpSize * TmpIdx), UdpTcpTableCall[Class].UdpSize); - tdiFreeThingSet( AdapterUdpTable ); + tdiFreeThingSet(AdapterUdpTable); } } } - closeTcpFile( tcpFile ); - - tdiFreeThingSet( entitySet ); + closeTcpFile(tcpFile); + tdiFreeThingSet(entitySet); IpUdpTable->dwNumEntries = CurrIdx; - return IpUdpTable; } @@ -739,39 +731,39 @@ DWORD getNumTcpEntries(void) TRACE("called.\n"); - status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { + status = openTcpFile(&tcpFile, FILE_READ_DATA); + if (!NT_SUCCESS(status)) + { ERR("openTcpFile returned 0x%08lx\n", status); return 0; } - status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - - for( i = 0; i < numEntities; i++ ) { - if( entitySet[i].tei_entity == CO_TL_ENTITY && - hasArp( tcpFile, &entitySet[i] ) ) { - - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - IP_MIB_ARPTABLE_ENTRY_ID, - CO_TL_ENTITY, - entitySet[i].tei_instance, - 0, - sizeof(MIB_TCPROW), - (PVOID *)&IpTcpTable, - &returnSize ); - - if( status == STATUS_SUCCESS ) totalNumber += returnSize; - if( IpTcpTable ) { - tdiFreeThingSet( IpTcpTable ); - IpTcpTable = NULL; - } - } + status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); + + for (i = 0; i < numEntities; i++) { + if (entitySet[i].tei_entity == CO_TL_ENTITY && hasArp(tcpFile, &entitySet[i])) + { + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_MIB_ARPTABLE_ENTRY_ID, + CO_TL_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(MIB_TCPROW), + (PVOID *)&IpTcpTable, + &returnSize); + + if (status == STATUS_SUCCESS) totalNumber += returnSize; + if (IpTcpTable) { + tdiFreeThingSet(IpTcpTable); + IpTcpTable = NULL; + } + } } - closeTcpFile( tcpFile ); - if( entitySet ) tdiFreeThingSet( entitySet ); + closeTcpFile(tcpFile); + if (entitySet) tdiFreeThingSet(entitySet); return totalNumber; } @@ -789,51 +781,48 @@ PVOID getTcpTable(CLASS_TABLE Class) totalNumber = getNumTcpEntries(); - status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { + status = openTcpFile(&tcpFile, FILE_READ_DATA); + if (!NT_SUCCESS(status)) + { ERR("openTcpFile returned 0x%08lx\n", status); return 0; } - IpTcpTable = HeapAlloc - ( GetProcessHeap(), 0, - UdpTcpTableCall[Class].TcpOffset + (UdpTcpTableCall[Class].TcpSize * totalNumber) ); + IpTcpTable = HeapAlloc(GetProcessHeap(), 0, + UdpTcpTableCall[Class].TcpOffset + (UdpTcpTableCall[Class].TcpSize * totalNumber)); if (!IpTcpTable) { closeTcpFile(tcpFile); return NULL; } - status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - - for( i = 0; i < numEntities; i++ ) { - if( entitySet[i].tei_entity == CO_TL_ENTITY && - hasArp( tcpFile, &entitySet[i] ) ) { - - status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_PROTOCOL, - INFO_TYPE_PROVIDER, - UdpTcpTableCall[Class].TOIID, - CO_TL_ENTITY, - entitySet[i].tei_instance, - 0, - UdpTcpTableCall[Class].TcpSize, - &AdapterTcpTable, - &returnSize ); - - if( status == STATUS_SUCCESS ) { - for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); + + for (i = 0; i < numEntities; i++) { + if (entitySet[i].tei_entity == CO_TL_ENTITY && hasArp(tcpFile, &entitySet[i])) + { + status = tdiGetSetOfThings(tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + UdpTcpTableCall[Class].TOIID, + CO_TL_ENTITY, + entitySet[i].tei_instance, + 0, + UdpTcpTableCall[Class].TcpSize, + &AdapterTcpTable, + &returnSize); + + if (status == STATUS_SUCCESS) { + for (TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++) CopyMemory(Add2Ptr(IpTcpTable, UdpTcpTableCall[Class].TcpOffset + UdpTcpTableCall[Class].TcpSize * CurrIdx), Add2Ptr(AdapterTcpTable, UdpTcpTableCall[Class].TcpSize * TmpIdx), UdpTcpTableCall[Class].TcpSize); - tdiFreeThingSet( AdapterTcpTable ); + tdiFreeThingSet(AdapterTcpTable); } } } - closeTcpFile( tcpFile ); - - tdiFreeThingSet( entitySet ); + closeTcpFile(tcpFile); + tdiFreeThingSet(entitySet); IpTcpTable->dwNumEntries = CurrIdx; - return IpTcpTable; }

1 year, 6 months

[reactos] 03/03: [NTOS:KE] Add x86 CPU features reporting to AMD64

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ae65ab7a70aa6e627c24… commit 5ae65ab7a70aa6e627c2462042584861258352b5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 30 18:06:38 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 21:00:32 2023 +0300 [NTOS:KE] Add x86 CPU features reporting to AMD64 CORE-18023 CORE-14922 --- ntoskrnl/include/internal/amd64/ke.h | 3 ++ ntoskrnl/ke/amd64/cpu.c | 54 ++++++++++++++++++++++++++++++++++++ ntoskrnl/ke/amd64/kiinit.c | 5 ++++ 3 files changed, 62 insertions(+) diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index 318b119d513..3287e7567c2 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -420,6 +420,9 @@ VOID KiGetCacheInformation(VOID); VOID KiSetProcessorType(VOID); ULONG KiGetFeatureBits(VOID); VOID KiInitializeCpuFeatures(VOID); +#if DBG +VOID KiReportCpuFeatures(IN PKPRCB Prcb); +#endif ULONG KeAllocateGdtSelector(ULONG Desc[2]); VOID KeFreeGdtSelector(ULONG Entry); diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 0967411e644..274320c1b12 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -234,6 +234,60 @@ KiGetFeatureBits(VOID) return FeatureBits; } +#if DBG +VOID +KiReportCpuFeatures(IN PKPRCB Prcb) +{ + ULONG CpuFeatures = 0; + CPU_INFO CpuInfo; + + if (Prcb->CpuVendor) + { + KiCpuId(&CpuInfo, 1); + CpuFeatures = CpuInfo.Edx; + } + + DPRINT1("Supported CPU features: "); + +#define print_kf_bit(kf_value) if (Prcb->FeatureBits & kf_value) DbgPrint(#kf_value " ") + print_kf_bit(KF_V86_VIS); + print_kf_bit(KF_RDTSC); + print_kf_bit(KF_CR4); + print_kf_bit(KF_CMOV); + print_kf_bit(KF_GLOBAL_PAGE); + print_kf_bit(KF_LARGE_PAGE); + print_kf_bit(KF_MTRR); + print_kf_bit(KF_CMPXCHG8B); + print_kf_bit(KF_CMPXCHG16B); + print_kf_bit(KF_MMX); + print_kf_bit(KF_WORKING_PTE); + print_kf_bit(KF_PAT); + print_kf_bit(KF_FXSR); + print_kf_bit(KF_FAST_SYSCALL); + print_kf_bit(KF_XMMI); + print_kf_bit(KF_3DNOW); + print_kf_bit(KF_XMMI64); + print_kf_bit(KF_DTS); + print_kf_bit(KF_NX_BIT); + print_kf_bit(KF_NX_DISABLED); + print_kf_bit(KF_NX_ENABLED); + print_kf_bit(KF_SSE3); + //print_kf_bit(KF_SSE3SUP); + //print_kf_bit(KF_SSE41); + //print_kf_bit(KF_MONITOR); + //print_kf_bit(KF_POPCNT); + print_kf_bit(KF_XSTATE); +#undef print_kf_bit + +#define print_cf(cpu_flag) if (CpuFeatures & cpu_flag) DbgPrint(#cpu_flag " ") + print_cf(X86_FEATURE_PAE); + print_cf(X86_FEATURE_HT); +#undef print_cf + + DbgPrint("\n"); +} +#endif // DBG + VOID NTAPI KiGetCacheInformation(VOID) diff --git a/ntoskrnl/ke/amd64/kiinit.c b/ntoskrnl/ke/amd64/kiinit.c index 65819290f46..a0dc2c5c5b8 100644 --- a/ntoskrnl/ke/amd64/kiinit.c +++ b/ntoskrnl/ke/amd64/kiinit.c @@ -341,6 +341,11 @@ KiInitializeKernelMachineDependent( SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_ALWAYSOFF; Prcb->FeatureBits |= KF_NX_DISABLED; } + +#if DBG + /* Print applied kernel features/policies and boot CPU features */ + KiReportCpuFeatures(Prcb); +#endif } static LDR_DATA_TABLE_ENTRY LdrCoreEntries[3];

1 year, 6 months

[reactos] 02/03: [NTOS:KE] Report x86 CPU features in a separate function

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a6b383abd2ac86746fda… commit 6a6b383abd2ac86746fdadb0522aadef37328caf Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 30 17:16:54 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 21:00:31 2023 +0300 [NTOS:KE] Report x86 CPU features in a separate function KiGetFeatureBits() is now being called in the early boot phase 0 when the Kernel Debugger is not yet initialized, so debug prints are not available here. Move the debug prints into a new function and call it at the right time. CORE-18023 --- ntoskrnl/include/internal/i386/ke.h | 6 +++ ntoskrnl/ke/i386/cpu.c | 80 +++++++++++++++++++++++-------------- ntoskrnl/ke/i386/kiinit.c | 6 +++ 3 files changed, 62 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index cc8bca420bf..30509248a2b 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -459,6 +459,12 @@ ULONG NTAPI KiGetFeatureBits(VOID); +#if DBG +CODE_SEG("INIT") +VOID +KiReportCpuFeatures(VOID); +#endif + VOID NTAPI KiThreadStartup(VOID); diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index d4634cbe33b..a39d27a2139 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -380,11 +380,6 @@ KiGetFeatureBits(VOID) if (CpuFeatures & X86_FEATURE_SSE) FeatureBits |= KF_XMMI; if (CpuFeatures & X86_FEATURE_SSE2) FeatureBits |= KF_XMMI64; - if (CpuFeatures & X86_FEATURE_PAE) - { - DPRINT1("Support PAE\n"); - } - /* Check if the CPU has hyper-threading */ if (CpuFeatures & X86_FEATURE_HT) { @@ -430,35 +425,60 @@ KiGetFeatureBits(VOID) } } -#define print_supported(kf_value) ((FeatureBits & kf_value) ? #kf_value : "") - DPRINT1("Supported CPU features : %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", - print_supported(KF_V86_VIS), - print_supported(KF_RDTSC), - print_supported(KF_CR4), - print_supported(KF_CMOV), - print_supported(KF_GLOBAL_PAGE), - print_supported(KF_LARGE_PAGE), - print_supported(KF_MTRR), - print_supported(KF_CMPXCHG8B), - print_supported(KF_MMX), - print_supported(KF_WORKING_PTE), - print_supported(KF_PAT), - print_supported(KF_FXSR), - print_supported(KF_FAST_SYSCALL), - print_supported(KF_XMMI), - print_supported(KF_3DNOW), - print_supported(KF_AMDK6MTRR), - print_supported(KF_XMMI64), - print_supported(KF_DTS), - print_supported(KF_NX_BIT), - print_supported(KF_NX_DISABLED), - print_supported(KF_NX_ENABLED)); -#undef print_supported - /* Return the Feature Bits */ return FeatureBits; } +#if DBG +CODE_SEG("INIT") +VOID +KiReportCpuFeatures(VOID) +{ + ULONG CpuFeatures = 0; + CPU_INFO CpuInfo; + + if (KiGetCpuVendor()) + { + KiCpuId(&CpuInfo, 1); + CpuFeatures = CpuInfo.Edx; + } + + DPRINT1("Supported CPU features: "); + +#define print_kf_bit(kf_value) if (KeFeatureBits & kf_value) DbgPrint(#kf_value " ") + print_kf_bit(KF_V86_VIS); + print_kf_bit(KF_RDTSC); + print_kf_bit(KF_CR4); + print_kf_bit(KF_CMOV); + print_kf_bit(KF_GLOBAL_PAGE); + print_kf_bit(KF_LARGE_PAGE); + print_kf_bit(KF_MTRR); + print_kf_bit(KF_CMPXCHG8B); + print_kf_bit(KF_MMX); + print_kf_bit(KF_WORKING_PTE); + print_kf_bit(KF_PAT); + print_kf_bit(KF_FXSR); + print_kf_bit(KF_FAST_SYSCALL); + print_kf_bit(KF_XMMI); + print_kf_bit(KF_3DNOW); + print_kf_bit(KF_AMDK6MTRR); + print_kf_bit(KF_XMMI64); + print_kf_bit(KF_DTS); + print_kf_bit(KF_NX_BIT); + print_kf_bit(KF_NX_DISABLED); + print_kf_bit(KF_NX_ENABLED); +#undef print_kf_bit + +#define print_cf(cpu_flag) if (CpuFeatures & cpu_flag) DbgPrint(#cpu_flag " ") + print_cf(X86_FEATURE_PAE); + print_cf(X86_FEATURE_APIC); + print_cf(X86_FEATURE_HT); +#undef print_cf + + DbgPrint("\n"); +} +#endif // DBG + CODE_SEG("INIT") VOID NTAPI diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index a83afe72c70..9699d11b03c 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -480,6 +480,12 @@ KiInitializeKernel(IN PKPROCESS InitProcess, /* Save CPU state */ KiSaveProcessorControlState(&Prcb->ProcessorState); +#if DBG + /* Print applied kernel features/policies and boot CPU features */ + if (Number == 0) + KiReportCpuFeatures(); +#endif + /* Get cache line information for this CPU */ KiGetCacheInformation();

1 year, 6 months

[reactos] 01/03: [NTOS:KE] Fix magic constants for x86 CPU features

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00715ccf8bde403dce65e… commit 00715ccf8bde403dce65e4e0cb63b63b133dfc5a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 30 17:06:19 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 21:00:31 2023 +0300 [NTOS:KE] Fix magic constants for x86 CPU features Do it the same way as in amd64 ke.h/cpu.c. CORE-18023 --- ntoskrnl/include/internal/i386/ke.h | 24 +++++++++++++++++++++++ ntoskrnl/ke/i386/cpu.c | 38 ++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index cdeba9ab87d..cc8bca420bf 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -22,6 +22,30 @@ extern "C" #define KD_BREAKPOINT_SIZE sizeof(UCHAR) #define KD_BREAKPOINT_VALUE 0xCC +/* CPUID 1 - EDX flags */ +#define X86_FEATURE_FPU 0x00000001 /* x87 FPU is present */ +#define X86_FEATURE_VME 0x00000002 /* Virtual 8086 Extensions are present */ +#define X86_FEATURE_DBG 0x00000004 /* Debugging extensions are present */ +#define X86_FEATURE_PSE 0x00000008 /* Page Size Extension is present */ +#define X86_FEATURE_TSC 0x00000010 /* Time Stamp Counters are present */ +#define X86_FEATURE_PAE 0x00000040 /* Physical Address Extension is present */ +#define X86_FEATURE_CX8 0x00000100 /* CMPXCHG8B instruction present */ +#define X86_FEATURE_APIC 0x00000200 /* APIC is present */ +#define X86_FEATURE_SYSCALL 0x00000800 /* SYSCALL/SYSRET support present */ +#define X86_FEATURE_MTTR 0x00001000 /* Memory type range registers are present */ +#define X86_FEATURE_PGE 0x00002000 /* Page Global Enable */ +#define X86_FEATURE_CMOV 0x00008000 /* "Conditional move" instruction supported */ +#define X86_FEATURE_PAT 0x00010000 /* Page Attribute Table is supported */ +#define X86_FEATURE_DS 0x00200000 /* Debug Store is present */ +#define X86_FEATURE_MMX 0x00800000 /* MMX extension present */ +#define X86_FEATURE_FXSR 0x01000000 /* FXSAVE/FXRSTOR instructions present */ +#define X86_FEATURE_SSE 0x02000000 /* SSE extension present */ +#define X86_FEATURE_SSE2 0x04000000 /* SSE2 extension present */ +#define X86_FEATURE_HT 0x10000000 /* Hyper-Threading present */ + +/* CPUID 0x80000001 - EDX extended flags */ +#define X86_FEATURE_NX 0x00100000 /* NX support present */ + // // One-liners for getting and setting special purpose registers in portable code // diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index eac0bf42680..d4634cbe33b 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -365,28 +365,28 @@ KiGetFeatureBits(VOID) CpuFeatures = CpuInfo.Edx; /* Convert all CPUID Feature bits into our format */ - if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; - if (CpuFeatures & 0x00000008) FeatureBits |= KF_LARGE_PAGE | KF_CR4; - if (CpuFeatures & 0x00000010) FeatureBits |= KF_RDTSC; - if (CpuFeatures & 0x00000100) FeatureBits |= KF_CMPXCHG8B; - if (CpuFeatures & 0x00000800) FeatureBits |= KF_FAST_SYSCALL; - if (CpuFeatures & 0x00001000) FeatureBits |= KF_MTRR; - if (CpuFeatures & 0x00002000) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; - if (CpuFeatures & 0x00008000) FeatureBits |= KF_CMOV; - if (CpuFeatures & 0x00010000) FeatureBits |= KF_PAT; - if (CpuFeatures & 0x00200000) FeatureBits |= KF_DTS; - if (CpuFeatures & 0x00800000) FeatureBits |= KF_MMX; - if (CpuFeatures & 0x01000000) FeatureBits |= KF_FXSR; - if (CpuFeatures & 0x02000000) FeatureBits |= KF_XMMI; - if (CpuFeatures & 0x04000000) FeatureBits |= KF_XMMI64; - - if (CpuFeatures & 0x00000040) + if (CpuFeatures & X86_FEATURE_VME) FeatureBits |= KF_V86_VIS | KF_CR4; + if (CpuFeatures & X86_FEATURE_PSE) FeatureBits |= KF_LARGE_PAGE | KF_CR4; + if (CpuFeatures & X86_FEATURE_TSC) FeatureBits |= KF_RDTSC; + if (CpuFeatures & X86_FEATURE_CX8) FeatureBits |= KF_CMPXCHG8B; + if (CpuFeatures & X86_FEATURE_SYSCALL) FeatureBits |= KF_FAST_SYSCALL; + if (CpuFeatures & X86_FEATURE_MTTR) FeatureBits |= KF_MTRR; + if (CpuFeatures & X86_FEATURE_PGE) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; + if (CpuFeatures & X86_FEATURE_CMOV) FeatureBits |= KF_CMOV; + if (CpuFeatures & X86_FEATURE_PAT) FeatureBits |= KF_PAT; + if (CpuFeatures & X86_FEATURE_DS) FeatureBits |= KF_DTS; + if (CpuFeatures & X86_FEATURE_MMX) FeatureBits |= KF_MMX; + if (CpuFeatures & X86_FEATURE_FXSR) FeatureBits |= KF_FXSR; + if (CpuFeatures & X86_FEATURE_SSE) FeatureBits |= KF_XMMI; + if (CpuFeatures & X86_FEATURE_SSE2) FeatureBits |= KF_XMMI64; + + if (CpuFeatures & X86_FEATURE_PAE) { DPRINT1("Support PAE\n"); } /* Check if the CPU has hyper-threading */ - if (CpuFeatures & 0x10000000) + if (CpuFeatures & X86_FEATURE_HT) { /* Set the number of logical CPUs */ Prcb->LogicalProcessorsPerPhysicalProcessor = (UCHAR)(CpuInfo.Ebx >> 16); @@ -416,7 +416,7 @@ KiGetFeatureBits(VOID) KiCpuId(&CpuInfo, 0x80000001); /* Check if NX-bit is supported */ - if (CpuInfo.Edx & 0x00100000) FeatureBits |= KF_NX_BIT; + if (CpuInfo.Edx & X86_FEATURE_NX) FeatureBits |= KF_NX_BIT; /* Now handle each features for each CPU Vendor */ switch (Vendor) @@ -481,7 +481,7 @@ KiGetCacheInformation(VOID) /* Handle Intel case */ case CPU_INTEL: - /*Check if we support CPUID 2 */ + /* Check if we support CPUID 2 */ KiCpuId(&CpuInfo, 0); if (CpuInfo.Eax >= 2) {

1 year, 6 months

[reactos] 01/01: [NTUSER] NtUserWaitForInputIdle: Fix unhandled exception BSOD 0x1E (#5391)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7e4c3a8e9d921233c173… commit c7e4c3a8e9d921233c1731ef64c388ed40b15fcb Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Jul 3 00:30:30 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 2 20:30:30 2023 +0300 [NTUSER] NtUserWaitForInputIdle: Fix unhandled exception BSOD 0x1E (#5391) Fix CLIENTINFO usermode pointer access once again. Based on a patch by Michael Fritscher from CORE-10017. Addendum to 705228250741da (r68702). CORE-18728 CORE-19014 --- win32ss/user/ntuser/message.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index 2d6164e7c7c..fbee45fec6b 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -3110,14 +3110,12 @@ NtUserWaitForInputIdle( IN HANDLE hProcess, Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000; KeStackAttachProcess(&Process->Pcb, &ApcState); - W32Process->W32PF_flags |= W32PF_WAITFORINPUTIDLE; for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) { pti->TIF_flags |= TIF_WAITFORINPUTIDLE; pti->pClientInfo->dwTIFlags = pti->TIF_flags; } - KeUnstackDetachProcess(&ApcState); TRACE("WFII: ppi %p\n", W32Process); @@ -3176,12 +3174,15 @@ NtUserWaitForInputIdle( IN HANDLE hProcess, while (TRUE); WaitExit: + KeStackAttachProcess(&Process->Pcb, &ApcState); for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) { pti->TIF_flags &= ~TIF_WAITFORINPUTIDLE; pti->pClientInfo->dwTIFlags = pti->TIF_flags; } W32Process->W32PF_flags &= ~W32PF_WAITFORINPUTIDLE; + KeUnstackDetachProcess(&ApcState); + IntDereferenceProcessInfo(W32Process); ObDereferenceObject(Process); UserLeave();

1 year, 6 months

[reactos] 01/01: [NTOS:EX] Fix swapped values in ExGetCurrentProcessorCounts() (#4565)

by Eugen Podrug

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e01dee25155b8edc256f… commit 8e01dee25155b8edc256f7d2239f8fb22496a543 Author: Eugen Podrug <eugen.podrug(a)gmail.com> AuthorDate: Tue Jan 24 05:42:03 2023 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 16:10:36 2023 +0300 [NTOS:EX] Fix swapped values in ExGetCurrentProcessorCounts() (#4565) The function should return the kernel time for the idle thread in the first argument, and kernel time + user time for the current thread in the second argument. Also retrieve the processor number from the cached PRCB instead of calling KeGetCurrentProcessorNumber() which retrieves the PRCB again since the processor could switch in-between those calls. NdisGetCurrentProcessorCounts() function follows the same prototype which is the correct one. --- drivers/network/ndis/include/ndissys.h | 4 ++-- ntoskrnl/ex/sysinfo.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/network/ndis/include/ndissys.h b/drivers/network/ndis/include/ndissys.h index b80a6a0bbfa..7d5dbb0740a 100644 --- a/drivers/network/ndis/include/ndissys.h +++ b/drivers/network/ndis/include/ndissys.h @@ -45,8 +45,8 @@ VOID NTAPI ExGetCurrentProcessorCounts( - PULONG ThreadKernelTime, - PULONG TotalCpuTime, + PULONG IdleTime, + PULONG KernelAndUserTime, PULONG ProcessorNumber); VOID diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index ecf6380dd8b..d6692bc83f6 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -342,17 +342,17 @@ ExGetCurrentProcessorCpuUsage(PULONG CpuUsage) */ VOID NTAPI -ExGetCurrentProcessorCounts(PULONG ThreadKernelTime, - PULONG TotalCpuTime, +ExGetCurrentProcessorCounts(PULONG IdleTime, + PULONG KernelAndUserTime, PULONG ProcessorNumber) { PKPRCB Prcb; Prcb = KeGetCurrentPrcb(); - *ThreadKernelTime = Prcb->KernelTime + Prcb->UserTime; - *TotalCpuTime = Prcb->CurrentThread->KernelTime; - *ProcessorNumber = KeGetCurrentProcessorNumber(); + *IdleTime = Prcb->IdleThread->KernelTime; + *KernelAndUserTime = Prcb->KernelTime + Prcb->UserTime; + *ProcessorNumber = (ULONG)Prcb->Number; } /*

1 year, 6 months

[reactos] 01/01: [IPCONFIG] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc85db7d8c326549d5873… commit bc85db7d8c326549d5873e59c35927d7976cd26a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jul 2 16:02:19 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jul 2 16:02:19 2023 +0300 [IPCONFIG] Update Russian (ru-RU) translation --- base/applications/network/ipconfig/lang/ru-RU.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index 340b40921d6..c365b1d37f3 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -84,12 +84,12 @@ STRINGTABLE BEGIN IDS_DNSNORECORD "\tНет записей типа %ls\n\n" IDS_DNSNONAME "\tИмя не существует.\n\n" - IDS_DNSFLUSHERROR "Не удается очистить кэш распознавателя DNS: " + IDS_DNSFLUSHERROR "Не удаётся очистить кэш распознавателя DNS: " IDS_DNSFLUSHSUCCESS "Успешно сброшен кэш распознавателя DNS.\n" - IDS_DHCPNOTCONNECTED "No operation can be performed on %ls while it has its media disconnected.\n" - IDS_DHCPNOTENABLED "Adapter %ls is not enabled for DHCP.\n" - IDS_DHCPNOADAPTER "The operation failed as no adapter is in the state permissible for \nthis operation.\n" - IDS_DHCPRELEASED "IP Address for adapter %ls has already been released.\n" + IDS_DHCPNOTCONNECTED "Операции не могут быть выполнены на ""%ls"", до тех пор, пока сеть отключена.\n" + IDS_DHCPNOTENABLED "Адаптер ""%ls"" не доступен для DHCP.\n" + IDS_DHCPNOADAPTER "Операция завершена с ошибкой, поскольку ни один адаптер\nне находился в состоянии, допустимом для её выполнения.\n" + IDS_DHCPRELEASED "IP-адрес для адаптера ""%ls"" уже освобождён.\n" END STRINGTABLE

1 year, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs