Ros-diffs November 2024

ros-diffs@reactos.org

22 participants
103 discussions

[reactos] 01/01: [FONTSUB] Update Romanian (ro-RO) translation (#7355)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e7f676aa75601131f881… commit 0e7f676aa75601131f881282ff12ae81f5f56bd9 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 21:22:18 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 20:22:18 2024 +0100 [FONTSUB] Update Romanian (ro-RO) translation (#7355) --- .../applications/sysutils/fontsub/lang/ro-RO.rc | 60 ++++++++++++---------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc b/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc index e8381377cc6..f40ca08fb16 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Font Substitute Editor + * LICENSE: CC0-1.0 (https://spdx.org/licenses/CC0-1.0) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -9,10 +15,10 @@ BEGIN MENUITEM "I&mportare din…\tCtrl+O", ID_IMPORT MENUITEM "E&xportare în…\tCtrl+S", ID_EXPORT MENUITEM SEPARATOR - MENUITEM "&Reîncarcă din registru\tCtrl+L", ID_RELOAD - MENUITEM "&Actualizează registru\tCtrl+U", ID_UPDATE_REGISTRY + MENUITEM "&Reîncărcare din registru\tCtrl+L", ID_RELOAD + MENUITEM "&Actualizare a registrului\tCtrl+U", ID_UPDATE_REGISTRY MENUITEM SEPARATOR - MENUITEM "&Deschide în Regedit", ID_OPEN_REGKEY + MENUITEM "&Deschidere în Edistorul de registru", ID_OPEN_REGKEY MENUITEM SEPARATOR MENUITEM "I&eșire\tAlt+F4", ID_EXIT END @@ -20,9 +26,9 @@ BEGIN BEGIN MENUITEM "Element &nou\tCtrl+N", ID_NEW MENUITEM SEPARATOR - MENUITEM "E&ditează element\tEnter", ID_EDIT + MENUITEM "E&ditare a elementului\tEnter", ID_EDIT MENUITEM SEPARATOR - MENUITEM "Ște&rge element\tDel", ID_DELETE + MENUITEM "Ște&rgere a elementului\tDel", ID_DELETE END POPUP "&Ajutor" BEGIN @@ -36,60 +42,60 @@ BEGIN BEGIN MENUITEM "Element &nou\tCtrl+N", ID_NEW MENUITEM SEPARATOR - MENUITEM "E&ditează element\tEnter", ID_EDIT + MENUITEM "E&ditare a elementului\tEnter", ID_EDIT MENUITEM SEPARATOR - MENUITEM "Ște&rge element\tDel", ID_DELETE + MENUITEM "Ște&rgere a elementului\tDel", ID_DELETE END END STRINGTABLE BEGIN - IDS_TITLE, "Editor de substituție font" - IDS_FONTNAME, "Nume font" + IDS_TITLE, "Editor de substituție a fonturilor" + IDS_FONTNAME, "Numele fontului" IDS_SUBSTITUTE, "Substitut" - IDS_ENTERNAME, "(introduceți un nume de font…)" + IDS_ENTERNAME, "(Introduceți un nume pentru font…)" IDS_IMPORT, "Importare" IDS_EXPORT, "Exportare" - IDS_CANTIMPORT, "Eșec la importare." - IDS_CANTEXPORT, "Eșec la exportare." + IDS_CANTIMPORT, "Imposibil de importat." + IDS_CANTEXPORT, "Imposibil de exportat." IDS_INPFILTER, "Fișiere de registru (*.reg)|*.reg|Orice fișier (*.*)|*.*|" IDS_OUTFILTER, "Fișiere de registru (*.reg)|*.reg|" - IDS_QUERYUPDATE, "Informația de substituție a fost alterată. Doriți actualizarea registrului?" + IDS_QUERYUPDATE, "Informațiile pentru înlocuitori au fost modificate. Actualizați registrul acum?" IDS_ALREADYEXISTS, "Acest nume există deja." - IDS_ENTERNAME2, "Introduceți un nume de font." - IDS_QUERYDELETE, "Confirmați ștergerea acestui element?" - IDS_CANTOPENKEY, "Eșec la deschiderea cheii de registru." + IDS_ENTERNAME2, "Introduceți un nume pentru font." + IDS_QUERYDELETE, "Chiar doriți să ștergeți acest articol?" + IDS_CANTOPENKEY, "Imposibil de deschis cheia de registru." IDS_REBOOTNOW, "Registrul a fost actualizat. Reporniți sistemul?" - IDS_ABOUT, "FontSub (Editor de substituție font) Versiune 0.5\r\nde Katayama Hirofumi MZ și Echipa ReactOS\r\n\r\nAcost program a fost publicat sub licența CC0 1.0." + IDS_ABOUT, "FontSub (Editor pentru substitutul fontului) Versiunea 0.5\r\nde Katayama Hirofumi MZ și Echipa ReactOS\r\n\r\nAcest software a fost publicat sub licența CC0 1.0." END IDD_ADD DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU -CAPTION "Adăugare element de substituție" +CAPTION "Adăugare a unui element de substituție" FONT 10, "MS Shell Dlg" BEGIN - CONTROL "N&ume de font:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "&Numele fontului:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 CONTROL "Su&bstitut:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 - CONTROL "Con&firmă", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 - CONTROL "A&nulează", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Revocare", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 END IDD_EDIT DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU -CAPTION "Editare element de substituție" +CAPTION "Editare a elementului de substituție" FONT 10, "MS Shell Dlg" BEGIN - CONTROL "N&ume de font:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "&Numele fontului:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14 CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 CONTROL "Su&bstitut:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 - CONTROL "Con&firmă", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 - CONTROL "A&nulează", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 - CONTROL "&Elimină", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Revocare", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 + CONTROL "&Eliminare", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 END

1 month, 3 weeks

[reactos] 01/01: [RAPPS] Improve Romanian (ro-RO) translation (#7360)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16f1abe1c872b775ffcba… commit 16f1abe1c872b775ffcba647ed4f4d7335b73f70 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 21:19:33 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 20:19:33 2024 +0100 [RAPPS] Improve Romanian (ro-RO) translation (#7360) --- base/applications/rapps/lang/ro-RO.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 48d63040990..e4cb46dd286 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -27,7 +27,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Împ&rospătare\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "&Actualizare baza de date\tCtrl+F5", ID_RESETDB + MENUITEM "&Actualizare a bazei de date\tCtrl+F5", ID_RESETDB END POPUP "Aj&utor" BEGIN @@ -178,9 +178,9 @@ BEGIN IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: " IDS_WELCOME_URL "https://reactos.org" - IDS_APPWIZ_TITLE "Add/Remove Programs" - IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." - IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." + IDS_APPWIZ_TITLE "Adăugare/Eliminare de programe" + IDS_APPWIZ_TEXT1 "Alegeți ""Aplicații"" sau ""Actualizări"" pentru a vedea lista aplicațiilor sau a actualizărilor instalate pe sistem." + IDS_APPWIZ_TEXT2 "Pentru a elimina un program sau pentru a-i modifica componentele instalate, selectați-l din listă și faceți clic pe ""Dezinstalare"" sau pe ""Modificare""." END STRINGTABLE @@ -247,9 +247,9 @@ END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Aplicații baza de date" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizare bază de date…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Actualizare bază de date… (Sursă neoficială)" + IDS_DL_DIALOG_DB_DISP "Aplicații pentru baza de date" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizare a bazei de date…" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Actualizare a bazei de date… (Sursă neoficială)" END STRINGTABLE @@ -261,7 +261,7 @@ BEGIN IDS_CMD_INVALID_OPTION "Eroare: opțiunea de linie de comandă specificată este necunoscută sau nevalidă.\n" IDS_CMD_FIND_RESULT_FOR "Rezultatele căutării pentru %1:\n" IDS_CMD_PACKAGE_NOT_FOUND "Nu se poate găsi pachetul %1.\n" - IDS_CMD_PACKAGE_INFO "Informații despre pachet %1:\n" + IDS_CMD_PACKAGE_INFO "Informații despre pachetul %1:\n" END STRINGTABLE

1 month, 3 weeks

[reactos] 01/01: [CLB] Update Romanian (ro-RO) translation (#7358)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d326ca1f3666c12abb296… commit d326ca1f3666c12abb296f70664007870df52468 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 21:16:24 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 20:16:24 2024 +0100 [CLB] Update Romanian (ro-RO) translation (#7358) --- base/applications/regedit/clb/lang/ro-RO.rc | 30 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/base/applications/regedit/clb/lang/ro-RO.rc b/base/applications/regedit/clb/lang/ro-RO.rc index ba052388a47..5c726f4896f 100644 --- a/base/applications/regedit/clb/lang/ro-RO.rc +++ b/base/applications/regedit/clb/lang/ro-RO.rc @@ -1,28 +1,34 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Column List Box + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Stiluri de câmp-listă coloană" +CAPTION "Stiluri de casete pentru listele de coloane" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Stiluri de câmp-listă coloană", -1, 6, 7, 158, 71 - CHECKBOX "Stan&dard", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Stiluri de casete pentru listele de coloane", -1, 6, 7, 158, 71 + CHECKBOX "&Standard", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Margine", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Ordonat", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Notifi&cantă", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "De&rulantă verticală", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "S&ortare", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Notificare", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Derulantă verticală", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Selecție m&ultiplă", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED CHECKBOX "Selecție e&xtinsă", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED CHECKBOX "Titluri &evidente", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Coloane flexi&bile", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Coloane elastice", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP GROUPBOX "Stiluri de bază", -1, 6, 80, 158, 34 CHECKBOX "&Vizibil", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "De&zactivat", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Grup", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "N&avigare tab", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Con&firmă", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&nulează", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP - CHECKBOX "Bloc&hează controlul derulării", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "O&prire tab", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Revocare", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "Op&rire derulare", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP END

1 month, 3 weeks

[reactos] 01/01: [MSCONFIG_NEW] Update Romanian (ro-RO) translation (#7407)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11a32fce15936ca76107e… commit 11a32fce15936ca76107e20a8dbb0103bbb95c2a Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 20:58:48 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 19:58:48 2024 +0100 [MSCONFIG_NEW] Update Romanian (ro-RO) translation (#7407) --- base/applications/msconfig_new/lang/ro-RO.rc | 140 +++++++++++++-------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/base/applications/msconfig_new/lang/ro-RO.rc b/base/applications/msconfig_new/lang/ro-RO.rc index 328a3d300d5..f8502a322bf 100644 --- a/base/applications/msconfig_new/lang/ro-RO.rc +++ b/base/applications/msconfig_new/lang/ro-RO.rc @@ -10,38 +10,38 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Despre programul de configurare al sistemului" +CAPTION "Despre programul de configurare a sistemului" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 - LTEXT "Program de configurare al sistemului\nVersiune 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX + LTEXT "Program de configurare a sistemului\nVersiune 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX // "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" LTEXT "Drept de autor (C) Echipa ReactOS 2005-2023\n\ Christoph von Wittich (Christoph(a)ApiViewer.de)\n\ Gregor Schneider (Gregor.Schneider(a)reactos.org)\n\ Hermès BÉLUSCA - MAÏTO (hermes.belusca(a)sfr.fr)", IDC_STATIC, 41, 34, 183, 34 - DEFPUSHBUTTON "Î&nchide", IDOK, 174, 79, 50, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 174, 79, 50, 14, WS_GROUP END IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION -CAPTION "Generale" +CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN CONTROL "&Pornire normală", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 CONTROL "Pornire de &diagnostic", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 CONTROL "Pornire selecti&vă", IDC_RB_SELECTIVE_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 73, 332, 10 - CONTROL "Procesează fișierul S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 - CONTROL "Procesează fișierul &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 - CONTROL "În&carcă serviciile de sistem", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 - CONTROL "Încarcă &elementele autolansate", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 - CONTROL "&Utilizează configurația originală de inițializare", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 - PUSHBUTTON "Lansează &Restaurare sistem", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 + CONTROL "Procesare a fișierului S&YSTEM.INI", IDC_CBX_SYSTEM_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 86, 316, 10 + CONTROL "Procesare a fișierului &WIN.INI", IDC_CBX_WIN_INI, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 98, 316, 10 + CONTROL "În&cărcare a serviciilor de sistem", IDC_CBX_LOAD_SYSTEM_SERVICES, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 110, 316, 10 + CONTROL "Încărcare a &elementelor de pornire", IDC_CBX_LOAD_STARTUP_ITEMS, "Button", BS_AUTO3STATE | WS_TABSTOP, 35, 122, 316, 10 + CONTROL "&Utilizare a configurației originale de pornire", IDC_CBX_USE_ORIGINAL_BOOTCFG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 134, 316, 10 + PUSHBUTTON "Lansare &Restaurare sistem", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 PUSHBUTTON "E&xtindere fișier…", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 - GROUPBOX "Moduri de pornire sistem", IDC_STATIC, 5, 5, 356, 145 - LTEXT "Încarcă toate serviciile și driverele", IDC_STATIC, 25, 30, 322, 10 - LTEXT "Încarcă doar driverele de bază", IDC_STATIC, 25, 58, 322, 10 + GROUPBOX "Selecție de pornire", IDC_STATIC, 5, 5, 356, 145 + LTEXT "Încărcare a tuturor serviciilor și driverelor", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Încărcare doar driverelor de bază", IDC_STATIC, 25, 58, 322, 10 END IDD_SYSTEM_PAGE DIALOGEX 0, 0, 366, 175 @@ -50,16 +50,16 @@ CAPTION "Sistem" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_SYSTEM_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP, 5, 5, 285, 146 - PUSHBUTTON "Mută s&us", IDC_BTN_SYSTEM_UP, 295, 5, 66, 14 - PUSHBUTTON "Mută j&os", IDC_BTN_SYSTEM_DOWN, 295, 24, 66, 14 - PUSHBUTTON "A&ctivează", IDC_BTN_SYSTEM_ENABLE, 295, 52, 66, 14 - PUSHBUTTON "D&ezactivează", IDC_BTN_SYSTEM_DISABLE, 295, 71, 66, 14 - PUSHBUTTON "&Găsește", IDC_BTN_SYSTEM_FIND, 295, 99, 66, 14 + PUSHBUTTON "Mutare &sus", IDC_BTN_SYSTEM_UP, 295, 5, 66, 14 + PUSHBUTTON "Mutare &jos", IDC_BTN_SYSTEM_DOWN, 295, 24, 66, 14 + PUSHBUTTON "&Activare", IDC_BTN_SYSTEM_ENABLE, 295, 52, 66, 14 + PUSHBUTTON "&Dezactivare", IDC_BTN_SYSTEM_DISABLE, 295, 71, 66, 14 + PUSHBUTTON "&Găsire", IDC_BTN_SYSTEM_FIND, 295, 99, 66, 14 PUSHBUTTON "Nou", IDC_BTN_SYSTEM_NEW, 295, 118, 66, 14 - PUSHBUTTON "E&ditează", IDC_BTN_SYSTEM_EDIT, 295, 137, 66, 14 - PUSHBUTTON "Acti&vează toate", IDC_BTN_SYSTEM_ENABLE_ALL, 153, 156, 66, 14 - PUSHBUTTON "De&zactivează toate", IDC_BTN_SYSTEM_DISABLE_ALL, 224, 156, 66, 14 - PUSHBUTTON "Eli&mină", IDC_BTN_SYSTEM_DELETE, 295, 156, 66, 14 + PUSHBUTTON "&Editare", IDC_BTN_SYSTEM_EDIT, 295, 137, 66, 14 + PUSHBUTTON "Acti&vare totală", IDC_BTN_SYSTEM_ENABLE_ALL, 153, 156, 66, 14 + PUSHBUTTON "De&zactivare totală", IDC_BTN_SYSTEM_DISABLE_ALL, 224, 156, 66, 14 + PUSHBUTTON "Eli&minare", IDC_BTN_SYSTEM_DELETE, 295, 156, 66, 14 END IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175 @@ -68,29 +68,29 @@ CAPTION "FREELDR.INI" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Verifică toate căile de inițializare", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14 - PUSHBUTTON "Impli&cite", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14 - PUSHBUTTON "Mută s&us", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14 - PUSHBUTTON "Mută j&os", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14 - GROUPBOX "Parametri de inițializare", IDC_STATIC, 5, 84, 285, 86 + PUSHBUTTON "&Verificare a tuturor căilor de pornire", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14 + PUSHBUTTON "Impli&cit", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14 + PUSHBUTTON "Mutare &sus", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14 + PUSHBUTTON "Mutare &jos", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14 + GROUPBOX "Opțiuni de pornire", IDC_STATIC, 5, 84, 285, 86 GROUPBOX "", IDC_STATIC, 10, 97, 143, 68 - CHECKBOX "Inițializare securi&zată (/SAFEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10 + CHECKBOX "&Pornire sigură (/SAFEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10 CONTROL "&Minimală (MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10 - CONTROL "Mediu alternativ\n(MINIMAL (ALTERNATE&SHELL))", IDC_RADIO4, + CONTROL "Alt mediu\n(MINIMAL (ALTERNATE&SHELL))", IDC_RADIO4, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17 - CONTROL "&Repară ActiveDirectory (DSREPAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10 + CONTROL "&Reparare ActiveDirectory (DSREPAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10 CONTROL "Rețea (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10 CHECKBOX "Fără interfață grafică\n(/NO&GUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE - CHECKBOX "&Jurnal de inițializare (/BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12 + CHECKBOX "&Jurnal de pornire (/BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12 CHECKBOX "Video de &bază (/BASEVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12 - CHECKBOX "&Detalii de inițializare (/SOS)", IDC_CBX_SOS, 158, 138, 127, 12 + CHECKBOX "I&nformații de pornire a SO (/SOS)", IDC_CBX_SOS, 158, 138, 127, 12 PUSHBUTTON "Opțiuni &avansate…", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14 LTEXT "&Limită de timp:", IDC_STATIC, 296, 91, 32, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER LTEXT "secunde", IDC_STATIC, 330, 104, 31, 10 - CONTROL "Fă toate s&etările de inițializare permanente", 292, + CONTROL "Facere a tuturor s&etărilor de pornire permanente", 292, "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49 - PUSHBUTTON "Șt&erge", IDC_BTN_DELETE, 295, 68, 66, 14 + PUSHBUTTON "Ș&tergere", IDC_BTN_DELETE, 295, 68, 66, 14 END IDD_SERVICES_PAGE DIALOGEX 0, 0, 366, 175 @@ -99,11 +99,11 @@ CAPTION "Servicii" FONT 8, "MS Shell Dlg" BEGIN CONTROL "List1", IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 5, 5, 356, 129 - PUSHBUTTON "A&ctivează toate", IDC_BTN_SERVICES_ACTIVATE, 224, 156, 66, 14 - PUSHBUTTON "D&ezactivează toate", IDC_BTN_SERVICES_DEACTIVATE, 295, 156, 66, 14 - CONTROL "Asc&unde toate serviciile %s", IDC_CBX_SERVICES_MASK_PROPRIETARY_SVCS, + PUSHBUTTON "&Activare totală", IDC_BTN_SERVICES_ACTIVATE, 224, 156, 66, 14 + PUSHBUTTON "&Dezactivare totală", IDC_BTN_SERVICES_DEACTIVATE, 295, 156, 66, 14 + CONTROL "A&scundere a tuturor serviciilor %s", IDC_CBX_SERVICES_MASK_PROPRIETARY_SVCS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 158, 203, 12 - LTEXT "Rețineți că unele servicii %s securizate nu pot fi dezactivate.", IDC_STATIC_SERVICES_WARNING, 5, 138, 220, 17 + LTEXT "Rețineți că este posibil ca unele servicii %s securizate să nu fie dezactivate.", IDC_STATIC_SERVICES_WARNING, 5, 138, 220, 17 END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 @@ -112,8 +112,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List3", IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 - PUSHBUTTON "A&ctivează toate", IDC_BTN_STARTUP_ACTIVATE, 203, 155, 76, 14 - PUSHBUTTON "D&ezactivează toate", IDC_BTN_STARTUP_DEACTIVATE, 285, 155, 76, 14 + PUSHBUTTON "&Activare totală", IDC_BTN_STARTUP_ACTIVATE, 203, 155, 76, 14 + PUSHBUTTON &Dezactivare totală", IDC_BTN_STARTUP_DEACTIVATE, 285, 155, 76, 14 END IDD_TOOLS_PAGE DIALOGEX 0, 0, 366, 175 @@ -123,28 +123,28 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List1", IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 5, 356, 118 EDITTEXT IDC_TOOLS_CMDLINE, 5, 139, 356, 14, ES_READONLY - PUSHBUTTON "&Lansează", IDC_BTN_RUN, 311, 156, 50, 14 + PUSHBUTTON "&Lansare", IDC_BTN_RUN, 311, 156, 50, 14 CONTROL "&Opțiuni avansate", IDC_CBX_TOOLS_ADVOPT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 158, 134, 12 LTEXT "&Comandă selectată:", IDC_STATIC, 5, 127, 128, 10 END IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Extragere fișiere de la o instalație sursă" +CAPTION "Extragere a fișierelor dintr-o sursă de instalare" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Specificați fișierele pe care doriți să le extrageți, locația sursei cu fișierele de instalare, și locația destinației.", IDC_STATIC, 7, 7, 339, 17 - LTEXT "Fișierele pentru e&xtragere:", IDC_STATIC, 7, 34, 93, 10 + LTEXT "&Fișiere de restaurat:", IDC_STATIC, 7, 34, 93, 10 EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL - PUSHBUTTON "Spe&cificare…", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 - LTEXT "E&xtrage din:", IDC_STATIC, 7, 55, 93, 10 + PUSHBUTTON "&Specificare fișiere…", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Extrage din:", IDC_STATIC, 7, 55, 93, 10 COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Specific&are…", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 - LTEXT "E&xtrage în:", IDC_STATIC, 7, 76, 93, 10 + PUSHBUTTON "S&pecificare din…", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "S&alvare fișiere în:", IDC_STATIC, 7, 76, 93, 10 COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Specifica&re…", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 - DEFPUSHBUTTON "&Extrage", IDOK, 179, 96, 82, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 264, 96, 82, 14 + PUSHBUTTON "Specifica&re în…", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "&Extragere", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Revocare", IDCANCEL, 264, 96, 82, 14 END IDD_FIND_DIALOG DIALOGEX 30, 73, 236, 75 @@ -152,17 +152,17 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Găsire" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Găsește:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP + LTEXT "&Găsire:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP EDITTEXT IDC_TXT_FIND_TEXT, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_GROUP - CONTROL "&Doar pentru întreg cuvântul", IDC_CBX_FIND_WHOLE_WORD_ONLY, + CONTROL "&Potrivire doar a cuvântului întreg", IDC_CBX_FIND_WHOLE_WORD_ONLY, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 - CONTROL "Distinge &MAJ/min", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 + CONTROL "&Potrivire majuscule", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 GROUPBOX "Direcție", IDC_STATIC, 107, 26, 68, 28 - CONTROL "S&us", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 - CONTROL "J&os", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 - DEFPUSHBUTTON "Găsește &următorul", IDOK, 182, 5, 50, 14, WS_GROUP - PUSHBUTTON "A&nulează", IDCANCEL, 182, 23, 50, 14, WS_GROUP - CONTROL "&Caută de la început (Direcție: Sus) sau sfârșit (Direcție: Jos)", IDC_CBX_FIND_FROM_BEGINNING, + CONTROL "&Sus", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 + CONTROL "&Jos", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 + DEFPUSHBUTTON "Găsire &următorul", IDOK, 182, 5, 50, 14, WS_GROUP + PUSHBUTTON "Revocare", IDCANCEL, 182, 23, 50, 14, WS_GROUP + CONTROL "&Căutare de la început (Direcție: Jos) sau de la sfârșit (Direcție: Sus)", IDC_CBX_FIND_FROM_BEGINNING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 58, 231, 12 END @@ -187,25 +187,25 @@ BEGIN CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT CONTROL "", IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 - PUSHBUTTON "Con&firmă", IDOK, 20, 160, 50, 12 - PUSHBUTTON "A&nulează", IDCANCEL, 100, 160, 50, 12 + PUSHBUTTON "OK", IDOK, 20, 160, 50, 12 + PUSHBUTTON "Revocare", IDCANCEL, 100, 160, 50, 12 END IDD_REQUIRED_SERVICES_DISABLING_DIALOG DIALOGEX 0, 0, 237, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Programul configurator de sistem" // "Program de configurare sistem" +CAPTION "Programul de configurare a sistemului" // "Program de configurare sistem" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Î&nchide", IDOK, 180, 41, 50, 14 - LTEXT "Serviciile esențiale nu pot fi dezactivate. Făcând astfel poate împiedica execuția %s.", IDC_STATIC_REQSVCSDIS_INFO, 7, 7, 223, 28 - CONTROL "N&u doresc recurența acestui mesaj", IDC_CBX_REQSVCSDIS_NO_MSG_ANYMORE, + DEFPUSHBUTTON "OK", IDOK, 180, 41, 50, 14 + LTEXT "Serviciile esențiale nu pot fi dezactivate. Acest lucru ar putea împiedica rularea %s pe computer.", IDC_STATIC_REQSVCSDIS_INFO, 7, 7, 223, 28 + CONTROL "&Nu se mai afişează acest mesaj", IDC_CBX_REQSVCSDIS_NO_MSG_ANYMORE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 42, 154, 13 END STRINGTABLE BEGIN - IDS_MSCONFIG "Programul configurator de sistem" - IDS_MSCONFIG_2 "Configurator de sistem" + IDS_MSCONFIG "Programul de configurare a sistemului" + IDS_MSCONFIG_2 "Configurarea sistemului" IDS_ABOUT "&Despre…\tShift+F1" END @@ -218,13 +218,13 @@ END STRINGTABLE BEGIN - IDS_TAB_STARTUP "Autolansate" + IDS_TAB_STARTUP "Pornire" END STRINGTABLE BEGIN IDS_SERVICES_COLUMN_SERVICE "Servicii" - IDS_SERVICES_COLUMN_REQ "De bază" + IDS_SERVICES_COLUMN_REQ "Necesare" IDS_SERVICES_COLUMN_VENDOR "Furnizor" IDS_SERVICES_COLUMN_STATUS "Stare" IDS_SERVICES_COLUMN_DATEDISABLED "Dată dezactivată" @@ -232,7 +232,7 @@ END STRINGTABLE BEGIN - IDS_TOOLS_COLUMN_NAME "Nume instrument" + IDS_TOOLS_COLUMN_NAME "Numele instrumentului" IDS_TOOLS_COLUMN_DESCR "Descriere" IDS_TOOLS_COLUMN_STANDARD "Standard" IDS_STARTUP_COLUMN_ELEMENT "Element" @@ -242,6 +242,6 @@ END STRINGTABLE BEGIN - IDS_SERVICES_STATUS_RUNNING "Pornit" + IDS_SERVICES_STATUS_RUNNING "Rulează" IDS_SERVICES_STATUS_STOPPED "Oprit" END

1 month, 3 weeks

[reactos] 01/01: [SERVMAN] Update Romanian (ro-RO) translation (#7413)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddb2899505ffc22b1e2c8… commit ddb2899505ffc22b1e2c86b90b2ead43b91956d3 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 20:54:26 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 19:54:26 2024 +0100 [SERVMAN] Update Romanian (ro-RO) translation (#7413) --- base/applications/mscutils/servman/lang/ro-RO.rc | 192 +++++++++++------------ 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/base/applications/mscutils/servman/lang/ro-RO.rc b/base/applications/mscutils/servman/lang/ro-RO.rc index 2813ec40270..4f969714eae 100644 --- a/base/applications/mscutils/servman/lang/ro-RO.rc +++ b/base/applications/mscutils/servman/lang/ro-RO.rc @@ -17,17 +17,17 @@ BEGIN MENUITEM SEPARATOR MENUITEM "I&eșire", ID_EXIT END - POPUP "A&cțiuni" + POPUP "&Acțiuni" BEGIN MENUITEM "Co&nectare la…", ID_CONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "P&ornește", ID_START, GRAYED - MENUITEM "&Oprește", ID_STOP, GRAYED + MENUITEM "P&ornire", ID_START, GRAYED + MENUITEM "&Oprire", ID_STOP, GRAYED MENUITEM "Într&erupe", ID_PAUSE, GRAYED - MENUITEM "R&eia", ID_RESUME, GRAYED - MENUITEM "&Repornește", ID_RESTART, GRAYED + MENUITEM "R&eluare", ID_RESUME, GRAYED + MENUITEM "&Repornire", ID_RESTART, GRAYED MENUITEM SEPARATOR - MENUITEM "Împrospătea&ză\tF5", ID_REFRESH + MENUITEM "Î&mprospătare\tF5", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Mo&dificare…", ID_EDIT, GRAYED MENUITEM "&Creare…", ID_CREATE, GRAYED @@ -35,7 +35,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Proprietăți…", ID_PROP, GRAYED END - POPUP "&Afișare" + POPUP "&Vizualizare" BEGIN MENUITEM "D&ale", ID_VIEW_LARGE MENUITEM "&Pictograme", ID_VIEW_SMALL @@ -44,9 +44,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Pa&rticularizare…", ID_VIEW_CUST, GRAYED END - POPUP "Aj&utor" + POPUP "A&jutor" BEGIN - MENUITEM "&Manual…", ID_HELP + MENUITEM "Aj&utor", ID_HELP MENUITEM "&Despre…", ID_ABOUT END END @@ -55,20 +55,20 @@ IDR_POPUP MENU BEGIN POPUP "popup" BEGIN - MENUITEM "P&ornește", ID_START, GRAYED - MENUITEM "&Oprește", ID_STOP, GRAYED - MENUITEM "Într&erupe", ID_PAUSE, GRAYED - MENUITEM "R&eia", ID_RESUME, GRAYED - MENUITEM "&Repornește", ID_RESTART, GRAYED + MENUITEM "P&ornire", ID_START, GRAYED + MENUITEM "&Oprire", ID_STOP, GRAYED + MENUITEM "Într&erupere", ID_PAUSE, GRAYED + MENUITEM "R&eluare", ID_RESUME, GRAYED + MENUITEM "&Repornire", ID_RESTART, GRAYED MENUITEM SEPARATOR - MENUITEM "Împrospătea&ză", ID_REFRESH + MENUITEM "Î&mprospare", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Mo&dificare…", ID_EDIT, GRAYED MENUITEM "Elimin&are…", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "&Proprietăți…", ID_PROP, GRAYED MENUITEM SEPARATOR - MENUITEM "&Manual…", ID_HELP + MENUITEM "Aj&utor", ID_HELP END END @@ -78,7 +78,7 @@ BEGIN END IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 -CAPTION "Generale" +CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN @@ -87,21 +87,21 @@ BEGIN EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - PUSHBUTTON "P&ornește", IDC_START, 6, 155, 54, 15, WS_DISABLED - PUSHBUTTON "&Oprește", IDC_STOP, 68, 155, 54, 15, WS_DISABLED - PUSHBUTTON "Într&erupe", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED - PUSHBUTTON "R&eia", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + PUSHBUTTON "&Pornire", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "&Oprire", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Î&ntrerupere", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "&Reluare", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED LTEXT "Nume serviciu:", IDC_STATIC, 4, 11, 53, 11 LTEXT "Nume afișat:", IDC_STATIC, 4, 29, 53, 11 LTEXT "Descriere:", IDC_STATIC, 4, 51, 53, 11 - LTEXT "Cale la executabil:", IDC_STATIC, 6, 73, 82, 9 - LTEXT "Tip lansare:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "Calea către executabil:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "Tipul de pornire:", IDC_STATIC, 6, 108, 53, 11 LTEXT "Stare serviciu:", IDC_STATIC, 4, 138, 53, 11 LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE - LTEXT "Aici pot fi specificați parametrii de pornire aplicabili lansării serviciului.", IDC_STATIC, 6, 177, 240, 15 + LTEXT "Se pot specifica parametrii de pornire care se aplică atunci când se pornește serviciul de aici.", IDC_STATIC, 6, 177, 240, 15 LTEXT "Parametri de pornire:", IDC_STATIC, 6, 200, 68, 11 EDITTEXT IDC_START_PARAM, 78, 199, 168, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Mo&dificare", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED + PUSHBUTTON "&Modificare", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_LOGON DIALOGEX 6, 6, 253, 232 @@ -112,17 +112,17 @@ BEGIN LTEXT "Autentificat ca:", IDC_STATIC, 7, 7, 238, 8 AUTORADIOBUTTON "&Cont de sistem local", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Acest c&ont:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE - AUTOCHECKBOX "Per&mite serviciului să interacționeze cu aplicațiile de desktop", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Se per&mite serviciului să interacționeze cu aplicațiile de desktop", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE EDITTEXT IDC_LOGON_ACCOUNTNAME, 72, 50, 103, 14, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "Spe&cificare…", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Parolă:", IDC_LOGON_PW1TEXT, 18, 71, 33, 8, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP EDITTEXT IDC_LOGON_PASSWORD1, 72, 68, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Confi&rmarea parolei:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP + LTEXT "Confi&rmare a parolei:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP EDITTEXT IDC_LOGON_PASSWORD2, 72, 86, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Serviciul poate fi activat sau dezactivat în următoarele profile:", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Se permite serviciului să interacționeze cu desktopul", IDC_STATIC, 7, 114, 210, 8, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_LOGON_HWPROFILE, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 124, 238, 65 - PUSHBUTTON "Acti&vează", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Dezacti&vează", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Activare", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Dezactivare", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED END IDD_RECOVERY DIALOGEX 6, 6, 253, 232 @@ -130,27 +130,27 @@ CAPTION "Recuperare" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN - LTEXT "Determinați răspunsul sistemului dacă acest serviciu cade.", IDC_STATIC, 7, 7, 238, 8 - LTEXT "&Prima cădere:", IDC_STATIC, 7, 24, 92, 8 + LTEXT "Selectează răspunsul computerului dacă acest serviciu eșuează.", IDC_STATIC, 7, 7, 238, 8 + LTEXT "&Primul eșec::", IDC_STATIC, 7, 24, 92, 8 COMBOBOX IDC_FIRST_FAILURE, 104, 22, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - LTEXT "A &doua cădere:", IDC_STATIC, 7, 41, 92, 8 + LTEXT "&Al doilea eșec:", IDC_STATIC, 7, 41, 92, 8 COMBOBOX IDC_SECOND_FAILURE, 104, 39, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - LTEXT "Alt&e căderi:", IDC_STATIC, 7, 58, 92, 8 + LTEXT "&Eșecuri ulterioare", IDC_STATIC, 7, 58, 92, 8 COMBOBOX IDC_SUBSEQUENT_FAILURES, 104, 56, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST - LTEXT "&Repornire contor după:", IDC_STATIC, 7, 75, 72, 8 + LTEXT "&Res. contor eș. după:", IDC_STATIC, 7, 75, 72, 8 EDITTEXT IDC_RESET_TIME, 104, 73, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER LTEXT "zile", IDC_STATIC, 150, 75, 95, 8 - LTEXT "Repornire ser&viciu după:", IDC_RESTART_TEXT1, 7, 92, 92, 8 + LTEXT "Repornire a ser&viciului după:", IDC_RESTART_TEXT1, 7, 92, 92, 8 EDITTEXT IDC_RESTART_TIME, 104, 90, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER LTEXT "minute", IDC_RESTART_TEXT2, 150, 92, 95, 8 - GROUPBOX "Execare program", IDC_RUN_GROUPBOX, 7, 108, 238, 80 - LTEXT "Pr&ogram:", IDC_RUN_TEXT1, 14, 121, 168, 8 + GROUPBOX "Executare a programului", IDC_RUN_GROUPBOX, 7, 108, 238, 80 + LTEXT "&Program:", IDC_RUN_TEXT1, 14, 121, 168, 8 EDITTEXT IDC_PROGRAM, 14, 131, 165, 14 - PUSHBUTTON "Spe&cificare…", IDC_BROWSE_PROGRAM, 180, 131, 58, 14 + PUSHBUTTON "&Specificare…", IDC_BROWSE_PROGRAM, 180, 131, 58, 14 LTEXT "Para&metrii liniei de comandă:", IDC_RUN_TEXT2, 14, 155, 108, 8 EDITTEXT IDC_PARAMETERS, 128, 152, 110, 14 - AUTOCHECKBOX "&Adaugă contorul căderilor la sfârșitul liniei de comandă (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE - PUSHBUTTON "Opți&uni de repornire calculator…", IDC_RESTART_OPTIONS, 116, 197, 129, 14 + AUTOCHECKBOX "Adău&gare nr. de eșecuri la sfârșit linie de comandă (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE + PUSHBUTTON "&Opțiuni de repornire a computerului…", IDC_RESTART_OPTIONS, 116, 197, 129, 14 END IDD_DLG_DEPEND DIALOGEX 6, 6, 253, 225 @@ -164,13 +164,13 @@ BEGIN CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 236, 68 - LTEXT "Unele servicii depind de alte servicii sau modúle de sistem și de ordinea încărcării în grup. Dacă o componentă de sistem este oprită sau nu are o funcționare corespunzătoare, serviciile dependente pot fi și ele afectate.", IDC_STATIC, 8, 7, 238, 26 - LTEXT "Acest serviciu depinde de următoarele componente:", IDC_STATIC, 8, 57, 236, 9 + LTEXT "Unele servicii depind de alte servicii sau de module de sistem și de ordinea încărcării în grup. Dacă o componentă de sistem este oprită sau nu rulează corespunzător, serviciile dependente pot fi și ele afectate.", IDC_STATIC, 8, 7, 238, 26 + LTEXT "Acest serviciu depinde de următoarele componente", IDC_STATIC, 8, 57, 236, 9 LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 END IDD_DLG_CREATE DIALOGEX 6, 6, 225, 209 -CAPTION "Creare serviciu" +CAPTION "Creare a unui serviciu" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN @@ -183,29 +183,29 @@ BEGIN LTEXT "*Nume afișat:", IDC_STATIC, 12, 33, 54, 9 LTEXT "*Cale la executabil:", IDC_STATIC, 10, 51, 68, 9 LTEXT "Descriere:", IDC_STATIC, 12, 86, 44, 9 - PUSHBUTTON "Con&firmă", IDOK, 126, 192, 44, 13 - PUSHBUTTON "A&nulează", IDCANCEL, 176, 192, 46, 13 - LTEXT "Alte opțiuni (apăsați „Manual” pentru detalii)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "&Manual…", ID_CREATE_HELP, 10, 192, 44, 13 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 + PUSHBUTTON "Revocare", IDCANCEL, 176, 192, 46, 13 + LTEXT "Opțiuni suplim. (clic pe Ajutor pt. detalii)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "&Ajutor", ID_CREATE_HELP, 10, 192, 44, 13 END IDD_DLG_DELETE DIALOGEX 6, 6, 185, 148 -CAPTION "Eliminare serviciu" +CAPTION "Ștergere a unui serviciu" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 - LTEXT "Sigur doriți eliminarea acestui serviciu? Odată eliminat, nu va mai putea fi recuperat!", IDC_STATIC, 50, 6, 125, 25 - LTEXT "Nume serviciu:", IDC_STATIC, 6, 40, 80, 9 + LTEXT "Sigur doriți eliminarea acestui serviciu? Odată eliminat, acesta nu mai poate fi recuperat!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "Numele serviciului:", IDC_STATIC, 6, 40, 80, 9 LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY - PUSHBUTTON "D&a", IDOK, 26, 129, 54, 13 - DEFPUSHBUTTON "N&u", IDCANCEL, 102, 129, 54, 13 + PUSHBUTTON "Da", IDOK, 26, 129, 54, 13 + DEFPUSHBUTTON "Nu", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_DEPEND_STOP DIALOGEX 6, 6, 240, 148 -CAPTION "Oprire servicii" +CAPTION "Oprire s altor servicii" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN @@ -213,8 +213,8 @@ BEGIN LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL LTEXT "Doriți oprirea acestor servicii?", IDC_STATIC, 15, 110, 150, 10 - DEFPUSHBUTTON "D&a", IDOK, 60, 129, 54, 14 - PUSHBUTTON "N&u", IDCANCEL, 120, 129, 54, 14 + DEFPUSHBUTTON "Da", IDOK, 60, 129, 54, 14 + PUSHBUTTON "Nu", IDCANCEL, 120, 129, 54, 14 END IDD_DLG_HELP_OPTIONS DIALOGEX 6, 6, 200, 150 @@ -223,18 +223,18 @@ FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 - PUSHBUTTON "Î&nchide", IDOK, 75, 130, 44, 13 + PUSHBUTTON "OK", IDOK, 75, 130, 44, 13 END IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 -CAPTION "Control servicii" +CAPTION "Controlul serviciilor" FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 - PUSHBUTTON "Î&nchide", IDOK, 100, 70, 54, 13 + PUSHBUTTON "Î&nchidere", IDOK, 100, 70, 54, 13 END STRINGTABLE @@ -242,7 +242,7 @@ BEGIN IDS_FIRSTCOLUMN "Nume" IDS_SECONDCOLUMN "Descriere" IDS_THIRDCOLUMN "Stare" - IDS_FOURTHCOLUMN "Tip lansare" + IDS_FOURTHCOLUMN "Tip de pornire" IDS_FITHCOLUMN "Autentificare ca" END @@ -250,15 +250,15 @@ STRINGTABLE BEGIN IDS_SERVICES_STARTED "Pornit" IDS_SERVICES_STOPPED "Oprit" - IDS_SERVICES_AUTO "Automată" - IDS_SERVICES_MAN "Manuală" - IDS_SERVICES_DIS "Inactivă" + IDS_SERVICES_AUTO "Automat" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Dezactivat" END STRINGTABLE BEGIN IDS_NUM_SERVICES "Nr. servicii: %d" - IDS_STOP_DEPENDS "Dacă %s se oprește aceste procese se vor opri de asemenea." + IDS_STOP_DEPENDS "Când %s se oprește, aceste alte servicii se vor opri și ele" IDS_NO_DEPENDS "<Fără dependențe>" END @@ -266,30 +266,30 @@ STRINGTABLE BEGIN IDS_TOOLTIP_PROP "Proprietăți" IDS_TOOLTIP_REFRESH "Împrospătare" - IDS_TOOLTIP_EXPORT "Listă de export" - IDS_TOOLTIP_CREATE "Creează un serviciu nou" - IDS_TOOLTIP_DELETE "Elimină un serviciu existent" - IDS_TOOLTIP_START "Pornește serviciul" - IDS_TOOLTIP_STOP "Oprește serviciul" - IDS_TOOLTIP_PAUSE "Întrerupe serviciul" - IDS_TOOLTIP_RESTART "Repornește serviciul" + IDS_TOOLTIP_EXPORT "Exportare a listei" + IDS_TOOLTIP_CREATE "Creare a unui serviciu nou" + IDS_TOOLTIP_DELETE "Eliminare a unui serviciu existent" + IDS_TOOLTIP_START "Pornire a serviciului" + IDS_TOOLTIP_STOP "Oprire a serviciului" + IDS_TOOLTIP_PAUSE "Întrerupere a serviciului" + IDS_TOOLTIP_RESTART "Repornire a serviciului" END STRINGTABLE BEGIN - IDS_PROGRESS_INFO_START "ReactOS încearcă pornirea serviciului" - IDS_PROGRESS_INFO_STOP "ReactOS încearcă oprirea serviciului" - IDS_PROGRESS_INFO_PAUSE "ReactOS încearcă întreruperea serviciului" - IDS_PROGRESS_INFO_RESUME "ReactOS încearcă reluarea serviciului" - IDS_CREATE_SUCCESS "Serviciu creat cu succes" - IDS_DELETE_SUCCESS "Serviciu eliminat cu succes" - IDS_CREATE_REQ "Câmpurile cu\nasterisc sunt obligatorii" - IDS_DELETE_STOP "Este necesară oprirea manuală a serviciului înainte de a-l eliminăra!" + IDS_PROGRESS_INFO_START "ReactOS încearcă să pornească următorul serviciu" + IDS_PROGRESS_INFO_STOP "ReactOS încearcă să oprească următorul serviciu" + IDS_PROGRESS_INFO_PAUSE "ReactOS încearcă să întrerupă următorul serviciu" + IDS_PROGRESS_INFO_RESUME "ReactOS încearcă să reia următorului serviciu" + IDS_CREATE_SUCCESS "Serviciul a fost creat cu succes" + IDS_DELETE_SUCCESS "Serviciul a fost eliminat cu succes" + IDS_CREATE_REQ "Câmpurile marcate cu un\nasterisc sunt obligatorii" + IDS_DELETE_STOP "Trebuie oprit manual serviciul înainte de a îl șterge!" END STRINGTABLE BEGIN - IDS_HELP_OPTIONS "OPȚIUNI DE CREARE:\nNOTĂ: Numele opțiunii include semnul de egalitate.\n type= <own|share|interact|kernel|filesys|rec>\n (implicit = own)\n start= <boot|system|auto|demand|disabled>\n (implicit = demand)\n error= <normal|severe|critical|ignore>\n (implicit = normal)\n group= <LoadOrderGroup>\n tag= <yes|no>\n depend= <Dependencies(separate de / (simbolul „solidus”))>\n obj= <AccountName|ObjectName>\n (implicit = LocalSystem)\n password= <pass [...] + IDS_HELP_OPTIONS "OPȚIUNI DE CREARE:\nNOTĂ: Numele opțiunii include semnul egal.\n type= <own|share|interact|kernel|filesys|rec>\n (implicit = own)\n start= <boot|system|auto|demand|disabled>\n (implicit = demand)\n error= <normal|severe|critical|ignore>\n (implicit = normal)\n group= <LoadOrderGroup>\n tag= <yes|no>\n depend= <Dependencies( separate de / (bară oblică înainte))>\n obj= <AccountName|ObjectName>\n (implicit = LocalSystem)\n password= <password>\n" END /* Hints */ @@ -297,50 +297,50 @@ STRINGTABLE BEGIN IDS_HINT_BLANK " " IDS_HINT_EXPORT " Exportă lista curentă într-un fișier." - IDS_HINT_EXIT " Părăsește programul." - IDS_HINT_CONNECT " Gestionează un alt calculator." + IDS_HINT_EXIT " Iese din program." + IDS_HINT_CONNECT " Gestionează un alt computer." IDS_HINT_START " Pornește serviciul selectat." IDS_HINT_STOP " Oprește serviciul selectat." IDS_HINT_PAUSE " Întrerupe serviciul selectat." IDS_HINT_RESUME " Reia serviciul selectat." - IDS_HINT_RESTART " Oprește apoi repornește serviciul selectat." + IDS_HINT_RESTART " Oprește și pornește serviciul selectat." IDS_HINT_REFRESH " Împrospătează lista de servicii." IDS_HINT_EDIT " Editează proprietățile serviciului selectat." IDS_HINT_CREATE " Creează un nou serviciu." - IDS_HINT_DELETE " Elimină serviciul selectat." - IDS_HINT_PROP " Deschide proprietățile selecției curente." + IDS_HINT_DELETE " Șterge serviciul selectat." + IDS_HINT_PROP " Deschideți foaia de proprietăți pentru selecția curentă." IDS_HINT_LARGE " Afișează elementele folosind pictograme mari." IDS_HINT_SMALL " Afișează elementele folosind pictograme mici." - IDS_HINT_LIST " Afișează elementele în listă." + IDS_HINT_LIST " Afișează elementul într-o listă." IDS_HINT_DETAILS " Afișează informații despre fiecare element într-o fereastră." IDS_HINT_CUST " Particularizează afișajul." IDS_HINT_HELP " Afișează fereastra de ajutor." - IDS_HINT_ABOUT " Despre Gestionar de servicii ReactOS." - IDS_HINT_SYS_RESTORE " Restabilește fereastra la mărimea originală." + IDS_HINT_ABOUT " Despre Managerul de servicii ReactOS." + IDS_HINT_SYS_RESTORE " Restabilește această fereastră la dimensiunea normală." IDS_HINT_SYS_MOVE " Mută fereastra." IDS_HINT_SYS_SIZE " Redimensionează fereastra." - IDS_HINT_SYS_MINIMIZE " Reduce fereastra la minim." - IDS_HINT_SYS_MAXIMIZE " Mărește fereastra la maxim." + IDS_HINT_SYS_MINIMIZE " Restrânge această fereastră la o pictogramă." + IDS_HINT_SYS_MAXIMIZE " Extinde această fereastră pentru a umple acest ecran." IDS_HINT_SYS_CLOSE " Închide fereastra." END /* Application title */ STRINGTABLE BEGIN - IDS_APPNAME "Gestionar de servicii" - IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" + IDS_APPNAME "Managerul de servicii ReactOS" + IDS_APPAUTHORS "Drepturi de autor (C) 2005-2007 de Ged Murphy (gedmurphy(a)reactos.org)" END STRINGTABLE BEGIN IDS_NO_ACTION "Nici o acțiune" - IDS_RESTART_SERVICE "Repornește serviciul" - IDS_RUN_PROGRAM "Execută un program" - IDS_RESTART_COMPUTER "Repornește calculatorul" + IDS_RESTART_SERVICE "Repornire serviciului" + IDS_RUN_PROGRAM "Executare a unui program" + IDS_RESTART_COMPUTER "Repornire a computerului" END STRINGTABLE BEGIN - IDS_NOT_SAME_PASSWORD "Parolele nu sunt identice!" + IDS_NOT_SAME_PASSWORD "Parolele nu sunt aceleași!" IDS_INVALID_PASSWORD "Introduceți o parolă validă!" END

1 month, 3 weeks

[reactos] 01/01: [SECLOGON] Add missing service status updates

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e462a3905af0959040c1… commit 0e462a3905af0959040c1cab3af176cee40cabc7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 3 10:37:04 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 3 10:37:04 2024 +0100 [SECLOGON] Add missing service status updates The Seclogon service must update its status to SERVICE_STOPPED on a SERVICE_CONTROL_STOP or SERVICE_CONTROL_SHUTDOWN command. This fixes CORE-19793. --- base/services/seclogon/seclogon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/services/seclogon/seclogon.c b/base/services/seclogon/seclogon.c index efe5ce4f853..b15fb22aa03 100644 --- a/base/services/seclogon/seclogon.c +++ b/base/services/seclogon/seclogon.c @@ -74,6 +74,7 @@ ServiceControlHandlerEx( TRACE(" SERVICE_CONTROL_STOP received\n"); UpdateServiceStatus(SERVICE_STOP_PENDING); StopRpcServer(); + UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; case SERVICE_CONTROL_PAUSE: @@ -100,6 +101,7 @@ ServiceControlHandlerEx( TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); UpdateServiceStatus(SERVICE_STOP_PENDING); StopRpcServer(); + UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; default :

1 month, 3 weeks

[reactos] 04/04: Fix various inet_ntop definitions

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79f2289a9d39eafa07259… commit 79f2289a9d39eafa07259ace33f5a1397264f0c8 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Tue Jul 2 00:13:09 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 Fix various inet_ntop definitions --- dll/3rdparty/libtirpc/src/rpc_generic.c | 2 +- dll/win32/winhttp/inet_ntop.c | 2 +- dll/win32/wininet/inet_ntop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/3rdparty/libtirpc/src/rpc_generic.c b/dll/3rdparty/libtirpc/src/rpc_generic.c index fc646f5bc50..ec13e56f69a 100644 --- a/dll/3rdparty/libtirpc/src/rpc_generic.c +++ b/dll/3rdparty/libtirpc/src/rpc_generic.c @@ -641,7 +641,7 @@ void freenetbuf(struct netbuf *nbuf) #ifdef __REACTOS__ PCSTR WSAAPI -inet_ntop(INT af, PVOID src, PSTR dst, size_t cnt) +inet_ntop(INT af, const VOID *src, PSTR dst, size_t cnt) { struct in_addr in; char *text_addr; diff --git a/dll/win32/winhttp/inet_ntop.c b/dll/win32/winhttp/inet_ntop.c index 99d5ccdcf19..8e40e261e33 100644 --- a/dll/win32/winhttp/inet_ntop.c +++ b/dll/win32/winhttp/inet_ntop.c @@ -54,7 +54,7 @@ static const char *inet_ntop6(const u_char *src, char *dst, size_t size); PCSTR WSAAPI -inet_ntop(INT Family, PVOID pAddr, PSTR pStringBuf, size_t StringBufSize) +inet_ntop(INT Family, const VOID *pAddr, PSTR pStringBuf, size_t StringBufSize) { switch (Family) { diff --git a/dll/win32/wininet/inet_ntop.c b/dll/win32/wininet/inet_ntop.c index 27a388f9146..378b67d9ab1 100644 --- a/dll/win32/wininet/inet_ntop.c +++ b/dll/win32/wininet/inet_ntop.c @@ -53,7 +53,7 @@ PCSTR WSAAPI inet_ntop( _In_ INT af, - _In_ PVOID src, + _In_ const VOID *src, _Out_writes_(StringBufSize) PSTR dst, _In_ size_t size) {

1 month, 3 weeks

[reactos] 03/04: [WS2_32_WINETEST] Sync tests for inet_pton, inet_ntop

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4453711b5a1cca5c31e96… commit 4453711b5a1cca5c31e960462f185dacc0bb2c37 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Sat Apr 20 22:31:26 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 [WS2_32_WINETEST] Sync tests for inet_pton, inet_ntop --- modules/rostests/winetests/ws2_32/sock.c | 493 +++++++++++++++++++++---------- 1 file changed, 343 insertions(+), 150 deletions(-) diff --git a/modules/rostests/winetests/ws2_32/sock.c b/modules/rostests/winetests/ws2_32/sock.c index 74ea920dd00..ea994454c01 100644 --- a/modules/rostests/winetests/ws2_32/sock.c +++ b/modules/rostests/winetests/ws2_32/sock.c @@ -82,9 +82,9 @@ static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, struct timeval *timeout, OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle); static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); -static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); +static PCSTR (WINAPI *p_inet_ntop)(INT,LPVOID,LPSTR,ULONG); static PCWSTR(WINAPI *pInetNtopW)(INT,LPVOID,LPWSTR,ULONG); -static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); +static int (WINAPI *p_inet_pton)(INT,LPCSTR,LPVOID); static int (WINAPI *pInetPtonW)(INT,LPWSTR,LPVOID); static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); static int (WINAPI *pWSALookupServiceEnd)(HANDLE); @@ -1298,9 +1298,9 @@ static void Init (void) pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pGetAddrInfoExW = (void *)GetProcAddress(hws2_32, "GetAddrInfoExW"); pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(hws2_32, "GetAddrInfoExOverlappedResult"); - pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + p_inet_ntop = (void *)GetProcAddress(hws2_32, "inet_ntop"); pInetNtopW = (void *)GetProcAddress(hws2_32, "InetNtopW"); - pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); + p_inet_pton = (void *)GetProcAddress(hws2_32, "inet_pton"); pInetPtonW = (void *)GetProcAddress(hws2_32, "InetPtonW"); pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); @@ -4903,26 +4903,26 @@ static void test_addr_to_print(void) ok(pdst != NULL, "inet_ntoa failed %s\n", dst); ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); - /* InetNtop became available in Vista and Win2008 */ - if (!pInetNtop) + /* inet_ntop became available in Vista and Win2008 */ + if (!p_inet_ntop) { win_skip("InetNtop not present, not executing tests\n"); return; } /* Second part of test */ - pdst = pInetNtop(AF_INET,(void*)&in.s_addr, dst, sizeof(dst)); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, sizeof(dst)); ok(pdst != NULL, "InetNtop failed %s\n", dst); ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); /* Test invalid parm conditions */ - pdst = pInetNtop(1, (void*)&in.s_addr, dst, sizeof(dst)); + pdst = p_inet_ntop(1, (void *)&in.s_addr, dst, sizeof(dst)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "Should be WSAEAFNOSUPPORT\n"); /* Test Null destination */ pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, NULL, sizeof(dst)); + pdst = p_inet_ntop(AF_INET, &in.s_addr, NULL, sizeof(dst)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4930,7 +4930,7 @@ static void test_addr_to_print(void) /* Test zero length passed */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 0); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, 0); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4938,7 +4938,7 @@ static void test_addr_to_print(void) /* Test length one shorter than the address length */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 6); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, 6); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4946,7 +4946,7 @@ static void test_addr_to_print(void) /* Test longer length is ok */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, sizeof(dst)+1); + pdst = p_inet_ntop(AF_INET, &in.s_addr, dst, sizeof(dst)+1); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); @@ -4954,19 +4954,19 @@ static void test_addr_to_print(void) /* Test an zero prefixed IPV6 address */ memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); - pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); ok(!strcmp(pdst, addr2_Str),"Address %s != %s\n", pdst, addr2_Str); /* Test an zero suffixed IPV6 address */ memcpy(in6.s6_addr, addr3_Num, sizeof(addr3_Num)); - pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); /* Test the IPv6 address contains the IPv4 address in IPv4 notation */ memcpy(in6.s6_addr, addr4_Num, sizeof(addr4_Num)); - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); ok(!strcmp(pdst, addr4_Str),"Address %s != %s\n", pdst, addr4_Str); @@ -4975,7 +4975,7 @@ static void test_addr_to_print(void) /* Test Null destination */ pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, NULL, sizeof(dst6)); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, NULL, sizeof(dst6)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4983,7 +4983,7 @@ static void test_addr_to_print(void) /* Test zero length passed */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 0); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, 0); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4991,7 +4991,7 @@ static void test_addr_to_print(void) /* Test length one shorter than the address length */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 16); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, 16); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); @@ -4999,151 +4999,344 @@ static void test_addr_to_print(void) /* Test longer length is ok */ WSASetLastError(0); pdst = NULL; - pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 18); + pdst = p_inet_ntop(AF_INET6, &in6.s6_addr, dst6, 18); ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); } static void test_inet_pton(void) { - struct TEST_DATA - { - int family, ret; - DWORD err; - const char *printable, *collapsed, *raw_data; - } tests[] = { - {AF_UNSPEC, -1, WSAEFAULT, /* Test 0 */ - NULL, NULL, NULL}, - {AF_INET, -1, WSAEFAULT, - NULL, NULL, NULL}, - {AF_INET6, -1, WSAEFAULT, - NULL, NULL, NULL}, - {AF_UNSPEC, -1, WSAEAFNOSUPPORT, - "127.0.0.1", NULL, NULL}, - {AF_INET, 1, 0, - "127.0.0.1", "127.0.0.1", - "\x7f\x00\x00\x01"}, - {AF_INET6, 0, 0, - "127.0.0.1", "127.0.0.1", NULL}, - {AF_INET, 0, 0, - "::1/128", NULL, NULL}, - {AF_INET6, 0, 0, - "::1/128", NULL, NULL}, - {AF_UNSPEC, -1, WSAEAFNOSUPPORT, - "broken", NULL, NULL}, - {AF_INET, 0, 0, - "broken", NULL, NULL}, - {AF_INET6, 0, 0, /* Test 10 */ - "broken", NULL, NULL}, - {AF_UNSPEC, -1, WSAEAFNOSUPPORT, - "177.32.45.20", NULL, NULL}, - {AF_INET, 1, 0, - "177.32.45.20", "177.32.45.20", - "\xb1\x20\x2d\x14"}, - {AF_INET6, 0, 0, - "177.32.45.20", NULL, NULL}, - {AF_INET, 0, 0, - "2607:f0d0:1002:51::4", NULL, NULL}, - {AF_INET6, 1, 0, - "2607:f0d0:1002:51::4", "2607:f0d0:1002:51::4", - "\x26\x07\xf0\xd0\x10\x02\x00\x51\x00\x00\x00\x00\x00\x00\x00\x04"}, - {AF_INET, 0, 0, - "::177.32.45.20", NULL, NULL}, - {AF_INET6, 1, 0, - "::177.32.45.20", "::177.32.45.20", - "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb1\x20\x2d\x14"}, - {AF_INET, 0, 0, - "fe80::0202:b3ff:fe1e:8329", NULL, NULL}, - {AF_INET6, 1, 0, - "fe80::0202:b3ff:fe1e:8329", "fe80::202:b3ff:fe1e:8329", - "\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"}, - {AF_INET6, 1, 0, /* Test 20 */ - "fe80::202:b3ff:fe1e:8329", "fe80::202:b3ff:fe1e:8329", - "\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"}, - {AF_INET, 0, 0, - "a", NULL, NULL}, - {AF_INET, 0, 0, - "a.b", NULL, NULL}, - {AF_INET, 0, 0, - "a.b.c", NULL, NULL}, - {AF_INET, 0, 0, - "a.b.c.d", NULL, NULL}, - {AF_INET6, 1, 0, - "2001:cdba:0000:0000:0000:0000:3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, - {AF_INET6, 1, 0, - "2001:cdba::3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, - {AF_INET6, 1, 0, - "2001:cdba:0:0:0:0:3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"} + static const struct + { + char input[32]; + int ret; + DWORD addr; + } + ipv4_tests[] = + { + {"", 0, 0xdeadbeef}, + {" ", 0, 0xdeadbeef}, + {"1.1.1.1", 1, 0x01010101}, + {"0.0.0.0", 1, 0x00000000}, + {"127.127.127.255", 1, 0xff7f7f7f}, + {"127.127.127.255:123", 0, 0xff7f7f7f}, + {"127.127.127.256", 0, 0xdeadbeef}, + {"a", 0, 0xdeadbeef}, + {"1.1.1.0xaA", 0, 0xdeadbeef}, + {"1.1.1.0x", 0, 0xdeadbeef}, + {"1.1.1.010", 0, 0xdeadbeef}, + {"1.1.1.00", 0, 0xdeadbeef}, + {"1.1.1.0a", 0, 0x00010101}, + {"1.1.1.0o10", 0, 0x00010101}, + {"1.1.1.0b10", 0, 0x00010101}, + {"1.1.1.-2", 0, 0xdeadbeef}, + {"1", 0, 0xdeadbeef}, + {"1.2", 0, 0xdeadbeef}, + {"1.2.3", 0, 0xdeadbeef}, + {"203569230", 0, 0xdeadbeef}, + {"3.4.5.6.7", 0, 0xdeadbeef}, + {" 3.4.5.6", 0, 0xdeadbeef}, + {"\t3.4.5.6", 0, 0xdeadbeef}, + {"3.4.5.6 ", 0, 0x06050403}, + {"3. 4.5.6", 0, 0xdeadbeef}, + {"[0.1.2.3]", 0, 0xdeadbeef}, + {"0x00010203", 0, 0xdeadbeef}, + {"0x2134", 0, 0xdeadbeef}, + {"1234BEEF", 0, 0xdeadbeef}, + {"017700000001", 0, 0xdeadbeef}, + {"0777", 0, 0xdeadbeef}, + {"2607:f0d0:1002:51::4", 0, 0xdeadbeef}, + {"::177.32.45.20", 0, 0xdeadbeef}, + {"::1/128", 0, 0xdeadbeef}, + {"::1", 0, 0xdeadbeef}, + {":1", 0, 0xdeadbeef}, }; + + static const struct + { + char input[64]; + int ret; + unsigned short addr[8]; + int broken; + int broken_ret; + } + ipv6_tests[] = + { + {"0000:0000:0000:0000:0000:0000:0000:0000", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0000:0000:0000:0000:0000:0000:0000:0001", 1, {0, 0, 0, 0, 0, 0, 0, 0x100}}, + {"0:0:0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0:0:0:1", 1, {0, 0, 0, 0, 0, 0, 0, 0x100}}, + {"0:0:0:0:0:0:0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0:0:13.1.68.3", 1, {0, 0, 0, 0, 0, 0, 0x10d, 0x344}}, + {"0:0:0:0:0:0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:0:0:0:0:FFFF:129.144.52.38", 1, {0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634}}, + {"0::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"0:1:2:3:4:5:6:7", 1, {0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700}}, + {"1080:0:0:0:8:800:200c:417a", 1, {0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41}}, + {"0:a:b:c:d:e:f::", 1, {0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00, 0}}, + {"1111:2222:3333:4444:5555:6666:123.123.123.123", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111:2222:3333:4444:5555:6666:7777:8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:0x5555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:x555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:0r5555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:r5555:6666:7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666:7777::", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0}}, + {"1111:2222:3333:4444:5555:6666::", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0}}, + {"1111:2222:3333:4444:5555:6666::8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888}}, + {"1111:2222:3333:4444:5555:6666::7777:8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x7777}}, + {"1111:2222:3333:4444:5555:6666:7777::8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0}}, + {"1111:2222:3333:4444:5555::", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0}}, + {"1111:2222:3333:4444:5555::123.123.123.123", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7b7b, 0x7b7b}}, + {"1111:2222:3333:4444:5555::0x1.123.123.123", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x100}}, + {"1111:2222:3333:4444:5555::0x88", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800}}, + {"1111:2222:3333:4444:5555::0X88", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800}}, + {"1111:2222:3333:4444:5555::0X", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0}}, + {"1111:2222:3333:4444:5555::0X88:7777", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800}}, + {"1111:2222:3333:4444:5555::0x8888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888}}, + {"1111:2222:3333:4444:5555::0x80000000", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0xffff}}, + {"1111:2222:3333:4444::5555:0x012345678", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0x7856}}, + {"1111:2222:3333:4444::5555:0x123456789", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0xffff}}, + {"1111:2222:3333:4444:5555:6666:0x12345678", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666:7777:0x80000000", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff}}, + {"1111:2222:3333:4444:5555:6666:7777:0x012345678", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x7856}}, + {"1111:2222:3333:4444:5555:6666:7777:0x123456789", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff}}, + {"111:222:333:444:555:666:777:0x123456789abcdef0", 0, {0x1101, 0x2202, 0x3303, 0x4404, 0x5505, 0x6606, 0x7707, 0xffff}}, + {"1111:2222:3333:4444:5555::08888", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555::08888::", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666:7777:fffff:", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xabab}}, + {"1111:2222:3333:4444:5555:6666::fffff:", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555::fffff", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444::fffff", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333::fffff", 0, {0x1111, 0x2222, 0x3333, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555::7777:8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:5555::8888", 1, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888}}, + {"1111::", 1, {0x1111, 0, 0, 0, 0, 0, 0, 0}}, + {"1111::123.123.123.123", 1, {0x1111, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b}}, + {"1111::3333:4444:5555:6666:123.123.123.123", 1, {0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::3333:4444:5555:6666:7777:8888", 1, {0x1111, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111::4444:5555:6666:123.123.123.123", 1, {0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::4444:5555:6666:7777:8888", 1, {0x1111, 0, 0, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111::5555:6666:123.123.123.123", 1, {0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::5555:6666:7777:8888", 1, {0x1111, 0, 0, 0, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111::6666:123.123.123.123", 1, {0x1111, 0, 0, 0, 0, 0x6666, 0x7b7b, 0x7b7b}}, + {"1111::6666:7777:8888", 1, {0x1111, 0, 0, 0, 0, 0x6666, 0x7777, 0x8888}}, + {"1111::7777:8888", 1, {0x1111, 0, 0, 0, 0, 0, 0x7777, 0x8888}}, + {"1111::8888", 1, {0x1111, 0, 0, 0, 0, 0, 0, 0x8888}}, + {"1:2:3:4:5:6:1.2.3.4", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x201, 0x403}}, + {"1:2:3:4:5:6:7:8", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700, 0x800}}, + {"1:2:3:4:5:6::", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0}}, + {"1:2:3:4:5:6::8", 1, {0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0, 0x800}}, + {"2001:0000:1234:0000:0000:C1C0:ABCD:0876", 1, {0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608}}, + {"2001:0000:4136:e378:8000:63bf:3fff:fdd2", 1, {0x120, 0, 0x3641, 0x78e3, 0x80, 0xbf63, 0xff3f, 0xd2fd}}, + {"2001:0db8:0:0:0:0:1428:57ab", 1, {0x120, 0xb80d, 0, 0, 0, 0, 0x2814, 0xab57}}, + {"2001:0db8:1234:ffff:ffff:ffff:ffff:ffff", 1, {0x120, 0xb80d, 0x3412, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff}}, + {"2001::CE49:7601:2CAD:DFFF:7C94:FFFE", 1, {0x120, 0, 0x49ce, 0x176, 0xad2c, 0xffdf, 0x947c, 0xfeff}}, + {"2001:db8:85a3::8a2e:370:7334", 1, {0x120, 0xb80d, 0xa385, 0, 0, 0x2e8a, 0x7003, 0x3473}}, + {"3ffe:0b00:0000:0000:0001:0000:0000:000a", 1, {0xfe3f, 0xb, 0, 0, 0x100, 0, 0, 0xa00}}, + {"::", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::%16", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::/16", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::01234", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::0:0:0:0:0:0:0", 1, {0, 0, 0, 0, 0, 0, 0, 0}, 1}, + {"::0:a:b:c:d:e:f", 1, {0, 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00}, 1}, + {"::123.123.123.123", 1, {0, 0, 0, 0, 0, 0, 0x7b7b, 0x7b7b}}, + {"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 1, {0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff}}, + {"':10.0.0.1", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"-1", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"02001:0000:1234:0000:0000:C1C0:ABCD:0876", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:00000:1234:0000:0000:C1C0:ABCD:0876", 0, {0x120, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0000:01234:0000:0000:C1C0:ABCD:0876", 0, {0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0000::01234.0", 0, {0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0::b.0", 0, {0x120, 0, 0, 0, 0, 0, 0, 0xb00}}, + {"2001::0:b.0", 0, {0x120, 0, 0, 0, 0, 0, 0, 0xb00}}, + {"1.2.3.4", 0, {0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1.2.3.4:1111::5555", 0, {0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1.2.3.4::5555", 0, {0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"11112222:3333:4444:5555:6666:1.2.3.4", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"11112222:3333:4444:5555:6666:7777:8888", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"0x1111", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:22223333:4444:5555:6666:1.2.3.4", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:22223333:4444:5555:6666:7777:8888", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:123456789:4444:5555:6666:7777:8888", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:1234567890abcdef0:4444:5555:6666:7777:888", 0, {0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:", 0, {0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:1.2.3.4", 0, {0x1111, 0x2222, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333", 0, {0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111:2222:3333:4444:5555:6666::1.2.3.4", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x100}}, + {"1111:2222:3333:4444:5555:6666:7777:1.2.3.4", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100}}, + {"1111:2222:3333:4444:5555:6666:7777:8888:", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:5555:6666:7777:8888:1.2.3.4",0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:3333:4444:5555:6666:7777:8888:9999", 0, {0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x8888}}, + {"1111:2222:::", 0, {0x1111, 0x2222, 0, 0, 0, 0, 0, 0}}, + {"1111::5555:", 0, {0x1111, 0x5555, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1111::3333:4444:5555:6666:7777::", 0, {0x1111, 0, 0, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777}}, + {"1111:2222:::4444:5555:6666:1.2.3.4", 0, {0x1111, 0x2222, 0, 0, 0, 0, 0, 0}}, + {"1111::3333::5555:6666:1.2.3.4", 0, {0x1111, 0, 0, 0, 0, 0, 0, 0x3333}}, + {"12345::6:7:8", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::001.2.3.4", 1, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::1.002.3.4", 1, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::0001.2.3.4", 0, {0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.0002.3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.256.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.4294967296.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.18446744073709551616.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.256", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.4294967296", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.18446744073709551616", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.300", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.300.", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2::1", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.4::1", 0, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::1.", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.3.4", 1, {0x100, 0, 0, 0, 0, 0, 0x201, 0x403}}, + {"1::1.2.3.900", 0, {0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2.300.4", 0, {0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.256.3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.256:3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1.2a.3.4", 0, {0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::256.2.3.4", 0, {0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"1::1a.2.3.4", 0, {0x100, 0, 0, 0, 0, 0, 0, 0x1a00}}, + {"1::2::3", 0, {0x100, 0, 0, 0, 0, 0, 0, 0x200}}, + {"2001:0000:1234: 0000:0000:C1C0:ABCD:0876", 0, {0x120, 0, 0x3412, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"2001:0000:1234:0000:0000:C1C0:ABCD:0876 0", 0, {0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608}}, + {"2001:1:1:1:1:1:255Z255X255Y255", 0, {0x120, 0x100, 0x100, 0x100, 0x100, 0x100, 0xabab, 0xabab}}, + {"2001::FFD3::57ab", 0, {0x120, 0, 0, 0, 0, 0, 0, 0xd3ff}}, + {":", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {":1111:2222:3333:4444:5555:6666:1.2.3.4", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {":1111:2222:3333:4444:5555:6666:7777:8888", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {":1111::", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::-1", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::12345678", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::123456789", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::1234567890abcdef0", 0, {0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"::0x80000000", 0, {0, 0, 0, 0, 0, 0, 0, 0xffff}}, + {"::0x012345678", 0, {0, 0, 0, 0, 0, 0, 0, 0x7856}}, + {"::0x123456789", 0, {0, 0, 0, 0, 0, 0, 0, 0xffff}}, + {"::0x1234567890abcdef0", 0, {0, 0, 0, 0, 0, 0, 0, 0xffff}}, + {"::.", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::..", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"::...", 0, {0, 0, 0, 0, 0, 0, 0, 0}}, + {"XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:1.2.3.4", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + {"[::]", 0, {0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab}}, + }; + + BYTE buffer[32]; int i, ret; - DWORD err; - char buffer[64],str[64]; - WCHAR printableW[64], collapsedW[64]; - const char *ptr; - const WCHAR *ptrW; - /* InetNtop and InetPton became available in Vista and Win2008 */ - if (!pInetNtop || !pInetNtopW || !pInetPtonA || !pInetPtonW) + /* inet_ntop and inet_pton became available in Vista and Win2008 */ + if (!p_inet_ntop) { - win_skip("InetNtop and/or InetPton not present, not executing tests\n"); + win_skip("inet_ntop is not available\n"); return; } - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_UNSPEC, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_INET, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pInetPtonW(AF_UNSPEC, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pInetPtonW(AF_INET, NULL, buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_UNSPEC, "127.0.0.1", buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = p_inet_pton(AF_UNSPEC, "2607:f0d0:1002:51::4", buffer); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); + + for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { + WCHAR inputW[32]; + DWORD addr; + + winetest_push_context( "Address %s", debugstr_a(ipv4_tests[i].input) ); + WSASetLastError(0xdeadbeef); - ret = pInetPtonA(tests[i].family, tests[i].printable, buffer); - ok (ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); - if (tests[i].ret == -1) - { - err = WSAGetLastError(); - ok (tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } - if (tests[i].ret != 1) continue; - ok (memcmp(buffer, tests[i].raw_data, - tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, - "Test [%d]: Expected binary data differs\n", i); - - /* Test the result from Pton with Ntop */ - strcpy (str, "deadbeef"); - ptr = pInetNtop(tests[i].family, buffer, str, sizeof(str)); - ok (ptr != NULL, "Test [%d]: Failed with NULL\n", i); - ok (ptr == str, "Test [%d]: Pointers differ (%p != %p)\n", i, ptr, str); - if (!ptr) continue; - ok (strcmp(ptr, tests[i].collapsed) == 0, "Test [%d]: Expected '%s', got '%s'\n", - i, tests[i].collapsed, ptr); - } - - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - if (tests[i].printable) - MultiByteToWideChar(CP_ACP, 0, tests[i].printable, -1, printableW, - sizeof(printableW) / sizeof(printableW[0])); + addr = 0xdeadbeef; + ret = p_inet_pton(AF_INET, ipv4_tests[i].input, &addr); + ok(ret == ipv4_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == ipv4_tests[i].addr, "got addr %#08lx\n", addr); + + MultiByteToWideChar(CP_ACP, 0, ipv4_tests[i].input, -1, inputW, ARRAY_SIZE(inputW)); WSASetLastError(0xdeadbeef); - ret = pInetPtonW(tests[i].family, tests[i].printable ? printableW : NULL, buffer); - ok(ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); - if (tests[i].ret == -1) - { - err = WSAGetLastError(); - ok(tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } - if (tests[i].ret != 1) continue; - ok(memcmp(buffer, tests[i].raw_data, - tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, - "Test [%d]: Expected binary data differs\n", i); - - /* Test the result from Pton with Ntop */ - printableW[0] = 0xdead; - ptrW = pInetNtopW(tests[i].family, buffer, printableW, sizeof(printableW) / sizeof(printableW[0])); - ok (ptrW != NULL, "Test [%d]: Failed with NULL\n", i); - ok (ptrW == printableW, "Test [%d]: Pointers differ (%p != %p)\n", i, ptrW, printableW); - if (!ptrW) continue; - - MultiByteToWideChar(CP_ACP, 0, tests[i].collapsed, -1, collapsedW, - sizeof(collapsedW) / sizeof(collapsedW[0])); - ok (lstrcmpW(ptrW, collapsedW) == 0, "Test [%d]: Expected '%s', got '%s'\n", - i, tests[i].collapsed, wine_dbgstr_w(ptrW)); + addr = 0xdeadbeef; + ret = pInetPtonW(AF_INET, inputW, &addr); + ok(ret == ipv4_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); + ok(addr == ipv4_tests[i].addr, "got addr %#08lx\n", addr); + + WSASetLastError(0xdeadbeef); + addr = inet_addr(ipv4_tests[i].input); + ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, "got addr %#08lx\n", addr); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(ipv6_tests); ++i) + { + unsigned short addr[8]; + WCHAR inputW[64]; + + winetest_push_context( "Address %s", debugstr_a(ipv6_tests[i].input) ); + + WSASetLastError(0xdeadbeef); + memset(addr, 0xab, sizeof(addr)); + ret = p_inet_pton(AF_INET6, ipv6_tests[i].input, addr); + if (ipv6_tests[i].broken) + ok(ret == ipv6_tests[i].ret || broken(ret == ipv6_tests[i].broken_ret), "got %d\n", ret); + else + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + if (ipv6_tests[i].broken) + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)) || broken(memcmp(addr, ipv6_tests[i].addr, sizeof(addr))), + "address didn't match\n"); + else + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); + + MultiByteToWideChar(CP_ACP, 0, ipv6_tests[i].input, -1, inputW, ARRAY_SIZE(inputW)); + WSASetLastError(0xdeadbeef); + memset(addr, 0xab, sizeof(addr)); + ret = pInetPtonW(AF_INET6, inputW, addr); + if (ipv6_tests[i].broken) + ok(ret == ipv6_tests[i].ret || broken(ret == ipv6_tests[i].broken_ret), "got %d\n", ret); + else + ok(ret == ipv6_tests[i].ret, "got %d\n", ret); + ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); + if (ipv6_tests[i].broken) + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)) || broken(memcmp(addr, ipv6_tests[i].addr, sizeof(addr))), + "address didn't match\n"); + else + ok(!memcmp(addr, ipv6_tests[i].addr, sizeof(addr)), "address didn't match\n"); + + winetest_pop_context(); } } @@ -7730,7 +7923,7 @@ static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) ok(sockaddr6->sin6_port == 0, "ai_addr->sin6_port == %d\n", sockaddr6->sin6_port); ZeroMemory(ipBuffer, sizeof(ipBuffer)); - ret = pInetNtop(AF_INET6, &sockaddr6->sin6_addr, ipBuffer, sizeof(ipBuffer)); + ret = p_inet_ntop(AF_INET6, &sockaddr6->sin6_addr, ipBuffer, sizeof(ipBuffer)); ok(ret != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); ok(strcmp(ipBuffer, expectedIp) == 0, "ai_addr->sin6_addr == '%s' (expected '%s')\n", ipBuffer, expectedIp); }

1 month, 3 weeks

[reactos] 02/04: [WS2_32] Add inet_pton, inet_ntop

by Baruch Rutman

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454de56c6b8ca47b47e6e… commit 454de56c6b8ca47b47e6ec21f7d9a8f2715673b2 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Sat Apr 20 22:30:01 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 [WS2_32] Add inet_pton, inet_ntop --- dll/win32/ws2_32/src/addrconv.c | 140 ++++++++++++++++++++++++++++++++++++++++ dll/win32/ws2_32/ws2_32.spec | 4 ++ sdk/include/psdk/ws2tcpip.h | 4 +- 3 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dll/win32/ws2_32/src/addrconv.c b/dll/win32/ws2_32/src/addrconv.c index 3cfca497a47..fa459a073f3 100644 --- a/dll/win32/ws2_32/src/addrconv.c +++ b/dll/win32/ws2_32/src/addrconv.c @@ -492,3 +492,143 @@ WSANtohs(IN SOCKET s, return SOCKET_ERROR; } +PCSTR +WSAAPI +inet_ntop( + _In_ INT Family, + _In_ const VOID *pAddr, + _Out_writes_(StringBufSize) PSTR pStringBuf, + _In_ size_t StringBufSize) +{ + NTSTATUS Status; + ULONG BufSize = StringBufSize; + + switch (Family) + { + case AF_INET: + Status = RtlIpv4AddressToStringExA(pAddr, 0, pStringBuf, &BufSize); + break; + case AF_INET6: + Status = RtlIpv6AddressToStringExA(pAddr, 0, 0, pStringBuf, &BufSize); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return NULL; + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(WSAEINVAL); + return NULL; + } + + return pStringBuf; +} + +PCWSTR +WSAAPI +InetNtopW( + _In_ INT Family, + _In_ const VOID *pAddr, + _Out_writes_(StringBufSize) PWSTR pStringBuf, + _In_ size_t StringBufSize) +{ + NTSTATUS Status; + ULONG BufSize = StringBufSize; + + switch (Family) + { + case AF_INET: + Status = RtlIpv4AddressToStringExW(pAddr, 0, pStringBuf, &BufSize); + break; + case AF_INET6: + Status = RtlIpv6AddressToStringExW(pAddr, 0, 0, pStringBuf, &BufSize); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return NULL; + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(WSAEINVAL); + return NULL; + } + + return pStringBuf; +} + +INT +WSAAPI +inet_pton( + _In_ INT Family, + _In_ PCSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN_ADDR6)) PVOID pAddrBuf) +{ + NTSTATUS Status; + PCSTR ch; + + if (!pszAddrString || !pAddrBuf) + { + SetLastError(WSAEFAULT); + return -1; + } + + switch (Family) + { + case AF_INET: + Status = RtlIpv4StringToAddressA(pszAddrString, TRUE, &ch, pAddrBuf); + break; + case AF_INET6: + Status = RtlIpv6StringToAddressA(pszAddrString, &ch, pAddrBuf); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return -1; + } + + if (!NT_SUCCESS(Status) || (*ch != 0)) + { + return 0; + } + + return 1; +} + +INT +WSAAPI +InetPtonW( + _In_ INT Family, + _In_ PCWSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN_ADDR6)) PVOID pAddrBuf) +{ + NTSTATUS Status; + PCWSTR ch; + + if (!pszAddrString || !pAddrBuf) + { + SetLastError(WSAEFAULT); + return -1; + } + + switch (Family) + { + case AF_INET: + Status = RtlIpv4StringToAddressW(pszAddrString, TRUE, &ch, pAddrBuf); + break; + case AF_INET6: + Status = RtlIpv6StringToAddressW(pszAddrString, &ch, pAddrBuf); + break; + default: + SetLastError(WSAEAFNOSUPPORT); + return -1; + } + + if (!NT_SUCCESS(Status) || (*ch != 0)) + { + SetLastError(WSAEINVAL); /* Only unicode version sets this error */ + return 0; + } + + return 1; +} diff --git a/dll/win32/ws2_32/ws2_32.spec b/dll/win32/ws2_32/ws2_32.spec index e0e14b7e68e..84e5680349e 100644 --- a/dll/win32/ws2_32/ws2_32.spec +++ b/dll/win32/ws2_32/ws2_32.spec @@ -115,3 +115,7 @@ 23 stdcall socket(long long long) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long wstr long wstr long long) +@ stdcall -version=0x600+ inet_ntop(long ptr ptr long) +@ stdcall -version=0x600+ InetNtopW(long ptr ptr long) +@ stdcall -version=0x600+ inet_pton(long str ptr) +@ stdcall -version=0x600+ InetPtonW(long wstr ptr) diff --git a/sdk/include/psdk/ws2tcpip.h b/sdk/include/psdk/ws2tcpip.h index 8d8aaa75add..b28e89c9bef 100644 --- a/sdk/include/psdk/ws2tcpip.h +++ b/sdk/include/psdk/ws2tcpip.h @@ -451,7 +451,7 @@ PCSTR WSAAPI inet_ntop( _In_ INT Family, - _In_ PVOID pAddr, + _In_ const VOID *pAddr, _Out_writes_(StringBufSize) PSTR pStringBuf, _In_ size_t StringBufSize); @@ -459,7 +459,7 @@ PCWSTR WSAAPI InetNtopW( _In_ INT Family, - _In_ PVOID pAddr, + _In_ const VOID *pAddr, _Out_writes_(StringBufSize) PWSTR pStringBuf, _In_ size_t StringBufSize);

1 month, 3 weeks

[reactos] 01/04: [RTL] ntdll: Implement RtlIpv6StringToAddress(Ex)[AW]

by Alex Henrie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56229b7a06fe24cc084b9… commit 56229b7a06fe24cc084b939ccdac0415ebe3493c Author: Alex Henrie <alexhenrie24(a)gmail.com> AuthorDate: Sat Apr 20 22:20:37 2024 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 2 21:57:28 2024 +0100 [RTL] ntdll: Implement RtlIpv6StringToAddress(Ex)[AW] Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 474d1f0b2daa8583fa82fe203b207807ba29499d --- sdk/lib/rtl/network.c | 410 ++++++++++++++++++++++++++------------------------ 1 file changed, 213 insertions(+), 197 deletions(-) diff --git a/sdk/lib/rtl/network.c b/sdk/lib/rtl/network.c index 44151e42b5e..acf3d9b26bf 100644 --- a/sdk/lib/rtl/network.c +++ b/sdk/lib/rtl/network.c @@ -110,26 +110,6 @@ RtlpStringToUlong( return RtlpStringToUlongBase(String, Base, Terminator, Out); } -/* Tell us what possible base the string could be in, 10 or 16 by looking at the characters. - Invalid characters break the operation */ -static -ULONG -RtlpClassifyChars(PCWSTR S, PULONG Base) -{ - ULONG Len = 0; - *Base = 0; - for (Len = 0; S[Len]; ++Len) - { - if (iswascii(S[Len]) && isdigit(S[Len])) - *Base = max(*Base, 10); - else if (iswascii(S[Len]) && isxdigit(S[Len])) - *Base = 16; - else - break; - } - return Len; -} - /* Worker function to extract the ipv4 part of a string. */ NTSTATUS NTAPI @@ -798,152 +778,239 @@ RtlIpv6StringToAddressExA( return Status; } -/* -* @implemented -*/ -NTSTATUS -NTAPI -RtlIpv6StringToAddressW( - _In_ PCWSTR String, - _Out_ PCWSTR *Terminator, - _Out_ struct in6_addr *Addr) +/* + * RtlIpv6StringToAddress[Ex]W implementation was imported from Wine 9.6 at 20/4/2024 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * For full text of the license see COPYING.LIB in the root of this project. + * + * Copyright 2020 Alex Henrie + */ + +static const int hex_table[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ +}; + +static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) { - INT n, j; - INT StartSkip = -1, Parts = 0; - ULONG Base, Len; - NTSTATUS Status = STATUS_SUCCESS; - enum { None, Number, Colon, DoubleColon } Last = None; - BOOLEAN SkipoutLastHex = FALSE; + int base = 10, d; + WCHAR c; + ULONG cur_value, prev_value = 0; + BOOL success = FALSE; - if (!String || !Terminator || !Addr) - return STATUS_INVALID_PARAMETER; + if (**str == '.') + { + *str += 1; + return FALSE; + } - for (n = 0; n < 8;) + if ((*str)[0] == '0') { - Len = RtlpClassifyChars(String, &Base); - if (Len == 0) + if ((*str)[1] == 'x' || (*str)[1] == 'X') + { + *str += 2; + if (strict) return FALSE; + base = 16; + } + else if ((*str)[1] >= '0' && (*str)[1] <= '9') { - /* not a number, and no ':' or already encountered an ':' */ - if (String[0] != ':' || Last == Colon) - break; + *str += 1; + if (strict) return FALSE; + base = 8; + } + } - /* double colon, 1 or more fields set to 0. mark the position, and move on. */ - if (StartSkip == -1 && String[1] == ':') - { - /* this case was observed in windows, but it does not seem correct. */ - if (!n) - { - Addr->s6_words[n++] = 0; - Addr->s6_words[n++] = 0; - } - StartSkip = n; - String += 2; - Last = DoubleColon; - } - else if (String[1] == ':' || Last != Number) + for (cur_value = 0; **str; *str += 1) + { + c = **str; + if (c >= ARRAYSIZE(hex_table)) break; + d = hex_table[c]; + if (d == -1 || d >= base) break; + cur_value = cur_value * base + d; + success = TRUE; + if (cur_value < prev_value) return FALSE; /* overflow */ + prev_value = cur_value; + } + + if (success) *value = cur_value; + return success; +} + +static BOOL parse_ipv6_component(const WCHAR **str, int base, ULONG *value) +{ + WCHAR *terminator; + if (**str >= ARRAYSIZE(hex_table) || hex_table[**str] == -1) return FALSE; + *value = min(wcstoul(*str, &terminator, base), 0x7FFFFFFF); + if (*terminator == '0') terminator++; /* "0x" but nothing valid after */ + else if (terminator == *str) return FALSE; + *str = terminator; + return TRUE; +} + +static NTSTATUS ipv6_string_to_address(const WCHAR *str, BOOL ex, + const WCHAR **terminator, IN6_ADDR *address, ULONG *scope, USHORT *port) +{ + BOOL expecting_port = FALSE, has_0x = FALSE, too_big = FALSE; + int n_bytes = 0, n_ipv4_bytes = 0, gap = -1; + ULONG ip_component, scope_component = 0, port_component = 0; + const WCHAR *prev_str; + + if (str[0] == '[') + { + if (!ex) goto error; + expecting_port = TRUE; + str++; + } + + if (str[0] == ':') + { + if (str[1] != ':') goto error; + str++; + address->u.Word[0] = 0; + } + + for (;;) + { + if (!n_ipv4_bytes && *str == ':') + { + /* double colon */ + if (gap != -1) goto error; + str++; + prev_str = str; + gap = n_bytes; + if (n_bytes == 14 || !parse_ipv6_component(&str, 16, &ip_component)) break; + str = prev_str; + } + else + { + prev_str = str; + } + + if (!n_ipv4_bytes && n_bytes <= (gap != -1 ? 10 : 12)) + { + if (parse_ipv6_component(&str, 10, &ip_component) && *str == '.') + n_ipv4_bytes = 1; + str = prev_str; + } + + if (n_ipv4_bytes) + { + /* IPv4 component */ + if (!parse_ipv6_component(&str, 10, &ip_component)) goto error; + if (str - prev_str > 3 || ip_component > 255) { - /* a double colon after we already encountered one, or a the last parsed item was not a number. */ - break; + too_big = TRUE; } else { - ++String; - Last = Colon; + if (*str != '.' && (n_ipv4_bytes < 4 || (n_bytes < 15 && gap == -1))) goto error; + address->u.Byte[n_bytes] = ip_component; + n_bytes++; } - } - else if (Len > 4) - { - /* it seems that when encountering more than 4 chars, the terminator is not updated, - unless the previously encountered item is a double colon.... */ - Status = STATUS_INVALID_PARAMETER; - if (Last != DoubleColon) - return Status; - String += Len; - break; + if (n_ipv4_bytes == 4 || *str != '.') break; + n_ipv4_bytes++; } else { - ULONG Value; - if (String[Len] == '.' && n <= 6) + /* IPv6 component */ + if (!parse_ipv6_component(&str, 16, &ip_component)) goto error; + if (prev_str[0] == '0' && (prev_str[1] == 'x' || prev_str[1] == 'X')) { - ULONG Values[4]; - INT PartsV4 = 0; - /* this could be an ipv4 address inside an ipv6 address http://tools.ietf.org/html/rfc2765 */ - Last = Number; - Status = RtlpIpv4StringToAddressParserW(String, TRUE, &String, Values, &PartsV4); - for(j = 0; j < PartsV4; ++j) - { - if (Values[j] > 255) - { - Status = STATUS_INVALID_PARAMETER; - if (j != 3) - return Status; - break; - } - if ((j == PartsV4 - 1) && - (j < 3 || - (*String == ':' && StartSkip == -1) || - (StartSkip == -1 && n < 6) || - Status == STATUS_INVALID_PARAMETER)) - { - Status = STATUS_INVALID_PARAMETER; - break; - } - Addr->s6_bytes[n * 2 + j] = Values[j] & 0xff; - } - /* mark enough parts as converted in case we are the last item to be converted */ - n += 2; - /* mark 2 parts as converted in case we are not the last item, and we encountered a double colon. */ - Parts+=2; - break; + /* Windows "feature": the last IPv6 component can start with "0x" and be longer than 4 digits */ + if (terminator) *terminator = prev_str + 1; /* Windows says that the "x" is the terminator */ + if (n_bytes < 14 && gap == -1) return STATUS_INVALID_PARAMETER; + address->u.Word[n_bytes/2] = RtlUshortByteSwap(ip_component); + n_bytes += 2; + has_0x = TRUE; + goto fill_gap; } + if (*str != ':' && n_bytes < 14 && gap == -1) goto error; + if (str - prev_str > 4) + too_big = TRUE; + else + address->u.Word[n_bytes/2] = RtlUshortByteSwap(ip_component); + n_bytes += 2; + if (*str != ':' || (gap != -1 && str[1] == ':')) break; + } + if (n_bytes == (gap != -1 ? 14 : 16)) break; + if (too_big) return STATUS_INVALID_PARAMETER; + str++; + } - if (String[Len] != ':' && n < 7 && StartSkip == -1) - { - /* if we decoded atleast some numbers, update the terminator to point to the first invalid char */ - if (Base) - String += Len; - Status = STATUS_INVALID_PARAMETER; - break; - } + if (terminator) *terminator = str; + if (too_big) return STATUS_INVALID_PARAMETER; - if (Len == 1 && towlower(String[Len]) == 'x' && String[0] == '0') +fill_gap: + if (gap == -1) + { + if (n_bytes < 16) goto error; + } + else + { + memmove(address->u.Byte + 16 - (n_bytes - gap), address->u.Byte + gap, n_bytes - gap); + memset(address->u.Byte + gap, 0, 16 - n_bytes); + } + + if (ex) + { + if (has_0x) goto error; + + if (*str == '%') + { + str++; + if (!parse_ipv4_component(&str, TRUE, &scope_component)) goto error; + } + + if (expecting_port) + { + if (*str != ']') goto error; + str++; + if (*str == ':') { - Len = RtlpClassifyChars(String + 2, &Base); - if (Len > 0 && Len <= 4) - { - *Terminator = String + 1; - String += 2; - SkipoutLastHex = TRUE; - } + str++; + if (!parse_ipv4_component(&str, FALSE, &port_component)) goto error; + if (!port_component || port_component > 0xFFFF || *str) goto error; + port_component = RtlUshortByteSwap(port_component); } - - Status = RtlpStringToUlongBase(String, 16, &String, &Value); - if (!NT_SUCCESS(Status)) - break; - - if (StartSkip != -1) - Parts++; - Addr->s6_words[n++] = WN2H(Value); - Last = Number; - if (SkipoutLastHex) - break; } } - if (StartSkip != -1 && Status != STATUS_INVALID_PARAMETER && Last != Colon) - { - /* we found a '::' somewhere, so expand that. */ - memmove(&Addr->s6_words[8-Parts], &Addr->s6_words[StartSkip], Parts * sizeof(Addr->s6_words[0])); - memset(&Addr->s6_words[StartSkip], 0, (8-StartSkip-Parts) * sizeof(Addr->s6_words[0])); - n = 8; - } + if (!terminator && *str) return STATUS_INVALID_PARAMETER; - /* we have already set the terminator */ - if (SkipoutLastHex) - return n < 8 ? STATUS_INVALID_PARAMETER : Status; - *Terminator = String; - return n < 8 ? STATUS_INVALID_PARAMETER : Status; + if (scope) *scope = scope_component; + if (port) *port = port_component; + + return STATUS_SUCCESS; + +error: + if (terminator) *terminator = str; + return STATUS_INVALID_PARAMETER; +} + +/* +* @implemented +*/ +NTSTATUS +NTAPI +RtlIpv6StringToAddressW( + _In_ PCWSTR String, + _Out_ PCWSTR *Terminator, + _Out_ struct in6_addr *Addr) +{ + if (!String || !Terminator || !Addr) + return STATUS_INVALID_PARAMETER; + + return ipv6_string_to_address(String, FALSE, Terminator, Addr, NULL, NULL); } /* @@ -957,63 +1024,12 @@ RtlIpv6StringToAddressExW( _Out_ PULONG ScopeId, _Out_ PUSHORT Port) { - NTSTATUS Status; - ULONG ConvertedPort = 0, ConvertedScope = 0; - if (!AddressString || !Address || !ScopeId || !Port) - return STATUS_INVALID_PARAMETER; - - if (*AddressString == '[') - { - ConvertedPort = 1; - ++AddressString; - } - Status = RtlIpv6StringToAddressW(AddressString, &AddressString, Address); - if (!NT_SUCCESS(Status)) + if (!AddressString || !Address || !ScopeId || !Port) return STATUS_INVALID_PARAMETER; - if (*AddressString == '%') - { - ++AddressString; - Status = RtlpStringToUlongBase(AddressString, 10, &AddressString, &ConvertedScope); - if (!NT_SUCCESS(Status)) - return STATUS_INVALID_PARAMETER; - } - else if (*AddressString && !(ConvertedPort && *AddressString == ']')) - { - return STATUS_INVALID_PARAMETER; - } - - if (ConvertedPort) - { - if (*AddressString++ !=']') - return STATUS_INVALID_PARAMETER; - if (*AddressString ==':') - { - ULONG Base = 10; - if (*++AddressString == '0') - { - if (towlower(*++AddressString) != 'x') - return STATUS_INVALID_PARAMETER; - ++AddressString; - Base = 16; - } - Status = RtlpStringToUlongBase(AddressString, Base, &AddressString, &ConvertedPort); - if (!NT_SUCCESS(Status) || ConvertedPort > 0xffff) - return STATUS_INVALID_PARAMETER; - } - else - { - ConvertedPort = 0; - } - } - - if (*AddressString == 0) - { - *ScopeId = ConvertedScope; - *Port = WN2H(ConvertedPort); - return STATUS_SUCCESS; - } - return STATUS_INVALID_PARAMETER; + return ipv6_string_to_address(AddressString, TRUE, NULL, Address, ScopeId, Port); } +/* End of Wine implementation */ + /* EOF */

1 month, 3 weeks

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2024