Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 01/01: [SAMSRV] Update Romanian (ro-RO) translation (#5388)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=821d9422fed8963fdc66c… commit 821d9422fed8963fdc66cde8525aabf10853aea4 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jul 3 23:17:45 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 22:17:45 2023 +0200 [SAMSRV] Update Romanian (ro-RO) translation (#5388) --- dll/win32/samsrv/lang/ro-RO.rc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dll/win32/samsrv/lang/ro-RO.rc b/dll/win32/samsrv/lang/ro-RO.rc index a4604d10064..720fb566d0a 100644 --- a/dll/win32/samsrv/lang/ro-RO.rc +++ b/dll/win32/samsrv/lang/ro-RO.rc @@ -1,4 +1,6 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> +*/ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -15,20 +17,20 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Utilizatorii avansați posedă majoritatea drepturilor administrative cu unele restricții." IDS_ALIAS_USERS_NAME "Utilizatori" IDS_ALIAS_USERS_COMMENT "Utilizatorilor le este limitată capacitatea de a aduce modificări în sistem." - IDS_ALIAS_PRINT_OPS_NAME "Print Operators" - IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" - IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" - IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or restoring files" + IDS_ALIAS_PRINT_OPS_NAME "Operatori de imprimare" + IDS_ALIAS_PRINT_OPS_COMMENT "Membrii pot administra imprimantele de domeniu" + IDS_ALIAS_BACKUP_OPS_NAME "Operatori de copii de rezervă" + IDS_ALIAS_BACKUP_OPS_COMMENT "Operatorii de copii de rezervă pot trece peste restricțiile de securitate pentru singurul scop de a face o copie de rezervă sau de a restaura fișiere" IDS_ALIAS_REPLICATOR_NAME "Replicator" - IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" - IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" - IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" - IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" - IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" - IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" - IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" - IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" - IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" + IDS_ALIAS_REPLICATOR_COMMENT "Acceptă replicarea fișierelor într-un domeniu" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Utilizatori de birou de la distanță" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Membrilor acestui grup li se acordă dreptul de a se conecta de la distanță" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Operatori de configurație a rețelei" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Membrii acestui grup pot avea privilegii administrative pentru a administra configurația caracteristicilor de rețea" + IDS_ALIAS_MONITORING_USERS_NAME "Utilizatori de monitorizare a performanței" + IDS_ALIAS_MONITORING_USERS_COMMENT "Membrii acestui grup au acces de la distanță pentru a monitoriza acest calculator" + IDS_ALIAS_LOGGING_USERS_NAME "Utilizatori pentru jurnalul penformanței" + IDS_ALIAS_LOGGING_USERS_COMMENT "Membrii acestui grup au acces de la distanță pentru a planifica înregistrarea contoarelor de performanță pe acest calculator" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and

1 year, 2 months

[reactos] 01/01: [NETID] Update Romanian (ro-RO) translation (#5384)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f502d34b04d5ccf32ccb9… commit f502d34b04d5ccf32ccb94bf024641b52ac6c630 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jul 3 23:17:16 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 22:17:16 2023 +0200 [NETID] Update Romanian (ro-RO) translation (#5384) --- dll/win32/netid/lang/ro-RO.rc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc index dd835f717a3..d37f3fb1a60 100644 --- a/dll/win32/netid/lang/ro-RO.rc +++ b/dll/win32/netid/lang/ro-RO.rc @@ -1,7 +1,8 @@ /* - * FILE: dll/win32/netid/lang/ro-RO.rc - * ReactOS Project (https://reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * FILE: dll/win32/netid/lang/ro-RO.rc + * ReactOS Project (https://reactos.org) + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -25,7 +26,7 @@ BEGIN PUSHBUTTON "S&chimbare…", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46 ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE - LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8 + LTEXT "Schimbările vor avea efect atunci când vă veți reporni calculatorul.", IDC_RESTARTTEXT, 25, 195, 223, 8 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 @@ -72,20 +73,20 @@ BEGIN 4 "Schimbarea identității calculatorului" 5 "Grup de lucru:" 6 "Domeniu:" - 7 "The domain name ""%1"" does not conform to Internet Domain Name Service specifications, although it is a legal ReactOS name. You must use ReactOS DNS server for non-standard names." - 8 "The domain name ""%1"" is not properly formatted. Periods (.) are used to separate domains. Each domain is limited to 63 characters. Example: domain-1.reactos.org." - 10 "The new computer name ""%1"" is too long. The name may not be longer than 63 characters." - 11 "The new computer name entered is not properly formatted. Standard names may contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.). The name may not consist entirely of digits." + 7 "Numele de domeniu ""%1"" nu se conformează cu specificațiile Serviciului de nume de domenii de internet, cu toate că este un nume ReactOS legal. Trebuie să folosiți serverul DNS ReactOS pentru numele non-standard." + 8 "Numele de domeniu ""%1"" nu este formatat corect. Punctele (.) sunt folosite la domeniile separate. Fiecare domeniu este limitat la 63 de caractere. De exemplu: domeniul-1.reactos.org." + 10 "Noul nume de calculator ""%1"" este prea lung. Numele nu poate fi mai lung de 63 de caractere." + 11 "Noul nume de calculator introdus nu e formatat corect. Numele standard pot conține litere (a-z, A-Z), numere (0-9), și cratime (-), dar nu spații sau puncte (.). Numele nu poate fi compus numai din cifre." 22 "Bun venit în grupul de lucru „%1”." 23 "Bun venit în domeniul „%1”." 24 "Repornirea calculatorului este necesară pentru a aplica schimbările aduse." 25 "Puteți schimba numele și apartenența acestui calculator la un domeniu sau grup de lucru. Schimbările pot afecta accesul la resursele rețelei." 1021 "Notă: Doar administratorii pot schimba identitatea calculatorului." 1022 "Notă: Identitatea calculatorului nu poate fi schimbată deoarece:" - 1029 "The new computer name ""%1"" is a number. The name may not be a number." + 1029 "Noul nume de calculator ""%1"" e un număr. Numele nu poate fi un număr." 1030 "Noul nume „%1” conține caractere nepermise. Caracterele nepermise sunt ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / și ?" - 1031 "The first domain of the domain name ""%1"" is a number. The first domain may not be a number." - 1032 "The domain name ""%1"" contains characters which are not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and hyphens, but no spaces. Periods (.) are used to separate domains. Example: domain-1.reactos.org." + 1031 "Primul domeniu al numelui de domeniu ""%1"" este un număr. Primul domeniu nu poate fi un număr." + 1032 "Numele de domeniu ""%1"" conține caractere ce nu sunt permise. Numele standard de DNS pot conține litere (a-z, A-Z), numere (0-9), și cratime, dar nu spații. Punctele (.) sunt folosite la domeniile separate. De exemplu: domeniu-1.reactos.org." 3210 "&Detalii >>" 3220 "<< &Detalii" 4000 "Informație"

1 year, 2 months

[reactos] 01/01: [IPCONFIG] Update Romanian (ro-RO) translation (#5381)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=497009da823e8ba46c7fc… commit 497009da823e8ba46c7fc20ab67321e6f0ac514a Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jul 3 23:16:43 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 22:16:43 2023 +0200 [IPCONFIG] Update Romanian (ro-RO) translation (#5381) --- base/applications/network/ipconfig/lang/ro-RO.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index bfdb06b9a8f..12bb29f70bc 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -24,7 +24,7 @@ BEGIN IDS_WINSPROXYYES "\tProxy-ul WINS activat . . . . . . : Da\n" IDS_DNSSUFFIXLIST "\tLista de căutare a sufixului DNS. : %hs\n" IDS_EMPTYLINE "\t %hs\n" - IDS_MEDIADISCONNECTED "\tStarea media. . . . . . . . . . . : Media deconectată\n" + IDS_MEDIADISCONNECTED "\tStarea mediului . . . . . . . . . : Mediu deconectat\n" IDS_CONNECTIONDNSSUFFIX "\tSufixul DNS specific conexiunii . : %hs\n" IDS_DESCRIPTION "\tDescriere . . . . . . . . . . . . : " IDS_PHYSICALADDRESS "\tAdresă fizică . . . . . . . . . . : %hs\n" @@ -82,16 +82,16 @@ END STRINGTABLE BEGIN - IDS_DNSNORECORD "\tNo records of type %ls\n\n" - IDS_DNSNONAME "\tName does not exist.\n\n" - IDS_DNSFLUSHERROR "Could not flush the DNS Resolver Cache: " - IDS_DNSFLUSHSUCCESS "Successfully flushed the DNS Resolver Cache.\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_DHCPRELEASEERROR "An error occurred while releasing interface %ls: " - IDS_DHCPRENEWERROR "An error occurred while renewing interface %ls: " + IDS_DNSNORECORD "\tNu sunt înregistrări de tipul %ls\n\n" + IDS_DNSNONAME "\tNumele nu există.\n\n" + IDS_DNSFLUSHERROR "Memoria de depozitare a resolverului DNS nu a putut fi golită: " + IDS_DNSFLUSHSUCCESS "Memoria de depozitare a resolverului DNS a fost golită cu succes.\n" + IDS_DHCPNOTCONNECTED "Nu poate fi efectuată nicio operațiune %ls atât timp cât mediul este deconectat.\n" + IDS_DHCPNOTENABLED "Adaptorul %ls nu este activat pentru DHCP.\n" + IDS_DHCPNOADAPTER "Operațiunea a eșuat pentru că adaptorul nu este în stadiul admisibil \npentru această operațiune.\n" + IDS_DHCPRELEASED "Adresa IP pentru adaptorul %ls a fost deja eliberată.\n" + IDS_DHCPRELEASEERROR "A apărut o eroare în timpul eliberării interfeței %ls: " + IDS_DHCPRENEWERROR "A apărut o eroare în timpul reînnoirii interfeței %ls: " END STRINGTABLE

1 year, 2 months

[reactos] 01/01: [MMC] Improve Romanian (ro-RO) translation (#5389)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b41615376bbf0d0eefefa… commit b41615376bbf0d0eefefa46e8ca8281d5c5c80c2 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jul 3 23:16:01 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 22:16:01 2023 +0200 [MMC] Improve Romanian (ro-RO) translation (#5389) --- base/applications/mmc/lang/ro-RO.rc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/applications/mmc/lang/ro-RO.rc b/base/applications/mmc/lang/ro-RO.rc index 1c29ef47504..109a220140e 100644 --- a/base/applications/mmc/lang/ro-RO.rc +++ b/base/applications/mmc/lang/ro-RO.rc @@ -1,7 +1,8 @@ /* - * FILE: base/applications/mmc/lang/ro-RO.rc - * ReactOS Project (https://reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * FILE: base/applications/mmc/lang/ro-RO.rc + * ReactOS Project (https://reactos.org) + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -32,9 +33,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "I&eșire\tAlt+F4", IDM_FILE_EXIT END - POPUP "&Windows" + POPUP "&Ferestre" BEGIN - MENUITEM "List", IDM_WINDOWS_LIST + MENUITEM "Listă", IDM_WINDOWS_LIST END POPUP "Aj&utor" BEGIN

1 year, 2 months

[reactos] 01/01: [SHELL32] Improve Romanian (ro-RO) trnaslation (#5392)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f62d80f2d05a722538d2… commit 0f62d80f2d05a722538d2fddc863a2076b2dbda8 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jul 3 23:15:28 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 22:15:28 2023 +0200 [SHELL32] Improve Romanian (ro-RO) trnaslation (#5392) --- dll/win32/shell32/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 02cf044309d..48b136c2337 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1027,7 +1027,7 @@ BEGIN IDS_NO_ICONS "Fișierul „%s” nu conține pictograme.\n\nAlegeți o pictogramă din listă sau specificați un alt fișier." IDS_FILE_NOT_FOUND "Fișierul „%s” nu a fost găsit." IDS_LINK_INVALID "Elementul '%s' ca această scurtătură face referire la faptul ca a fost schimbat sau mutat, deci această scurtătură nu va mai funcționa în mod corespunzător." - IDS_COPYTOMENU "Copiază în &docsarul..." + IDS_COPYTOMENU "Copiază în &dosarul..." IDS_COPYTOTITLE "Selectați locul unde vreți să copiați '%s'. Apoi, apăsați pe butonul Copiază." IDS_COPYITEMS "Copiază elementele" IDS_COPYBUTTON "Copiază"

1 year, 2 months

[reactos] 01/01: [MSPAINT] Update Polish (pl-PL) translation (#5368)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c7ef7b1a23fbde826e3b… commit 4c7ef7b1a23fbde826e3b12bc6292ec114886f69 Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Mon Jul 3 14:28:38 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 3 15:28:38 2023 +0300 [MSPAINT] Update Polish (pl-PL) translation (#5368) --- base/applications/mspaint/lang/pl-PL.rc | 41 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 4ed134606fc..80d75558f8e 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -5,6 +5,7 @@ * TRANSLATORS: Copyright 2009 Olaf Siejka <caemyr(a)gmail.com> * Copyright 2015 Adam Stachowicz <saibamenppl(a)gmail.com> * Copyright 2017 Adam Słaboń <asaillen456esx(a)gmail.com> + * Copyright 2023 Piotr Hetnarowicz <piotrhwz(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -105,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Wytnij\tCtrl+X", IDM_EDITCUT + MENUITEM "Kopiuj\tCtrl+C", IDM_EDITCOPY + MENUITEM "Wkl&ej\tCtrl+V", IDM_EDITPASTE + MENUITEM "Wyczyść z&aznaczenie\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Zaznacz wszystko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiuj &do...", IDM_EDITCOPYTO + MENUITEM "Wk&lej z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Przerzuć/Obróć...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Roz&ciągnij/Pochyl...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Odwróć kolory\tCtrl+I", IDM_IMAGEINVERTCOLORS END END @@ -214,7 +215,7 @@ BEGIN END IDD_FONTS DIALOG 0, 0, 225, 25 -CAPTION "Fonts" +CAPTION "Czcionki" STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" @@ -230,7 +231,7 @@ BEGIN IDS_WINDOWTITLE "%s - Paint" IDS_INFOTITLE "Paint dla ReactOS" IDS_INFOTEXT "Dostępny na licencji GNU Lesser General Public License (LGPL, www.gnu.org)" - IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do %s?" + IDS_SAVEPROMPTTEXT "Czy chcesz zapisać zmiany do pliku %s?" IDS_DEFAULTFILENAME "bez tytułu" IDS_MINIATURETITLE "Miniatura" IDS_TOOLTIP1 "Zaznaczenie dowolne" @@ -250,17 +251,17 @@ BEGIN IDS_TOOLTIP15 "Elipsa" IDS_TOOLTIP16 "Zaokrąglony prostokąt" IDS_ALLFILES "Wszystkie pliki" - IDS_ALLPICTUREFILES "Wszystkie pliki graficzne" + IDS_ALLPICTUREFILES "Wszystkie pliki obrazów" IDS_FILESIZE "%d bajtów" IDS_INTNUMBERS "Wprowadź liczbę całkowitą." IDS_PERCENTAGE "Wprowadź liczbę całkowitą z zakresu od 1 do 500." IDS_ANGLE "Wprowadź liczbę całkowitą z zakresu od -89 do 89." IDS_LOADERRORTEXT "Plik %s nie może być załadowany." - IDS_ENLARGEPROMPTTEXT "Obraz w schowku jest większy niż bitmapa.\nChciałbyś powiększyć bitmapę?" - IDS_BOLD "Bold" - IDS_ITALIC "Italic" - IDS_UNDERLINE "Underline" - 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_ENLARGEPROMPTTEXT "Obraz w schowku jest większy niż bitmapa.\nCzy chcesz powiększyć bitmapę?" + IDS_BOLD "Pogrubienie" + IDS_ITALIC "Kursywa" + IDS_UNDERLINE "Podkreślenie" + IDS_VERTICAL "Pionowe" + IDS_PRINTRES "%d x %d piksel/cm" + IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." END

1 year, 2 months

[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, 2 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, 2 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, 2 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, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2023