Ros-diffs

ros-diffs@reactos.org

19 participants
81091 discussions

[reactos] 01/01: [REGEDIT] Update Romanian (ro-RO) translation (#5427)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d821292de4124b8e2db8… commit 8d821292de4124b8e2db8662a65c740b6ef05e27 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Jul 12 13:22:47 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 12 12:22:47 2023 +0200 [REGEDIT] Update Romanian (ro-RO) translation (#5427) --- base/applications/regedit/lang/ro-RO.rc | 106 +++++++++++++++++--------------- 1 file changed, 56 insertions(+), 50 deletions(-) diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index d746d684545..cca1bf234f8 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Registry Editor + * 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 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -17,53 +23,53 @@ END /* Command-line strings */ STRINGTABLE BEGIN - STRING_USAGE "Usage:\n\ + STRING_USAGE "Utilizare:\n\ regedit [options] [filename] [reg_key]\n\n\ -Options:\n\ - [no option] Launch the graphical version of this program.\n\ - /L:system.dat The location of the system.dat file to be modified.\n\ - Compatible with any other switch. Ignored.\n\ - /R:user.dat The location of the user.dat file to be modified.\n\ - Compatible with any other switch. Ignored.\n\ - /C Import the contents of a registry file.\n\ - /D Delete a specified registry key.\n\ - /E Export the contents of a specified registry key to a file.\n\ - If no key is specified, the entire registry is exported.\n\ - /S Silent mode. No messages will be displayed.\n\ - /V Launch the GUI in advanced mode. Ignored.\n\ - /? Display this information and exit.\n\ - [filename] The location of the file containing registry information to\n\ - be imported. When used with [/E], this option specifies the\n\ - file location where registry information will be exported.\n\ - [reg_key] The registry key to be modified.\n\ +Opțiuni:\n\ + [no option] Lansează versiunea grafică a programului.\n\ + /L:system.dat Locația fișierului system.dat urmează să fie modificată.\n\ + Compatibil cu orice alt comutator. Ignorat.\n\ + /R:user.dat Locația fișierului user.dat urmează să fie modificată.\n\ + Compatibil cu orice alt comutator. Ignorat.\n\ + /C Importă conținutul unui fișier de regiștri.\n\ + /D Șterge o cheie de regiștrii specificată.\n\ + /E Exportă conținutul unei cheie de regiștri specificată într-un fișier.\n\ + Dacă nu este nicio cheie specificată, toți regiștrii sunt exportați.\n\ + /S Modul silențios. Nu sunt afișate mesaje.\n\ + /V Lansează interfața grafică (GUI) în modul avansat. Ignorat.\n\ + /? Afișează informații și părăsește programul.\n\ + [filename] Locația fișierului ce conține informații despre regiștri ce urmează\n\ + să fie importați. Când e folosit cu [/E], această opțiune specifică\n\ + locația fișierului în care informațiile despre regiștri vor fi exportate.\n\ + [reg_key] Cheie de regiștri ce urmează să fie modificată.\n\ \n\ -Usage examples:\n\ +Exemple de utilizări:\n\ regedit ""import.reg""\n\ - regedit /E ""export.reg"" ""HKEY_CURRENT_USER\\Console""\n\ - regedit /D ""HKEY_LOCAL_MACHINE\\Error\\Path""\n" - STRING_INVALID_SWITCH "regedit: Invalid or unrecognized switch [%1]\n" - STRING_HELP "Type ""regedit /?"" for help.\n" - STRING_NO_FILENAME "regedit: No filename was specified.\n" - STRING_NO_REG_KEY "regedit: No registry key was specified for removal.\n" - STRING_FILE_NOT_FOUND "regedit: The file '%1' was not found.\n" - STRING_CANNOT_OPEN_FILE "regedit: Unable to open the file '%1'.\n" - STRING_UNHANDLED_ACTION "regedit: Unhandled action.\n" - STRING_OUT_OF_MEMORY "regedit: Out of memory! (%1!S!, line %2!u!)\n" - STRING_INVALID_HEX "regedit: Invalid hexadecimal value.\n" - STRING_CSV_HEX_ERROR "regedit: Unable to convert hexadecimal data. An invalid value was encountered at '%1'.\n" - STRING_ESCAPE_SEQUENCE "regedit: Unrecognized escape sequence [\\%1!c!]\n" - STRING_UNKNOWN_DATA_FORMAT "regedit: Unsupported registry data type [0x%1!x!]\n" - STRING_UNEXPECTED_EOL "regedit: Unexpected end of line in '%1'.\n" - STRING_UNRECOGNIZED_LINE "regedit: The line '%1' was not recognized.\n" - STRING_SETVALUE_FAILED "regedit: Unable to add the registry value '%1' to '%2'.\n" - STRING_OPEN_KEY_FAILED "regedit: Unable to open the registry key '%1'.\n" - STRING_UNSUPPORTED_TYPE "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" - STRING_EXPORT_AS_BINARY "regedit: The registry value '%1' will be exported as binary data.\n" - STRING_INVALID_SYSTEM_KEY "regedit: Invalid system key [%1]\n" - STRING_REG_KEY_NOT_FOUND "regedit: Unable to export '%1'. The specified registry key was not found.\n" - STRING_DELETE_FAILED "regedit: Unable to delete the registry key '%1'.\n" - STRING_UNKNOWN_TYPE "Unknown Type" - STRING_INVALID_LINE_SYNTAX, "regedit: The line contains invalid syntax.\n" + regedit /E ""export.reg"" ""HKEY_CURRENT_USER\\Consolă""\n\ + regedit /D ""HKEY_LOCAL_MACHINE\\Eroare\\Cale""\n" + STRING_INVALID_SWITCH "regedit: Comutatorul este nevalid sau nerecunoscut [%1]\n" + STRING_HELP "Scrieți ""regedit /?"" pentru ajutor.\n" + STRING_NO_FILENAME "regedit: Niciun nume de fișier nu a fost specificat.\n" + STRING_NO_REG_KEY "regedit: Nicio cheie de regiștri nu a fost specificată pentru ștergere.\n" + STRING_FILE_NOT_FOUND "regedit: Fișierul '%1' nu a fost găsit.\n" + STRING_CANNOT_OPEN_FILE "regedit: Fișierul '%1' nu a putut fi deschis.\n" + STRING_UNHANDLED_ACTION "regedit: Acțiune necontrolată.\n" + STRING_OUT_OF_MEMORY "regedit: Fără memorie! (%1!S!, linia %2!u!)\n" + STRING_INVALID_HEX "regedit: Valoare hexazecimală nevalidă.\n" + STRING_CSV_HEX_ERROR "regedit: Datele hexazecimale nu au putut fi transformate. O valoare nevalidă a fost întâlnită la '%1'.\n" + STRING_ESCAPE_SEQUENCE "regedit: Secvență de evadare nerecunoscută [\\%1!c!]\n" + STRING_UNKNOWN_DATA_FORMAT "regedit: Tipul de date de regiștri [0x%1!x!] nesuportat\n" + STRING_UNEXPECTED_EOL "regedit: Capăt de linie neașteptat în '%1'.\n" + STRING_UNRECOGNIZED_LINE "regedit: Linia '%1' nu a fost recunoscută.\n" + STRING_SETVALUE_FAILED "regedit: Valoarea de regiștri '%1' nu a putut fi adăugată la '%2'.\n" + STRING_OPEN_KEY_FAILED "regedit: Cheia de regiștri '%1' nu a putut fi deschisă.\n" + STRING_UNSUPPORTED_TYPE "regedit: Tipul de date de regiștri [0x%1!x!] nesuportat a apărut în '%2'.\n" + STRING_EXPORT_AS_BINARY "regedit: Valoarea de regiștri '%1' va fi exportată ca date binare.\n" + STRING_INVALID_SYSTEM_KEY "regedit: Cheia de sistem [%1] este nevalidă\n" + STRING_REG_KEY_NOT_FOUND "regedit: '%1' nu a putut fi exportat. Cheia de regiștri specificată nu a fost găsită.\n" + STRING_DELETE_FAILED "regedit: Cheia de regiștri nu a putut fi ștearsă '%1'.\n" + STRING_UNKNOWN_TYPE "Tip necunoscut" + STRING_INVALID_LINE_SYNTAX, "regedit: Linia conține sintaxă nevalidă.\n" END /* Menus */ @@ -301,7 +307,7 @@ BEGIN LTEXT "Nedeterminată", IDC_UNDETERMINED, 18, 230, 50, 8, WS_DISABLED LTEXT "Partajată", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED LTEXT "Dispozitiv, exclusivă", IDC_DEVICE_EXCLUSIVE, 75, 230, 74, 8, WS_DISABLED - LTEXT "Modúl-pilot, exclusivă", IDC_DRIVER_EXCLUSIVE, 75, 240, 74, 8, WS_DISABLED + LTEXT "Modul-pilot, exclusivă", IDC_DRIVER_EXCLUSIVE, 75, 240, 74, 8, WS_DISABLED RTEXT "Tip interfață:", IDC_STATIC, 158, 220, 57, 8 LTEXT "", IDC_INTERFACETYPE, 218, 220, 66, 8 RTEXT "Număr magistrală:", IDC_STATIC, 155, 230, 60, 8 @@ -502,8 +508,8 @@ BEGIN IDS_BUS_INTERNAL "Internă" IDS_BUS_ISA "ISA" IDS_BUS_EISA "EISA" - IDS_BUS_MICROCHANNEL "MicroChannel" - IDS_BUS_TURBOCHANNEL "TurboChannel" + IDS_BUS_MICROCHANNEL "Microcanal" + IDS_BUS_TURBOCHANNEL "Turbocanal" IDS_BUS_PCIBUS "PCI" IDS_BUS_VMEBUS "VME" IDS_BUS_NUBUS "NuBus" @@ -602,7 +608,7 @@ END /* *STRINGTABLE *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." + * ID_HELP_HELPTOPICS "Deschide Ajutor pentru Editorul de regiștri." + * ID_HELP_ABOUT "Afișează informații despre program, numărul versiunii și marca înregistrată." *END */

1 year, 6 months

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

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f105d51a27f1e20580259… commit f105d51a27f1e2058025955d3c1d32106cee85b5 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Jul 12 13:20:57 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 12 12:20:57 2023 +0200 [RAPPS] Improve Romanian (ro-RO) translation (#5424) --- base/applications/rapps/lang/ro-RO.rc | 57 ++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 5587bd2a1fb..0c60f2f3c26 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -4,6 +4,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> * Copyright 2017-2018 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -74,9 +75,9 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificare…", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Șt&erge aplicația de instalare după instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Software source", -1, 4, 118, 240, 46 - CONTROL "Use default", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 74, 10 - CONTROL "Specified source", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 + GROUPBOX "Sursa programului", -1, 4, 118, 240, 46 + CONTROL "Folosește valorile implicite", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 121, 10 + CONTROL "Sursa specificată", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED GROUPBOX "Mandatar", -1, 4, 166, 240, 76 CONTROL "Configur&ația mandatar din sistem", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 @@ -150,7 +151,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nComanda pentru dezinstalare: " IDS_INFO_MODIFYPATH "\nComanda pentru modificare: " IDS_INFO_INSTALLDATE "\nData de instalare: " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNumele pachetului: " END STRINGTABLE @@ -169,7 +170,7 @@ STRINGTABLE BEGIN IDS_CAT_AUDIO "Audio" IDS_CAT_DEVEL "Dezvoltare" - IDS_CAT_DRIVERS "Modúle-pilot" + IDS_CAT_DRIVERS "Module pilot" IDS_CAT_EDU "Educație" IDS_CAT_ENGINEER "Inginerie" IDS_CAT_FINANCE "Finanțe" @@ -182,13 +183,13 @@ BEGIN IDS_CAT_SCIENCE "Știință" IDS_CAT_TOOLS "Instrumente" IDS_CAT_VIDEO "Video" - IDS_CAT_THEMES "Themes" + IDS_CAT_THEMES "Teme" END STRINGTABLE BEGIN IDS_APPTITLE "Gestionar de programe" - IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" + IDS_APP_AUTHORS "Marcă înregistrată 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Căutare…" IDS_APPS_COUNT "Numărul de programe: %d; Selectate: %d" IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n" @@ -200,7 +201,7 @@ BEGIN IDS_APPLICATIONS "Aplicații" IDS_CHOOSE_FOLDER_TEXT "Specificați un dosar destinație pentru descărcări:" IDS_CHOOSE_FOLDER_ERROR "Dosarul specificat nu există. Doriți crearea lui?" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "Adresa URL specificată de dumneavoastră este fie nevalidă, fie nesuportată. Vă rugăm să o corectați!" IDS_APP_REG_REMOVE "Sigur doriți să ștergeți datele din registru pentru această aplicațe?" IDS_INFORMATION "Informație" IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descărcat! Adresa nu este găsită!" @@ -215,11 +216,11 @@ BEGIN IDS_INSTALL_SELECTED "Instalează selecționate" IDS_SELECTEDFORINST "Selectate pentru instalare" IDS_MISMATCH_CERT_INFO "Certificatul în uz este necunoscut:\nSubiect: %s\nEmitent: %s\nVreți să continuați oricum?" - IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "Details" - IDS_APP_DISPLAY_LIST "List" - IDS_APP_DISPLAY_TILE "Tile" - IDS_NO_SEARCH_RESULTS "No search results" + IDS_UNABLE_PATH "Formatul căii specificate nu este corect." + IDS_APP_DISPLAY_DETAILS "Detalii" + IDS_APP_DISPLAY_LIST "Listă" + IDS_APP_DISPLAY_TILE "Dale" + IDS_NO_SEARCH_RESULTS "Niciun rezultat al căutării" END STRINGTABLE @@ -236,17 +237,17 @@ END STRINGTABLE BEGIN - IDS_LICENSE_OPENSOURCE "Sursă Deschisă" - IDS_LICENSE_FREEWARE "Freeware" - IDS_LICENSE_TRIAL "Trial/Demo" + IDS_LICENSE_OPENSOURCE "Sursă deschisă" + IDS_LICENSE_FREEWARE "Gratuită" + IDS_LICENSE_TRIAL "Variantă de încercare/Demonstrație" END STRINGTABLE BEGIN IDS_LANGUAGE_AVAILABLE_TRANSLATION "Suportă limba respectivă" IDS_LANGUAGE_NO_TRANSLATION "Suportă alte limbi" - IDS_LANGUAGE_ENGLISH_TRANSLATION "Suportă limba Engleză" - IDS_LANGUAGE_SINGLE "Singura Limbă" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Suportă limba engleză" + IDS_LANGUAGE_SINGLE "Singura limbă" IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d mult)" IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d disponibil)" END @@ -254,18 +255,18 @@ END STRINGTABLE BEGIN IDS_DL_DIALOG_DB_DISP "Aplicații baza de date" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizare baza de date…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Actualizare bază de date…" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Actualizare bază de date… (Sursă neoficială)" END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Utilizare: " + IDS_CMD_NEED_PACKAGE_NAME "Eroare: opțiunea %1 așteaptă unul sau mai multe nume de pachete.\n" + IDS_CMD_NEED_FILE_NAME "Eroare: opțiunea %1 așteaptă un nume de fișier.\n" + IDS_CMD_NEED_PARAMS "Eroare: opțiunea %1 așteaptă unul sau mai mulți parametri.\n" + 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 a putut fi găsit pachetul %1.\n" + IDS_CMD_PACKAGE_INFO "Informații despre pachet %1:\n" END

1 year, 6 months

[reactos] 01/01: [FREELDR] Add UEFI Console input support. CORE-11954 (#5426)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5053944664f1e74d407f… commit e5053944664f1e74d407fdf77d4ee2d7f8d23205 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Tue Jul 11 11:07:31 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 11 11:07:31 2023 -0700 [FREELDR] Add UEFI Console input support. CORE-11954 (#5426) Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- boot/freeldr/freeldr/arch/uefi/stubs.c | 12 ----- boot/freeldr/freeldr/arch/uefi/ueficon.c | 82 ++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 12 deletions(-) diff --git a/boot/freeldr/freeldr/arch/uefi/stubs.c b/boot/freeldr/freeldr/arch/uefi/stubs.c index 48b436bd68d..ac5cebab51c 100644 --- a/boot/freeldr/freeldr/arch/uefi/stubs.c +++ b/boot/freeldr/freeldr/arch/uefi/stubs.c @@ -55,18 +55,6 @@ UefiPcBeep(VOID) /* Not possible on UEFI, for now */ } -BOOLEAN -UefiConsKbHit(VOID) -{ - return FALSE; -} - -int -UefiConsGetCh(void) -{ - return 0; -} - VOID UefiHwIdle(VOID) { diff --git a/boot/freeldr/freeldr/arch/uefi/ueficon.c b/boot/freeldr/freeldr/arch/uefi/ueficon.c index 944d9707bc7..000b6b9d3a7 100644 --- a/boot/freeldr/freeldr/arch/uefi/ueficon.c +++ b/boot/freeldr/freeldr/arch/uefi/ueficon.c @@ -16,6 +16,9 @@ extern EFI_SYSTEM_TABLE* GlobalSystemTable; static unsigned CurrentCursorX = 0; static unsigned CurrentCursorY = 0; static unsigned CurrentAttr = 0x0f; +static EFI_INPUT_KEY Key; +static BOOLEAN ExtendedKey = FALSE; +static char ExtendedScanCode = 0; /* FUNCTIONS ******************************************************************/ @@ -59,3 +62,82 @@ UefiConsPutChar(int c) CurrentCursorY++; } } + +static +UCHAR +ConvertToBiosExtValue(UCHAR KeyIn) +{ + switch (KeyIn) + { + case SCAN_UP: + return KEY_UP; + case SCAN_DOWN: + return KEY_DOWN; + case SCAN_RIGHT: + return KEY_RIGHT; + case SCAN_LEFT: + return KEY_LEFT; + case SCAN_F1: + return KEY_F1; + case SCAN_F2: + return KEY_F2; + case SCAN_F3: + return KEY_F3; + case SCAN_F4: + return KEY_F4; + case SCAN_F5: + return KEY_F5; + case SCAN_F6: + return KEY_F6; + case SCAN_F7: + return KEY_F7; + case SCAN_F8: + return KEY_F8; + case SCAN_F9: + return KEY_F9; + case SCAN_F10: + return KEY_F10; + case SCAN_ESC: + return KEY_ESC; + case SCAN_DELETE: + return KEY_DELETE; + } + return 0; +} + +BOOLEAN +UefiConsKbHit(VOID) +{ + return (GlobalSystemTable->ConIn->ReadKeyStroke(GlobalSystemTable->ConIn, &Key) != EFI_NOT_READY); +} + +int +UefiConsGetCh(VOID) +{ + UCHAR KeyOutput = 0; + + /* If an extended key press was detected the last time we were called + * then return the scan code of that key. */ + if (ExtendedKey) + { + ExtendedKey = FALSE; + return ExtendedScanCode; + } + + if (Key.UnicodeChar != 0) + { + KeyOutput = Key.UnicodeChar; + } + else + { + ExtendedKey = TRUE; + ExtendedScanCode = ConvertToBiosExtValue(Key.ScanCode); + KeyOutput = KEY_EXTENDED; + } + + /* UEFI will stack input requests, we have to clear it */ + Key.UnicodeChar = 0; + Key.ScanCode = 0; + GlobalSystemTable->ConIn->Reset(GlobalSystemTable->ConIn, FALSE); + return KeyOutput; +}

1 year, 6 months

[reactos] 01/01: [NOTEPAD] Update Romanian (ro-RO) translation (#5419)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d144f3d3bbb14ab4ecc79… commit d144f3d3bbb14ab4ecc79957b5072cc4bf7ae265 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jul 11 18:40:23 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 11 18:40:23 2023 +0300 [NOTEPAD] Update Romanian (ro-RO) translation (#5419) --- base/applications/notepad/lang/ro-RO.rc | 36 ++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index 5b95ee1fac3..7564a109a27 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -1,6 +1,10 @@ /* - * Translators: Petru Dimitriu (petrimetri at gmail dot com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011 Petru Dimitriu <petrimetri(a)gmail.com> + * Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -30,7 +34,7 @@ BEGIN POPUP "&Fișier" BEGIN MENUITEM "&Nou\tCtrl+N", CMD_NEW - MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "Fereastră &nouă\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Deschidere…\tCtrl+O", CMD_OPEN MENUITEM "&Păstrează\tCtrl+S", CMD_SAVE MENUITEM "Păst&rare în…", CMD_SAVE_AS @@ -70,7 +74,7 @@ BEGIN BEGIN MENUITEM "&Manual…", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Despre Carnețel", CMD_HELP_ABOUT_NOTEPAD END END @@ -136,12 +140,12 @@ BEGIN END DIALOG_PRINTING DIALOG 0, 0, 160, 100 -CAPTION "Now printing" +CAPTION "În curs de imprimare" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 - CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Începe sarcina imprimării...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Numele fișierului)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 CTEXT "Pagină %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 PUSHBUTTON "A&nulează", IDCANCEL, 50, 75, 60, 20 END @@ -152,7 +156,7 @@ BEGIN STRING_PAGESETUP_FOOTERVALUE "Pagină &p" STRING_NOTEPAD "Carnețel" STRING_ERROR "EROARE" - STRING_WARNING "ATENțIONARE" + STRING_WARNING "ATENȚIONARE" STRING_INFO "Informație" STRING_UNTITLED "Neintitulat" STRING_ALL_FILES "Orice fișier (*.*)" @@ -171,21 +175,21 @@ Păstrați modificările aduse?" STRING_CANNOTFIND "„%s” nu poate fi găsit" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" - STRING_UNICODE_BE "Unicode (big endian)" + STRING_UNICODE_BE "Unicode (endian mare)" STRING_UTF8 "UTF-8" - STRING_UTF8_BOM "UTF-8 with BOM" + STRING_UTF8_BOM "UTF-8 cu BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linia %d, coloana %d" STRING_PRINTERROR "Fișierul „%s” nu a putut fi imprimat.\n\nAsigurați-vă că imprimanta este pornită și configurată corespunzător." STRING_DEFAULTFONT "Lucida Console" - STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." - STRING_NOWPRINTING "Now printing page..." - STRING_PRINTCANCELING "The print job is being canceled..." - STRING_PRINTCOMPLETE "Printing is successfully done." - STRING_PRINTCANCELED "Printing has been canceled." - STRING_PRINTFAILED "Printing is failed." + STRING_LINE_NUMBER_OUT_OF_RANGE "Linia specificată este în afara intervalului." + STRING_NOWPRINTING "În curs de imprimare..." + STRING_PRINTCANCELING "Sarcina de imprimare este în curs de anulare..." + STRING_PRINTCOMPLETE "Imprimarea a fost realizată cu succes." + STRING_PRINTCANCELED "Imprimarea a fost anulată." + STRING_PRINTFAILED "Imprimare eșuată." STRING_TEXT_DOCUMENT "Document text" STRING_NOTEPAD_AUTHORS "Drept de autor 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n"

1 year, 6 months

[reactos] 01/01: [MODE] Improve Romanian (ro-RO) translation (#5425)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f299f40f50dd6dcfa6eb… commit 1f299f40f50dd6dcfa6eb351e9d0df1e55fa2b8a Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jul 11 11:49:03 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 11 10:49:03 2023 +0200 [MODE] Improve Romanian (ro-RO) translation (#5425) --- base/applications/cmdutils/mode/lang/ro-RO.rc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/base/applications/cmdutils/mode/lang/ro-RO.rc b/base/applications/cmdutils/mode/lang/ro-RO.rc index 8c8c38e47d9..56b1eed3bb0 100644 --- a/base/applications/cmdutils/mode/lang/ro-RO.rc +++ b/base/applications/cmdutils/mode/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Mode Utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -27,12 +33,12 @@ Rata de repetiție la menținerea unei taste apăsate:\n\ IDS_QUERY_PRINTER_FOUND "Depistat dispozitiv de imprimare - %s\n" IDS_QUERY_PARALLEL_FOUND "Depistat dispozitiv la portul paralel - %s\n" IDS_QUERY_DOSDEV_FOUND "Depistat dispozitiv de tip DOS - %s\n" - // IDS_QUERY_MISC_FOUND "Found other device - %s\n" + // IDS_QUERY_MISC_FOUND "Nu a fost găsit alt dispozitiv - %s\n" - // IDS_QUERY_DEVICE_FOUND "Found %s device - %s\n" + // IDS_QUERY_DEVICE_FOUND "A fost găsit dispozitivul %s - %s\n" // IDS_SERIAL "serial" - // IDS_PRINTER "parallel" - // IDS_OTHER "other" + // IDS_PRINTER "paralel" + // IDS_OTHER "altul" END STRINGTABLE @@ -75,7 +81,7 @@ BEGIN IDS_ERROR_TIMEOUT_SET_DEVICE "Eșec la stabilirea perioadei de expirare pentru dispozitivul %s:\n" IDS_ERROR_INVALID_PARITY_BITS "EROARE: Valoare eronată pentru biții de paritate %d:\n" IDS_ERROR_INVALID_STOP_BITS "EROARE: Valoare eronată pentru biții delimitori %d:\n" - IDS_ERROR_NO_MEMORY "ERAORE: Nu există suficientă memorie.\n" + IDS_ERROR_NO_MEMORY "EROARE: Nu există suficientă memorie.\n" IDS_ERROR_SCREEN_LINES_COL "Ecranul nu poate fi stabilit cu numărul de linii sau coloane specificate.\n" - IDS_ERROR_INVALID_CODEPAGE "The code page specified is not valid.\n" + IDS_ERROR_INVALID_CODEPAGE "Pagina de cod specificată nu e validă.\n" END

1 year, 6 months

[reactos] 01/01: [FONTEXT] Update Romanian (ro-RO) translation (#5422)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6f1feff26ad792daae5c… commit f6f1feff26ad792daae5ccb71ae50567349ad811 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Jul 11 11:41:56 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 11 10:41:56 2023 +0200 [FONTEXT] Update Romanian (ro-RO) translation (#5422) --- dll/shellext/fontext/lang/ro-RO.rc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dll/shellext/fontext/lang/ro-RO.rc b/dll/shellext/fontext/lang/ro-RO.rc index 5ca0c056eab..a57f9092d6e 100644 --- a/dll/shellext/fontext/lang/ro-RO.rc +++ b/dll/shellext/fontext/lang/ro-RO.rc @@ -2,7 +2,8 @@ * PROJECT: ReactOS Font Text * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Romanian translation for FONTEXT - * COPYRIGHT: Copyright 2018 George Bișoc (george.bisoc(a)reactos.org) + * TRANSLATORS: Copyright 2018 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -14,20 +15,20 @@ END STRINGTABLE BEGIN - IDS_COL_NAME "Name" + IDS_COL_NAME "Nume" END STRINGTABLE BEGIN - IDS_COL_FILENAME "Filename" - IDS_COL_SIZE "Size" - IDS_COL_MODIFIED "Modified" - IDS_COL_ATTR "Attributes" + IDS_COL_FILENAME "Numele fișierului" + IDS_COL_SIZE "Mărime" + IDS_COL_MODIFIED "Modificat" + IDS_COL_ATTR "Atribuții" IDS_COL_ATTR_LETTERS "RHSAC" END STRINGTABLE BEGIN - IDS_FONT_PREVIEW "Preview" + IDS_FONT_PREVIEW "Previzualizează" END

1 year, 6 months

[reactos] 01/01: [PSDK] Add the netsh.h header file

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0e70a8e31be88de91e12… commit c0e70a8e31be88de91e12662eefc4208c600b198 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Jul 10 22:30:36 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Jul 10 22:30:36 2023 +0200 [PSDK] Add the netsh.h header file --- sdk/include/psdk/netsh.h | 239 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) diff --git a/sdk/include/psdk/netsh.h b/sdk/include/psdk/netsh.h new file mode 100644 index 00000000000..39cef2f6ff3 --- /dev/null +++ b/sdk/include/psdk/netsh.h @@ -0,0 +1,239 @@ +#ifndef _NETSH_H_ +#define _NETSH_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef +DWORD +WINAPI +(GET_RESOURCE_STRING_FN)( + _In_ DWORD dwMsgID, + _Out_ LPWSTR lpBuffer, + _In_ DWORD nBufferMax); + +typedef GET_RESOURCE_STRING_FN *PGET_RESOURCE_STRING_FN; + +typedef +DWORD +WINAPI +(NS_DLL_INIT_FN)( + _In_ DWORD dwNetshVersion, + _Out_ PVOID pReserved); + +typedef NS_DLL_INIT_FN *PNS_DLL_INIT_FN; + +typedef +DWORD +WINAPI +(NS_HELPER_START_FN)( + _In_ const GUID *pguidParent, + _In_ DWORD dwVersion); + +typedef NS_HELPER_START_FN *PNS_HELPER_START_FN; + +typedef +DWORD +WINAPI +(NS_HELPER_STOP_FN)( + _In_ DWORD dwReserved); + +typedef NS_HELPER_STOP_FN *PNS_HELPER_STOP_FN; + +typedef +DWORD +WINAPI +(NS_CONTEXT_COMMIT_FN)( + _In_ DWORD dwAction); + +typedef NS_CONTEXT_COMMIT_FN *PNS_CONTEXT_COMMIT_FN; + +typedef +DWORD +WINAPI +(NS_CONTEXT_CONNECT_FN)( + _In_ LPCWSTR pwszMachine); + +typedef NS_CONTEXT_CONNECT_FN *PNS_CONTEXT_CONNECT_FN; + +typedef +DWORD +WINAPI +(NS_CONTEXT_DUMP_FN)( + _In_ LPCWSTR pwszRouter, + _In_ LPWSTR *ppwcArguments, + _In_ DWORD dwArgCount, + _In_ LPCVOID pvData); + +typedef NS_CONTEXT_DUMP_FN *PNS_CONTEXT_DUMP_FN; + +typedef +BOOL +WINAPI +(NS_OSVERSIONCHECK)( + _In_ UINT CIMOSType, + _In_ UINT CIMOSProductSuite, + _In_ LPCWSTR CIMOSVersion, + _In_ LPCWSTR CIMOSBuildNumber, + _In_ LPCWSTR CIMServicePackMajorVersion, + _In_ LPCWSTR CIMServicePackMinorVersion, + _In_ UINT uiReserved, + _In_ DWORD dwReserved); + +typedef NS_OSVERSIONCHECK *PNS_OSVERSIONCHECK; + +typedef +DWORD +WINAPI +(FN_HANDLE_CMD)( + _In_ LPCWSTR pwszMachine, + _In_ LPWSTR *ppwcArguments, + _In_ DWORD dwCurrentIndex, + _In_ DWORD dwArgCount, + _In_ DWORD dwFlags, + _In_ LPCVOID pvData, + _Out_ BOOL *pbDone); + +typedef FN_HANDLE_CMD *PFN_HANDLE_CMD; + + +typedef struct _CMD_ENTRY +{ + LPCWSTR pwszCmdToken; + PFN_HANDLE_CMD pfnCmdHandler; + DWORD dwShortCmdHelpToken; + DWORD dwCmdHlpToken; + DWORD dwFlags; + PNS_OSVERSIONCHECK pOsVersionCheck; +} CMD_ENTRY, *PCMD_ENTRY; + +typedef struct _CMD_GROUP_ENTRY +{ + LPCWSTR pwszCmdGroupToken; + DWORD dwShortCmdHelpToken; + ULONG ulCmdGroupSize; + DWORD dwFlags; + PCMD_ENTRY pCmdGroup; + PNS_OSVERSIONCHECK pOsVersionCheck; +} CMD_GROUP_ENTRY, *PCMD_GROUP_ENTRY; + +typedef struct _NS_HELPER_ATTRIBUTES +{ + union + { + struct + { + DWORD dwVersion; + DWORD dwReserved; + }; + ULONGLONG _ullAlign; + }; + GUID guidHelper; + PNS_HELPER_START_FN pfnStart; + PNS_HELPER_STOP_FN pfnStop; +} NS_HELPER_ATTRIBUTES, *PNS_HELPER_ATTRIBUTES; + +typedef struct _NS_CONTEXT_ATTRIBUTES +{ + union + { + struct + { + DWORD dwVersion; + DWORD dwReserved; + }; + ULONGLONG _ullAlign; + }; + LPWSTR pwszContext; + GUID guidHelper; + DWORD dwFlags; + ULONG ulPriority; + ULONG ulNumTopCmds; + CMD_ENTRY *pTopCmds; + ULONG ulNumGroups; + CMD_GROUP_ENTRY *pCmdGroups; + PNS_CONTEXT_COMMIT_FN pfnCommitFn; + PNS_CONTEXT_DUMP_FN pfnDumpFn; + PNS_CONTEXT_CONNECT_FN pfnConnectFn; + PVOID pReserved; + PNS_OSVERSIONCHECK pfnOsVersionCheck; +} NS_CONTEXT_ATTRIBUTES, *PNS_CONTEXT_ATTRIBUTES; + +typedef struct _TAG_TYPE +{ + LPCWSTR pwszTag; + DWORD dwRequired; + BOOL bPresent; +} TAG_TYPE, *PTAG_TYPE; + +typedef struct _TOKEN_VALUE +{ + LPCWSTR pwszToken; + DWORD dwValue; +} TOKEN_VALUE, *PTOKEN_VALUE; + +DWORD +WINAPI +MatchEnumTag( + _In_ HANDLE hModule, + _In_ LPCWSTR pwcArg, + _In_ DWORD dwNumArg, + _In_ const TOKEN_VALUE *pEnumTable, + _Out_ PDWORD pdwValue); + +BOOL +WINAPI +MatchToken( + _In_ LPCWSTR pwszUserToken, + _In_ LPCWSTR pwszCmdToken); + +DWORD +WINAPI +PreprocessCommand( + _In_ HANDLE hModule, + _Inout_ LPWSTR *ppwcArguments, + _In_ DWORD dwCurrentIndex, + _In_ DWORD dwArgCount, + _Inout_ PTAG_TYPE pttTags, + _In_ DWORD dwTagCount, + _In_ DWORD dwMinArgs, + _In_ DWORD dwMaxArgs, + _Out_ DWORD *pdwTagType); + +DWORD +CDECL +PrintError( + _In_opt_ HANDLE hModule, + _In_ DWORD dwErrId, + ...); + +DWORD +CDECL +PrintMessageFromModule( + _In_ HANDLE hModule, + _In_ DWORD dwMsgId, + ...); + +DWORD +CDECL +PrintMessage( + _In_ LPCWSTR pwszMessage, + ...); + +DWORD +WINAPI +RegisterContext( + _In_ const NS_CONTEXT_ATTRIBUTES *pChildContext); + +DWORD +WINAPI +RegisterHelper( + _In_ const GUID *pguidParentContext, + _In_ const NS_HELPER_ATTRIBUTES *pfnRegisterSubContext); + +#ifdef __cplusplus +} +#endif + +#endif /* _NETSH_H_ */

1 year, 6 months

[reactos] 01/01: [BROWSEUI] Fix pos of taskbar toolbar right-click menu (#5421)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4e946f5b0147480d0df3… commit b4e946f5b0147480d0df34654b55f9a7705787ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 11 05:28:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 11 05:28:50 2023 +0900 [BROWSEUI] Fix pos of taskbar toolbar right-click menu (#5421) Don't call ClientToScreen in handling NM_RCLICK message because NMMOUSE.pt is already in screen coordinates. CORE-18966 --- dll/win32/browseui/shellbars/CISFBand.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/browseui/shellbars/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp index 2d8c7d4500b..c0266aeca9c 100644 --- a/dll/win32/browseui/shellbars/CISFBand.cpp +++ b/dll/win32/browseui/shellbars/CISFBand.cpp @@ -353,7 +353,7 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) case NM_RCLICK: { HRESULT hr; - POINT pt = ((LPNMMOUSE)lParam)->pt; + POINT pt = ((LPNMMOUSE)lParam)->pt; // Already in screen coordinates CComPtr<IContextMenu> picm; HMENU fmenu = CreatePopupMenu(); TBBUTTON tb; @@ -363,7 +363,6 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent) if (chk) { - ClientToScreen(&pt); hr = m_pISF->GetUIObjectOf(m_hWnd, 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &picm)); if (FAILED_UNEXPECTEDLY(hr)) return hr;

1 year, 6 months

[reactos] 01/01: [TASKMGR] Fix text truncation for fr-FR.rc (#5380)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=831288fe691ec311c5b91… commit 831288fe691ec311c5b910f05d9b833b4b952261 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Jul 10 21:43:00 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 10 21:43:00 2023 +0200 [TASKMGR] Fix text truncation for fr-FR.rc (#5380) CORE-18523 The old string exceeded 256 chars and can be shortened. Translation suggested by Kyle Katarn, a.k.a. KRosUser --- base/applications/taskmgr/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index 4a3496dbb1b..d9bc6444733 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -436,7 +436,7 @@ BEGIN IDS_MSG_UNABLEDEBUGPROCESS "Impossible de déboguer le processus." IDS_MSG_WARNINGDEBUG "ATTENTION : Déboguer ce processus peut entraîner une perte de données.\nÊtes-vous sûrs de vouloir le déboguer ?" IDS_MSG_TASKMGRWARNING "Avertissement du Gestionnaire des tâches" - IDS_MSG_WARNINGTERMINATING "ATTENTION : Terminer un processus peut causer des effets indésirables\nincluant une perte de donnée ou une instabilité du système.\nLe processus n'aura pas la chance de sauvegarder son état\nou les données avant de terminer.\nÊtes-vous sûr de vouloir terminer le processus ?" + IDS_MSG_WARNINGTERMINATING "ATTENTION : Terminer un processus peut engendrer une perte de données ou une instabilité du système.\nLe processus n'aura pas la chance de sauvegarder son état ou ses données avant de terminer.\nVoulez-vous vraiment terminer le processus ?" IDS_MSG_UNABLETERMINATEPRO "Impossible de terminer le processus" IDS_MSG_CLOSESYSTEMPROCESS "C'est un processus critique du système. Le gestionnaire de tâche ne le terminera pas." IDS_MSG_UNABLECHANGEPRIORITY "Impossible de changer la priorité"

1 year, 6 months

[reactos] 01/01: [USER32_APITEST] Improve user32:PrivateExtractIcons test (#5209)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454a27cdff3c817ad873c… commit 454a27cdff3c817ad873c9fa0c325c89fe243c0a Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Jul 10 14:24:41 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 10 22:24:41 2023 +0300 [USER32_APITEST] Improve user32:PrivateExtractIcons test (#5209) - Improve the test by examining total number of icon groups in files and by adding more testcases including two new icon files. - Add new ROS.ico file which has both a normal icon and a PNG one. - Add tests for explorer.exe and new ROS.ico and sysicon.ico files. CORE-18897 --- .../rostests/apitests/user32/PrivateExtractIcons.c | 125 +++++++++++++++++++-- modules/rostests/apitests/user32/ROS.ico | Bin 0 -> 10526 bytes modules/rostests/apitests/user32/resource.h | 3 + modules/rostests/apitests/user32/sysicon.ico | Bin 0 -> 22486 bytes modules/rostests/apitests/user32/user32_apitest.rc | 3 + 5 files changed, 120 insertions(+), 11 deletions(-) diff --git a/modules/rostests/apitests/user32/PrivateExtractIcons.c b/modules/rostests/apitests/user32/PrivateExtractIcons.c index 01c43ee0c74..85edab85a16 100644 --- a/modules/rostests/apitests/user32/PrivateExtractIcons.c +++ b/modules/rostests/apitests/user32/PrivateExtractIcons.c @@ -3,38 +3,132 @@ * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for PrivateExtractIcons * PROGRAMMER: Hermes Belusca-Maito + * Doug Lyons <douglyons(a)douglyons.com> */ #include "precomp.h" +#include <stdio.h> + +BOOL FileExists(PCWSTR FileName) +{ + DWORD Attribute = GetFileAttributesW(FileName); + + return (Attribute != INVALID_FILE_ATTRIBUTES && + !(Attribute & FILE_ATTRIBUTE_DIRECTORY)); +} + +BOOL ResourceToFile(INT i, PCWSTR FileName) +{ + FILE *fout; + HGLOBAL hData; + HRSRC hRes; + PVOID pResLock; + UINT iSize; + + if (FileExists(FileName)) + { + skip("'%S' already exists. Exiting now\n", FileName); + return FALSE; + } + + hRes = FindResourceW(NULL, MAKEINTRESOURCEW(i), MAKEINTRESOURCEW(RT_RCDATA)); + if (hRes == NULL) + { + skip("Could not locate resource (%d). Exiting now\n", i); + return FALSE; + } + + iSize = SizeofResource(NULL, hRes); + + hData = LoadResource(NULL, hRes); + if (hData == NULL) + { + skip("Could not load resource (%d). Exiting now\n", i); + return FALSE; + } + + // Lock the resource into global memory. + pResLock = LockResource(hData); + if (pResLock == NULL) + { + skip("Could not lock resource (%d). Exiting now\n", i); + return FALSE; + } + + fout = _wfopen(FileName, L"wb"); + fwrite(pResLock, iSize, 1, fout); + fclose(fout); + return TRUE; +} static struct { PCWSTR FilePath; - UINT cIcons; // Return value from PrivateExtractIconsW + UINT cIcons; // Return value of the first icon group extracted (should be 1 if no error) + UINT cTotalIcons; // Return value of total icon groups in file BOOL bhIconValid; // Whether or not the returned icon handle is not NULL. } IconTests[] = { - /* Executables with icons */ - {L"notepad.exe", 1, TRUE}, - {L"%SystemRoot%\\System32\\cmd.exe", 1, TRUE}, + /* Executables with just one icon group */ + {L"notepad.exe", 1, 1, TRUE}, + {L"%SystemRoot%\\System32\\cmd.exe", 1, 1, TRUE}, - /* Executable without icon */ - {L"%SystemRoot%\\System32\\autochk.exe", 0, FALSE}, + /* Executable without icon groups */ + {L"%SystemRoot%\\System32\\autochk.exe", 0, 0, FALSE}, - /* Existing file */ - {L"%SystemRoot%\\System32\\shell32.dll", 1, TRUE}, + /* Existing file (shell32 has 233 icon groups in ReactOS only) */ + {L"%SystemRoot%\\System32\\shell32.dll", 1, 233, TRUE}, /* Non-existing files */ - {L"%SystemRoot%\\non-existent-file.sdf", 0xFFFFFFFF, FALSE}, + {L"%SystemRoot%\\non-existent-file.sdf", 0xFFFFFFFF, 0, FALSE}, + + /* Executable with 18 icon groups */ + {L"%SystemRoot%\\explorer.exe", 1, 18, TRUE}, + + /* Icon group file containing 6 icons */ + {L"%temp%\\sysicon.ico", 1, 1, TRUE}, + + /* Icon group file containing one PNG icon and one normal icon */ + {L"%temp%\\ROS.ico", 1, 1, TRUE}, +}; + +static struct +{ + PCWSTR FileName; + INT ResourceId; +} IconFiles[] = +{ + {L"%temp%\\ROS.ico", IDR_ICONS_PNG}, + {L"%temp%\\sysicon.ico", IDR_ICONS_NORMAL}, }; START_TEST(PrivateExtractIcons) { HICON ahIcon; - UINT i, aIconId, cIcons; + UINT i, aIconId, cIcons, cIcoTotal; + WCHAR PathBuffer[MAX_PATH]; + + /* Extract icons */ + for (i = 0; i < _countof(IconFiles); ++i) + { + ExpandEnvironmentStringsW(IconFiles[i].FileName, PathBuffer, _countof(PathBuffer)); + + if (!ResourceToFile(IconFiles[i].ResourceId, PathBuffer)) + goto Cleanup; + } for (i = 0; i < _countof(IconTests); ++i) { + /* Get total number of icon groups in file. + * None of the hard numbers in the function matter since we have + * two NULLs for the Icon Handle and Count to be set. */ + cIcoTotal = PrivateExtractIconsW(IconTests[i].FilePath, 0, 16, 16, NULL, NULL, 0, 0); + ok((i == 3 ? + cIcoTotal > 232 && cIcoTotal < 240 : /* shell32 case: ROS has 233, W2K2SP2 has 239 icon groups. */ + cIcoTotal == IconTests[i].cTotalIcons), + "PrivateExtractIconsW(%u): " + "got %u, expected %u\n", i, cIcoTotal, IconTests[i].cTotalIcons); + /* Always test extraction of the FIRST icon (index 0) */ ahIcon = (HICON)UlongToHandle(0xdeadbeef); aIconId = 0xdeadbeef; @@ -46,7 +140,9 @@ START_TEST(PrivateExtractIcons) i, IconTests[i].bhIconValid ? "valid" : "not valid", ahIcon); if (cIcons == 0xFFFFFFFF) { - ok(aIconId == 0xdeadbeef, "PrivateExtractIconsW(%u): id should not be set\n", i); + ok(aIconId == 0xdeadbeef, + "PrivateExtractIconsW(%u): id should not be set to 0x%x\n", + i, aIconId); } else { @@ -55,4 +151,11 @@ START_TEST(PrivateExtractIcons) if (ahIcon && ahIcon != (HICON)UlongToHandle(0xdeadbeef)) DestroyIcon(ahIcon); } + +Cleanup: + for (i = 0; i < _countof(IconFiles); ++i) + { + ExpandEnvironmentStringsW(IconFiles[i].FileName, PathBuffer, _countof(PathBuffer)); + DeleteFileW(PathBuffer); + } } diff --git a/modules/rostests/apitests/user32/ROS.ico b/modules/rostests/apitests/user32/ROS.ico new file mode 100644 index 00000000000..587992b6eea Binary files /dev/null and b/modules/rostests/apitests/user32/ROS.ico differ diff --git a/modules/rostests/apitests/user32/resource.h b/modules/rostests/apitests/user32/resource.h index 8435d9ff725..ac91b1b51be 100644 --- a/modules/rostests/apitests/user32/resource.h +++ b/modules/rostests/apitests/user32/resource.h @@ -1,2 +1,5 @@ #define IDI_TEST 1000 + +#define IDR_ICONS_PNG 2000 +#define IDR_ICONS_NORMAL 2001 diff --git a/modules/rostests/apitests/user32/sysicon.ico b/modules/rostests/apitests/user32/sysicon.ico new file mode 100644 index 00000000000..2c32fdf0022 Binary files /dev/null and b/modules/rostests/apitests/user32/sysicon.ico differ diff --git a/modules/rostests/apitests/user32/user32_apitest.rc b/modules/rostests/apitests/user32/user32_apitest.rc index c6da5676f18..370c3aaa721 100644 --- a/modules/rostests/apitests/user32/user32_apitest.rc +++ b/modules/rostests/apitests/user32/user32_apitest.rc @@ -8,6 +8,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_TEST ICON "test.ico" TESTCURSOR CURSOR "test.cur" +IDR_ICONS_PNG RCDATA "ROS.ico" +IDR_ICONS_NORMAL RCDATA "sysicon.ico" + TESTDIALOG DIALOG 0,0, 200,200 CLASS "TestDialogClass" CAPTION "Testdialog"

1 year, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs