Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mf] 18047: new tool bar icons for the drive bar
by mf＠svn.reactos.com 25 Sep '05

25 Sep '05

new tool bar icons for the drive bar Modified: trunk/reactos/subsys/system/explorer/res/drivebar.bmp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/res/drivebar.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-09-25 11:16:54 UTC (rev 18046) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-09-25 11:52:42 UTC (rev 18047) @@ -729,29 +729,34 @@ // insert shell namespace button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Shell\0")); extraBtns.idCommand = ID_DRIVE_SHELL_NS; + extraBtns.iBitmap = 6; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); // insert web control button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Web\0")); extraBtns.idCommand = ID_WEB_WINDOW; + extraBtns.iBitmap = 7; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); if ((HIWORD(GetVersion())>>14) == W_VER_NT) { // insert NT object namespace button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("NT Obj\0")); extraBtns.idCommand = ID_DRIVE_NTOBJ_NS; + extraBtns.iBitmap = 8; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); } // insert Registry button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0")); extraBtns.idCommand = ID_DRIVE_REGISTRY; + extraBtns.iBitmap = 9; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); #ifdef _DEBUG // insert FAT direct file system access button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("FAT\0")); extraBtns.idCommand = ID_DRIVE_FAT; + extraBtns.iBitmap = 10; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); #endif

1 0

[navaraf] 18046: - Intersect the paint rectangle in NtUserBeginPaint with the client window rectangle.
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

- Intersect the paint rectangle in NtUserBeginPaint with the client window rectangle. - Fix the data returned by co_UserGetUpdateRgn and NtUserGetUpdateRect. Modified: trunk/reactos/subsys/win32k/ntuser/painting.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-25 11:05:00 UTC (rev 18045) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-25 11:16:54 UTC (rev 18046) @@ -755,7 +755,7 @@ Ps.hdc = UserGetDCEx(Window, Window->UpdateRegion, DCX_INTERSECTRGN | DCX_USESTYLE); if (!Ps.hdc) { - RETURN( NULL); + RETURN(NULL); } if (Window->UpdateRegion != NULL) @@ -766,6 +766,7 @@ { UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); RGNDATA_UnlockRgn(Rgn); + IntGdiIntersectRect(&Ps.rcPaint, &Ps.rcPaint, &Window->ClientRect); IntGdiOffsetRect(&Ps.rcPaint, -Window->ClientRect.left, -Window->ClientRect.top); @@ -801,10 +802,10 @@ if (! NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( NULL); + RETURN(NULL); } - RETURN( Ps.hdc); + RETURN(Ps.hdc); CLEANUP: if (Window) UserDerefObjectCo(Window); @@ -855,6 +856,7 @@ co_UserGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase) { int RegionType; + RECT Rect; ASSERT_REFS_CO(Window); @@ -864,7 +866,10 @@ } else { - RegionType = NtGdiCombineRgn(hRgn, Window->UpdateRegion, hRgn, RGN_COPY); + Rect = Window->ClientRect; + IntIntersectWithParents(Window, &Rect); + NtGdiSetRectRgn(hRgn, Rect.left, Rect.top, Rect.right, Rect.bottom); + RegionType = NtGdiCombineRgn(hRgn, hRgn, Window->UpdateRegion, RGN_AND); NtGdiOffsetRgn(hRgn, -Window->ClientRect.left, -Window->ClientRect.top); } @@ -875,6 +880,7 @@ return RegionType; } + /* * NtUserGetUpdateRgn * @@ -923,7 +929,6 @@ RECT Rect; INT RegionType; PROSRGNDATA RgnData; - BOOL AlwaysPaint; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -932,7 +937,7 @@ if (!(Window = UserGetWindowObject(hWnd))) { - RETURN( ERROR); + RETURN(FALSE); } if (Window->UpdateRegion == NULL) @@ -941,16 +946,34 @@ } else { - RgnData = RGNDATA_LockRgn(Window->UpdateRegion); - ASSERT(RgnData != NULL); - RegionType = UnsafeIntGetRgnBox(RgnData, &Rect); - ASSERT(RegionType != ERROR); - RGNDATA_UnlockRgn(RgnData); + /* Get the update region bounding box. */ + if (Window->UpdateRegion == (HRGN)1) + { + Rect = Window->ClientRect; + } + else + { + RgnData = RGNDATA_LockRgn(Window->UpdateRegion); + ASSERT(RgnData != NULL); + RegionType = UnsafeIntGetRgnBox(RgnData, &Rect); + RGNDATA_UnlockRgn(RgnData); + + if (RegionType != ERROR && RegionType != NULLREGION) + IntGdiIntersectRect(&Rect, &Rect, &Window->ClientRect); + } + + if (IntIntersectWithParents(Window, &Rect)) + { + IntGdiOffsetRect(&Rect, + -Window->ClientRect.left, + -Window->ClientRect.top); + } else + { + Rect.left = Rect.top = Rect.right = Rect.bottom = 0; + } } - AlwaysPaint = (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) || - (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT); - if (bErase && Rect.left < Rect.right && Rect.top < Rect.bottom) + if (bErase && !IntGdiIsEmptyRect(&Rect)) { UserRefObjectCo(Window); co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); @@ -963,11 +986,11 @@ if (!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); + RETURN(FALSE); } } - RETURN( (Rect.left < Rect.right && Rect.top < Rect.bottom) || AlwaysPaint); + RETURN(Window->UpdateRegion != NULL); CLEANUP: DPRINT("Leave NtUserGetUpdateRect, ret=%i\n",_ret_); @@ -1314,7 +1337,7 @@ UserDerefObjectCo(CaretWnd); } - RETURN( Result); + RETURN(Result); CLEANUP: if (Window)

1 0

[navaraf] 18045: Patricio Martínez Ros <silencium@wanadoo.es>
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Patricio Martínez Ros <silencium(a)wanadoo.es> Update spanish translation. Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc --- trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-09-25 10:52:51 UTC (rev 18044) +++ trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-09-25 11:05:00 UTC (rev 18045) @@ -1,482 +1,491 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "resource.h" -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -#undef APSTUDIO_READONLY_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""resource.h""\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -/////////////////////////////////////////////////////////////////////// ////// - - -/////////////////////////////////////////////////////////////////////// ////// -// Spanish (Castilian) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP) -#ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH -#pragma code_page(1252) -#endif //_WIN32 - -/////////////////////////////////////////////////////////////////////// ////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Salir", ID_FILE_EXIT - END - POPUP "&Ver" - BEGIN - MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR - MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR - MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR - MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Actualizar\tF5", ID_REFRESH - MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&SDI", ID_VIEW_SDI - END - POPUP "&Ventana" - BEGIN - MENUITEM "Nueva &Ventana", ID_WINDOW_NEW - MENUITEM "Cascada\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Agrupar &Simbolos", ID_WINDOW_ARRANGE - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "A&yuda" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Abrir\tEnter", 101 - MENUITEM "&Mover...\tF7", 106 - MENUITEM "&Copiar...\tF8", 107 - MENUITEM "&en el Portapapeles...\tF9", 118 - MENUITEM "&Eliminar\tDel", 108 - MENUITEM "Re&nombrar...", 109 - MENUITEM "Prop&iedades...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&omprimir...", 119 - MENUITEM "Desc&omprimir...", 120 - MENUITEM SEPARATOR - MENUITEM "&Ejecutar...", ID_EXECUTE - MENUITEM "&Imprimir...", 102 - MENUITEM "Asociar...", 103 - MENUITEM SEPARATOR - MENUITEM "Cr&ear Directorio...", ID_EXECUTE - MENUITEM "Busca&r...", 104 - MENUITEM "&Seleccionar Archivos...", 116 - MENUITEM SEPARATOR - MENUITEM "S&alir\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disco" - BEGIN - MENUITEM "&Copiar Disco...", 201 - MENUITEM "&Etiqueta del Disco...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formateart Disco...", 203 - MENUITEM SEPARATOR - MENUITEM "Conectar a &Unidad de Red", 252 - MENUITEM "&Desconectar Unidad de Red", 253 - MENUITEM SEPARATOR - MENUITEM "Guardar como...", 254 - MENUITEM "&Eliminar Guardado...", 255 - MENUITEM SEPARATOR - MENUITEM "&Seleccionar Unidad...", 251 - END - POPUP "&Directorios" - BEGIN - MENUITEM "&Siguiente Nivel\t+", 301 - MENUITEM "Expandir &Arbol\t*", 302 - MENUITEM "Expandir &Todo\tStrg+*", 303 - MENUITEM "Contraer &Arbol\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Marcar Hijos", 505 - END - POPUP "&Ver" - BEGIN - MENUITEM "A&rbol y Directorio", 413 - MENUITEM "Solo Arb&ol", 411 - MENUITEM "S&olo Directorio", 412 - MENUITEM SEPARATOR - MENUITEM "Sp&lit", 414 - MENUITEM SEPARATOR - MENUITEM "&Nombre", ID_VIEW_NAME - MENUITEM "&Todos Los Detalles del Archivo", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "Detalles &Parciales...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ordenar por Nombre", 404 - MENUITEM "Ordenar &por Tipo", 405 - MENUITEM "Ord&enar por Tama±o", 406 - MENUITEM "Or&denar por Fecha", 407 - MENUITEM SEPARATOR - MENUITEM "Ordenar por &...", 409 - END - POPUP "&Opciones" - BEGIN - MENUITEM "&Confirmacion...", 65535 - MENUITEM "&Fuente...", 65535 - MENUITEM "Personalizar la &Barra de Herramientas...", 65535 - MENUITEM SEPARATOR - MENUITEM "Barra de Herramien&tas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Barra de Uni&dades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR - MENUITEM "Barra de E&stado", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - END - POPUP "&Seguridad" - BEGIN - MENUITEM "&Aceso...", 605 - MENUITEM "&Entrada...", 606 - MENUITEM "&Propietario...", 607 - END - POPUP "&Ventana" - BEGIN - MENUITEM "Nueva &Ventana", ID_WINDOW_NEW - MENUITEM "Cascada\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Agrupar &Simbolos", ID_WINDOW_ARRANGE - MENUITEM "&Actualizar\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Temas de Ayuda\tF1", ID_HELP - MENUITEM "Ayuda y &Buscar...\tF1", ID_HELP - MENUITEM "&Usando la Ayuda\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Info sobre &ArchivoWine...", ID_ABOUT_WINEFILE - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Configuracion...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Administrador de Tareas...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Abrir Control de Volumen", ID_TRAY_VOLUME - MENUITEM "Ajustar Propiedades de Audio", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Mostrar iconos ocultos", ID_SHOW_HIDDEN_ICONS - MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configurar Notificaciones...", ID_CONFIG_NOTIFYAREA - MENUITEM "Ajustar Fecha/&Hora...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "S&alir", ID_FILE_EXIT - END - POPUP "&Ver" - BEGIN - MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Actualizar\tF5", ID_REFRESH - MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "&Ayuda" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// Dialog -// - -IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "&Aceptar",1,158,6,47,14 - PUSHBUTTON "&Cancelar",2,158,23,47,14 - PUSHBUTTON "&Ayuda",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Buscar Programa en el menu Inicio" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "&Filtro:",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Marcar Entradas",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades de Pantalla" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Por favor seleccione su algoritmo de alineamiento preferido:", - IDC_STATIC,7,7,166,8 - CONTROL "izquierda/arriba abajo",IDC_ICON_ALIGN_0,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "izquierda/arriba derecha",IDC_ICON_ALIGN_1,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "derecha/arriba izquierda",IDC_ICON_ALIGN_2,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "derecha/arriba abajo",IDC_ICON_ALIGN_3,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "derecha/abajo arriba",IDC_ICON_ALIGN_4,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "izquierda/abajo derecha",IDC_ICON_ALIGN_5,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "derecha/abajo izquierda",IDC_ICON_ALIGN_6,"Button", - BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "derecha/abajo",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "borde inferior",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "borde H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | - WS_TABSTOP,159,121,46,44 - CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades de la Barra de Tareas" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "Mostrar &Reloj",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "&Ocultar iconos de notificacion inactivos", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&Notificaciones...",ID_CONFIG_NOTIFYAREA,153,173,50,14 -END - -IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades del Menu Inicio" -FONT 8, "MS Sans Serif" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Configure Notification Icons" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Texto de Info:",IDC_LABEL1,7,44,45,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,84,42,117,14,ES_AUTOHSCROLL - LTEXT "Titulo de la V&entana:",IDC_LABEL2,7,63,66,8 - EDITTEXT IDC_NOTIFY_TITLE,84,60,117,14,ES_AUTOHSCROLL - LTEXT "&Parche del Modulo:",IDC_LABEL3,7,81,62,8 - EDITTEXT IDC_NOTIFY_MODULE,84,78,117,14,ES_AUTOHSCROLL - GROUPBOX "Modo de &Display",IDC_LABEL4,7,95,157,28 - CONTROL "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,107,33,10 - CONTROL "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, - 63,107,29,10 - CONTROL "A&utoocultar",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,104,107,51,10 - ICON "",IDC_PICTURE,173,100,20,20 - LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "Mostrar Ocu&ltos",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,153,65,10 - DEFPUSHBUTTON "&Aceptar",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Cancelar",IDCANCEL,151,153,50,14 -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "Reactos Explorer" - IDS_START "Iniciar" - IDS_LOGOFF "Salir..." - IDS_SHUTDOWN "Apagar..." - IDS_LAUNCH "Ejecutar..." - IDS_START_HELP "Ayuda" - IDS_SEARCH_FILES "Buscar..." - IDS_DOCUMENTS "Documentos" - IDS_FAVORITES "Favoritos" - IDS_PROGRAMS "Programas" - IDS_SETTINGS "Configuracion" - IDS_EXPLORE "Explorar" - IDS_EMPTY "(Vacio)" - IDS_RECENT "Documentos Recientes" - IDS_ADMIN "Administracion" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Menu Inicio" - IDS_MINIMIZE_ALL "mimimizar todas las ventanas" - IDS_DESKTOP_NUM "Escritorio %d" - IDS_VOLUME "Volumen" - IDS_ITEMS_CUR "Objetos Actuales" - IDS_ITEMS_CONFIGURED "configuracion" - IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "oculto" - IDS_NOTIFY_SHOW "mostrar" - IDS_NOTIFY_HIDE "ocultar" - IDS_NOTIFY_AUTOHIDE "autoocultar" - IDS_SHOW_HIDDEN_ICONS "Show hidden icons" - IDS_HIDE_ICONS "Hide icons" - IDS_TERMINATE "Salir" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "Res" - IDS_CONNECTIONS "Conexiones de Red" - IDS_DRIVES "Unidades" - IDS_SEARCH_COMPUTER "Buscar PC..." - IDS_SETTINGS_MENU "Menus de Configuracion" - IDS_CONTROL_PANEL "Panel de Control" - IDS_PRINTERS "Impresoras" - IDS_BROWSE "Explorer Archivos" - IDS_SEARCH_PRG "Buscar Programas..." - IDS_ALL_USERS "Todos los Usuarios\\" - IDS_SEARCH "Buscar" - IDS_ABOUT_EXPLORER "&Acerca de Explorer..." - IDS_LAUNCH_MANY_PROGRAMS - "Ha seleccionado mas de un programa.\n?Estß seguro de que desea ejecutarlos todos ?" - IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio" - IDS_DESKTOP "Escritorio" - IDS_TASKBAR "Barra de Tareas" -END - -#endif // Spanish (Castilian) resources -/////////////////////////////////////////////////////////////////////// ////// - - - -#ifndef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -/////////////////////////////////////////////////////////////////////// ////// -#endif // not APSTUDIO_INVOKED - +/* + * Explorer (Spanish resources) + * + * Copyright 2005 Patricio MartÝnez Ros + * + */ + +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Salir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR + MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&SDI", ID_VIEW_SDI + END + POPUP "&Ventana" + BEGIN + MENUITEM "Nueva &Ventana", ID_WINDOW_NEW + MENUITEM "Cascada\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaico &Vertical\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT + MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE + END + POPUP "&Tools" + BEGIN + MENUITEM "&Options", ID_TOOLS_OPTIONS + END + POPUP "A&yuda" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configuracion...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Administrador de Tareas...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Abrir Control de Volumen", ID_TRAY_VOLUME + MENUITEM "Ajustar Propiedades de Audio", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Mostrar iconos ocultos", ID_SHOW_HIDDEN_ICONS + MENUITEM "Mostrar &Bot¾n de Icono", ID_SHOW_ICON_BUTTON + MENUITEM "&Configurar Notificaciones...", ID_CONFIG_NOTIFYAREA + MENUITEM "Ajustar Fecha/&Hora...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "S&alir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "Herramientas" + BEGIN + MENUITEM "&Opciones", ID_TOOLS_OPTIONS + END + POPUP "&Ayuda" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_WINEFILE MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Abrir\tEnter", 101 + MENUITEM "&Mover...\tF7", 106 + MENUITEM "&Copiar...\tF8", 107 + MENUITEM "&en el Portapapeles...\tF9", 118 + MENUITEM "&Eliminar\tDel", 108 + MENUITEM "Re&nombrar...", 109 + MENUITEM "Prop&iedades...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "C&omprimir...", 119 + MENUITEM "Desc&omprimir...", 120 + MENUITEM SEPARATOR + MENUITEM "&Ejecutar...", ID_EXECUTE + MENUITEM "&Imprimir...", 102 + MENUITEM "Asociar...", 103 + MENUITEM SEPARATOR + MENUITEM "Cr&ear Directorio...", ID_EXECUTE + MENUITEM "Busca&r...", 104 + MENUITEM "&Seleccionar Archivos...", 116 + MENUITEM SEPARATOR + MENUITEM "S&alir\tAlt+X", ID_FILE_EXIT + END + POPUP "&Disco" + BEGIN + MENUITEM "&Copiar Disco...", 201 + MENUITEM "&Etiqueta del Disco...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formateart Disco...", 203 + MENUITEM SEPARATOR + MENUITEM "Conectar a &Unidad de Red", 252 + MENUITEM "&Desconectar Unidad de Red", 253 + MENUITEM SEPARATOR + MENUITEM "Guardar como...", 254 + MENUITEM "&Eliminar Guardado...", 255 + MENUITEM SEPARATOR + MENUITEM "&Seleccionar Unidad...", 251 + END + POPUP "&Directorios" + BEGIN + MENUITEM "&Siguiente Nivel\t+", 301 + MENUITEM "Expandir &Arbol\t*", 302 + MENUITEM "Expandir &Todo\tStrg+*", 303 + MENUITEM "Contraer &Arbol\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Marcar Hijos", 505 + END + POPUP "&Ver" + BEGIN + MENUITEM "A&rbol y Directorio", 413 + MENUITEM "Solo Arb&ol", 411 + MENUITEM "S&olo Directorio", 412 + MENUITEM SEPARATOR + MENUITEM "Sp&lit", 414 + MENUITEM SEPARATOR + MENUITEM "&Nombre", ID_VIEW_NAME + MENUITEM "&Todos Los Detalles del Archivo", ID_VIEW_ALL_ATTRIBUTES + , CHECKED + MENUITEM "Detalles &Parciales...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ordenar por Nombre", 404 + MENUITEM "Ordenar &por Tipo", 405 + MENUITEM "Ord&enar por Tama±o", 406 + MENUITEM "Or&denar por Fecha", 407 + MENUITEM SEPARATOR + MENUITEM "Ordenar por &...", 409 + END + POPUP "&Opciones" + BEGIN + MENUITEM "&Confirmacion...", 65535 + MENUITEM "&Fuente...", 65535 + MENUITEM "Personalizar la &Barra de Herramientas...", 65535 + MENUITEM SEPARATOR + MENUITEM "Barra de Herramien&tas", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Barra de Uni&dades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR + MENUITEM "Barra de E&stado", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM SEPARATOR + MENUITEM "&SÝmbolo despuÚs de ejecutar", 65535 + MENUITEM "&Guardar cambios al salir", 511 + END + POPUP "&Seguridad" + BEGIN + MENUITEM "&Aceso...", 605 + MENUITEM "&Entrada...", 606 + MENUITEM "&Propietario...", 607 + END + POPUP "&Ventana" + BEGIN + MENUITEM "Nueva &Ventana", ID_WINDOW_NEW + MENUITEM "Cascada\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT + MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE + MENUITEM "&Actualizar\tF5", ID_REFRESH + END + POPUP "&?" + BEGIN + MENUITEM "&Temas de Ayuda\tF1", ID_HELP + MENUITEM "Ayuda y &Buscar...\tF1", ID_HELP + MENUITEM "&Usando la Ayuda\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Info sobre &ArchivoWine...", ID_ABOUT_WINEFILE + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ejecutar" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "Orden:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Como &SÝmbolo",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&Aceptar",1,158,6,47,14 + PUSHBUTTON "&Cancelar",2,158,23,47,14 + PUSHBUTTON "&Ayuda",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Buscar Programa en el menu Inicio" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filtro:",IDC_STATIC,7,9,23,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Marcar Entradas",IDC_CHECK_ENTRIES,136,7,57,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de Pantalla" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Por favor seleccione su algoritmo de alineamiento preferido:", + IDC_STATIC,7,7,195,8 + CONTROL "izquierda/arriba abajo",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "izquierda/arriba derecha",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "derecha/arriba izquierda",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "derecha/arriba abajo",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "derecha/abajo arriba",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "izquierda/abajo derecha",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "derecha/abajo izquierda",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "derecha/abajo",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "borde inferior",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "borde H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "aproximado",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de la Barra de Tareas" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Mostrar &Reloj",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,56,10 + CONTROL "&Ocultar iconos de notificacion inactivos", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,136,10 + PUSHBUTTON "&Notificaciones...",ID_CONFIG_NOTIFYAREA,145,173,64,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades del Men· Inicio" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Configurar Iconos de Notificaciones" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Texto de Info:",IDC_LABEL1,8,44,51,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,82,42,117,14,ES_AUTOHSCROLL + LTEXT "TÝtulo de la V&entana:",IDC_LABEL2,8,63,70,8 + EDITTEXT IDC_NOTIFY_TITLE,82,60,117,14,ES_AUTOHSCROLL + LTEXT "&Parche del M¾dulo:",IDC_LABEL3,8,81,65,8 + EDITTEXT IDC_NOTIFY_MODULE,82,78,117,14,ES_AUTOHSCROLL + GROUPBOX "Modo de &Display",IDC_LABEL4,7,96,157,28 + CONTROL "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,38,10 + CONTROL "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,36,10 + CONTROL "A&utoocultar",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,50,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "?ltimo cambio:",IDC_LABEL6,7,132,50,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "Mostrar Ocu&ltos",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,64,10 + DEFPUSHBUTTON "&Aceptar",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Cancelar",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Elegir modo MDI / SDI" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Por favor, seleccione su interfaz de usuario preferida para el explorador:", + IDC_STATIC,7,7,170,18 + CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,123,10 + CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,53,116,10 + LTEXT "Esta configuraci¾n se usarß por defecto y apartir de ahora para todas las ventanas del explorador.", + IDC_STATIC,7,76,174,22 + DEFPUSHBUTTON "&Aceptar",IDOK,29,105,50,14,WS_GROUP + PUSHBUTTON "&Cancelar",IDCANCEL,106,105,50,14 +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "Iniciar" + IDS_LOGOFF "Salir..." + IDS_SHUTDOWN "Apagar..." + IDS_LAUNCH "Ejecutar..." + IDS_START_HELP "Ayuda" + IDS_SEARCH_FILES "Buscar..." + IDS_DOCUMENTS "Documentos" + IDS_FAVORITES "Favoritos" + IDS_PROGRAMS "Programas" + IDS_SETTINGS "Configuraci¾n" + IDS_EXPLORE "Explorar" + IDS_EMPTY "(VacÝo)" + IDS_RECENT "Documentos Recientes" + IDS_ADMIN "Administracion" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Men· Inicio" + IDS_MINIMIZE_ALL "mimimizar todas las ventanas" + IDS_DESKTOP_NUM "Escritorio %d" + IDS_VOLUME "Volumen" + IDS_ITEMS_CUR "Objetos Actuales" + IDS_ITEMS_CONFIGURED "configuraci¾n" + IDS_ITEMS_VISIBLE "visible" + IDS_ITEMS_HIDDEN "oculto" + IDS_NOTIFY_SHOW "mostrar" + IDS_NOTIFY_HIDE "ocultar" + IDS_NOTIFY_AUTOHIDE "autoocultar" + IDS_SHOW_HIDDEN_ICONS "Mostrar iconos ocultos" + IDS_HIDE_ICONS "Ocultar iconos" + IDS_TERMINATE "Finalizar ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Red" + IDS_CONNECTIONS "Conexiones de Red" + IDS_DRIVES "Unidades" + IDS_SEARCH_COMPUTER "Buscar PC..." + IDS_SETTINGS_MENU "Men·s de Configuraci¾n" + IDS_CONTROL_PANEL "Panel de Control" + IDS_PRINTERS "Impresoras" + IDS_BROWSE "Explorar Archivos" + IDS_SEARCH_PRG "Buscar Programas..." + IDS_ALL_USERS "Todos los Usuarios\\" + IDS_SEARCH "Buscar" + IDS_ABOUT_EXPLORER "&Acerca de Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Ha seleccionado mßs de un programa.\n?Estß seguro de que desea ejecutarlos todos?" + IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio" + IDS_DESKTOP "Escritorio" + IDS_TASKBAR "Barra de Tareas" +END + +#endif // Spanish (Castilian) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED +

1 0

[navaraf] 18044: Patricio Martínez Ros <silencium@wanadoo.es>
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Patricio Martínez Ros <silencium(a)wanadoo.es> Update spanish translation. Modified: trunk/reactos/subsys/system/regedit/Es.rc _____ Modified: trunk/reactos/subsys/system/regedit/Es.rc --- trunk/reactos/subsys/system/regedit/Es.rc 2005-09-25 09:23:05 UTC (rev 18043) +++ trunk/reactos/subsys/system/regedit/Es.rc 2005-09-25 10:52:51 UTC (rev 18044) @@ -2,6 +2,7 @@ * Regedit resources * * Copyright 2003 JosÚ Manuel Ferrer Ortiz + * Copyright 2005 Patricio MartÝnez Ros * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -88,7 +89,7 @@ END POPUP "&Ayuda" BEGIN - MENUITEM "&Help Topics", ID_HELP_HELPTOPICS + MENUITEM "Temas de Ayuda", ID_HELP_HELPTOPICS MENUITEM SEPARATOR MENUITEM "&Acerca de Editor de registro", ID_HELP_ABOUT END

1 0

[navaraf] 18043: Add TestAlert check to NtContinue.
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Add TestAlert check to NtContinue. Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c _____ Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c --- trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 09:22:22 UTC (rev 18042) +++ trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 09:23:05 UTC (rev 18043) @@ -80,6 +80,11 @@ KeLowerIrql(oldIrql); } + if (TestAlert) + { + KeTestAlertThread(TrapFrame->PreviousMode); + } + /* Restore the user context */ Thread->TrapFrame = PrevTrapFrame; __asm__("mov %%ebx, %%esp;\n" "jmp _KiServiceExit": : "b" (TrapFrame));

1 0

[navaraf] 18042: Fix up the indentation.
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Fix up the indentation. Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c _____ Modified: trunk/reactos/ntoskrnl/ps/i386/continue.c --- trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 04:55:16 UTC (rev 18041) +++ trunk/reactos/ntoskrnl/ps/i386/continue.c 2005-09-25 09:22:22 UTC (rev 18042) @@ -22,66 +22,67 @@ * @implemented */ NTSTATUS STDCALL -NtContinue ( - IN PCONTEXT Context, - IN BOOLEAN TestAlert) +NtContinue( + IN PCONTEXT Context, + IN BOOLEAN TestAlert) { - PKTHREAD Thread = KeGetCurrentThread(); - PKTRAP_FRAME TrapFrame = Thread->TrapFrame; - PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; - PFX_SAVE_AREA FxSaveArea; - KIRQL oldIrql; + PKTHREAD Thread = KeGetCurrentThread(); + PKTRAP_FRAME TrapFrame = Thread->TrapFrame; + PKTRAP_FRAME PrevTrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + PFX_SAVE_AREA FxSaveArea; + KIRQL oldIrql; - DPRINT("NtContinue: Context: Eip=0x%x, Esp=0x%x\n", Context->Eip, Context->Esp ); - PULONG Frame = 0; - __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); - DPRINT( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame ); #ifndef NDEBUG - KeRosDumpStackFrames(NULL,5); + DPRINT("NtContinue: Context: Eip=0x%x, Esp=0x%x\n", Context->Eip, Context->Esp ); + PULONG Frame = 0; + __asm__("mov %%ebp, %%ebx" : "=b" (Frame) : ); + DPRINT( "NtContinue(): Ebp=%x, prev/TF=%x/%x\n", Frame, Frame[0], TrapFrame ); + KeRosDumpStackFrames(NULL,5); #endif - if ( Context == NULL ) - { - DPRINT1("NtContinue called with NULL Context\n"); - return STATUS_INVALID_PARAMETER; - } + if (Context == NULL) + { + DPRINT1("NtContinue called with NULL Context\n"); + return STATUS_INVALID_PARAMETER; + } - if ( TrapFrame == NULL ) - { - CPRINT("NtContinue called but TrapFrame was NULL\n"); - KEBUGCHECK(0); - } + if (TrapFrame == NULL) + { + CPRINT("NtContinue called but TrapFrame was NULL\n"); + KEBUGCHECK(0); + } - /* - * Copy the supplied context over the register information that was saved - * on entry to kernel mode, it will then be restored on exit - * FIXME: Validate the context - */ - KeContextToTrapFrame ( Context, TrapFrame ); + /* + * Copy the supplied context over the register information that was saved + * on entry to kernel mode, it will then be restored on exit + * FIXME: Validate the context + */ + KeContextToTrapFrame(Context, TrapFrame); - /* Put the floating point context into the thread's FX_SAVE_AREA - * and make sure it is reloaded when needed. - */ - FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); - if (KiContextToFxSaveArea(FxSaveArea, Context)) - { - Thread->NpxState = NPX_STATE_VALID; - KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - if (KeGetCurrentPrcb()->NpxThread == Thread) - { - KeGetCurrentPrcb()->NpxThread = NULL; - Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); - } - else - { - ASSERT((Ke386GetCr0() & X86_CR0_TS) == X86_CR0_TS); - } - KeLowerIrql(oldIrql); - } + /* + * Put the floating point context into the thread's FX_SAVE_AREA + * and make sure it is reloaded when needed. + */ + FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); + if (KiContextToFxSaveArea(FxSaveArea, Context)) + { + Thread->NpxState = NPX_STATE_VALID; + KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); + if (KeGetCurrentPrcb()->NpxThread == Thread) + { + KeGetCurrentPrcb()->NpxThread = NULL; + Ke386SetCr0(Ke386GetCr0() | X86_CR0_TS); + } + else + { + ASSERT((Ke386GetCr0() & X86_CR0_TS) == X86_CR0_TS); + } + KeLowerIrql(oldIrql); + } - /* Restore the user context */ - Thread->TrapFrame = PrevTrapFrame; - __asm__("mov %%ebx, %%esp;\n" "jmp _KiServiceExit": : "b" (TrapFrame)); + /* Restore the user context */ + Thread->TrapFrame = PrevTrapFrame; + __asm__("mov %%ebx, %%esp;\n" "jmp _KiServiceExit": : "b" (TrapFrame)); - return STATUS_SUCCESS; /* this doesn't actually happen b/c KeRosTrapReturn() won't return */ + return STATUS_SUCCESS; /* this doesn't actually happen b/c KeRosTrapReturn() won't return */ }

1 0

[amunger] 18041: Fix getInterfaceInfoSet so GetInterfaceInfo returns only non-loopback adapters, however, we still return some incorrect info.
by amunger＠svn.reactos.com 25 Sep '05

25 Sep '05

Fix getInterfaceInfoSet so GetInterfaceInfo returns only non-loopback adapters, however, we still return some incorrect info. Silenced a DPRINT. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-25 00:35:13 UTC (rev 18040) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-25 04:55:16 UTC (rev 18041) @@ -363,6 +363,7 @@ if( infoSetInt ) { for( i = 0; i < numEntities; i++ ) { if( isInterface( &entIDSet[i] ) ) { + infoSetInt[curInterf].entity_id = entIDSet[i]; status = tdiGetMibForIfEntity ( tcpFile, &entIDSet[i], @@ -769,7 +770,7 @@ sizeof(info.if_info) ); } - DPRINT1("entry->bDescr = %s\n", entry->bDescr); + DPRINT("entry->bDescr = %s\n", entry->bDescr); closeTcpFile( tcpFile ); } _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_main.c --- trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-09-25 00:35:13 UTC (rev 18040) +++ trunk/reactos/lib/iphlpapi/iphlpapi_main.c 2005-09-25 04:55:16 UTC (rev 18041) @@ -935,8 +935,9 @@ if (!dwOutBufLen) ret = ERROR_INVALID_PARAMETER; else { - DWORD numInterfaces = getNumInterfaces(); - ULONG size = sizeof(IP_INTERFACE_INFO) + (numInterfaces - 1) * + DWORD numNonLoopbackInterfaces = getNumNonLoopbackInterfaces(); + DPRINT("numNonLoopbackInterfaces == 0x%x\n", numNonLoopbackInterfaces); + ULONG size = sizeof(IP_INTERFACE_INFO) + (numNonLoopbackInterfaces) * sizeof(IP_ADAPTER_INDEX_MAP); if (!pIfTable || *dwOutBufLen < size) { @@ -944,10 +945,11 @@ ret = ERROR_INSUFFICIENT_BUFFER; } else { - InterfaceIndexTable *table = getInterfaceIndexTable(); + InterfaceIndexTable *table = getNonLoopbackInterfaceIndexTable(); + DPRINT("table->numIndexes == 0x%x\n", table->numIndexes); if (table) { - size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes - 1) * + size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes) * sizeof(IP_ADAPTER_INDEX_MAP); if (*dwOutBufLen < size) { *dwOutBufLen = size;

1 0

[npwoods] 18040: 1. Moved windows styles pertaining to the edit control to main.h
by npwoods＠svn.reactos.com 25 Sep '05

25 Sep '05

1. Moved windows styles pertaining to the edit control to main.h 2. Stopped using WS_BORDER on the edit control Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-25 00:12:12 UTC (rev 18039) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-25 00:35:13 UTC (rev 18040) @@ -617,8 +617,7 @@ VOID DIALOG_EditWrap(VOID) { static const WCHAR editW[] = { 'e','d','i','t',0 }; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL; + DWORD dwStyle; RECT rc; DWORD size; LPWSTR pTemp; @@ -633,7 +632,7 @@ GetWindowText(Globals.hEdit, pTemp, size); DestroyWindow(Globals.hEdit); GetClientRect(Globals.hMainWnd, &rc); - if( Globals.bWrapLongLines ) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; + dwStyle = Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE; Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, dwStyle, 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-25 00:12:12 UTC (rev 18039) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-25 00:35:13 UTC (rev 18040) @@ -222,9 +222,7 @@ static const WCHAR editW[] = { 'e','d','i','t',0 }; RECT rc; GetClientRect(hWnd, &rc); - Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL, + Globals.hEdit = CreateWindowEx(EDIT_EXSTYLE, editW, NULL, EDIT_STYLE, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); break; _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-25 00:12:12 UTC (rev 18039) +++ trunk/reactos/subsys/system/notepad/main.h 2005-09-25 00:35:13 UTC (rev 18040) @@ -23,6 +23,11 @@ #include "notepad_res.h" +#define EDIT_STYLE (WS_CHILD | WS_VISIBLE | WS_VSCROLL \ + | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL) +#define EDIT_STYLE_WRAP (EDIT_STYLE | WS_HSCROLL | ES_AUTOHSCROLL) +#define EDIT_EXSTYLE (WS_EX_CLIENTEDGE) + #define MAX_STRING_LEN 255 #define ENCODING_ANSI 0

1 0

[npwoods] 18039: Fixed property svn:eol-style
by npwoods＠svn.reactos.com 25 Sep '05

25 Sep '05

Fixed property svn:eol-style Modified: trunk/reactos/subsys/system/notepad/text.c _____ Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2005-09-25 00:00:03 UTC (rev 18038) +++ trunk/reactos/subsys/system/notepad/text.c 2005-09-25 00:12:12 UTC (rev 18039) @@ -1,389 +1,389 @@ -/* - * Notepad (text.c) - * - * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#define UNICODE - -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> - -#include "main.h" - -static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) -{ - LPWSTR pszNewText; - - if (dwAppendLen > 0) - { - if (*ppszText) - { - pszNewText = (LPWSTR) HeapReAlloc(GetProcessHeap(), 0, *ppszText, (*pdwTextLen + dwAppendLen) * sizeof(WCHAR)); - } - else - { - pszNewText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwAppendLen * sizeof(WCHAR)); - } - - if (!pszNewText) - return FALSE; - - memcpy(pszNewText + *pdwTextLen, pszAppendText, dwAppendLen * sizeof(WCHAR)); - *ppszText = pszNewText; - *pdwTextLen += dwAppendLen; - } - return TRUE; -} - -BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) -{ - DWORD dwSize; - LPBYTE pBytes = NULL; - LPCWSTR pszText; - LPWSTR pszAllocText = NULL; - DWORD dwPos, i; - DWORD dwCharCount; - BOOL bSuccess = FALSE; - BYTE b; - int iEncoding = ENCODING_ANSI; - int iCodePage; - WCHAR szCrlf[2] = { '\r', '\n' }; - DWORD adwEolnCount[3] = { 0, 0, 0 }; - - *ppszText = NULL; - *pdwTextLen = 0; - - dwSize = GetFileSize(hFile, NULL); - if (dwSize == INVALID_FILE_SIZE) - goto done; - - pBytes = HeapAlloc(GetProcessHeap(), 0, dwSize + 2); - if (!pBytes) - goto done; - - if (!ReadFile(hFile, pBytes, dwSize, &dwSize, NULL)) - goto done; - dwPos = 0; - - /* Make sure that there is a NUL character at the end, in any encoding */ - pBytes[dwSize + 0] = '\0'; - pBytes[dwSize + 1] = '\0'; - - /* Look for Byte Order Marks */ - if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) - { - iEncoding = ENCODING_UNICODE; - dwPos += 2; - } - else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) - { - iEncoding = ENCODING_UNICODE_BE; - dwPos += 2; - } - else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) - { - iEncoding = ENCODING_UTF8; - dwPos += 3; - } - - switch(iEncoding) - { - case ENCODING_UNICODE_BE: - for (i = dwPos; i < dwSize-1; i += 2) - { - b = pBytes[i+0]; - pBytes[i+0] = pBytes[i+1]; - pBytes[i+1] = b; - } - /* fall through */ - - case ENCODING_UNICODE: - pszText = (LPCWSTR) &pBytes[dwPos]; - dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); - break; - - case ENCODING_ANSI: - case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (iEncoding == ENCODING_UTF8) - iCodePage = CP_UTF8; - else - goto done; - - dwCharCount = MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, NULL, 0); - if (dwCharCount == 0) - goto done; - - pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); - if (!pszAllocText) - goto done; - - if (!MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) - goto done; - - pszAllocText[dwCharCount] = '\0'; - pszText = pszAllocText; - break; - } - - dwPos = 0; - for (i = 0; i < dwCharCount; i++) - { - switch(pszText[i]) - { - case '\r': - if ((i < dwCharCount-1) && (pszText[i+1] == '\n')) - { - i++; - adwEolnCount[EOLN_CRLF]++; - break; - } - /* fall through */ - - case '\n': - if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) - return FALSE; - if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) - return FALSE; - dwPos = i + 1; - - if (pszText[i] == '\r') - adwEolnCount[EOLN_CR]++; - else - adwEolnCount[EOLN_LF]++; - break; - } - } - - if (!*ppszText && (pszText == pszAllocText)) - { - /* special case; don't need to reallocate */ - *ppszText = pszAllocText; - *pdwTextLen = dwCharCount; - pszAllocText = NULL; - } - else - { - /* append last remaining text */ - if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos + 1)) - return FALSE; - } - - /* chose which eoln to use */ - *piEoln = EOLN_CRLF; - if (adwEolnCount[EOLN_LF] > adwEolnCount[*piEoln]) - *piEoln = EOLN_LF; - if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) - *piEoln = EOLN_CR; - *piEncoding = iEncoding; - - bSuccess = TRUE; - -done: - if (pBytes) - HeapFree(GetProcessHeap(), 0, pBytes); - if (pszAllocText) - HeapFree(GetProcessHeap(), 0, pszAllocText); - - if (!bSuccess && *ppszText) - { - HeapFree(GetProcessHeap(), 0, *ppszText); - *ppszText = NULL; - *pdwTextLen = 0; - } - return bSuccess; -} - -static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) -{ - LPBYTE pBytes; - LPBYTE pAllocBuffer = NULL; - DWORD dwPos = 0; - DWORD dwByteCount; - BYTE buffer[1024]; - UINT iCodePage; - DWORD dwDummy, i; - BOOL bSuccess; - int iBufferSize, iRequiredBytes; - BYTE b; - - while(dwPos < dwTextLen) - { - switch(iEncoding) - { - case ENCODING_UNICODE: - pBytes = (LPBYTE) &pszText[dwPos]; - dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); - dwPos = dwTextLen; - break; - - case ENCODING_UNICODE_BE: - dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); - if (dwByteCount > sizeof(buffer)) - dwByteCount = sizeof(buffer); - - memcpy(buffer, &pszText[dwPos], dwByteCount); - for (i = 0; i < dwByteCount; i += 2) - { - b = buffer[i+0]; - buffer[i+0] = buffer[i+1]; - buffer[i+1] = b; - } - dwPos += dwByteCount / sizeof(WCHAR); - break; - - case ENCODING_ANSI: - case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (iEncoding == ENCODING_UTF8) - iCodePage = CP_UTF8; - else - goto done; - - iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); - if (iRequiredBytes <= 0) - { - goto done; - } - else if (iRequiredBytes < sizeof(buffer)) - { - pBytes = buffer; - iBufferSize = sizeof(buffer); - } - else - { - pAllocBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(), 0, iRequiredBytes); - if (!pAllocBuffer) - return FALSE; - pBytes = pAllocBuffer; - iBufferSize = iRequiredBytes; - } - - dwByteCount = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, (LPSTR) pBytes, iBufferSize, NULL, NULL); - if (!dwByteCount) - goto done; - - dwPos = dwTextLen; - break; - - default: - goto done; - } - - if (!WriteFile(hFile, pBytes, dwByteCount, &dwDummy, NULL)) - goto done; - - /* free the buffer, if we have allocated one */ - if (pAllocBuffer) - { - HeapFree(GetProcessHeap(), 0, pAllocBuffer); - pAllocBuffer = NULL; - } - } - bSuccess = TRUE; - -done: - if (pAllocBuffer) - HeapFree(GetProcessHeap(), 0, pAllocBuffer); - return bSuccess; -} - -BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) -{ - WCHAR wcBom; - WCHAR wcEoln; - BYTE bEoln; - LPBYTE pbEoln = NULL; - DWORD dwDummy, dwPos, dwNext, dwEolnSize = 0; - - /* Write the proper byte order marks if not ANSI */ - if (iEncoding != ENCODING_ANSI) - { - wcBom = 0xFEFF; - if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) - return FALSE; - } - - /* Identify the proper eoln to use */ - switch(iEoln) - { - case EOLN_LF: - bEoln = '\n'; - pbEoln = &bEoln; - dwEolnSize = sizeof(bEoln); - break; - case EOLN_CR: - bEoln = '\r'; - pbEoln = &bEoln; - dwEolnSize = sizeof(bEoln); - break; - } - - /* If we have an eoln, make sure it is of the proper encoding */ - if (pbEoln && ((iEncoding == ENCODING_UNICODE) || (iEncoding == ENCODING_UNICODE_BE))) - { - wcEoln = bEoln; - pbEoln = (LPBYTE) &wcEoln; - dwEolnSize = sizeof(wcEoln); - } - - dwPos = 0; - - while(dwPos < dwTextLen) - { - if (pbEoln) - { - /* Find the next eoln */ - dwNext = dwPos; - while(dwNext < dwTextLen-1) - { - if ((pszText[dwNext] == '\r') && (pszText[dwNext+1] == '\n')) - break; - dwNext++; - } - } - else - { - /* No eoln conversion is necessary */ - dwNext = dwTextLen; - } - - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) - return FALSE; - dwPos = dwNext; - - /* are we at an eoln? */ - while ((dwPos < dwTextLen-1) && - ((pszText[dwPos] == '\r') && (pszText[dwPos+1] == '\n'))) - { - if (!WriteFile(hFile, pbEoln, dwEolnSize, &dwDummy, NULL)) - return FALSE; - dwPos += 2; - } - } - while(dwPos < dwTextLen); - - return TRUE; -} - +/* + * Notepad (text.c) + * + * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define UNICODE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> + +#include "main.h" + +static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) +{ + LPWSTR pszNewText; + + if (dwAppendLen > 0) + { + if (*ppszText) + { + pszNewText = (LPWSTR) HeapReAlloc(GetProcessHeap(), 0, *ppszText, (*pdwTextLen + dwAppendLen) * sizeof(WCHAR)); + } + else + { + pszNewText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwAppendLen * sizeof(WCHAR)); + } + + if (!pszNewText) + return FALSE; + + memcpy(pszNewText + *pdwTextLen, pszAppendText, dwAppendLen * sizeof(WCHAR)); + *ppszText = pszNewText; + *pdwTextLen += dwAppendLen; + } + return TRUE; +} + +BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) +{ + DWORD dwSize; + LPBYTE pBytes = NULL; + LPCWSTR pszText; + LPWSTR pszAllocText = NULL; + DWORD dwPos, i; + DWORD dwCharCount; + BOOL bSuccess = FALSE; + BYTE b; + int iEncoding = ENCODING_ANSI; + int iCodePage; + WCHAR szCrlf[2] = { '\r', '\n' }; + DWORD adwEolnCount[3] = { 0, 0, 0 }; + + *ppszText = NULL; + *pdwTextLen = 0; + + dwSize = GetFileSize(hFile, NULL); + if (dwSize == INVALID_FILE_SIZE) + goto done; + + pBytes = HeapAlloc(GetProcessHeap(), 0, dwSize + 2); + if (!pBytes) + goto done; + + if (!ReadFile(hFile, pBytes, dwSize, &dwSize, NULL)) + goto done; + dwPos = 0; + + /* Make sure that there is a NUL character at the end, in any encoding */ + pBytes[dwSize + 0] = '\0'; + pBytes[dwSize + 1] = '\0'; + + /* Look for Byte Order Marks */ + if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) + { + iEncoding = ENCODING_UNICODE; + dwPos += 2; + } + else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) + { + iEncoding = ENCODING_UNICODE_BE; + dwPos += 2; + } + else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) + { + iEncoding = ENCODING_UTF8; + dwPos += 3; + } + + switch(iEncoding) + { + case ENCODING_UNICODE_BE: + for (i = dwPos; i < dwSize-1; i += 2) + { + b = pBytes[i+0]; + pBytes[i+0] = pBytes[i+1]; + pBytes[i+1] = b; + } + /* fall through */ + + case ENCODING_UNICODE: + pszText = (LPCWSTR) &pBytes[dwPos]; + dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + iCodePage = CP_ACP; + else if (iEncoding == ENCODING_UTF8) + iCodePage = CP_UTF8; + else + goto done; + + dwCharCount = MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, NULL, 0); + if (dwCharCount == 0) + goto done; + + pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); + if (!pszAllocText) + goto done; + + if (!MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) + goto done; + + pszAllocText[dwCharCount] = '\0'; + pszText = pszAllocText; + break; + } + + dwPos = 0; + for (i = 0; i < dwCharCount; i++) + { + switch(pszText[i]) + { + case '\r': + if ((i < dwCharCount-1) && (pszText[i+1] == '\n')) + { + i++; + adwEolnCount[EOLN_CRLF]++; + break; + } + /* fall through */ + + case '\n': + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) + return FALSE; + if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) + return FALSE; + dwPos = i + 1; + + if (pszText[i] == '\r') + adwEolnCount[EOLN_CR]++; + else + adwEolnCount[EOLN_LF]++; + break; + } + } + + if (!*ppszText && (pszText == pszAllocText)) + { + /* special case; don't need to reallocate */ + *ppszText = pszAllocText; + *pdwTextLen = dwCharCount; + pszAllocText = NULL; + } + else + { + /* append last remaining text */ + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos + 1)) + return FALSE; + } + + /* chose which eoln to use */ + *piEoln = EOLN_CRLF; + if (adwEolnCount[EOLN_LF] > adwEolnCount[*piEoln]) + *piEoln = EOLN_LF; + if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) + *piEoln = EOLN_CR; + *piEncoding = iEncoding; + + bSuccess = TRUE; + +done: + if (pBytes) + HeapFree(GetProcessHeap(), 0, pBytes); + if (pszAllocText) + HeapFree(GetProcessHeap(), 0, pszAllocText); + + if (!bSuccess && *ppszText) + { + HeapFree(GetProcessHeap(), 0, *ppszText); + *ppszText = NULL; + *pdwTextLen = 0; + } + return bSuccess; +} + +static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) +{ + LPBYTE pBytes; + LPBYTE pAllocBuffer = NULL; + DWORD dwPos = 0; + DWORD dwByteCount; + BYTE buffer[1024]; + UINT iCodePage; + DWORD dwDummy, i; + BOOL bSuccess; + int iBufferSize, iRequiredBytes; + BYTE b; + + while(dwPos < dwTextLen) + { + switch(iEncoding) + { + case ENCODING_UNICODE: + pBytes = (LPBYTE) &pszText[dwPos]; + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + dwPos = dwTextLen; + break; + + case ENCODING_UNICODE_BE: + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + if (dwByteCount > sizeof(buffer)) + dwByteCount = sizeof(buffer); + + memcpy(buffer, &pszText[dwPos], dwByteCount); + for (i = 0; i < dwByteCount; i += 2) + { + b = buffer[i+0]; + buffer[i+0] = buffer[i+1]; + buffer[i+1] = b; + } + dwPos += dwByteCount / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + iCodePage = CP_ACP; + else if (iEncoding == ENCODING_UTF8) + iCodePage = CP_UTF8; + else + goto done; + + iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); + if (iRequiredBytes <= 0) + { + goto done; + } + else if (iRequiredBytes < sizeof(buffer)) + { + pBytes = buffer; + iBufferSize = sizeof(buffer); + } + else + { + pAllocBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(), 0, iRequiredBytes); + if (!pAllocBuffer) + return FALSE; + pBytes = pAllocBuffer; + iBufferSize = iRequiredBytes; + } + + dwByteCount = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, (LPSTR) pBytes, iBufferSize, NULL, NULL); + if (!dwByteCount) + goto done; + + dwPos = dwTextLen; + break; + + default: + goto done; + } + + if (!WriteFile(hFile, pBytes, dwByteCount, &dwDummy, NULL)) + goto done; + + /* free the buffer, if we have allocated one */ + if (pAllocBuffer) + { + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + pAllocBuffer = NULL; + } + } + bSuccess = TRUE; + +done: + if (pAllocBuffer) + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + return bSuccess; +} + +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) +{ + WCHAR wcBom; + WCHAR wcEoln; + BYTE bEoln; + LPBYTE pbEoln = NULL; + DWORD dwDummy, dwPos, dwNext, dwEolnSize = 0; + + /* Write the proper byte order marks if not ANSI */ + if (iEncoding != ENCODING_ANSI) + { + wcBom = 0xFEFF; + if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) + return FALSE; + } + + /* Identify the proper eoln to use */ + switch(iEoln) + { + case EOLN_LF: + bEoln = '\n'; + pbEoln = &bEoln; + dwEolnSize = sizeof(bEoln); + break; + case EOLN_CR: + bEoln = '\r'; + pbEoln = &bEoln; + dwEolnSize = sizeof(bEoln); + break; + } + + /* If we have an eoln, make sure it is of the proper encoding */ + if (pbEoln && ((iEncoding == ENCODING_UNICODE) || (iEncoding == ENCODING_UNICODE_BE))) + { + wcEoln = bEoln; + pbEoln = (LPBYTE) &wcEoln; + dwEolnSize = sizeof(wcEoln); + } + + dwPos = 0; + + while(dwPos < dwTextLen) + { + if (pbEoln) + { + /* Find the next eoln */ + dwNext = dwPos; + while(dwNext < dwTextLen-1) + { + if ((pszText[dwNext] == '\r') && (pszText[dwNext+1] == '\n')) + break; + dwNext++; + } + } + else + { + /* No eoln conversion is necessary */ + dwNext = dwTextLen; + } + + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + return FALSE; + dwPos = dwNext; + + /* are we at an eoln? */ + while ((dwPos < dwTextLen-1) && + ((pszText[dwPos] == '\r') && (pszText[dwPos+1] == '\n'))) + { + if (!WriteFile(hFile, pbEoln, dwEolnSize, &dwDummy, NULL)) + return FALSE; + dwPos += 2; + } + } + while(dwPos < dwTextLen); + + return TRUE; +} + Property changes on: trunk/reactos/subsys/system/notepad/text.c ___________________________________________________________________ Name: svn:eol-style + native

1 0

[gvg] 18038: Fix GDB backtrace
by gvg＠svn.reactos.com 25 Sep '05

25 Sep '05

Fix GDB backtrace Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-24 23:45:05 UTC (rev 18037) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-25 00:00:03 UTC (rev 18038) @@ -255,6 +255,22 @@ mov ebx, [ebp+KTRAP_FRAME_EBP] mov edi, [ebp+KTRAP_FRAME_EIP] +#ifdef DBG + /* + * We want to know the address from where the syscall stub was called. + * If PrevMode is KernelMode, that address is stored in our own (kernel) + * stack, at location KTRAP_FRAME_ESP. + * If we're coming from UserMode, we load the usermode stack pointer + * and go back two frames (first frame is the syscall stub, second call + * is the caller of the stub). + */ + mov edi, [ebp+KTRAP_FRAME_ESP] + test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 + jz PrevWasKernelMode + mov edi, [edi+4] +PrevWasKernelMode: +#endif + /* Write the debug data */ mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 @@ -334,6 +350,22 @@ mov edi, esp rep movsd +#ifdef DBG + /* + * The following lines are for the benefit of GDB. It will see the return + * address of the "call ebx" below, find the last label before it and + * thinks that that's the start of the function. It will then check to see + * if it starts with a standard function prolog (push ebp, mov ebp,esp). + * When that standard function prolog is not found, it will stop the + * stack backtrace. Since we do want to backtrace into usermode, let's + * make GDB happy and create a standard prolog. + */ +KiSystemService: + push ebp + mov ebp,esp + pop ebp +#endif + /* Do the System Call */ call ebx

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs