Ros-diffs

ros-diffs@reactos.org

11 participants
81012 discussions

[reactos] 01/01: Fix Cursor Position in "...file name:" box when opening from Explorer 'Search' toolbar (#6333)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb43301bad62b3ae290b7… commit fb43301bad62b3ae290b784c64227ea7d63fe533 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Jan 17 09:42:18 2024 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 07:42:18 2024 -0800 Fix Cursor Position in "...file name:" box when opening from Explorer 'Search' toolbar (#6333) Original patch by @I_Kill_Bugs. Fix Cursor being in middle of '...file name:' edit box when using 'Search' from the Explorer toolbar. JIRA issue: CORE-19407 --- dll/win32/comctl32/edit.c | 5 +++++ win32ss/user/user32/controls/edit.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 5185605eb72..fc6b53755ef 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -1752,6 +1752,11 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, #ifdef __REACTOS__ HKL hKL = GetKeyboardLayout(0); POINT pt = { (short)LOWORD(res), (short)HIWORD(res) }; + + /* Don't set caret if not focused */ + if ((es->flags & EF_FOCUSED) == 0) + return; + SetCaretPos(pt.x, pt.y); if (!ImmIsIME(hKL)) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index d48e8e3b034..9b0eac86988 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -1907,6 +1907,11 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, #ifdef __REACTOS__ HKL hKL = GetKeyboardLayout(0); POINT pt = { (short)LOWORD(res), (short)HIWORD(res) }; + + /* Don't set caret if not focused */ + if ((es->flags & EF_FOCUSED) == 0) + return; + SetCaretPos(pt.x, pt.y); if (!ImmIsIME(hKL))

12 months

[reactos] 01/01: [MKISOFS] CMakeLists.txt: Add a check for Clang and its version (#6369)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2505489d2952f1df5c27b… commit 2505489d2952f1df5c27bdc1a5a242b582da70ba Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Jan 17 16:32:46 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 16:32:46 2024 +0100 [MKISOFS] CMakeLists.txt: Add a check for Clang and its version (#6369) GCC 8.4 and Clang 13.0.1: `cc1: note: unrecognized command-line option ‘-Wno-deprecated-non-prototype’ may have been intended to silence earlier diagnostics` Addendum to commit 4e3bf252d --- sdk/tools/mkisofs/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sdk/tools/mkisofs/CMakeLists.txt b/sdk/tools/mkisofs/CMakeLists.txt index bd25bf36403..1b4c2116035 100644 --- a/sdk/tools/mkisofs/CMakeLists.txt +++ b/sdk/tools/mkisofs/CMakeLists.txt @@ -107,10 +107,12 @@ else() # Silence compilers checking for invalid formatting sequences. target_compile_options(libschily PRIVATE "-Wno-format") - # mkisofs uses K&R-style function definitions to support very old compilers. - # This causes warnings with modern compilers. - target_compile_options(libmdigest PRIVATE "-Wno-deprecated-non-prototype") - target_compile_options(libschily PRIVATE "-Wno-deprecated-non-prototype") - target_compile_options(libsiconv PRIVATE "-Wno-deprecated-non-prototype") - target_compile_options(mkisofs PRIVATE "-Wno-deprecated-non-prototype") + if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "15") + # mkisofs uses K&R-style function definitions to support very old compilers. + # This causes warnings with modern compilers. + target_compile_options(libmdigest PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(libschily PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(libsiconv PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(mkisofs PRIVATE "-Wno-deprecated-non-prototype") + endif() endif()

12 months

[reactos] 01/01: [TRANSLATION] Improve Portuguese (pt-PT) translation (#6171)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4a453ca2e304fe227719… commit d4a453ca2e304fe22771910680fea4b2c5c527cb Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Jan 17 11:07:21 2024 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 16:07:21 2024 +0100 [TRANSLATION] Improve Portuguese (pt-PT) translation (#6171) Updates for DESK.CPL, INPUT.CPL, EXPLORER.EXE, SHELL32.DLL --- base/shell/explorer/lang/pt-PT.rc | 20 ++++++++++---------- dll/cpl/desk/lang/pt-PT.rc | 8 ++++---- dll/cpl/input/lang/pt-PT.rc | 36 ++++++++++++++++++------------------ dll/win32/shell32/lang/pt-PT.rc | 22 +++++++++++----------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index dcc1584103d..35d813c7a9d 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -79,8 +79,8 @@ BEGIN AUTOCHECKBOX "&Ocultar automaticamente a barra de tarefas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Manter a barra de tarefas sobre outras janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 - AUTOCHECKBOX "&Mostrar Iniciação Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "Mostrar Iniciação &Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + AUTOCHECKBOX "Mostrar icones &pequenos", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,15 +103,15 @@ CAPTION "Área de Notificação" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 - GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 - LTEXT "Pode manter a área de notificação organizada ocultando os ícones que não clicou recentemente.", IDC_STATIC, 13, 48, 223, 16 + GROUPBOX "Icones", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Pode manter a área de notificação organizada ocultando os ícones em que não clicou recentemente.", IDC_STATIC, 13, 48, 223, 16 AUTOCHECKBOX "&Ocultar ícones inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 - GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + GROUPBOX "Icones de sistema", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Seleccione quais ícones do sistema serão sempre visiveis.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 - AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "Mostrar &segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "&Área de trabalho", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 @@ -187,8 +187,8 @@ BEGIN GROUPBOX "Seleccione o tamanho do icone dos programas ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "Icons &grandes", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "icones &pequenos", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "Icones &grandes", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "Icones &pequenos", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP GROUPBOX "Programas ", IDC_STATIC, 7, 49, 238, 70 LTEXT "O menu 'Iniciar' comtém atalhos para os programas que usa frequentemente. Ao limpar a lista de atalhos, não elimina os programas.", IDC_STATIC, 14, 63, 224, 20 LTEXT "&Numero de programas no menu 'Iniciar':", IDC_STATIC, 14, 86, 112, 8 diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index bfc159d4c4b..e14a8ec08ab 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -3,14 +3,14 @@ * Traduzido por: Jose Carlos Jesus 05-08-2019 zecarlos1957(a)hotmail.com */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_THEMES DIALOGEX 0, 0, 246, 210 CAPTION "Temas" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Um tema é um plano de fundo, além de um conjunto de sons, ícones e outros elementos para ajudá-lo a personalizar seu computador com um clique.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Um tema é um plano de fundo, além de um conjunto de sons, ícones e outros elementos para ajudá-lo a personalizar o seu computador com um clique.", IDC_STATIC, 5, 5, 235, 30 LTEXT "Tema:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Guardar &como...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Padrão" - IDS_CLEARTYPEEFFECT "FreeType Antialiased" + IDS_CLEARTYPEEFFECT "FreeType suavizado" END STRINGTABLE @@ -298,7 +298,7 @@ BEGIN IDS_ELEMENT_6 "Itens seleccionados" IDS_ELEMENT_7 "Janela" IDS_ELEMENT_8 "Barra de deslocamento" - IDS_ELEMENT_9 "Objetos 3D" + IDS_ELEMENT_9 "Objectos 3D" IDS_ELEMENT_10 "Título da paleta" IDS_ELEMENT_11 "Barra de título" IDS_ELEMENT_12 "Caixa de mensagem" diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index 7972707e353..08a75c707da 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -1,15 +1,15 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Definições" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Idioma de entrada padrão", -1, 5, 5, 246, 55 - LTEXT "Seleccione um dos idiomas de entrada instalados para utilizar quando o computador for iniciado.", -1, 15, 15, 230, 23 + GROUPBOX "&Idioma de teclado predefinido", -1, 5, 5, 246, 55 + LTEXT "Seleccione um dos idiomas de teclado instalados para utilizar quando o computador for iniciado.", -1, 15, 15, 230, 23 COMBOBOX IDC_DEFAULT_LANGUAGE, 15, 40, 230, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "&Serviços instalados", -1, 5, 65, 246, 125 - LTEXT "Seleccione os serviços desejados para cada idioma de entrada mostrado na lista. Utilize os botões 'Adicionar' e 'Remover' para modificar a lista.", -1, 15, 78, 230, 25 + LTEXT "Seleccione os serviços que deseja para cada um dos idiomas de teclado mostrado na lista. Utilize os botões 'Adicionar' e 'Remover' para modificar a lista.", -1, 15, 78, 230, 25 CONTROL "", IDC_KEYLAYOUT_LIST, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_DISABLEDRAGDROP | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 15, 105, 155, 80 PUSHBUTTON "&Adicionar...", IDC_ADD_BUTTON, 175, 105, 70, 14 PUSHBUTTON "&Remover", IDC_REMOVE_BUTTON, 175, 125, 70, 14 @@ -21,7 +21,7 @@ END IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Definições avançadas" +CAPTION "Avançadas" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Configuração do sistema", -1, 7, 7, 240, 70 @@ -37,7 +37,7 @@ BEGIN GROUPBOX "Para desactivar Caps Lock", -1, 7, 7, 258, 26 AUTORADIOBUTTON "Pressione a tecla CAPS LOC&K", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP AUTORADIOBUTTON "Pressione a tecla SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP - GROUPBOX "Teclas de acesso para idiomas de entrada", -1, 7, 37, 258, 95 + GROUPBOX "Teclas de acesso para idiomas de teclado", -1, 7, 37, 258, 95 LTEXT "Acção", -1, 14, 47, 60, 9 RTEXT "Seqüência de &teclas", -1, 177, 47, 79, 9 CONTROL "", IDC_KEY_LISTVIEW, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_AUTOARRANGE | LVS_SINGLESEL, 14, 57, 244, 52, WS_EX_CLIENTEDGE @@ -48,12 +48,12 @@ END IDD_ADD DIALOGEX 20, 20, 227, 90 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Adicionar idioma de entrada" +CAPTION "Adicionar idioma de teclado" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Idioma de entrada:", -1, 7, 7, 61, 10 + LTEXT "&Idioma de teclado:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Esquema do teclado/IME:", -1, 7, 36, 110, 10 + LTEXT "&Esquema de teclado/IME:", -1, 7, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 @@ -65,7 +65,7 @@ CAPTION "Alterar seqüência de teclas" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "Alternar &idiomas de entrada", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + AUTOCHECKBOX "Alternar &idiomas de teclado", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 LTEXT "SHIFT", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&CTRL", IDC_CTRL_LANG, 29, 31, 30, 11 @@ -81,10 +81,10 @@ END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Propriedades do idioma de entrada" +CAPTION "Propriedades do idioma de teclado" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Idioma de entrada:", -1, 7, 7, 61, 8 + LTEXT "Idioma de teclado:", -1, 7, 7, 61, 8 LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8 LTEXT "&Esquema do teclado/IME:", -1, 7, 21, 110, 10 COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -94,23 +94,23 @@ END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Serviços de texto e idiomas de entrada" + IDS_CPLSYSTEMNAME "Serviços de texto e idiomas de introdução" IDS_CPLSYSTEMDESCRIPTION "Personaliza configurações para entrada de texto de idiomas" IDS_KEYBOARD "Teclado" IDS_NONE "(Nenhum)" IDS_UNKNOWN "(Desconhecido)" - IDS_RESTART "Deseja reiniciar o seu computador agora?" + IDS_RESTART "Deseja reiniciar o computador agora?" IDS_WHATS_THIS "O que é isto?" IDS_LANGUAGE "Idioma" - IDS_LAYOUT "Esquema do teclado" - IDS_REM_QUESTION "Deseja remover o esquema do teclado selecionado?" + IDS_LAYOUT "Esquema de teclado" + IDS_REM_QUESTION "Deseja remover o esquema de teclado seleccionado?" IDS_CONFIRMATION "Confirmação" IDS_LAYOUT_EXISTS "Este esquema já existe." IDS_LAYOUT_EXISTS2 "Este esquema já existe e não pode ser adicionado." IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" - IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" - IDS_REBOOT_NOW "You have to restart the system for the settings to take effect. Reboot now?" + IDS_SWITCH_BET_INLANG "Alternar entre idiomas de teclado" + IDS_REBOOT_NOW "Tem de reiniciar o computador para que as novas definições surtam efeito.\nPretende reiniciar o computador agora?" END STRINGTABLE diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 6ea2041f42c..0c835e9f397 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -341,7 +341,7 @@ BEGIN GROUPBOX "Desfragmentação", -1, 5, 65, 230, 60 ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opção vai desfragmentar os ficheiros no volume.", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragmentar agora...", 14001, 130, 105, 90, 15, WS_TABSTOP + PUSHBUTTON "Desfragmentar agora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Cópia de segurança", -1, 5, 130, 230, 60 ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opção vai verificar os ficheiros do volume.", -1, 40, 150, 160, 20 @@ -447,7 +447,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Tipos de Ficheiro" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Tipos de ficheiros registados:", -1, 7, 10, 180, 10 + LTEXT "&Tipos de ficheiro registados:", -1, 7, 10, 180, 10 CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 259, 99 PUSHBUTTON "&Novo...", IDC_FILETYPES_NEW, 140, 123, 55, 14, WS_TABSTOP PUSHBUTTON "&Eliminar...", IDC_FILETYPES_DELETE, 200, 123, 65, 14, WS_TABSTOP @@ -488,7 +488,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Pretende terminar a sessão?", -1, 49, 15, 156, 8 - DEFPUSHBUTTON "&Terminar a sessão", IDOK, 49, 38, 67, 14 + DEFPUSHBUTTON "&Terminar sessão", IDOK, 49, 38, 67, 14 PUSHBUTTON "Cancelar", IDCANCEL, 123, 38, 67, 14 END @@ -499,11 +499,11 @@ BEGIN CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 PUSHBUTTON "&Mudar de utilizador", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP - PUSHBUTTON "&Terminar a sessão", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Terminar sessão", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW PUSHBUTTON "Cancelar", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT LTEXT "Terminar sessão ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 150, 19 CTEXT "Mudar de utilizador", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 - CTEXT "Terminar a sessão", IDC_LOG_OFF_STATIC, 116, 70, 55, 11 + CTEXT "Terminar sessão", IDC_LOG_OFF_STATIC, 116, 70, 55, 11 END IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 @@ -550,7 +550,7 @@ CAPTION "Conteúdo misto" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS pode executar a mesma acção de cada vez que inserir um disco ou um dispositivo com este tipo de ficheiro:", 1001, 30, 7, 193, 20 + LTEXT "O ReactOS pode executar a mesma acção de cada vez que inserir um disco ou um dispositivo com este tipo de ficheiro:", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "O que pretende que o ReactOS faça?", 1002, 32, 41, 190, 8 @@ -566,7 +566,7 @@ CAPTION "Autoplay" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS pode executar sempre a mesma acção de cada vez que inserir um disco ou um dispositivo.", 1001, 32, 7, 190, 22 + LTEXT "O ReactOS pode executar sempre a mesma acção de cada vez que inserir um disco ou um dispositivo.", 1001, 32, 7, 190, 22 LTEXT "O que pretende que o ReactOS faça?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 AUTOCHECKBOX "&Executar sempre a acção seleccionada", 1004, 32, 143, 190, 8 @@ -871,7 +871,7 @@ BEGIN IDS_NETHOOD "Vizinhança na rede" IDS_TEMPLATES "Modelos" IDS_APPDATA "Dados de Programas" - IDS_PRINTHOOD "PrintHood" + IDS_PRINTHOOD "Impressoras" IDS_LOCAL_APPDATA "Definições locais\\Dados de Programas" IDS_INTERNET_CACHE "Definições locais\\Ficheiros Temporários da Internet" IDS_COOKIES "Cookies" @@ -891,7 +891,7 @@ BEGIN IDS_NEWITEMFORMAT "Novo %s" IDS_DRIVE_FIXED "Disco Local" - IDS_DRIVE_CDROM "CD Drive" + IDS_DRIVE_CDROM "Unidade de CD-ROM" IDS_DRIVE_NETWORK "Disco de Rede" IDS_DRIVE_FLOPPY "3.5 Floppy" IDS_DRIVE_REMOVABLE "Disco removível" @@ -905,7 +905,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Autores" IDS_SHELL_ABOUT_BACK "< &Retroceder" - FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ + FCIDM_SHVIEW_NEW "No&vo" /* A menu item with an ampersand */ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Opções das Pastas" @@ -984,7 +984,7 @@ BEGIN IDS_EXE_DESCRIPTION "Descrição:" IDS_MENU_EMPTY "(Vazio)" - IDS_OBJECTS "%d Objetos" + IDS_OBJECTS "%d Objectos" IDS_OBJECTS_SELECTED "%d Objectos seleccionados" IDS_TITLE_MYCOMP "O Meu Computador"

12 months

[reactos] 01/01: [MSUTB] Add CTrayIconItem (#6371)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89d8b472af5b5c3960cbe… commit 89d8b472af5b5c3960cbe92f9521b9d866398798 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 17 12:42:54 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 12:42:54 2024 +0900 [MSUTB] Add CTrayIconItem (#6371) Supporting Language Bar... JIRA issue: CORE-19363 - Implement CTrayIconItem class. - Add delay link to shell32.dll. --- dll/win32/msutb/CMakeLists.txt | 2 +- dll/win32/msutb/msutb.cpp | 107 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index d4259dc7cda..dd79a30d8c5 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -15,5 +15,5 @@ set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) add_importlibs(msutb user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msutb comctl32 msctf ole32 oleaut32) +add_delay_importlibs(msutb comctl32 msctf ole32 oleaut32 shell32) add_cd_file(TARGET msutb DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 4ba8f878913..ec7e1ea24cb 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -30,6 +30,113 @@ END_OBJECT_MAP() CMsUtbModule gModule; +/***********************************************************************/ + +class CTrayIconWnd +{ +public: + //FIXME + HWND GetNotifyWnd() { return NULL; }; +}; + +/***********************************************************************/ + +class CTrayIconItem +{ +protected: + HWND m_hWnd; + UINT m_uCallbackMessage; + UINT m_uNotifyIconID; + DWORD m_dwIconAddOrModify; + BOOL m_bIconAdded; + CTrayIconWnd *m_pTrayIconWnd; + DWORD m_dw; + GUID m_guid; + RECT m_rcMenu; + POINT m_ptCursor; + + CTrayIconItem(CTrayIconWnd *pTrayIconWnd); + + BOOL _Init(HWND hWnd, UINT uCallbackMessage, UINT uNotifyIconID, const GUID& rguid); + BOOL UpdateMenuRectPoint(); + BOOL RemoveIcon(); + + STDMETHOD_(BOOL, SetIcon)(HICON hIcon, LPCTSTR pszTip); + STDMETHOD_(LRESULT, OnMsg)(WPARAM wParam, LPARAM lParam) { return 0; }; + STDMETHOD_(LRESULT, OnDelayMsg)(LPARAM lParam) { return 0; }; +}; + +/*********************************************************************** + * CTrayIconItem + */ + +CTrayIconItem::CTrayIconItem(CTrayIconWnd *pTrayIconWnd) +{ + m_dwIconAddOrModify = NIM_ADD; + m_pTrayIconWnd = pTrayIconWnd; +} + +BOOL +CTrayIconItem::_Init( + HWND hWnd, + UINT uCallbackMessage, + UINT uNotifyIconID, + const GUID& rguid) +{ + m_hWnd = hWnd; + m_uCallbackMessage = uCallbackMessage; + m_uNotifyIconID = uNotifyIconID; + m_guid = rguid; + return TRUE; +} + +BOOL CTrayIconItem::RemoveIcon() +{ + if (m_dwIconAddOrModify == NIM_MODIFY) + { + NOTIFYICONDATA NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; + NotifyIcon.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + NotifyIcon.uCallbackMessage = m_uCallbackMessage; + ::Shell_NotifyIcon(NIM_DELETE, &NotifyIcon); + } + + m_dwIconAddOrModify = NIM_ADD; + m_bIconAdded = TRUE; + return TRUE; +} + +BOOL CTrayIconItem::SetIcon(HICON hIcon, LPCTSTR pszTip) +{ + if (!hIcon) + return FALSE; + + NOTIFYICONDATA NotifyIcon = { sizeof(NotifyIcon), m_hWnd, m_uNotifyIconID }; + NotifyIcon.uFlags = NIF_ICON | NIF_MESSAGE; + NotifyIcon.uCallbackMessage = m_uCallbackMessage; + NotifyIcon.hIcon = hIcon; + if (pszTip) + { + NotifyIcon.uFlags |= NIF_TIP; + StringCchCopy(NotifyIcon.szTip, _countof(NotifyIcon.szTip), pszTip); + } + + ::Shell_NotifyIcon(m_dwIconAddOrModify, &NotifyIcon); + + m_dwIconAddOrModify = NIM_MODIFY; + m_bIconAdded = NIM_MODIFY; + return TRUE; +} + +BOOL CTrayIconItem::UpdateMenuRectPoint() +{ + HWND hNotifyWnd = m_pTrayIconWnd->GetNotifyWnd(); + ::GetClientRect(hNotifyWnd, &m_rcMenu); + ::ClientToScreen(hNotifyWnd, (LPPOINT)&m_rcMenu); + ::ClientToScreen(hNotifyWnd, (LPPOINT)&m_rcMenu.right); + ::GetCursorPos(&m_ptCursor); + return TRUE; +} + /*********************************************************************** * GetLibTls (MSUTB.@) *

12 months

[reactos] 01/01: [SDK] cicuif.h: Add CUIFWndFrame (#6370)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae54529024469878b75e7… commit ae54529024469878b75e7637ebb9a6b91684c4ee Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 17 12:42:18 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 17 12:42:18 2024 +0900 [SDK] cicuif.h: Add CUIFWndFrame (#6370) Supporting TIPs... JIRA issue: CORE-19360 Implement CUIFWndFrame class. --- sdk/include/reactos/cicero/cicuif.h | 215 ++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 64388328801..c5f4bfcc845 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -849,6 +849,33 @@ public: ///////////////////////////////////////////////////////////////////////////// +class CUIFWndFrame : public CUIFObject +{ +protected: + DWORD m_dwHitTest; + POINT m_ptHit; + RECT m_rcWnd; + INT m_cxFrame; + INT m_cyFrame; + INT m_cxMin; + INT m_cyMin; + +public: + CUIFWndFrame(CUIFObject *pParent, LPCRECT prc, DWORD style); + + void GetFrameSize(LPSIZE pSize); + DWORD HitTest(LONG x, LONG y); + + STDMETHOD_(void, OnMouseMove)(LONG x, LONG y) override; + STDMETHOD_(void, OnLButtonDown)(LONG x, LONG y) override; + STDMETHOD_(void, OnLButtonUp)(LONG x, LONG y) override; + STDMETHOD_(BOOL, OnPaintTheme)(HDC hDC) override; + STDMETHOD_(void, OnPaintNoTheme)(HDC hDC) override; + STDMETHOD_(BOOL, OnSetCursor)(UINT uMsg, LONG x, LONG y) override; +}; + +///////////////////////////////////////////////////////////////////////////// + inline void cicInitUIFLib(void) { cicInitUIFSys(); @@ -4622,3 +4649,191 @@ CUIFToolbarButton::SetToolTip(LPCWSTR pszToolTip) if (m_pToolbarMenuButton) m_pToolbarMenuButton->SetToolTip(pszToolTip); } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFWndFrame::CUIFWndFrame( + CUIFObject *pParent, + LPCRECT prc, + DWORD style) : CUIFObject(pParent, 0, prc, style) +{ + m_iPartId = 7; + m_iStateId = 0; + m_pszClassList = L"WINDOW"; + m_dwHitTest = 0; + m_cxFrame = m_cyFrame = 0; + + if (m_pScheme) + { + if ((m_style & 0xF) && (m_style & 0xF) <= 2) + { + m_cxFrame = m_pScheme->CxSizeFrame(); + m_cyFrame = m_pScheme->CySizeFrame(); + } + else + { + m_cxFrame = m_pScheme->CxWndBorder(); + m_cyFrame = m_pScheme->CyWndBorder(); + } + } + + m_cxMin = GetSystemMetrics(SM_CXMIN); + m_cyMin = GetSystemMetrics(SM_CYMIN); +} + +inline void CUIFWndFrame::GetFrameSize(LPSIZE pSize) +{ + pSize->cx = m_cxFrame; + pSize->cy = m_cyFrame; +} + +inline DWORD CUIFWndFrame::HitTest(LONG x, LONG y) +{ + DWORD dwFlags = 0; + if ( m_rc.left <= x && x < m_rc.left + m_cxFrame) + dwFlags |= 0x10; + if (m_rc.top <= y && y < m_rc.top + m_cyFrame ) + dwFlags |= 0x20; + if (m_rc.right - m_cxFrame <= x && x < m_rc.right) + dwFlags |= 0x40; + if (m_rc.bottom - m_cyFrame <= y && y < m_rc.bottom) + dwFlags |= 0x80; + return dwFlags; +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnMouseMove(LONG x, LONG y) +{ + if (!IsCapture()) + return; + + POINT Point; + ::ClientToScreen(*m_pWindow, &Point); + + RECT rc = m_rcWnd; + + if (m_dwHitTest & 0x10) + rc.left = Point.x + m_rcWnd.left - m_ptHit.x; + + if (m_dwHitTest & 0x20) + rc.top = Point.y + m_rcWnd.top - m_ptHit.y; + + if (m_dwHitTest & 0x40) + { + rc.right = Point.x + m_rcWnd.right - m_ptHit.x; + if (rc.right <= rc.left + m_cxMin) + rc.right = rc.left + m_cxMin; + } + + if (m_dwHitTest & 0x80) + { + rc.bottom = Point.y + m_rcWnd.bottom - m_ptHit.y; + if (rc.bottom <= rc.top + m_cyMin) + rc.bottom = rc.top + m_cyMin; + } + + m_pWindow->Move(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnLButtonDown(LONG x, LONG y) +{ + POINT Point = { x, y }; + DWORD hitTest = m_style & HitTest(x, y); + if (!hitTest) + return; + + ::ClientToScreen(*m_pWindow, &Point); + m_ptHit = Point; + m_pWindow = m_pWindow; + m_dwHitTest = hitTest; + ::GetWindowRect(*m_pWindow, &m_rcWnd); + StartCapture(); +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnLButtonUp(LONG x, LONG y) +{ + if (IsCapture()) + EndCapture(); +} + +inline STDMETHODIMP_(BOOL) +CUIFWndFrame::OnPaintTheme(HDC hDC) +{ + if (FAILED(EnsureThemeData(*m_pWindow))) + return FALSE; + + RECT rc = m_rc; + rc.right = m_cxFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 5, 1, NULL))) + return FALSE; + + rc = m_rc; + rc.left = rc.right - m_cxFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 10, 4, NULL))) + return FALSE; + + rc = m_rc; + rc.bottom = m_cyFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 5, 2, NULL))) + return FALSE; + + rc = m_rc; + rc.top = rc.bottom - m_cyFrame; + if (FAILED(DrawThemeEdge(hDC, 0, &rc, 10, 8, NULL))) + return FALSE; + + return TRUE; +} + +inline STDMETHODIMP_(void) +CUIFWndFrame::OnPaintNoTheme(HDC hDC) +{ + if (!m_pScheme) + return; + + DWORD type = 0; + if ((m_style & 0xF) == 1) + type = 1; + else if ( (m_style & 0xF) == 2 ) + type = 2; + + m_pScheme->DrawWndFrame(hDC, &m_rc, type, m_cxFrame, m_cyFrame); +} + +inline STDMETHODIMP_(BOOL) +CUIFWndFrame::OnSetCursor(UINT uMsg, LONG x, LONG y) +{ + DWORD dwHitTest = m_dwHitTest; + if (!IsCapture()) + dwHitTest = m_style & HitTest(x, y); + + LPTSTR pszCursor = NULL; + switch (dwHitTest) + { + case 0x30: + case 0xC0: + pszCursor = IDC_SIZENWSE; + break; + case 0x90: + case 0x60: + pszCursor = IDC_SIZENESW; + break; + case 0x10: + case 0x40: + pszCursor = IDC_SIZEWE; + break; + case 0x20: + case 0x80: + pszCursor = IDC_SIZENS; + break; + default: + return FALSE; + } + + HCURSOR hCursor = ::LoadCursor(NULL, pszCursor); + ::SetCursor(hCursor); + return TRUE; +}

12 months

[reactos] 01/01: [SDK][VIRTIO][NETKVM] Make VirtIO a separate library (#6280)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823fdb19d75b29352b162… commit 823fdb19d75b29352b1621e16f5c955153d90ed3 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Wed Jan 17 02:55:35 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 16 17:55:35 2024 -0800 [SDK][VIRTIO][NETKVM] Make VirtIO a separate library (#6280) * [SDK][VIRTIO][NETKVM] Make VirtIO a separate library This is to avoid code duplication when more VirtIO drivers are brought in. This will also be used on development of a VirtIO XDDM GPU Driver. * [VIRTIO] Sync with upstream --- drivers/network/dd/netkvm/CMakeLists.txt | 10 +++------- media/doc/3rd Party Files.txt | 8 +++++++- sdk/lib/drivers/CMakeLists.txt | 1 + sdk/lib/drivers/virtio/CMakeLists.txt | 17 +++++++++++++++++ .../dd/netkvm => sdk/lib/drivers}/virtio/LICENSE | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/VirtIO.h | 0 .../netkvm => sdk/lib/drivers}/virtio/VirtIOPCICommon.c | 0 .../netkvm => sdk/lib/drivers}/virtio/VirtIOPCILegacy.c | 0 .../netkvm => sdk/lib/drivers}/virtio/VirtIOPCIModern.c | 5 +++++ .../lib/drivers}/virtio/VirtIORing-Packed.c | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/VirtIORing.c | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/kdebugprint.h | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/linux/types.h | 0 .../lib/drivers}/virtio/linux/virtio_config.h | 0 .../lib/drivers}/virtio/linux/virtio_types.h | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/osdep.h | 2 ++ .../dd/netkvm => sdk/lib/drivers}/virtio/virtio_pci.h | 0 .../lib/drivers}/virtio/virtio_pci_common.h | 0 .../dd/netkvm => sdk/lib/drivers}/virtio/virtio_ring.h | 0 .../drivers}/virtio/windows/virtio_ring_allocation.h | 0 20 files changed, 35 insertions(+), 8 deletions(-) diff --git a/drivers/network/dd/netkvm/CMakeLists.txt b/drivers/network/dd/netkvm/CMakeLists.txt index 26ff48a184b..7aa1ca6d146 100644 --- a/drivers/network/dd/netkvm/CMakeLists.txt +++ b/drivers/network/dd/netkvm/CMakeLists.txt @@ -1,5 +1,6 @@ -include_directories(BEFORE Common virtio) +include_directories(BEFORE Common + ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/virtio) add_definitions( -DNDIS_MINIPORT_DRIVER @@ -11,16 +12,12 @@ list(APPEND SOURCE Common/ParaNdis-VirtIO.c Common/ParaNdis-Debug.c Common/sw-offload.c - virtio/VirtIOPCICommon.c - virtio/VirtIOPCILegacy.c - virtio/VirtIOPCIModern.c - virtio/VirtIORing.c - virtio/VirtIORing-Packed.c wxp/ParaNdis5-Driver.c wxp/ParaNdis5-Impl.c wxp/ParaNdis5-Oid.c) add_library(netkvm MODULE ${SOURCE} wxp/parandis.rc) +target_link_libraries(netkvm virtio) set_module_type(netkvm kernelmodedriver) add_importlibs(netkvm ndis ntoskrnl hal) add_cd_file(TARGET netkvm DESTINATION reactos/system32/drivers FOR all) @@ -29,7 +26,6 @@ add_driver_inf(netkvm netkvm.inf) if(NOT MSVC) target_compile_options(netkvm PRIVATE -Wno-unused-function - -Wno-unknown-pragmas -Wno-pointer-sign -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index b39199a5cd6..83175a78dd9 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -74,6 +74,12 @@ Used Version: 20221020 License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) URL: https://acpica.org/ +Title: VirtIO Windows guest driver library +Path: sdk/lib/drivers/virtio +Used Version: git commit 4c4d181 +License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) +URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/master/VirtIO + Title: WinBtrfs Path: dll/shellext/shellbtrfs Path: drivers/filesystems/btrfs @@ -115,7 +121,7 @@ Title: VirtIO NetKVM Windows guest driver Path: drivers/network/dd/netkvm Used Version: git commit 5e01b36 License: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) -URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/master/NetKVM/… +URL: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/03ca1696b9474d… Title: Microsoft CDROM Storage Class Driver Path: drivers/storage/class/cdrom diff --git a/sdk/lib/drivers/CMakeLists.txt b/sdk/lib/drivers/CMakeLists.txt index 2dd4251706e..4e43c7f8bec 100644 --- a/sdk/lib/drivers/CMakeLists.txt +++ b/sdk/lib/drivers/CMakeLists.txt @@ -9,4 +9,5 @@ add_subdirectory(rdbsslib) add_subdirectory(rtlver) add_subdirectory(rxce) add_subdirectory(sound) +add_subdirectory(virtio) add_subdirectory(wdf) diff --git a/sdk/lib/drivers/virtio/CMakeLists.txt b/sdk/lib/drivers/virtio/CMakeLists.txt new file mode 100644 index 00000000000..c7cffcc09a7 --- /dev/null +++ b/sdk/lib/drivers/virtio/CMakeLists.txt @@ -0,0 +1,17 @@ + +list(APPEND SOURCE + VirtIOPCICommon.c + VirtIOPCILegacy.c + VirtIOPCIModern.c + VirtIORing.c + VirtIORing-Packed.c) + +add_library(virtio ${SOURCE}) +add_dependencies(virtio xdk) + +if(NOT MSVC) + target_compile_options(virtio PRIVATE + -Wno-unused-function + -Wno-unknown-pragmas + -Wno-attributes) +endif() diff --git a/drivers/network/dd/netkvm/virtio/LICENSE b/sdk/lib/drivers/virtio/LICENSE similarity index 100% rename from drivers/network/dd/netkvm/virtio/LICENSE rename to sdk/lib/drivers/virtio/LICENSE diff --git a/drivers/network/dd/netkvm/virtio/VirtIO.h b/sdk/lib/drivers/virtio/VirtIO.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIO.h rename to sdk/lib/drivers/virtio/VirtIO.h diff --git a/drivers/network/dd/netkvm/virtio/VirtIOPCICommon.c b/sdk/lib/drivers/virtio/VirtIOPCICommon.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIOPCICommon.c rename to sdk/lib/drivers/virtio/VirtIOPCICommon.c diff --git a/drivers/network/dd/netkvm/virtio/VirtIOPCILegacy.c b/sdk/lib/drivers/virtio/VirtIOPCILegacy.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIOPCILegacy.c rename to sdk/lib/drivers/virtio/VirtIOPCILegacy.c diff --git a/drivers/network/dd/netkvm/virtio/VirtIOPCIModern.c b/sdk/lib/drivers/virtio/VirtIOPCIModern.c similarity index 98% rename from drivers/network/dd/netkvm/virtio/VirtIOPCIModern.c rename to sdk/lib/drivers/virtio/VirtIOPCIModern.c index 8a44a2b3465..7d303069d90 100644 --- a/drivers/network/dd/netkvm/virtio/VirtIOPCIModern.c +++ b/sdk/lib/drivers/virtio/VirtIOPCIModern.c @@ -184,6 +184,11 @@ static void vio_modern_reset(VirtIODevice *vdev) * including MSI-X interrupts, if any. */ while (ioread8(vdev, &vdev->common->device_status)) { + u16 val; + if (pci_read_config_word(vdev, 0, &val) || val == 0xffff) { + DPrintf(0, "PCI config space is not readable, probably the device is removed\n", 0); + break; + } vdev_sleep(vdev, 1); } } diff --git a/drivers/network/dd/netkvm/virtio/VirtIORing-Packed.c b/sdk/lib/drivers/virtio/VirtIORing-Packed.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIORing-Packed.c rename to sdk/lib/drivers/virtio/VirtIORing-Packed.c diff --git a/drivers/network/dd/netkvm/virtio/VirtIORing.c b/sdk/lib/drivers/virtio/VirtIORing.c similarity index 100% rename from drivers/network/dd/netkvm/virtio/VirtIORing.c rename to sdk/lib/drivers/virtio/VirtIORing.c diff --git a/drivers/network/dd/netkvm/virtio/kdebugprint.h b/sdk/lib/drivers/virtio/kdebugprint.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/kdebugprint.h rename to sdk/lib/drivers/virtio/kdebugprint.h diff --git a/drivers/network/dd/netkvm/virtio/linux/types.h b/sdk/lib/drivers/virtio/linux/types.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/linux/types.h rename to sdk/lib/drivers/virtio/linux/types.h diff --git a/drivers/network/dd/netkvm/virtio/linux/virtio_config.h b/sdk/lib/drivers/virtio/linux/virtio_config.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/linux/virtio_config.h rename to sdk/lib/drivers/virtio/linux/virtio_config.h diff --git a/drivers/network/dd/netkvm/virtio/linux/virtio_types.h b/sdk/lib/drivers/virtio/linux/virtio_types.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/linux/virtio_types.h rename to sdk/lib/drivers/virtio/linux/virtio_types.h diff --git a/drivers/network/dd/netkvm/virtio/osdep.h b/sdk/lib/drivers/virtio/osdep.h similarity index 96% rename from drivers/network/dd/netkvm/virtio/osdep.h rename to sdk/lib/drivers/virtio/osdep.h index b1c98145060..36a929294f4 100644 --- a/drivers/network/dd/netkvm/virtio/osdep.h +++ b/sdk/lib/drivers/virtio/osdep.h @@ -24,8 +24,10 @@ #endif #ifndef __REACTOS__ +#if !defined(ENOSPC) #define ENOSPC 1 #endif +#endif #if !defined(__cplusplus) && !defined(bool) // Important note: in MSFT C++ bool length is 1 bytes diff --git a/drivers/network/dd/netkvm/virtio/virtio_pci.h b/sdk/lib/drivers/virtio/virtio_pci.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/virtio_pci.h rename to sdk/lib/drivers/virtio/virtio_pci.h diff --git a/drivers/network/dd/netkvm/virtio/virtio_pci_common.h b/sdk/lib/drivers/virtio/virtio_pci_common.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/virtio_pci_common.h rename to sdk/lib/drivers/virtio/virtio_pci_common.h diff --git a/drivers/network/dd/netkvm/virtio/virtio_ring.h b/sdk/lib/drivers/virtio/virtio_ring.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/virtio_ring.h rename to sdk/lib/drivers/virtio/virtio_ring.h diff --git a/drivers/network/dd/netkvm/virtio/windows/virtio_ring_allocation.h b/sdk/lib/drivers/virtio/windows/virtio_ring_allocation.h similarity index 100% rename from drivers/network/dd/netkvm/virtio/windows/virtio_ring_allocation.h rename to sdk/lib/drivers/virtio/windows/virtio_ring_allocation.h

12 months

[reactos] 02/02: [NTOS:KE/x64] Fix boot process affinity

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96d5b6281d67b25165b29… commit 96d5b6281d67b25165b293b4bbfb8e85fddf91a0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Dec 23 13:23:40 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 16 08:15:53 2024 +0100 [NTOS:KE/x64] Fix boot process affinity --- ntoskrnl/ke/amd64/krnlinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/krnlinit.c b/ntoskrnl/ke/amd64/krnlinit.c index 234628a3d46..34d1a6621f6 100644 --- a/ntoskrnl/ke/amd64/krnlinit.c +++ b/ntoskrnl/ke/amd64/krnlinit.c @@ -292,7 +292,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, PageDirectory[1] = 0; KeInitializeProcess(InitProcess, 0, - 0xFFFFFFFF, + MAXULONG_PTR, PageDirectory, FALSE); InitProcess->QuantumReset = MAXCHAR;

12 months

[reactos] 01/02: [NTOS:KE] Fix some KAFFINITYs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ee23d33ac70fd93276a0… commit 1ee23d33ac70fd93276a0c6fd5adda8975fa382a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Dec 23 11:19:28 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 16 08:15:53 2024 +0100 [NTOS:KE] Fix some KAFFINITYs --- ntoskrnl/include/internal/ke.h | 4 ++-- ntoskrnl/ke/thrdobj.c | 18 ++++++++++-------- ntoskrnl/ke/thrdschd.c | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index 6a477545c44..ba3a5079a95 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -137,7 +137,7 @@ extern LIST_ENTRY KiProcessInSwapListHead, KiProcessOutSwapListHead; extern LIST_ENTRY KiStackInSwapListHead; extern KEVENT KiSwapEvent; extern PKPRCB KiProcessorBlock[]; -extern ULONG_PTR KiIdleSummary; +extern KAFFINITY KiIdleSummary; extern PVOID KeUserApcDispatcher; extern PVOID KeUserCallbackDispatcher; extern PVOID KeUserExceptionDispatcher; @@ -379,7 +379,7 @@ UCHAR NTAPI KeFindNextRightSetAffinity( IN UCHAR Number, - IN ULONG Set + IN KAFFINITY Set ); VOID diff --git a/ntoskrnl/ke/thrdobj.c b/ntoskrnl/ke/thrdobj.c index 1fc58b99c9e..6fca3821411 100644 --- a/ntoskrnl/ke/thrdobj.c +++ b/ntoskrnl/ke/thrdobj.c @@ -20,9 +20,10 @@ extern LIST_ENTRY PspReaperListHead; UCHAR NTAPI KeFindNextRightSetAffinity(IN UCHAR Number, - IN ULONG Set) + IN KAFFINITY Set) { - ULONG Bit, Result; + KAFFINITY Bit; + ULONG Result; ASSERT(Set != 0); /* Calculate the mask */ @@ -32,7 +33,7 @@ KeFindNextRightSetAffinity(IN UCHAR Number, if (!Bit) Bit = Set; /* Now find the right set and return it */ - BitScanReverse(&Result, Bit); + BitScanReverseAffinity(&Result, Bit); return (UCHAR)Result; } @@ -491,7 +492,7 @@ KeStartThread(IN OUT PKTHREAD Thread) #ifdef CONFIG_SMP PKNODE Node; PKPRCB NodePrcb; - ULONG Set, Mask; + KAFFINITY Set, Mask; #endif UCHAR IdealProcessor = 0; PKPROCESS Process = Thread->ApcState.Process; @@ -526,7 +527,7 @@ KeStartThread(IN OUT PKTHREAD Thread) #else Set = ~NodePrcb->MultiThreadProcessorSet; #endif - Mask = (ULONG)(Node->ProcessorMask & Process->Affinity); + Mask = Node->ProcessorMask & Process->Affinity; Set &= Mask; if (Set) Mask = Set; @@ -1122,7 +1123,8 @@ KeSetSystemAffinityThread(IN KAFFINITY Affinity) #ifdef CONFIG_SMP if (!(Affinity & AFFINITY_MASK(CurrentThread->IdealProcessor))) { - ULONG AffinitySet, NodeMask; + KAFFINITY AffinitySet, NodeMask; + ULONG IdealProcessor; /* It's not! Get the PRCB */ Prcb = KiProcessorBlock[CurrentThread->IdealProcessor]; @@ -1137,8 +1139,8 @@ KeSetSystemAffinityThread(IN KAFFINITY Affinity) } /* Calculate the ideal CPU from the affinity set */ - BitScanReverse(&NodeMask, AffinitySet); - CurrentThread->IdealProcessor = (UCHAR)NodeMask; + BitScanReverseAffinity(&IdealProcessor, AffinitySet); + CurrentThread->IdealProcessor = (UCHAR)IdealProcessor; } #endif diff --git a/ntoskrnl/ke/thrdschd.c b/ntoskrnl/ke/thrdschd.c index a3235d221a4..40801ff5bee 100644 --- a/ntoskrnl/ke/thrdschd.c +++ b/ntoskrnl/ke/thrdschd.c @@ -22,8 +22,8 @@ /* GLOBALS *******************************************************************/ -ULONG_PTR KiIdleSummary; -ULONG_PTR KiIdleSMTSummary; +KAFFINITY KiIdleSummary; +KAFFINITY KiIdleSMTSummary; /* FUNCTIONS *****************************************************************/

12 months

[reactos] 01/01: [DESK] Update Romanian (ro-RO) translation (#6350)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a175a88fcb23068864bf4… commit a175a88fcb23068864bf4319537059b8dc6ebcc5 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jan 15 23:25:11 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 15 22:25:11 2024 +0100 [DESK] Update Romanian (ro-RO) translation (#6350) --- dll/cpl/desk/lang/ro-RO.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 89d3b9a8a3e..0deedbffd4b 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -30,12 +30,12 @@ BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 - LTEXT "Alegeți o imagine pentru a o folosi ca decor de birou.", IDC_STATIC, 8, 93, 230, 9 + LTEXT "Selectați o imagine pentru a o folosi ca fundal de desktop.", IDC_STATIC, 8, 93, 230, 9 PUSHBUTTON "Spe&cificare…", IDC_BROWSE_BUTTON, 188, 104, 55, 15 PUSHBUTTON "C&uloare…", IDC_COLOR_BUTTON, 188, 167, 55, 15 - LTEXT "Amplasament", IDC_STATIC, 188, 128, 55, 9 + LTEXT "Poziție", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Personalizează &biroul...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 + PUSHBUTTON "Personalizează &desktopul...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -166,7 +166,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Pictograme de birou", IDC_STATIC, 6, 4, 212, 40 + GROUPBOX "Pictograme de desktop", IDC_STATIC, 6, 4, 212, 40 CONTROL "&Documente", IDC_ICONS_MYDOCS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 CONTROL "Locurile din &rețeaua mea", IDC_ICONS_MYNET, "button", @@ -242,7 +242,7 @@ END STRINGTABLE BEGIN - IDS_DESKTOP_ITEMS "Elemente de birou" + IDS_DESKTOP_ITEMS "Elemente de desktop" END STRINGTABLE @@ -255,7 +255,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Afișaj" - IDS_CPLDESCRIPTION "Personalizează afișajului biroului și protectorului de ecran." + IDS_CPLDESCRIPTION "Personalizează afișajului desktopului și al protectorului de ecran." IDS_NONE "(nespecificată)" IDS_CENTER "Centrat" IDS_STRETCH "Extins"

12 months

[reactos] 01/01: [CMD] Update Romanian (ro-RO) translation (#6366)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e084cbc7c3a48cb07bdd4… commit e084cbc7c3a48cb07bdd4cd8198b3fb89a8cb349 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jan 15 23:23:07 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 15 22:23:07 2024 +0100 [CMD] Update Romanian (ro-RO) translation (#6366) --- base/shell/cmd/lang/ro-RO.rc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 90cfeb9dc36..2d04f4145d5 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -50,7 +50,7 @@ CHOICE [/C[:]opțiuni][/N][/S][/T[:]implicit,nn][text]\n\n\ /S Distinge diferențele între majuscule și minuscule.\n\ /T[:]implicit,nn Alege «implicit» după «nn» secunde.\n\ text Textul interogării.\n\n\ -ERRORLEVEL este calibrat pe deplasamentul tastei opțiunii alese de utilizator.\n" +ERRORLEVEL este setat la compensarea tastelor apăsate de utilizator în opțiuni\n" STRING_CLS_HELP "Curăță ecranul.\n\nCLS\n" STRING_CMD_HELP1 "\nComenzile interne disponibile:\n" STRING_CMD_HELP2 "\nFuncționalitățile disponibile:" @@ -72,12 +72,12 @@ COLOR [attr [/-F]]\n\n\ attr Atributele de culoare pentru consolă.\n\ /-F Omite umplerea spațiului gol al consolei.\n\n\ Există trei moduri de formulare a atributelor de culoare:\n\ -1) nume_englez ON nume_englez\n\ +1) nume_englezesc ON nume_englezesc\n\ (sunt suficiente doar primele trei litere per cuvânt)\n\ 2) cod_zecimal ON cod_zecimal\n\ 3) o combinație din două caractere (coduri) hexazecimale alăturate\n\n\ Culorile disponibile:\n\ -CULOARE ZEC. HEX. NUME ENGLEZ\n\ +CULOARE ZEC. HEX. NUME ENGLEZESC\n\ negru 0 0 Black\n\ albastru naval 1 1 Blue\n\ verde 2 2 Green\n\ @@ -98,7 +98,7 @@ Exemple:\n\ COLOR green ON bright white\n\ COLOR 0 ON 7\n\ COLOR 8F /-F\n" - STRING_COPY_HELP1 "Suprascrieți «%s» (Da|Nu|Toate)? " + STRING_COPY_HELP1 "Suprascrieți «%s» (Da/Nu/Toate)? " STRING_COPY_HELP2 "Copiază unul sau mai multe fișiere într-un alt loc.\n\n\ COPY [/V][/Y|/-Y][/A|/B] sursă [/A|/B]\n\ [+ sursă [/A|/B] [+ ...]] [destinație [/A|/B]]\n\n\ @@ -147,7 +147,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]atribute]] fișier ...\n\n\ A Arhivabil\n\ H Ascuns\n\ - Prefix de negație\n" - STRING_DEL_HELP2 "Toate fișierele din director vor fi șterse!\nConfirmați ștergerea (Da|Nu)? " + STRING_DEL_HELP2 "Toate fișierele din director vor fi șterse!\nConfirmați ștergerea (Da/Nu)? " STRING_DEL_HELP3 " %lu fișier(e) șters(e)\n" STRING_DEL_HELP4 " %lu fișier(e) șters(e)\n" STRING_DELAY_HELP "Pauză pentru n secunde sau milisecunde.\n\ @@ -197,7 +197,7 @@ De exemplu /-W.\n" STRING_DIR_HELP3 " Volumul unității %c nu este etichetat.\n" STRING_DIR_HELP4 " Numărul de serie al volumului este %04X-%04X\n" STRING_DIR_HELP5 "\n Numărul de fișiere enumerate:\n%16i fișier(e) %14s octeți\n" - STRING_DIR_HELP6 "%16i dir-re %14s octeți liberi\n" + STRING_DIR_HELP6 "%16i director/directoare %14s octeți liberi\n" STRING_DIR_HELP7 "\n Directorul %s\n\n" STRING_DIR_HELP8 "%16i fișier(e) %14s octeți\n" STRING_DIRSTACK_HELP1 "Înregistrează directorul curent în stivă, pentru a-l accesa\n\ @@ -233,8 +233,8 @@ Tastați ECHO fără argumente pentru afișarea stării curente a ecoului.\n" FOR %variablă IN (grup) DO comandă [argumente]\n\ FOR /L %variablă IN (start,step,end) DO comandă [argumente]\n\ FOR /D %variablă IN (grup) DO comandă [argumente]\n\ -FOR /R [[drive:]path] IN (grup) DO comandă [argumente]\n\ -FOR /F [""options""] IN (grup) DO comandă [argumente]\n\n\ +FOR /R [[disc:]cale] IN (grup) DO comandă [argumente]\n\ +FOR /F [""opțiuni""] IN (grup) DO comandă [argumente]\n\n\ /L Generates a number sequence from start to end incrementing by step.\n\ /D Modifies the set to refer to directories instead of files.\n\ /R Executes command for files in the set in the specified path (or current\n\ @@ -299,7 +299,7 @@ legătură simbolică." %13s octeți în total în memoria virtuală.\n\ %13s octeți disponibili în memoria virtuală.\n" STRING_MISC_HELP1 "Tastați pentru a continua..." - STRING_MOVE_HELP1 "Suprascrieți «%s» (Da|Nu|Toate)?" + STRING_MOVE_HELP1 "Suprascrieți «%s» (Da/Nu/Toate)?" STRING_MOVE_HELP2 "Mută sau redenumește fișiere și directoare.\n\n\ Pentru a muta unul sau mai multe fișiere:\n\ MOVE [/N][/Y|/-Y][disc:][cale]fișier[,...] destinație\n\n\ @@ -400,8 +400,8 @@ REPLACE [disc1:][cale1]fișier [disc2:][cale2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP6 "Înlocuiește «%s»\n" STRING_REPLACE_HELP7 "Nu au fost adăugate fișiere\n" STRING_REPLACE_HELP8 "A(u) fost adăugat(e) %lu fișier(e)\n" - STRING_REPLACE_HELP9 "Adaugă «%s» (Da|Nu)? " - STRING_REPLACE_HELP10 "Înlocuiește «%s» (Da|Nu)? " + STRING_REPLACE_HELP9 "Adaugă «%s» (Da/Nu)? " + STRING_REPLACE_HELP10 "Înlocuiește «%s» (Da/Nu)? " STRING_REPLACE_HELP11 "Adăugare «%s»\n" STRING_SHIFT_HELP "Modifică poziția argumentelor înlocuibile într-un fișier de comenzi.\n\n\ SHIFT [DOWN]\n" @@ -416,7 +416,7 @@ SET [variablă[=][șir]]\n\n\ Tastați SET fără argumente pentru afișarea variabilelor curente.\n" STRING_START_HELP1 "Lansează o comandă.\n\n\ START [""titlu""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ - [comaandă/program] [parametri]\n\n\ + [comandă/program] [parametri]\n\n\ ""titlu"" Titlul ferestrei.\n\ path Specifică un director curent.\n\ I Utilizează mediul original dat de cmd.exe,\n\ @@ -524,7 +524,7 @@ titlu Noul titlu.\n" STRING_COPY_ERROR4 "Eroare: Încă nu a fost implementat!\n" STRING_DATE_ERROR "Dată nevalidă.\n" STRING_DEL_ERROR5 "Fișierul «%s» va fi șters!\n" - STRING_DEL_ERROR6 "Confirmați (Da|Nu)? " + STRING_DEL_ERROR6 "Confirmați (Da/Nu)? " STRING_DEL_ERROR7 "Ștergere: %s\n" STRING_ERROR_ERROR1 "Eroare necunoscută! Codul de eroare: 0x%lx\n" STRING_ERROR_ERROR2 "Eroare de sintaxă" @@ -550,21 +550,21 @@ titlu Noul titlu.\n" STRING_ERROR_PATH_NOT_FOUND "Calea nu este găsită\n" STRING_ERROR_FILE_NOT_FOUND "Fișierul nu este găsit\n" STRING_ERROR_REQ_PARAM_MISSING "Lipsește (cel puțin) un argument obligatoriu!\n" - STRING_ERROR_INVALID_DRIVE "Specificarea unității este eronată\n" + STRING_ERROR_INVALID_DRIVE "Specificarea discului este eronată\n" STRING_ERROR_INVALID_PARAM_FORMAT "Formatul argumentului este eronat - %s\n" STRING_ERROR_BADCOMMAND "Comandă eronată sau fișier inexistent - %s\n" STRING_ERROR_OUT_OF_MEMORY "Eroare de exces de memorie.\n" STRING_ERROR_CANNOTPIPE "Eroare! Nu se poate înlănțui! Nu se poate deschide fișierul temporar!\n" STRING_ERROR_D_PAUSEMSG "Tastați pentru a continua... " STRING_ERROR_DRIVER_NOT_READY "Discul de stocare nu e utilizabil" - STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" + STRING_SET_ENV_ERROR "Variabila de mediu '%s' nu este definită\n" STRING_REPLACE_ERROR1 "Argument eronat - %s\n" STRING_REPLACE_ERROR2 "Calea nu este găsită - %s\n" STRING_REPLACE_ERROR3 "Numele fișierului, directorului sau eticheta volumului este incorectă.\n" STRING_REPLACE_ERROR4 "Combinația de argumente nu este validă!\n" STRING_REPLACE_ERROR5 "Acces respins - %s\n" STRING_REPLACE_ERROR6 "Fișierele nu au fost găsite - %s\n" - STRING_REPLACE_ERROR7 "Eroare Extinsă 32\n" + STRING_REPLACE_ERROR7 "Eroare extinsă 32\n" STRING_CMD_INFOLINE " Interpretorul de comenzi ReactOS Tastați HELP = Ajutor " STRING_REACTOS_VERSION "ReactOS [Versiunea %s %s]\n" STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s" @@ -579,8 +579,8 @@ titlu Noul titlu.\n" STRING_MKLINK_CREATED_SYMBOLIC "A fost creată o legătură simbolică pentru %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "A fost creată o legătură permanentă pentru %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION "A fost creată o joncțiune pentru %s <<===>> %s\n" - STRING_MORE "Mai mult? " - STRING_CANCEL_BATCH_FILE "\r\nAți apăsat Ctrl-Break. Anulați fișierul de comenzi? (Da|Nu|Toate)" + STRING_MORE "Mai mult?" + STRING_CANCEL_BATCH_FILE "\r\nAți apăsat Ctrl-Break. Anulați fișierul de comenzi? (Da/Nu/Toate)" STRING_INVALID_OPERAND "Operand eronat.\n" STRING_EXPECTED_CLOSE_PAREN "Este necesar «)».\n" STRING_EXPECTED_NUMBER_OR_VARIABLE "Este necesar un număr sau un nume de variabilă.\n"

12 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