Ros-diffs July 2018

ros-diffs@reactos.org

17 participants
89 discussions

01/01: [TRANSLATIONS] Fix some Spanish translations (#715)
by Julio Carchi 31 Jul '18

31 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3045af9d5f243c7c6fec… commit d3045af9d5f243c7c6fec2b619f666dda4c23fba Author: Julio Carchi <contacto(a)julcar.info.tm> AuthorDate: Tue Jul 31 03:58:21 2018 -0500 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Tue Jul 31 10:58:21 2018 +0200 [TRANSLATIONS] Fix some Spanish translations (#715) Also added some new ones. --- dll/cpl/desk/lang/es-ES.rc | 8 +- dll/shellext/acppage/lang/es-ES.rc | 14 ++- dll/win32/browseui/lang/es-ES.rc | 24 +++-- dll/win32/shell32/lang/es-ES.rc | 210 +++++++++++++++++++------------------ dll/win32/userenv/lang/es-ES.rc | 11 +- 5 files changed, 146 insertions(+), 121 deletions(-) diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 3229eeda2d..c22c096da8 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -118,7 +118,7 @@ BEGIN "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Ocultar el subrayado de acceso rápido hasta presionar la tecla Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 - CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + CONTROL "Usar menús &planos", IDC_EFFAPPEARANCE_FLATMENUS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "Aceptar", IDOK, 172, 165, 50, 14 @@ -218,8 +218,8 @@ BEGIN IDS_CENTER "Centrada" IDS_STRETCH "Expandida" IDS_TILE "En mosaico" - IDS_FIT "Fit" - IDS_FILL "Fill" + IDS_FIT "Ajustar" + IDS_FILL "Rellenar" END STRINGTABLE @@ -276,5 +276,5 @@ BEGIN IDS_DISPLAY_SETTINGS "Configuración del monitor" IDS_APPLY_FAILED "Error al aplicar la nueva configuración..." IDS_APPLY_NEEDS_RESTART "Necesita reiniciar el equipo para aplicar los cambios." - IDS_TIMEOUTTEXT "Regresar a la última configuraciín en %d segundos." + IDS_TIMEOUTTEXT "Volver a la última configuración en %d segundos." END diff --git a/dll/shellext/acppage/lang/es-ES.rc b/dll/shellext/acppage/lang/es-ES.rc index 69e60c3aad..2d5e195e86 100644 --- a/dll/shellext/acppage/lang/es-ES.rc +++ b/dll/shellext/acppage/lang/es-ES.rc @@ -1,4 +1,10 @@ -/* Spanish translation by Samuel Serapión Vega */ +/* + * PROJECT: ReactOS Shell + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Samuel Serapión Vega + * Julio Carchi Ruiz + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -37,7 +43,7 @@ END STRINGTABLE BEGIN IDS_COMPAT_TITLE "Compatibilidad" - IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." - IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" + IDS_FAILED_NETWORK "No se puede establecer modo de compatibilidad para este programa porque se encuentra en una unidad de red." + IDS_FAILED_PROTECTED "No se puede establecer modo de compatibilidad para este programa porque es parte de ReactOS." + IDS_YOU_DID_NOT_ADD "No se ha añadido el modo, ¿desea añadirlo ahora?" END diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index b6d3ea6db0..1834f99b0e 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -1,4 +1,10 @@ -/* Spanish translation by ??? and Ismael Ferreras Morezuelas (Swyter) */ +/* + * PROJECT: ReactOS Win32 BrowseUI + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Ismael Ferreras Morezuelas + * Julio Carchi Ruiz + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -99,13 +105,13 @@ IDM_POPUPMENU MENUEX DISCARDABLE BEGIN POPUP "" BEGIN - POPUP "&View", IDM_VIEW_MENU + POPUP "&Ver", IDM_VIEW_MENU BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS + MENUITEM "Íconos &grandes", IDM_LARGE_ICONS + MENUITEM "Íconos &pequeños", IDM_SMALL_ICONS END - MENUITEM "&Open Folder", IDM_OPEN_FOLDER - MENUITEM "&Show Text", IDM_SHOW_TEXT + MENUITEM "&Abrir carpeta", IDM_OPEN_FOLDER + MENUITEM "&Mostrar texto", IDM_SHOW_TEXT END END @@ -297,7 +303,7 @@ END STRINGTABLE BEGIN - IDS_BROWSEFORNEWTOOLAR "Choose a folder" - IDS_TOOLBAR_ERR_TITLE "Toolbar" - IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." + IDS_BROWSEFORNEWTOOLAR "Seleccione una carpeta" + IDS_TOOLBAR_ERR_TITLE "Barra de herramientas" + IDS_TOOLBAR_ERR_TEXT "No se pudo crear la barra de herramientas." END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index ca0eb15982..1de25b0d0a 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -1,4 +1,10 @@ -/* Spanish translation by ??? and Ismael Ferreras Morezuelas (Swyter) */ +/* + * PROJECT: ReactOS Shell + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Ismael Ferreras Morezuelas + * Julio Carchi Ruiz + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -81,11 +87,11 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE - MENUITEM "&Move here", IDM_MOVEHERE - MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM "&Copiar aquí", IDM_COPYHERE + MENUITEM "&Mover aquí", IDM_MOVEHERE + MENUITEM "Crear &acceso directo aquí", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "Cancelar", 0 END END @@ -620,10 +626,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL CAPTION "Cambiar icono" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + LTEXT "Buscar íconos en este archivo:", -1, 7, 7, 179, 10 PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL - LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LTEXT "Seleccione un ícono de la siguiente lista:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14 @@ -644,74 +650,74 @@ sistema o comprometer su correcto funcionamiento.\n\n\ END IDD_NEWEXTENSION DIALOGEX 0, 0, 260, 75 -CAPTION "Create New Extension" +CAPTION "Crear nueva extensión" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&File Extension:", -1, 10, 10, 85, 14 + LTEXT "&Extensión de archivo:", -1, 10, 10, 85, 14 EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 - PUSHBUTTON "<< Ad&vanced", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 - LTEXT "&Associated File Type:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 + PUSHBUTTON "<< A&vanzado", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + LTEXT "&Tipo de archivo asociado:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 190, 55, 60, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 125, 55, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 190, 55, 60, 14 END IDD_EDITTYPE DIALOG 0, 0, 225, 190 -CAPTION "Edit File Type" +CAPTION "Editar tipo de archivo" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_EDITTYPE_ICON, 5, 8, 20, 20 EDITTEXT IDC_EDITTYPE_TEXT, 30, 10, 115, 14, ES_AUTOHSCROLL - PUSHBUTTON "Change &Icon...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 - LTEXT "&Actions:", -1, 5, 37, 70, 10 + PUSHBUTTON "Cambiar &Ícono...", IDC_EDITTYPE_CHANGE_ICON, 150, 10, 70, 14 + LTEXT "&Acciones:", -1, 5, 37, 70, 10 LISTBOX IDC_EDITTYPE_LISTBOX, 5, 50, 140, 60, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | LBS_OWNERDRAWFIXED | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&New...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 - PUSHBUTTON "&Edit...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 - PUSHBUTTON "&Remove", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 - PUSHBUTTON "&Set Default", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 - AUTOCHECKBOX "Confirm &open after download", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 - AUTOCHECKBOX "Al&ways show extension", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 - AUTOCHECKBOX "&Browse in same window", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 - DEFPUSHBUTTON "OK", IDOK, 95, 170, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 170, 60, 14 + PUSHBUTTON "&Nueva...", IDC_EDITTYPE_NEW, 150, 50, 70, 14 + PUSHBUTTON "&Editar...", IDC_EDITTYPE_EDIT_BUTTON, 150, 65, 70, 14 + PUSHBUTTON "E&liminar", IDC_EDITTYPE_REMOVE, 150, 80, 70, 14 + PUSHBUTTON "Establecer por &defecto", IDC_EDITTYPE_SET_DEFAULT, 150, 95, 70, 14 + AUTOCHECKBOX "Abrir al &terminar descarga", IDC_EDITTYPE_CONFIRM_OPEN, 5, 115, 150, 14 + AUTOCHECKBOX "Siempre &mostrar extensión", IDC_EDITTYPE_SHOW_EXT, 5, 130, 150, 14 + AUTOCHECKBOX "Examinar en la misma &ventana", IDC_EDITTYPE_SAME_WINDOW, 5, 145, 150, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 95, 170, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 160, 170, 60, 14 END IDD_ACTION DIALOG 0, 0, 225, 95 -CAPTION "New Action" +CAPTION "Nueva Acción" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Action:", -1, 5, 7, 150, 10 + LTEXT "&Acción:", -1, 5, 7, 150, 10 EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL - LTEXT "App&lication used to perform action:", -1, 5, 42, 150, 10 + LTEXT "&Programa utilizado para realizar esta acción:", -1, 5, 42, 150, 10 EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "B&rowse...", IDC_ACTION_BROWSE, 160, 60, 60, 14 - AUTOCHECKBOX "&Use DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 - DEFPUSHBUTTON "OK", IDOK, 160, 20, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 60, 14 + PUSHBUTTON "&Examinar...", IDC_ACTION_BROWSE, 160, 60, 60, 14 + AUTOCHECKBOX "Usar &DDE", IDC_ACTION_USE_DDE, 10, 75, 103, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 160, 20, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 160, 40, 60, 14 END IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 -CAPTION "Customize" +CAPTION "Personalizar" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "What kind of folder do you want?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP - LTEXT "Use this &folder type as a template:", IDC_STATIC, 15, 20, 210, 12 + GROUPBOX "¿Qué tipo de carpeta necesita?", IDC_STATIC, 5, 5, 230, 65, WS_TABSTOP + LTEXT "&Usar esta carpeta como plantilla:", IDC_STATIC, 15, 20, 210, 12 COMBOBOX IDC_FOLDERCUST_COMBOBOX, 15, 35, 210, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "Also apply this template to all &subfolders", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 - GROUPBOX "Folder pictures", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP - LTEXT "For Thumbnails view, you can put a picture on this folder to remind you of the contents.", IDC_STATIC, 15, 87, 115, 33 - PUSHBUTTON "Choose &Picture...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 - PUSHBUTTON "&Restore Default", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 - LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + AUTOCHECKBOX "Aplicar esta plantilla a todas las &sub carpetas", IDC_FOLDERCUST_CHECKBOX, 15, 50, 210, 15 + GROUPBOX "Carpeta de imágenes", IDC_STATIC, 5, 75, 230, 90, WS_TABSTOP + LTEXT "Para ver miniaturas, guarde una imagen en esta carpeta para recordar su contenido.", IDC_STATIC, 15, 87, 115, 33 + PUSHBUTTON "Seleccionar &imagen...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 + PUSHBUTTON "&Restaurar por defecto", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 + LTEXT "Previsualizar:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 - GROUPBOX "Folder icons", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP - LTEXT "For all views except Thumbnails, you can change the standard ""folder"" icon to another icon.", IDC_STATIC, 15, 180, 210, 25 + GROUPBOX "Íconos de carpeta", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP + LTEXT "Para todas las vistas excepto miniaturas, usted puede cambiar el ícono por defecto de ""carpeta"" con otro ícono.", IDC_STATIC, 15, 180, 210, 25 ICON 0, IDC_FOLDERCUST_ICON, 175, 209, 32, 30 - PUSHBUTTON "Change &Icon...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 + PUSHBUTTON "&Cambiar ícono...", IDC_FOLDERCUST_CHANGE_ICON, 15, 210, 75, 15 END STRINGTABLE @@ -747,10 +753,10 @@ BEGIN IDS_ADMINISTRATIVETOOLS "Herramientas administrativas" /* special folders descriptions */ - IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." - IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." - IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." - IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configuraciones administrativas para su computadora." + IDS_FOLDER_OPTIONS_DESCRIPTION "Personalize archivos y carpetas, y cambie asociaciones de archivos." + IDS_FONTS_DESCRIPTION "Añada, cambie y administre las fuentes de su computadora." + IDS_PRINTERS_DESCRIPTION "Muestra impresoras y faxes instalados y le ayuda a configurar nuevos." /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" @@ -768,11 +774,11 @@ BEGIN IDS_FORMATDRIVE "Formatear..." IDS_RENAME "Renombrar" IDS_PASTE "Insertar" - IDS_EJECT "Eject" - IDS_DISCONNECT "Disconnect" + IDS_EJECT "Extraer" + IDS_DISCONNECT "Desconectar" - IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" - IDS_CREATEFOLDER_CAPTION "Unable to create folder" + IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'" + IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta" IDS_DELETEITEM_CAPTION "Confirmar eliminación de archivos" IDS_DELETEFOLDER_CAPTION "Confirmar eliminación de carpetas" IDS_DELETEITEM_TEXT "¿Seguro que desea eliminar '%1'?" @@ -811,7 +817,7 @@ BEGIN IDS_FAVORITES "Favoritos" IDS_STARTUP "Menú Inicio\\Programas\\Inicio" IDS_RECENT "Reciente" - IDS_SENDTO "SendTo" + IDS_SENDTO "Enviar a" IDS_STARTMENU "Menú Inicio" IDS_MYMUSIC "Mis documentos\\Mi música" IDS_MYVIDEO "Mis documentos\\Mis vídeos" @@ -863,11 +869,11 @@ BEGIN IDS_PICK_ICON_FILTER "Archivos de icono (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Todos los archivos (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "Programas (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0" - IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." - IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." - IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTLOCKVOLUME "No se pudo bloquear la unidad (Error Code: %lu)." + IDS_CANTDISMOUNTVOLUME "No se pudo desmontar la unidad (Error Code: %lu)." + IDS_CANTEJECTMEDIA "No se pudo extraer la unidad (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "No se puede mostrar las propiedades (Error Code: %lu)." + IDS_CANTDISCONNECT "No se pudo desconectar (Error Code: %lu)." /* Friendly File Type Names */ IDS_DIRECTORY "Directorio" @@ -876,27 +882,27 @@ BEGIN IDS_COM_FILE "Aplicación DOS" IDS_CPL_FILE "Elemento del Panel de control" IDS_CUR_FILE "Cursor" - IDS_DB__FILE "Database File" + IDS_DB__FILE "Base de datos" IDS_DLL_FILE "Biblioteca de aplicación" IDS_DRV_FILE "Controlador de dispositivo" - IDS_EFI_FILE "Extensible Firmware Interface Executable" + IDS_EFI_FILE "Aplicación EFI (Extensible Firmware Interface)" IDS_EXE_FILE "Aplicación" - IDS_NLS_FILE "National Language Support File" - IDS_OCX_FILE "ActiveX Control" - IDS_TLB_FILE "Type Library" + IDS_NLS_FILE "Archivo NLS (National Language Support)" + IDS_OCX_FILE "Control ActiveX" + IDS_TLB_FILE "Librería de tipos" IDS_FON_FILE "Archivo de fuente" IDS_TTF_FILE "Archivo de fuente TrueType" IDS_OTF_FILE "Archivo de fuente OpenType" IDS_HLP_FILE "Archivo de ayuda" - IDS_ICO_FILE "Icon" + IDS_ICO_FILE "Ícono" IDS_INI_FILE "Archivo de configuración" IDS_LNK_FILE "Acceso directo" - IDS_NT__FILE "NT DOS32 Configuration File" + IDS_NT__FILE "Archivo de configuración NT DOS32" IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" + IDS_SCR_FILE "Protector de pantalla" IDS_SYS_FILE "Archivo del sistema" IDS_VXD_FILE "Controlador de dispositivo virtual" - IDS_ANY_FILE "%s-file" + IDS_ANY_FILE "Archivo %s" IDS_OPEN_VERB "Abrir" IDS_EXPLORE_VERB "Explorar" @@ -932,40 +938,40 @@ BEGIN IDS_OBJECTS "%d elementos" IDS_OBJECTS_SELECTED "%d elementos seleccionados" - IDS_ADVANCED_FOLDER "Files and Folders" - IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers" - IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips" - IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list" - IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders" - IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar" - IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar" - IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails" - IDS_ADVANCED_HIDDEN "Hidden files and folders" - IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders" - IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders" - IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types" - IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)" - IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process" - IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" - IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" - IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" - IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" - IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" - - IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced" - IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" - IDS_NEWEXT_NEW "<New>" - IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" - IDS_NEWEXT_EXT_IN_USE "Extension is in use" - - IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" - IDS_SPECIFY_ACTION "You must specify an action." - IDS_INVALID_PROGRAM "The specified program could not be found. Make sure the file name and path are correct." - IDS_REMOVE_ACTION "Are you sure you want to remove this action?" - IDS_ACTION_EXISTS "The action '%s' is already registered for this file type. Please enter a different name and try again." + IDS_ADVANCED_FOLDER "Archivos y carpetas" + IDS_ADVANCED_NET_CRAWLER "Buscar automáticamente carpetas e impresoras en red" + IDS_ADVANCED_FOLDER_SIZE_TIP "Mostrar tamaño de la carpeta" + IDS_ADVANCED_FRIENDLY_TREE "Mostrar vista simple en lista de carpetas" + IDS_ADVANCED_WEB_VIEW_BARRICADE "Mostrar el cotenido de carpetas del sistema" + IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Mostrar la ruta completa en la barra de direcciones" + IDS_ADVANCED_SHOW_FULL_PATH "Mostrar la ruta completa en la barra de título" + IDS_ADVANCED_DISABLE_THUMB_CACHE "No guardar caché de las vistas en miniatura" + IDS_ADVANCED_HIDDEN "Archivos y carpetas ocultos" + IDS_ADVANCED_DONT_SHOW_HIDDEN "No mostrar archivos y carpetas ocultos" + IDS_ADVANCED_SHOW_HIDDEN "Mostrar archivos y carpetas ocultos" + IDS_ADVANCED_HIDE_FILE_EXT "Ocultar extensiones para tipos de archivos conocidos" + IDS_ADVANCED_SUPER_HIDDEN "Ocultar archivos protegidos del sistema operativo (Recomendado)" + IDS_ADVANCED_DESKTOP_PROCESS "Abrir carpetas en procesos separados" + IDS_ADVANCED_CLASSIC_VIEW_STATE "Recordar vistas personalizadas en carpetas" + IDS_ADVANCED_PERSIST_BROWSERS "Restaurar carpetas abiertas al iniciar sesión" + IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Mostrar Panel de Control en Mi PC" + IDS_ADVANCED_SHOW_COMP_COLOR "Mostrar en color archivos NTFS comprimidos o encriptados" + IDS_ADVANCED_SHOW_INFO_TIP "Mostrar descripción de íconos y carpetas en el escritorio" + + IDS_NEWEXT_ADVANCED_LEFT "<< A&vanzado" + IDS_NEWEXT_ADVANCED_RIGHT "A&vanzado >>" + IDS_NEWEXT_NEW "<Nuevo>" + IDS_NEWEXT_SPECIFY_EXT "Debe especificar una extensión." + IDS_NEWEXT_ALREADY_ASSOC "La extensión %s ya está asociada con el tipo de archivo %s. ¿Desea desasociar %s con %s y crear un nuevo tipo de arcivo?" + IDS_NEWEXT_EXT_IN_USE "Ésta extensión ya está en uso" + + IDS_REMOVE_EXT "Si elimina una extensión de archivo, no podrá abrir archivos con esa extensión haciendo doble click en sus íconos.\n\n¿Está seguro de eliminar esta extensión?" + IDS_SPECIFY_ACTION "Debe especificar una acción." + IDS_INVALID_PROGRAM "No se pudo encontrar el programa. Verifique que el nombre de archivo y la ruta son correctos." + IDS_REMOVE_ACTION "¿Está seguro de eliminar esta acción?" + IDS_ACTION_EXISTS "La acción '%s' ya está registrada para este tipo de archivo. Intente nuevamente con otro nombre." IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" - IDS_EDITING_ACTION "Editing action for type: " - IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." - IDS_FILE_NOT_FOUND "The file '%s' was not found." + IDS_EDITING_ACTION "Editar acción: " + IDS_NO_ICONS "El archivo '%s' no contiene íconos.\n\nEscoja un ícono de la lista o seleccione otro archivo." + IDS_FILE_NOT_FOUND "El archivo '%s' no pudo ser encontrado." END diff --git a/dll/win32/userenv/lang/es-ES.rc b/dll/win32/userenv/lang/es-ES.rc index ce38e96a1f..0551571990 100644 --- a/dll/win32/userenv/lang/es-ES.rc +++ b/dll/win32/userenv/lang/es-ES.rc @@ -1,4 +1,11 @@ -/* Spanish translation by Samuel Serapión Vega, Marc Piulachs */ +/* + * PROJECT: ReactOS Win32 User Environment + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Samuel Serapión Vega + * Marc Piulachs + * Julio Carchi Ruiz + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -12,7 +19,7 @@ BEGIN IDS_NETHOOD "Entorno de red" IDS_PRINTHOOD "Impresoras" IDS_RECENT "Reciente" - IDS_SENDTO "SendTo" + IDS_SENDTO "Enviar a" IDS_TEMPLATES "Plantillas" IDS_STARTMENU "Menú Inicio" IDS_PROGRAMS "Menú Inicio\\Programas"

1 0

01/01: [RAPPS] Deselect apps after installing
by Phil Eaton 30 Jul '18

30 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5c1aa41290d568f60e1b… commit b5c1aa41290d568f60e1bcd9a6b4e880b3bc3d38 Author: Phil Eaton <philneaton95(a)gmail.com> AuthorDate: Fri Jul 6 22:35:39 2018 -0400 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Mon Jul 30 15:01:22 2018 +0300 [RAPPS] Deselect apps after installing I found it unintuitive that each time I selected some software for installation, it wasn't automatically deselected after installation. I kept re-triggering the same installation a few times before I realized I had to manually uncheck the checked packages. --- base/applications/rapps/gui.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 1b715b6d8b..dca702fc9f 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -1467,6 +1467,7 @@ private: { CDownloadManager::DownloadListOfApplications(m_AvailableApps.GetSelected()); UpdateApplicationsList(-1); + m_ListView->SetSelected(-1, FALSE); } else if (CDownloadManager::DownloadApplication(m_ListView->GetSelectedData())) {

1 0

01/01: [ADVAPI32] Stop the service dispatcher thread only if a SERVICE_CONTROL_STOP command was sent
by Eric Kohl 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf1e655172088eb372b23… commit bf1e655172088eb372b23e968205cf9c8f841da2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 29 23:19:14 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 29 23:40:36 2018 +0200 [ADVAPI32] Stop the service dispatcher thread only if a SERVICE_CONTROL_STOP command was sent --- dll/win32/advapi32/service/sctrl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index 8b28b2bffa..f4a7aa85c4 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -602,9 +602,10 @@ ScServiceDispatcher(HANDLE hPipe, lpServiceName = (LPWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); TRACE("Service: %S\n", lpServiceName); - if (lpServiceName[0] == UNICODE_NULL) + if ((ControlPacket->dwControl == SERVICE_CONTROL_STOP) && + (lpServiceName[0] == UNICODE_NULL)) { - ERR("Stop dispatcher thread\n"); + TRACE("Stop dispatcher thread\n"); bRunning = FALSE; dwError = ERROR_SUCCESS; }

1 0

01/01: [SHELL32] Silence a noisy DPRINT.
by Hermès Bélusca-Maïto 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74adcadbd08f782cc4301… commit 74adcadbd08f782cc43017b12378611bbff50836 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 29 17:39:09 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 29 17:39:09 2018 +0200 [SHELL32] Silence a noisy DPRINT. --- dll/win32/shell32/wine/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 2637c179d5..d1a3ada74e 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -1510,7 +1510,7 @@ BOOL _SHGetUserProfileDirectoryW(HANDLE hToken, LPWSTR szPath, LPDWORD lpcchPath { result = GetUserProfileDirectoryW(hToken, szPath, lpcchPath); } - DbgPrint("_SHGetUserProfileDirectoryW returning %S\n", szPath); + TRACE("_SHGetUserProfileDirectoryW returning %S\n", szPath); return result; }

1 0

04/04: [AUTOCHK] Improvements: code + command-line handling.
by Hermès Bélusca-Maïto 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b6faba11a0d0593cd03e… commit 3b6faba11a0d0593cd03e036fde79d7e0fb7bec9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 29 16:00:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 29 16:21:09 2018 +0200 [AUTOCHK] Improvements: code + command-line handling. - Add support for the following command-line arguments: /k, /p (and a little bit of /r), and add support for checking a particular volume. A description of these arguments can be found at: "Description of Enhanced Chkdsk, Autochk, and Chkntfs Tools in Windows 2000", https://web.archive.org/web/20150215210228/http://support.microsoft.com:80/… - Slightly improve some messages. - Get rid of legacy OpenDirectory() and simplify GetFileSystem(). --- base/system/autochk/autochk.c | 317 ++++++++++++++++++++++++++++-------------- 1 file changed, 212 insertions(+), 105 deletions(-) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index fb8239b3c9..72b010f8d8 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -124,57 +124,6 @@ EraseLine( NtDisplayString(&UnicodeString); } -// this func is taken from kernel32/file/volume.c -static HANDLE -OpenDirectory( - IN LPCWSTR DirName, - IN BOOLEAN Write) -{ - UNICODE_STRING NtPathU; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE hFile; - - if (!RtlDosPathNameToNtPathName_U(DirName, - &NtPathU, - NULL, - NULL)) - { - DPRINT1("Invalid path!\n"); - return INVALID_HANDLE_VALUE; - } - - InitializeObjectAttributes( - &ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtCreateFile( - &hFile, - Write ? FILE_GENERIC_WRITE : FILE_GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, - 0, - NULL, - 0); - - RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathU.Buffer); - - if (!NT_SUCCESS(Status)) - { - return INVALID_HANDLE_VALUE; - } - - return hFile; -} - static NTSTATUS OpenKeyboard( OUT PHANDLE KeyboardHandle) @@ -279,21 +228,42 @@ WaitForKeyboard( static NTSTATUS GetFileSystem( - IN LPCWSTR Drive, - IN OUT LPWSTR FileSystemName, + IN PUNICODE_STRING VolumePathU, + IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { - HANDLE FileHandle; NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE FileHandle; IO_STATUS_BLOCK IoStatusBlock; PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; - FileHandle = OpenDirectory(Drive, FALSE); - if (FileHandle == INVALID_HANDLE_VALUE) - return STATUS_INVALID_PARAMETER; + InitializeObjectAttributes(&ObjectAttributes, + VolumePathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile(&FileHandle, + FILE_GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not open volume '%wZ' to obtain its file system, Status 0x%08lx\n", + VolumePathU, Status); + return Status; + } Status = NtQueryVolumeInformationFile(FileHandle, &IoStatusBlock, @@ -308,7 +278,7 @@ GetFileSystem( return Status; } - if (FileSystemNameSize * sizeof(WCHAR) >= FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) + if (FileSystemNameSize >= FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) { RtlCopyMemory(FileSystemName, FileFsAttribute->FileSystemName, @@ -421,32 +391,46 @@ ChkdskCallback( static NTSTATUS CheckVolume( - IN PWCHAR DrivePath, - IN LONG TimeOut) + IN PCWSTR VolumePath, + IN LONG TimeOut, + IN BOOLEAN CheckOnlyIfDirty) { - WCHAR FileSystem[128]; - WCHAR NtDrivePath[64]; - UNICODE_STRING DrivePathU; NTSTATUS Status; - DWORD Count; + PCWSTR DisplayName; + UNICODE_STRING VolumePathU; + ULONG Count; + WCHAR FileSystem[128]; - swprintf(NtDrivePath, L"\\??\\"); - wcscat(NtDrivePath, DrivePath); - NtDrivePath[wcslen(NtDrivePath)-1] = 0; - RtlInitUnicodeString(&DrivePathU, NtDrivePath); + RtlInitUnicodeString(&VolumePathU, VolumePath); - DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); - PrintString(" Checking file system on %S\r\n", DrivePath); + /* Get a drive string for display purposes only */ + if (wcslen(VolumePath) == 6 && + VolumePath[0] == L'\\' && + VolumePath[1] == L'?' && + VolumePath[2] == L'?' && + VolumePath[3] == L'\\' && + VolumePath[5] == L':') + { + /* DOS drive */ + DisplayName = &VolumePath[4]; + } + else + { + DisplayName = VolumePath; + } + + DPRINT1("AUTOCHK: Checking %wZ\n", &VolumePathU); + PrintString("Verifying the file system on %S\r\n", DisplayName); /* Get the file system */ - Status = GetFileSystem(DrivePath, + Status = GetFileSystem(&VolumePathU, FileSystem, - ARRAYSIZE(FileSystem)); + sizeof(FileSystem)); if (!NT_SUCCESS(Status)) { DPRINT1("GetFileSystem() failed, Status 0x%08lx\n", Status); - PrintString(" Unable to detect file system of %S\r\n", DrivePath); - return Status; + PrintString(" Unable to detect the file system of volume %S\r\n", DisplayName); + goto Quit; } PrintString(" The file system type is %S.\r\n\r\n", FileSystem); @@ -459,41 +443,52 @@ CheckVolume( } if (Count >= RTL_NUMBER_OF(FileSystems)) { - DPRINT1("File system not supported\n"); - PrintString(" Unable to check the file system. %S is not supported.\r\n", FileSystem); - return STATUS_DLL_NOT_FOUND; + DPRINT1("File system %S not supported\n", FileSystem); + PrintString(" Unable to verify the volume. The %S file system is not supported.\r\n", FileSystem); + Status = STATUS_DLL_NOT_FOUND; + goto Quit; } - /* First, check whether the volume is dirty */ - Status = FileSystems[Count].ChkdskFunc(&DrivePathU, + /* Check whether the volume is dirty */ + Status = FileSystems[Count].ChkdskFunc(&VolumePathU, FALSE, // FixErrors TRUE, // Verbose TRUE, // CheckOnlyIfDirty FALSE, // ScanDrive ChkdskCallback); - /* It is */ - if (Status == STATUS_DISK_CORRUPT_ERROR) + + /* Perform the check either when the volume is dirty or a check is forced */ + if ((Status == STATUS_DISK_CORRUPT_ERROR) || !CheckOnlyIfDirty) { /* Let the user decide whether to repair */ - PrintString(" The file system on this volume needs to be checked for problems.\r\n"); - PrintString(" You may cancel this check, but it's recommended that you continue.\r\n\r\n"); + if (Status == STATUS_DISK_CORRUPT_ERROR) + { + PrintString("The file system on volume %S needs to be checked for problems.\r\n", DisplayName); + PrintString("You may cancel this check, but it is recommended that you continue.\r\n"); + } + else + { + PrintString("A volume check has been scheduled.\r\n"); + } if (!KeyboardHandle || WaitForKeyboard(KeyboardHandle, TimeOut) == STATUS_TIMEOUT) { - PrintString(" The system will now check the file system.\r\n\r\n"); - Status = FileSystems[Count].ChkdskFunc(&DrivePathU, + PrintString("The system will now check the file system.\r\n\r\n"); + Status = FileSystems[Count].ChkdskFunc(&VolumePathU, TRUE, // FixErrors TRUE, // Verbose - TRUE, // CheckOnlyIfDirty + CheckOnlyIfDirty, FALSE, // ScanDrive ChkdskCallback); } else { - PrintString(" File system check has been skipped.\r\n"); + PrintString("The file system check has been skipped.\r\n"); } } +Quit: + PrintString("\r\n\r\n"); return Status; } @@ -521,24 +516,84 @@ _main( IN PCHAR envp[], IN ULONG DebugFlag) { - PROCESS_DEVICEMAP_INFORMATION DeviceMap; - ULONG i; NTSTATUS Status; - WCHAR DrivePath[128]; LONG TimeOut; + ULONG i; + BOOLEAN CheckAllVolumes = FALSE; + BOOLEAN CheckOnlyIfDirty = TRUE; + PROCESS_DEVICEMAP_INFORMATION DeviceMap; + PCHAR SkipDrives = NULL; + ANSI_STRING VolumePathA; + UNICODE_STRING VolumePathU; + WCHAR VolumePath[128] = L""; - // Win2003 passes the only param - "*". Probably means to check all drives /* - DPRINT("Got %d params\n", argc); - for (i=0; i<argc; i++) - DPRINT("Param %d: %s\n", i, argv[i]); - */ - - /* Query timeout */ - TimeOut = 3; - QueryTimeout(&TimeOut); + * Parse the command-line: optional command switches, + * then the NT volume name (or drive letter) to be analysed. + * If "*" is passed this means that we check all the volumes. + */ + if (argc <= 1) + { + /* Only one parameter (the program name), bail out */ + return 1; + } + for (i = 1; i < argc; ++i) + { + if (argv[i][0] == '/' || argv[i][0] == '-') + { + DPRINT("Parameter %d: %s\n", i, argv[i]); + switch (toupper(argv[i][1])) + { + case 'K': /* List of drive letters to skip */ + { + /* Check for the separator */ + if (argv[i][2] != ':') + goto Default; + + SkipDrives = &argv[i][3]; + break; + } + + case 'R': /* Repair the errors, implies /P */ + case 'P': /* Check even if not dirty */ + { + if (argv[i][2] != ANSI_NULL) + goto Default; + + CheckOnlyIfDirty = FALSE; + break; + } + + default: Default: + DPRINT1("Unknown switch %d: %s\n", i, argv[i]); + break; + } + } + else + { + DPRINT("Parameter %d - Volume specification: %s\n", i, argv[i]); + if (strcmp(argv[i], "*") == 0) + { + CheckAllVolumes = TRUE; + } + else + { + RtlInitEmptyUnicodeString(&VolumePathU, + VolumePath, + sizeof(VolumePath)); + RtlInitAnsiString(&VolumePathA, argv[i]); + Status = RtlAnsiStringToUnicodeString(&VolumePathU, + &VolumePathA, + FALSE); + } + + /* Stop the parsing now */ + break; + } + } - /* FIXME: We should probably use here the mount manager to be + /* + * FIXME: We should probably use here the mount manager to be * able to check volumes which don't have a drive letter. */ Status = NtQueryInformationProcess(NtCurrentProcess(), @@ -552,6 +607,30 @@ _main( return 1; } + /* Filter out the skipped drives from the map */ + if (SkipDrives && *SkipDrives) + { + DPRINT1("Skipping drives:"); + while (*SkipDrives) + { +#if DBG + DbgPrint(" %c:", *SkipDrives); +#endif + /* Retrieve the index and filter the drive out */ + i = toupper(*SkipDrives) - 'A'; + if (0 <= i && i <= 'Z'-'A') + DeviceMap.Query.DriveMap &= ~(1 << i); + + /* Go to the next drive letter */ + ++SkipDrives; + } + DbgPrint("\n"); + } + + /* Query the timeout */ + TimeOut = 3; + QueryTimeout(&TimeOut); + /* Open the keyboard */ Status = OpenKeyboard(&KeyboardHandle); if (!NT_SUCCESS(Status)) @@ -560,13 +639,41 @@ _main( /* Ignore keyboard interaction */ } - for (i = 0; i < 26; i++) + if (CheckAllVolumes) { - if ((DeviceMap.Query.DriveMap & (1 << i)) - && (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED)) + /* Enumerate and check each of the available volumes */ + for (i = 0; i <= 'Z'-'A'; i++) + { + if ((DeviceMap.Query.DriveMap & (1 << i)) && + (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED)) + { + swprintf(VolumePath, L"\\??\\%c:", L'A' + i); + CheckVolume(VolumePath, TimeOut, CheckOnlyIfDirty); + } + } + } + else + { + /* Retrieve our index and analyse the volume */ + if (wcslen(VolumePath) == 6 && + VolumePath[0] == L'\\' && + VolumePath[1] == L'?' && + VolumePath[2] == L'?' && + VolumePath[3] == L'\\' && + VolumePath[5] == L':') + { + i = toupper(VolumePath[4]) - 'A'; + if ((DeviceMap.Query.DriveMap & (1 << i)) && + (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED)) + { + CheckVolume(VolumePath, TimeOut, CheckOnlyIfDirty); + } + } + else { - swprintf(DrivePath, L"%c:\\", L'A'+i); - CheckVolume(DrivePath, TimeOut); + /* Just perform the check on the specified volume */ + // TODO: Check volume type using NtQueryVolumeInformationFile(FileFsDeviceInformation) + CheckVolume(VolumePath, TimeOut, CheckOnlyIfDirty); } }

1 0

03/04: [AUTOCHK] Improve the timeout countdown prompt by displaying the actual remaining seconds before the disk check.
by Hermès Bélusca-Maïto 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=472d1d2f64537d577f456… commit 472d1d2f64537d577f456992e15e405cf9805a0e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 29 15:19:30 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 29 16:21:08 2018 +0200 [AUTOCHK] Improve the timeout countdown prompt by displaying the actual remaining seconds before the disk check. Make also keyboard availability optional. --- base/system/autochk/autochk.c | 149 +++++++++++++++++++++++++++++++----------- 1 file changed, 112 insertions(+), 37 deletions(-) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index b9f7934f37..fb8239b3c9 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -6,6 +6,7 @@ * Copyright 2006-2018 Aleksey Bragin * Copyright 2006-2018 Hervé Poussineau * Copyright 2008-2018 Pierre Schweitzer + * Copyright 2018 Hermes Belusca-Maito */ /* INCLUDES *****************************************************************/ @@ -58,7 +59,7 @@ FILESYSTEM_CHKDSK FileSystems[10] = { L"CDFS", CdfsChkdsk }, }; -HANDLE KeyboardHandle; +HANDLE KeyboardHandle = NULL; /* FUNCTIONS ****************************************************************/ @@ -66,16 +67,17 @@ HANDLE KeyboardHandle; // FMIFS function // -static VOID +static INT PrintString(char* fmt,...) { + INT Len; char buffer[512]; va_list ap; UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; va_start(ap, fmt); - vsprintf(buffer, fmt, ap); + Len = vsprintf(buffer, fmt, ap); va_end(ap); RtlInitAnsiString(&AnsiString, buffer); @@ -84,6 +86,42 @@ PrintString(char* fmt,...) TRUE); NtDisplayString(&UnicodeString); RtlFreeUnicodeString(&UnicodeString); + + return Len; +} + +static VOID +EraseLine( + IN INT LineLength) +{ + INT Len; + UNICODE_STRING UnicodeString; + WCHAR buffer[512]; + + if (LineLength <= 0) + return; + + /* Go to the beginning of the line */ + RtlInitUnicodeString(&UnicodeString, L"\r"); + NtDisplayString(&UnicodeString); + + /* Fill the buffer chunk with spaces */ + Len = min(LineLength, ARRAYSIZE(buffer)); + while (Len > 0) buffer[--Len] = L' '; + + RtlInitEmptyUnicodeString(&UnicodeString, buffer, sizeof(buffer)); + while (LineLength > 0) + { + /* Display the buffer */ + Len = min(LineLength, ARRAYSIZE(buffer)); + LineLength -= Len; + UnicodeString.Length = Len * sizeof(WCHAR); + NtDisplayString(&UnicodeString); + } + + /* Go to the beginning of the line */ + RtlInitUnicodeString(&UnicodeString, L"\r"); + NtDisplayString(&UnicodeString); } // this func is taken from kernel32/file/volume.c @@ -138,7 +176,8 @@ OpenDirectory( } static NTSTATUS -OpenKeyboard(VOID) +OpenKeyboard( + OUT PHANDLE KeyboardHandle) { OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; @@ -150,7 +189,7 @@ OpenKeyboard(VOID) 0, NULL, NULL); - return NtOpenFile(&KeyboardHandle, + return NtOpenFile(KeyboardHandle, FILE_ALL_ACCESS, &ObjectAttributes, &IoStatusBlock, @@ -160,39 +199,79 @@ OpenKeyboard(VOID) static NTSTATUS WaitForKeyboard( + IN HANDLE KeyboardHandle, IN LONG TimeOut) { NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; LARGE_INTEGER Offset, Timeout; KEYBOARD_INPUT_DATA InputData; + INT Len = 0; - /* Attempt to read from the keyboard */ - Offset.QuadPart = 0; - Status = NtReadFile(KeyboardHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - &InputData, - sizeof(KEYBOARD_INPUT_DATA), - &Offset, - NULL); - if (Status == STATUS_PENDING) + /* Skip the wait if there is no timeout */ + if (TimeOut <= 0) + return STATUS_TIMEOUT; + + /* Attempt to read a down key-press from the keyboard */ + do { - /* Wait TimeOut seconds */ - Timeout.QuadPart = TimeOut * -10000000; - Status = NtWaitForSingleObject(KeyboardHandle, FALSE, &Timeout); - /* The user didn't enter anything, cancel the read */ - if (Status == STATUS_TIMEOUT) + Offset.QuadPart = 0; + Status = NtReadFile(KeyboardHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &InputData, + sizeof(KEYBOARD_INPUT_DATA), + &Offset, + NULL); + if (!NT_SUCCESS(Status)) { - NtCancelIoFile(KeyboardHandle, &IoStatusBlock); + /* Something failed, bail out */ + return Status; } - /* Else, return some status */ - else + if ((Status != STATUS_PENDING) && !(InputData.Flags & KEY_BREAK)) { - Status = IoStatusBlock.Status; + /* We have a down key-press, return */ + return Status; } + } while (Status != STATUS_PENDING); + + /* Perform the countdown of TimeOut seconds */ + Status = STATUS_TIMEOUT; + while (TimeOut > 0) + { + /* + * Display the countdown string. + * Note that we only do a carriage return to go back to the + * beginning of the line to possibly erase it. Note also that + * we display a trailing space to erase any last character + * when the string length decreases. + */ + Len = PrintString("Press any key within %d second(s) to cancel and resume startup. \r", TimeOut); + + /* Decrease the countdown */ + --TimeOut; + + /* Wait one second for a key press */ + Timeout.QuadPart = -10000000; + Status = NtWaitForSingleObject(KeyboardHandle, FALSE, &Timeout); + if (Status != STATUS_TIMEOUT) + break; + } + + /* Erase the countdown string */ + EraseLine(Len); + + if (Status == STATUS_TIMEOUT) + { + /* The user did not press any key, cancel the read */ + NtCancelIoFile(KeyboardHandle, &IoStatusBlock); + } + else + { + /* Otherwise, return some status */ + Status = IoStatusBlock.Status; } return Status; @@ -395,16 +474,11 @@ CheckVolume( /* It is */ if (Status == STATUS_DISK_CORRUPT_ERROR) { - NTSTATUS WaitStatus; - /* Let the user decide whether to repair */ PrintString(" The file system on this volume needs to be checked for problems.\r\n"); PrintString(" You may cancel this check, but it's recommended that you continue.\r\n\r\n"); - PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n\r\n", TimeOut); - /* Timeout == fix it! */ - WaitStatus = WaitForKeyboard(TimeOut); - if (WaitStatus == STATUS_TIMEOUT) + if (!KeyboardHandle || WaitForKeyboard(KeyboardHandle, TimeOut) == STATUS_TIMEOUT) { PrintString(" The system will now check the file system.\r\n\r\n"); Status = FileSystems[Count].ChkdskFunc(&DrivePathU, @@ -478,12 +552,12 @@ _main( return 1; } - /* Open keyboard */ - Status = OpenKeyboard(); + /* Open the keyboard */ + Status = OpenKeyboard(&KeyboardHandle); if (!NT_SUCCESS(Status)) { DPRINT1("OpenKeyboard() failed, Status 0x%08lx\n", Status); - return 1; + /* Ignore keyboard interaction */ } for (i = 0; i < 26; i++) @@ -496,8 +570,9 @@ _main( } } - /* Close keyboard */ - NtClose(KeyboardHandle); + /* Close the keyboard */ + if (KeyboardHandle) + NtClose(KeyboardHandle); // PrintString("Done\r\n\r\n"); return 0;

1 0

02/04: [AUTOCHK] Minor code formatting; reduce indentation level of some blocks; use RTL_NUMBER_OF() macro; normalize file header.
by Hermès Bélusca-Maïto 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4225172506cda06f699fc… commit 4225172506cda06f699fcc764f7a64dc68209acf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 29 15:05:22 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 29 16:21:07 2018 +0200 [AUTOCHK] Minor code formatting; reduce indentation level of some blocks; use RTL_NUMBER_OF() macro; normalize file header. --- base/system/autochk/autochk.c | 202 ++++++++++++++++++++---------------------- 1 file changed, 96 insertions(+), 106 deletions(-) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index 5c133a8c5e..b9f7934f37 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -1,45 +1,43 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/autochk/autochk.c - * PURPOSE: Filesystem checker - * PROGRAMMERS: Aleksey Bragin - * Eric Kohl - * Hervé Poussineau - * Pierre Schweitzer + * PROJECT: ReactOS AutoChk + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: FileSystem checker in Native mode. + * COPYRIGHT: Copyright 2002-2018 Eric Kohl + * Copyright 2006-2018 Aleksey Bragin + * Copyright 2006-2018 Hervé Poussineau + * Copyright 2008-2018 Pierre Schweitzer */ /* INCLUDES *****************************************************************/ #include <stdio.h> + #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <ntddkbd.h> + #define NTOS_MODE_USER #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> -#include <ndk/umfuncs.h> #include <fmifs/fmifs.h> #include <fslib/vfatlib.h> -#include <fslib/ext2lib.h> #include <fslib/ntfslib.h> -#include <fslib/cdfslib.h> +#include <fslib/ext2lib.h> #include <fslib/btrfslib.h> -#include <fslib/ffslib.h> #include <fslib/reiserfslib.h> +#include <fslib/ffslib.h> +#include <fslib/cdfslib.h> #define NDEBUG #include <debug.h> /* DEFINES ******************************************************************/ -#define FS_ATTRIBUTE_BUFFER_SIZE (MAX_PATH * sizeof(WCHAR) + sizeof(FILE_FS_ATTRIBUTE_INFORMATION)) - typedef struct _FILESYSTEM_CHKDSK { WCHAR Name[10]; @@ -63,6 +61,7 @@ FILESYSTEM_CHKDSK FileSystems[10] = HANDLE KeyboardHandle; /* FUNCTIONS ****************************************************************/ + // // FMIFS function // @@ -151,12 +150,12 @@ OpenKeyboard(VOID) 0, NULL, NULL); - return NtOpenFile(&KeyboardHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - FILE_OPEN, - 0); + return NtOpenFile(&KeyboardHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + FILE_OPEN, + 0); } static NTSTATUS @@ -209,7 +208,7 @@ GetFileSystem( NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; - UCHAR Buffer[FS_ATTRIBUTE_BUFFER_SIZE]; + UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; @@ -220,30 +219,34 @@ GetFileSystem( Status = NtQueryVolumeInformationFile(FileHandle, &IoStatusBlock, FileFsAttribute, - FS_ATTRIBUTE_BUFFER_SIZE, + sizeof(Buffer), FileFsAttributeInformation); NtClose(FileHandle); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryVolumeInformationFile() failed, Status 0x%08lx\n", Status); + return Status; + } + + if (FileSystemNameSize * sizeof(WCHAR) >= FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) { - if (FileSystemNameSize * sizeof(WCHAR) >= FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) - { - CopyMemory(FileSystemName, - FileFsAttribute->FileSystemName, - FileFsAttribute->FileSystemNameLength); - FileSystemName[FileFsAttribute->FileSystemNameLength / sizeof(WCHAR)] = 0; - } - else - return STATUS_BUFFER_TOO_SMALL; + RtlCopyMemory(FileSystemName, + FileFsAttribute->FileSystemName, + FileFsAttribute->FileSystemNameLength); + FileSystemName[FileFsAttribute->FileSystemNameLength / sizeof(WCHAR)] = UNICODE_NULL; } else - return Status; + { + return STATUS_BUFFER_TOO_SMALL; + } return STATUS_SUCCESS; } -// This is based on SysInternal's ChkDsk app -static BOOLEAN NTAPI +/* This is based on SysInternals' ChkDsk application */ +static BOOLEAN +NTAPI ChkdskCallback( IN CALLBACKCOMMAND Command, IN ULONG Modifier, @@ -348,6 +351,12 @@ CheckVolume( NTSTATUS Status; DWORD Count; + swprintf(NtDrivePath, L"\\??\\"); + wcscat(NtDrivePath, DrivePath); + NtDrivePath[wcslen(NtDrivePath)-1] = 0; + RtlInitUnicodeString(&DrivePathU, NtDrivePath); + + DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); PrintString(" Checking file system on %S\r\n", DrivePath); /* Get the file system */ @@ -356,71 +365,61 @@ CheckVolume( ARRAYSIZE(FileSystem)); if (!NT_SUCCESS(Status)) { - DPRINT1("GetFileSystem() failed with status 0x%08lx\n", Status); + DPRINT1("GetFileSystem() failed, Status 0x%08lx\n", Status); PrintString(" Unable to detect file system of %S\r\n", DrivePath); return Status; } PrintString(" The file system type is %S.\r\n\r\n", FileSystem); - /* Call provider */ - for (Count = 0; Count < sizeof(FileSystems) / sizeof(FileSystems[0]); ++Count) + /* Find a suitable file system provider */ + for (Count = 0; Count < RTL_NUMBER_OF(FileSystems); ++Count) { - if (wcscmp(FileSystem, FileSystems[Count].Name) != 0) - { - continue; - } - - swprintf(NtDrivePath, L"\\??\\"); - wcscat(NtDrivePath, DrivePath); - NtDrivePath[wcslen(NtDrivePath)-1] = 0; - RtlInitUnicodeString(&DrivePathU, NtDrivePath); - - DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); - /* First, check whether the volume is dirty */ - Status = FileSystems[Count].ChkdskFunc(&DrivePathU, - FALSE, // FixErrors - TRUE, // Verbose - TRUE, // CheckOnlyIfDirty - FALSE,// ScanDrive - ChkdskCallback); - /* It is */ - if (Status == STATUS_DISK_CORRUPT_ERROR) - { - NTSTATUS WaitStatus; - - /* Let the user decide whether to repair */ - PrintString(" The file system on this volume needs to be checked for problems.\r\n"); - PrintString(" You may cancel this check, but it's recommended that you continue.\r\n\r\n"); - PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n\r\n", TimeOut); - - /* Timeout == fix it! */ - WaitStatus = WaitForKeyboard(TimeOut); - if (WaitStatus == STATUS_TIMEOUT) - { - Status = FileSystems[Count].ChkdskFunc(&DrivePathU, - TRUE, // FixErrors - TRUE, // Verbose - TRUE, // CheckOnlyIfDirty - FALSE,// ScanDrive - ChkdskCallback); - PrintString(" The system will now check the file system.\r\n\r\n"); - } - else - { - PrintString(" File system check has been skipped.\r\n"); - } - } - break; + if (wcscmp(FileSystem, FileSystems[Count].Name) == 0) + break; } - - if (Count == sizeof(FileSystems) / sizeof(FileSystems[0])) + if (Count >= RTL_NUMBER_OF(FileSystems)) { DPRINT1("File system not supported\n"); PrintString(" Unable to check the file system. %S is not supported.\r\n", FileSystem); return STATUS_DLL_NOT_FOUND; } + /* First, check whether the volume is dirty */ + Status = FileSystems[Count].ChkdskFunc(&DrivePathU, + FALSE, // FixErrors + TRUE, // Verbose + TRUE, // CheckOnlyIfDirty + FALSE, // ScanDrive + ChkdskCallback); + /* It is */ + if (Status == STATUS_DISK_CORRUPT_ERROR) + { + NTSTATUS WaitStatus; + + /* Let the user decide whether to repair */ + PrintString(" The file system on this volume needs to be checked for problems.\r\n"); + PrintString(" You may cancel this check, but it's recommended that you continue.\r\n\r\n"); + PrintString(" Press any key within %d second(s) to cancel and resume startup.\r\n\r\n", TimeOut); + + /* Timeout == fix it! */ + WaitStatus = WaitForKeyboard(TimeOut); + if (WaitStatus == STATUS_TIMEOUT) + { + PrintString(" The system will now check the file system.\r\n\r\n"); + Status = FileSystems[Count].ChkdskFunc(&DrivePathU, + TRUE, // FixErrors + TRUE, // Verbose + TRUE, // CheckOnlyIfDirty + FALSE, // ScanDrive + ChkdskCallback); + } + else + { + PrintString(" File system check has been skipped.\r\n"); + } + } + return Status; } @@ -437,23 +436,16 @@ QueryTimeout( RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, L"Session Manager", QueryTable, NULL, NULL); /* See: https://docs.microsoft.com/en-us/windows-server/administration/windows-comm… */ - if (*TimeOut > 259200) - { - *TimeOut = 259200; - } - else if (*TimeOut < 0) - { - *TimeOut = 0; - } + *TimeOut = min(max(*TimeOut, 0), 259200); } -/* Native image's entry point */ -int -_cdecl -_main(int argc, - char *argv[], - char *envp[], - int DebugFlag) +INT +__cdecl +_main( + IN INT argc, + IN PCHAR argv[], + IN PCHAR envp[], + IN ULONG DebugFlag) { PROCESS_DEVICEMAP_INFORMATION DeviceMap; ULONG i; @@ -475,7 +467,6 @@ _main(int argc, /* FIXME: We should probably use here the mount manager to be * able to check volumes which don't have a drive letter. */ - Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDeviceMap, &DeviceMap.Query, @@ -483,8 +474,7 @@ _main(int argc, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtQueryInformationProcess() failed with status 0x%08lx\n", - Status); + DPRINT1("NtQueryInformationProcess() failed, Status 0x%08lx\n", Status); return 1; } @@ -492,7 +482,7 @@ _main(int argc, Status = OpenKeyboard(); if (!NT_SUCCESS(Status)) { - DPRINT1("OpenKeyboard() failed with status 0x%08lx\n", Status); + DPRINT1("OpenKeyboard() failed, Status 0x%08lx\n", Status); return 1; } @@ -509,7 +499,7 @@ _main(int argc, /* Close keyboard */ NtClose(KeyboardHandle); - // PrintString(" Done\r\n\r\n"); + // PrintString("Done\r\n\r\n"); return 0; }

1 0

01/04: [EXPLORER] Improve debug output.
by Hermès Bélusca-Maïto 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dbe62b294eccbaf37c8c… commit 8dbe62b294eccbaf37c8ccecc0f979102b7b9a4f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 28 17:27:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 29 16:21:06 2018 +0200 [EXPLORER] Improve debug output. --- base/shell/explorer/taskswnd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 3cadd4980f..0a5d4db442 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1917,7 +1917,7 @@ public: { /* A hard error balloon message */ PBALLOON_HARD_ERROR_DATA pData = (PBALLOON_HARD_ERROR_DATA)cpData->lpData; - ERR("Got balloon data 0x%x, 0x%x, %S, %S!\n", pData->Status, pData->dwType, (WCHAR*)((ULONG_PTR)pData + pData->TitleOffset), (WCHAR*)((ULONG_PTR)pData + pData->MessageOffset)); + ERR("Got balloon data 0x%x, 0x%x, '%S', '%S'\n", pData->Status, pData->dwType, (WCHAR*)((ULONG_PTR)pData + pData->TitleOffset), (WCHAR*)((ULONG_PTR)pData + pData->MessageOffset)); if (pData->cbHeaderSize == sizeof(BALLOON_HARD_ERROR_DATA)) m_HardErrorThread.StartThread(pData); return TRUE;

1 0

01/01: [WIN32SS][FREETYPE] Update copyright text
by Katayama Hirofumi MZ 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=994a5f457fdec69e04707… commit 994a5f457fdec69e047078c0204f1fe1d6b63a04 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 28 23:30:48 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 29 15:23:58 2018 +0200 [WIN32SS][FREETYPE] Update copyright text --- win32ss/gdi/ntgdi/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index efc3ad316a..c201b3d698 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5,7 +5,7 @@ * PURPOSE: FreeType font engine interface * PROGRAMMERS: Copyright 2001 Huw D M Davies for CodeWeavers. * Copyright 2006 Dmitry Timoshkov for CodeWeavers. - * Copyright 2016-2017 Katayama Hirofumi MZ. + * Copyright 2016-2018 Katayama Hirofumi MZ. */ /** Includes ******************************************************************/

1 0

01/01: [NTOSKNRL] Only allocate a MDL if we have an output length
by Pierre Schweitzer 29 Jul '18

29 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf3b9d5b56e1b0cf43513… commit cf3b9d5b56e1b0cf435139736e44711c752ad621 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jul 29 13:58:30 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jul 29 13:58:30 2018 +0200 [NTOSKNRL] Only allocate a MDL if we have an output length For user mode, when probing output buffer, if it's null, length will also be set to 0. This avoids user mode applications being able to trigger various asserts in ReactOS (and thus BSOD when no debugger is plugged ;-)). --- ntoskrnl/io/iomgr/iofunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index fa4886976d..d119f851e1 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -580,7 +580,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, } /* Check if we got an output buffer */ - if (OutputBuffer) + if (OutputBufferLength) { /* Allocate the System Buffer */ Irp->MdlAddress = IoAllocateMdl(OutputBuffer,

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2018