Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mpiulachs] 31312: spanish localizations by Remialdo <remialdo at gmail dot com> - Updated: downloader, solitarie, winemine, screensaver 3dtext - Added: mmc, screensaver logon, freeldr fdebug, console See issue #2898 for more details.
by mpiulachs＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: mpiulachs Date: Wed Dec 19 02:05:26 2007 New Revision: 31312 URL: http://svn.reactos.org/svn/reactos?rev=31312&view=rev Log: spanish localizations by Remialdo <remialdo at gmail dot com> - Updated: downloader,solitarie, winemine,screensaver 3dtext - Added: mmc,screensaver logon, freeldr fdebug, console See issue #2898 for more details. Added: trunk/reactos/base/applications/mmc/lang/es-ES.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc (with props) trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc (with props) trunk/reactos/dll/win32/console/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc trunk/rosapps/downloader/lang/es-ES.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -4,6 +4,7 @@ * FILE: base/applications/games/solitaire/lang/es-ES.rc * PURPOSE: Spanish Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + * ACTUALIZADO: Javier Remacha - 18/12/17 */ #include "resource.h" @@ -14,22 +15,22 @@ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT -CAPTION "Options" +CAPTION "Opciones" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Cards", -1, 7, 7, 65, 40 - AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + GROUPBOX "Cartas", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "Sacar &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Sacar &Tres", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Mostrar tiempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Barra de estado", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 END IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Select Card Back" +CAPTION "Seleccionar el reverso" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -37,8 +38,8 @@ CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 - DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + DEFPUSHBUTTON "Aceptar", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancelar", IDCANCEL, 162, 77, 54, 13 END @@ -46,10 +47,10 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_NAME "Solitario" + IDS_SOL_ABOUT "Solitario por J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" - IDS_SOL_WIN "Congratulations, you win!!" + IDS_SOL_WIN "Felicidadas, ¡¡Has ganado!!" END @@ -61,7 +62,7 @@ BEGIN MENUITEM "&Repartir\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Barajar...", IDM_GAME_DECK + MENUITEM "&Barajas...", IDM_GAME_DECK MENUITEM "&Opciones...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Salir", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -69,7 +69,7 @@ EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER DEFPUSHBUTTON "Aceptar", IDOK, 86, 32, 45, 15 - PUSHBUTTON "Cancel", IDCANCEL, 86, 52, 45, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 86, 52, 45, 15 } DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 Added: trunk/reactos/base/applications/mmc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/mmc/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,26 @@ +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-18 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM SEPARATOR + MENUITEM "Sa&lir\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Ayuda" + BEGIN + MENUITEM "&Acerca de la Consola de Administración de ReactOS...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Consola de Administración de ReactOS" + IDS_CONSOLETITLE "Consola%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -15,5 +15,5 @@ BEGIN IDS_DESCRIPTION "3D Text ScreenSaver" IDS_TITLE "Acerca de.." - IDS_TEXT "No options need to be set." + IDS_TEXT "Ninguna opción necesita ser configurada." END Added: trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logotipo ReactOS" + IDS_TITLE "Acerca de" + IDS_TEXT "Ninguna opción necesita ser configurada." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc (added) +++ trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,191 @@ +///////////////////////////////////////////////////////////////////////////// +// Spanish resources, Javier Remacha 2007-12-18 + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Conectar", IDM_FILE_CONNECT + MENUITEM "&Desconectar", IDM_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Limpiar pantalla", IDM_FILE_CLEARDISPLAY + MENUITEM SEPARATOR + MENUITEM "&Comenzar Captura", IDM_FILE_STARTCAPTURE + MENUITEM "&Parar Captura", IDM_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Local Echo", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "Sa&lir", IDM_EXIT + END + POPUP "Ay&uda" + BEGIN + MENUITEM "&Acerca de ...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + 63, IDM_ABOUT, ASCII, ALT // "?" + 47, IDM_ABOUT, ASCII, ALT // "/" +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Acerca de FreeLoader Debugger" +FONT 8, "Tahoma" +BEGIN + CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "Aceptar",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOG DISCARDABLE 0, 0, 196, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Opciones de Conexión" +FONT 8, "Tahoma" +BEGIN + LTEXT "Introduzca el puerto COM (p.e. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Introduzca la velocidad de transmisión (p.e. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar",IDOK,45,79,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Archivo de Captura" +FONT 8, "Tahoma" +BEGIN + LTEXT "Archivo de la Captura:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&Buscar",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "Aceptar",IDOK,139,74,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,194,74,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hola mundo" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + +#endif // +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/console/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,0 +1,150 @@ + +/* + *Spanish Language resource file + * Javier Remacha 2007-12-01 + */ + + + +#include <commctrl.h> + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Opciones" +FONT 8, "MS Shell Dlg" +BEGIN +GROUPBOX "Tamaño del Cursor", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "&Pequeño", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 +CONTROL "&Mediano", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 +CONTROL "&Grande", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 +GROUPBOX "Mostrar Opciones", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "&Ventana", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 +CONTROL "&Pantalla Completa", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 +GROUPBOX "Historial de Comandos:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +LTEXT "Tamaño del &Buffer", -1, 25, 100, 60, 15 +EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 +LTEXT "&Númber de Buffers:", -1, 25, 120, 80, 15 +EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 +CHECKBOX "&Descartar Viejos Duplicados", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 + + +GROUPBOX "Editar Opciones", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP +CHECKBOX "Modo &Edición rápida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +CHECKBOX "Modo &Insertar", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Fuente" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Window Preview", -1, 10, 7, 65, 10 +LTEXT "Tamaño", -1, 130, 10, 30, 10 +CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 +LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL +LTEXT "&Fuente", -1, 10, 105, 35, 10 +CHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 +LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL +GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 +CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 +LTEXT "Cada caracter es:", -1, 130, 165, 75, 10 +LTEXT "anchura del pixel\naltura del pixel", -1, 140, 180, 65, 20 +LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 +LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 +END + +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Disposición" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Ventana de Previsualización", -1, 10, 7, 65, 10 +CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 +GROUPBOX "Tamaño del Buffer de Pantalla", -1, 130, 15, 115, 40 +LTEXT "&Anchura:", -1, 135, 30, 25, 10 +LTEXT "A&ltura:", -1, 135, 40, 25, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +GROUPBOX "Tamaño de la Ventana", -1, 130, 60, 115, 40 +LTEXT "&A&nchura:", -1, 135, 70, 25, 10 +LTEXT "A&l&tura:", -1, 135, 80, 25, 10 +EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +GROUPBOX "Posición de la Ventana", -1, 130, 105, 115, 55 +LTEXT "&Izquierda:", -1, 135, 120, 25, 10 +LTEXT "&Arriba:", -1, 135, 130, 25, 10 +EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +CHECKBOX "Deje la &posición de ventana del sistema", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 +END + +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Colores" +FONT 8, "MS Shell Dlg" +BEGIN +CONTROL "&Texto Pantalla", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 +CONTROL "&Fondo Pantalla", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 +CONTROL "Texto &Emergente", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 +CONTROL "Fondo E&mergente", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 +GROUPBOX "Valores de Color Seleccionados", -1, 120, 15, 90, 45 +LTEXT "&Rojo:", -1, 125, 25, 30, 10 +EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 +LTEXT "&Verde:", -1, 125, 35, 30, 10 +EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 +LTEXT "&Azul:", -1, 125, 45, 30, 10 +EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 +CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 +CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 +GROUPBOX "Colores de Pantalla Seleccionados", -1, 10, 110, 200, 40 +CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 +GROUPBOX "Colores Emergentes Seleccionados", -1, 10, 155, 200, 40 +CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 +END + +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Aplicar Propiedades" +FONT 8, "MS Shell Dlg" +BEGIN +CONTROL "&Aplicar propiedades sólo a la ventana actual", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 +CONTROL "&Guardar propiedades para futuras ventanas con el mismo título", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 +PUSHBUTTON "Aceptar", IDOK, 25, 80, 40, 15, WS_VISIBLE +PUSHBUTTON "Cancelar", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Consola" + IDS_CPLDESCRIPTION "Configurar propiedades de la consola." + IDS_APPLY_SHORTCUT_ALL "Modificar &atajo que comienza esta ventana" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_RASTERFONTS "Fuentes Raster" +END Propchange: trunk/reactos/dll/win32/console/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/downloader/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/es-ES.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/es-ES.rc (original) +++ trunk/rosapps/downloader/lang/es-ES.rc Wed Dec 19 02:05:26 2007 @@ -1,3 +1,8 @@ +/* + *Spanish Language resource file + * Actualizado Javier Remacha 2007-12-01 + */ + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 @@ -7,22 +12,22 @@ BEGIN CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP END IDD_PROF DIALOGEX 6, 6, 267, 110 STYLE DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "Proferences" +CAPTION "Preferencias" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Download folder:", -1, 6, 10, 140, 8 + LTEXT "Carpeta de descarga:", -1, 6, 10, 140, 8 EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 - AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP - LTEXT "Update server:", -1, 6, 55, 140, 8 + PUSHBUTTON "&Seleccionar...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Borrar archivos de instalación tras la instalación", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Actualizar servidor:", -1, 6, 55, 140, 8 EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 + DEFPUSHBUTTON "&Aceptar", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 207, 90, 54, 15 END STRINGTABLE DISCARDABLE @@ -31,11 +36,11 @@ IDS_WELCOME_TITLE "Bienvenido al descargador de ReactOS" IDS_WELCOME "Por favor selecciona una categoría de la izquierda. Esta es la versión 1.1." IDS_NO_APP_TITLE "Ninguna aplicación seleccionada" - IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." + IDS_NO_APP "Por favor seleccione una Aplicación antes de pulsar el botón de Descarga, si necesita asistencia por favor pulsa el botón con la interrogación en la esquina superior derecha." IDS_UPDATE_TITLE "Actualizar" - IDS_UPDATE "Perdona esta característica no a sido implementada todavía." + IDS_UPDATE "Perdón esta característica no a sido implementada todavía." IDS_HELP_TITLE "Ayuda" - IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulda el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." + IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulsa el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." IDS_NO_APPS "Perdón, aun no hay ninguna aplicación en esta categoría. Puedes ayudar y añadir más aplicaciones." IDS_CHOOSE_APP "Por favor selecciona una aplicación." IDS_CHOOSE_SUB "Por favor selecciona una subcategoría." @@ -44,14 +49,14 @@ IDS_XMLERROR_1 "¡No se a encontrado el archivo xml!" IDS_XMLERROR_2 "¡No se ha podido analizar el archivo xml!" IDS_DOWNLOAD_ERROR "Imposible descargar el archivo.\nPor favor verifica tu conexión a internet." - IDS_VERSION "Version: " - IDS_LICENCE "Licence: " - IDS_MAINTAINER "Maintainer: " - IDS_APPS_TITLE "Applications" - IDS_CATS_TITLE "Categories" - IDS_CHOOSE_FOLDER "Please, choose the folder..." - IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_VERSION "Versión: " + IDS_LICENCE "Licencia: " + IDS_MAINTAINER "Mantenido por: " + IDS_APPS_TITLE "Aplicaciones" + IDS_CATS_TITLE "Categorias" + IDS_CHOOSE_FOLDER "Por favor, seleccione la carpeta..." + IDS_NOTCREATE_REGKEY "No se puede crear la llave del registro." IDS_DOWNLOAD_FOLDER "Downloader" - IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UNABLECREATE_FOLDER "¡Imposible crear una carpeta con este nombre!" IDS_UPDATE_URL "http://svn.reactos.org" END

1 0

[janderwald] 31311: - convert buffer back if pidle simple - fixes error message when opening control panel in explorer and displays the name for the folder option cpl (thus executing is not yet implemented)
by janderwald＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: janderwald Date: Wed Dec 19 02:01:14 2007 New Revision: 31311 URL: http://svn.reactos.org/svn/reactos?rev=31311&view=rev Log: - convert buffer back if pidle simple - fixes error message when opening control panel in explorer and displays the name for the folder option cpl (thus executing is not yet implemented) Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanelfolder.c (original) +++ trunk/reactos/dll/win32/shell32/cpanelfolder.c Wed Dec 19 02:01:14 2007 @@ -691,7 +691,12 @@ return E_OUTOFMEMORY; if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) wszPath[0] = '\0'; - } + } else { + if (bSimplePidl) { + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) + wszPath[0] = '\0'; + } + } } strRet->uType = STRRET_CSTR;

1 0

[mpiulachs] 31310: - Validate base address format - Ensure base address value between 0x00400000 and 0x80000000
by mpiulachs＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: mpiulachs Date: Wed Dec 19 00:20:59 2007 New Revision: 31310 URL: http://svn.reactos.org/svn/reactos?rev=31310&view=rev Log: - Validate base address format - Ensure base address value between 0x00400000 and 0x80000000 Modified: branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Wed Dec 19 00:20:59 2007 @@ -2029,7 +2029,26 @@ const Module* module_ ) : Property( node_ , project_, module_) { - //TODO: Add code to validate baseaddress + if (Convert::IsValidHex(value)) + { + if ((Convert::HexToInt(value) >= Convert::HexToInt("0x00400000")) && + (Convert::HexToInt(value) <= Convert::HexToInt("0x80000000")) ) + { + //Is valid + } + else + throw XMLInvalidBuildFileException ( + node->location, + "Out of range base address '%s' with value '%s'. Valid range is from 0x00400000 to 0x80000000", + name.c_str(), + value.c_str()); + } + else + throw XMLInvalidBuildFileException ( + node->location, + "Base adress '%s' has an invalid hexadecimal value '%s'", + name.c_str(), + value.c_str() ); } PchFile::PchFile ( Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Wed Dec 19 00:20:59 2007 @@ -17,6 +17,7 @@ */ #include "pch.h" #include <assert.h> +#include <sstream> #include "rbuild.h" #include "backend/backend.h" @@ -33,6 +34,41 @@ value ); else return ""; +} + +bool +Convert::IsValidHex ( const std::string& value ) +{ + return (HexToInt (value) != 0); +} + +unsigned long +Convert::HexToInt( const std::string& value ) +{ + unsigned long num = 0; + std::istringstream ss(value); + ss >> std::hex; + if (!(ss >> num)) + { + return 0; + } + return num; +} + +std::string +Convert::StringToHex (unsigned long num) +{ + std::string s1; + char sign[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; + int div, base = 16; + + while (num >= 1) + { + div = num % base; + num = num / base; + s1 = sign[div] + s1; + } + return s1; } string Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Wed Dec 19 00:20:59 2007 @@ -197,6 +197,14 @@ bool InstallFiles; }; +class Convert +{ +public: + static unsigned long HexToInt ( const std::string& value ); + static bool IsValidHex ( const std::string& value ); + static std::string StringToHex ( unsigned long num); +}; + class Environment { public:

1 0

[mpiulachs] 31309: - fix a typo
by mpiulachs＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: mpiulachs Date: Tue Dec 18 22:02:09 2007 New Revision: 31309 URL: http://svn.reactos.org/svn/reactos?rev=31309&view=rev Log: - fix a typo Modified: branches/rbuild/reactos/baseaddress.rbuild branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/baseaddress.rbui… ============================================================================== --- branches/rbuild/reactos/baseaddress.rbuild (original) +++ branches/rbuild/reactos/baseaddress.rbuild Tue Dec 18 22:02:09 2007 @@ -1,151 +1,151 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <baseadress name="BASEADDRESS_REGTESTS" value="0x07000000" /> - <baseadress name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> - <baseadress name="BASEADDRESS_COMCAT" value="0x20A50000" /> - <baseadress name="BASEADDRESS_DEVENUM" value="0x35680000" /> - <baseadress name="BASEADDRESS_PWRCFG" value="0x587e0000" /> - <baseadress name="BASEADDRESS_MMSYS" value="0x588a0000" /> - <baseadress name="BASEADDRESS_JOY" value="0x589b0000" /> - <baseadress name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> - <baseadress name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> - <baseadress name="BASEADDRESS_OBJSEL" value="0x5b400000" /> - <baseadress name="BASEADDRESS_TAPIUI" value="0x5b770000" /> - <baseadress name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> - <baseadress name="BASEADDRESS_USRMGR" value="0x5c900000" /> - <baseadress name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> - <baseadress name="BASEADDRESS_DPLAYX" value="0x5e080000" /> - <baseadress name="BASEADDRESS_INPUT" value ="0x5e400000" /> - <baseadress name="BASEADDRESS_DINPUT" value="0x5f580000" /> - <baseadress name="BASEADDRESS_NETID" value="0x5f660000" /> - <baseadress name="BASEADDRESS_MAPI32" value="0x62250000" /> - <baseadress name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> - <baseadress name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> - <baseadress name="BASEADDRESS_SYSDM" value="0x64dd0000" /> - <baseadress name="BASEADDRESS_NCPL" value="0x64ea0000" /> - <baseadress name="BASEADDRESS_MAIN" value="0x64f40000" /> - <baseadress name="BASEADDRESS_INTL" value="0x64fb0000" /> - <baseadress name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> - <baseadress name="BASEADDRESS_DESK" value="0x65080000" /> - <baseadress name="BASEADDRESS_APPWIZ" value="0x65100000" /> - <baseadress name="BASEADDRESS_MLANG" value="0x65140000" /> - <baseadress name="BASEADDRESS_ACCESS" value="0x65180000" /> - <baseadress name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> - <baseadress name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> - <baseadress name="BASEADDRESS_HID" value="0x688f0000" /> - <baseadress name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> - <baseadress name="BASEADDRESS_PSAPI" value="0x68f70000" /> - <baseadress name="BASEADDRESS_OLEACC" value="0x69640000" /> - <baseadress name="BASEADDRESS_WINMM" value="0x697d0000" /> - <baseadress name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> - <baseadress name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> - <baseadress name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> - <baseadress name="BASEADDRESS_SHELL32" value="0x6a360000" /> - <baseadress name="BASEADDRESS_UNICODE" value="0x6b200000" /> - <baseadress name="BASEADDRESS_ADVPACK" value="0x6b300000" /> - <baseadress name="BASEADDRESS_CONTROL" value="0x6b310000" /> - <baseadress name="BASEADDRESS_NCPA" value="0x6b320000" /> - <baseadress name="BASEADDRESS_DBGHELP" value="0x6b330000" /> - <baseadress name="BASEADDRESS_DINPUT8" value="0x6b340000" /> - <baseadress name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> - <baseadress name="BASEADDRESS_DSOUND" value="0x6b360000" /> - <baseadress name="BASEADDRESS_GLU32" value="0x6b370000" /> - <baseadress name="BASEADDRESS_MESA32" value="0x6b380000" /> - <baseadress name="BASEADDRESS_OPENGL32" value="0x6b390000" /> - <baseadress name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> - <baseadress name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> - <baseadress name="BASEADDRESS_URLMON" value="0x6b3c0000" /> - <baseadress name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> - <baseadress name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> - <baseadress name="BASEADDRESS_DESKMON" value="0x6d400000" /> - <baseadress name="BASEADDRESS_DESKADP" value="0x6d410000" /> - <baseadress name="BASEADDRESS_WLDAP32" value="0x6e130000" /> - <baseadress name="BASEADDRESS_CLB" value="0x6f2b0000" /> - <baseadress name="BASEADDRESS_CARDS" value="0x701a0000" /> - <baseadress name="BASEADDRESS_WININET" value="0x70200000" /> - <baseadress name="BASEADDRESS_ACLUI" value="0x71550000" /> - <baseadress name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> - <baseadress name="BASEADDRESS_SHDOCVW" value="0x71700000" /> - <baseadress name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> - <baseadress name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> - <baseadress name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> - <baseadress name="BASEADDRESS_NETAPI32" value="0x71c00000" /> - <baseadress name="BASEADDRESS_DPLAY" value="0x71e80000" /> - <baseadress name="BASEADDRESS_SECURITY" value="0x71f10000" /> - <baseadress name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> - <baseadress name="BASEADDRESS_WINFAX" value="0x722C0000" /> - <baseadress name="BASEADDRESS_WINSCARD" value="0x723d0000" /> - <baseadress name="BASEADDRESS_DEVMGR" value="0x72a90000" /> - <baseadress name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> - <baseadress name="BASEADDRESS_LZ32" value="0x73d80000" /> - <baseadress name="BASEADDRESS_COREDLL" value="0x73d80000" /> - <baseadress name="BASEADDRESS_ICMP" value="0x741f0000" /> - <baseadress name="BASEADDRESS_UFAT" value="0x741f0000" /> - <baseadress name="BASEADDRESS_USERENV" value="0x74850000" /> - <baseadress name="BASEADDRESS_WS2_32" value="0x74aa0000" /> - <baseadress name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> - <baseadress name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> - <baseadress name="BASEADDRESS_MMDRV" value="0x74c30000" /> - <baseadress name="BASEADDRESS_OLEDLG" value="0x74d00000" /> - <baseadress name="BASEADDRESS_SAMSRV" value="0x74f30000" /> - <baseadress name="BASEADDRESS_SAMLIB" value="0x750C0000" /> - <baseadress name="BASEADDRESS_CABINET" value="0x75120000" /> - <baseadress name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> - <baseadress name="BASEADDRESS_MSGINA" value="0x75970000" /> - <baseadress name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> - <baseadress name="BASEADDRESS_RPCRT4" value="0x76000000" /> - <baseadress name="BASEADDRESS_SHLWAPI" value="0x76120000" /> - <baseadress name="BASEADDRESS_COMCTL32" value="0x76160000" /> - <baseadress name="BASEADDRESS_COMDLG32" value="0x76210000" /> - <baseadress name="BASEADDRESS_OLEAUT32" value="0x76290000" /> - <baseadress name="BASEADDRESS_RICHED32" value="0x76340000" /> - <baseadress name="BASEADDRESS_D3D8THK" value="0x76340000" /> - <baseadress name="BASEADDRESS_RICHED20" value="0x76360000" /> - <baseadress name="BASEADDRESS_TWAIN_32" value="0x76380000" /> - <baseadress name="BASEADDRESS_IMM32" value="0x76390000" /> - <baseadress name="BASEADDRESS_LSASRV" value="0x76540000" /> - <baseadress name="BASEADDRESS_MIDIMAP" value="0x76600000" /> - <baseadress name="BASEADDRESS_ODBC32" value="0x76660000" /> - <baseadress name="BASEADDRESS_ODBCCP32" value="0x76380000" /> - <baseadress name="BASEADDRESS_WAVEMAP" value="0x76610000" /> - <baseadress name="BASEADDRESS_MPR" value="0x76620000" /> - <baseadress name="BASEADDRESS_SETUPAPI" value="0x76660000" /> - <baseadress name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <baseadress name="BASEADDRESS_SHFOLDER" value="0x76780000" /> - <baseadress name="BASEADDRESS_NTMARTA" value="0x768A0000" /> - <baseadress name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> - <baseadress name="BASEADDRESS_WINTRUST" value="0x76c30000" /> - <baseadress name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> - <baseadress name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> - <baseadress name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> - <baseadress name="BASEADDRESS_FMIFS" value="0x76df0000" /> - <baseadress name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> - <baseadress name="BASEADDRESS_MSVFW32" value="0x77400000" /> - <baseadress name="BASEADDRESS_MSACM32" value="0x77400000" /> - <baseadress name="BASEADDRESS_CRTDLL" value="0x77630000" /> - <baseadress name="BASEADDRESS_AUTHZ" value="0x77690000" /> - <baseadress name="BASEADDRESS_CFGMGR32" value="0x77700000" /> - <baseadress name="BASEADDRESS_SENSAPI" value="0x77700000" /> - <baseadress name="BASEADDRESS_PACKET" value="0x77780000" /> - <baseadress name="BASEADDRESS_MSAFD" value="0x77780000" /> - <baseadress name="BASEADDRESS_WINSPOOL" value="0x77800000" /> - <baseadress name="BASEADDRESS_MSI" value="0x77790000" /> - <baseadress name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> - <baseadress name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> - <baseadress name="BASEADDRESS_WS2HELP" value="0x777e0000" /> - <baseadress name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> - <baseadress name="BASEADDRESS_VERSION" value="0x77a40000" /> - <baseadress name="BASEADDRESS_OLE32" value="0x77a50000" /> - <baseadress name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> - <baseadress name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> - <baseadress name="BASEADDRESS_USER32" value="0x77e30000" /> - <baseadress name="BASEADDRESS_GDI32" value="0x77f70000" /> - <baseadress name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> - <baseadress name="BASEADDRESS_MSVCRT" value="0x78000000" /> - <baseadress name="BASEADDRESS_MSVCRT20" value="0x78500000" /> - <baseadress name="BASEADDRESS_KERNEL32" value="0x7c800000" /> - <baseadress name="BASEADDRESS_NTDLL" value="0x7c900000" /> - <baseadress name="BASEADDRESS_HHCTRL" value="0x7e410000" /> - <baseadress name="BASEADDRESS_FREETYPE" value="0x7f000000" /> + <baseaddress name="BASEADDRESS_REGTESTS" value="0x07000000" /> + <baseaddress name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <baseaddress name="BASEADDRESS_COMCAT" value="0x20A50000" /> + <baseaddress name="BASEADDRESS_DEVENUM" value="0x35680000" /> + <baseaddress name="BASEADDRESS_PWRCFG" value="0x587e0000" /> + <baseaddress name="BASEADDRESS_MMSYS" value="0x588a0000" /> + <baseaddress name="BASEADDRESS_JOY" value="0x589b0000" /> + <baseaddress name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> + <baseaddress name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> + <baseaddress name="BASEADDRESS_OBJSEL" value="0x5b400000" /> + <baseaddress name="BASEADDRESS_TAPIUI" value="0x5b770000" /> + <baseaddress name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> + <baseaddress name="BASEADDRESS_USRMGR" value="0x5c900000" /> + <baseaddress name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> + <baseaddress name="BASEADDRESS_DPLAYX" value="0x5e080000" /> + <baseaddress name="BASEADDRESS_INPUT" value ="0x5e400000" /> + <baseaddress name="BASEADDRESS_DINPUT" value="0x5f580000" /> + <baseaddress name="BASEADDRESS_NETID" value="0x5f660000" /> + <baseaddress name="BASEADDRESS_MAPI32" value="0x62250000" /> + <baseaddress name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> + <baseaddress name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> + <baseaddress name="BASEADDRESS_SYSDM" value="0x64dd0000" /> + <baseaddress name="BASEADDRESS_NCPL" value="0x64ea0000" /> + <baseaddress name="BASEADDRESS_MAIN" value="0x64f40000" /> + <baseaddress name="BASEADDRESS_INTL" value="0x64fb0000" /> + <baseaddress name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> + <baseaddress name="BASEADDRESS_DESK" value="0x65080000" /> + <baseaddress name="BASEADDRESS_APPWIZ" value="0x65100000" /> + <baseaddress name="BASEADDRESS_MLANG" value="0x65140000" /> + <baseaddress name="BASEADDRESS_ACCESS" value="0x65180000" /> + <baseaddress name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> + <baseaddress name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> + <baseaddress name="BASEADDRESS_HID" value="0x688f0000" /> + <baseaddress name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> + <baseaddress name="BASEADDRESS_PSAPI" value="0x68f70000" /> + <baseaddress name="BASEADDRESS_OLEACC" value="0x69640000" /> + <baseaddress name="BASEADDRESS_WINMM" value="0x697d0000" /> + <baseaddress name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> + <baseaddress name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> + <baseaddress name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> + <baseaddress name="BASEADDRESS_SHELL32" value="0x6a360000" /> + <baseaddress name="BASEADDRESS_UNICODE" value="0x6b200000" /> + <baseaddress name="BASEADDRESS_ADVPACK" value="0x6b300000" /> + <baseaddress name="BASEADDRESS_CONTROL" value="0x6b310000" /> + <baseaddress name="BASEADDRESS_NCPA" value="0x6b320000" /> + <baseaddress name="BASEADDRESS_DBGHELP" value="0x6b330000" /> + <baseaddress name="BASEADDRESS_DINPUT8" value="0x6b340000" /> + <baseaddress name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> + <baseaddress name="BASEADDRESS_DSOUND" value="0x6b360000" /> + <baseaddress name="BASEADDRESS_GLU32" value="0x6b370000" /> + <baseaddress name="BASEADDRESS_MESA32" value="0x6b380000" /> + <baseaddress name="BASEADDRESS_OPENGL32" value="0x6b390000" /> + <baseaddress name="BASEADDRESS_SECUR32" value="0x6b3a0000" /> + <baseaddress name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> + <baseaddress name="BASEADDRESS_URLMON" value="0x6b3c0000" /> + <baseaddress name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> + <baseaddress name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> + <baseaddress name="BASEADDRESS_DESKMON" value="0x6d400000" /> + <baseaddress name="BASEADDRESS_DESKADP" value="0x6d410000" /> + <baseaddress name="BASEADDRESS_WLDAP32" value="0x6e130000" /> + <baseaddress name="BASEADDRESS_CLB" value="0x6f2b0000" /> + <baseaddress name="BASEADDRESS_CARDS" value="0x701a0000" /> + <baseaddress name="BASEADDRESS_WININET" value="0x70200000" /> + <baseaddress name="BASEADDRESS_ACLUI" value="0x71550000" /> + <baseaddress name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> + <baseaddress name="BASEADDRESS_SHDOCVW" value="0x71700000" /> + <baseaddress name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> + <baseaddress name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> + <baseaddress name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> + <baseaddress name="BASEADDRESS_NETAPI32" value="0x71c00000" /> + <baseaddress name="BASEADDRESS_DPLAY" value="0x71e80000" /> + <baseaddress name="BASEADDRESS_SECURITY" value="0x71f10000" /> + <baseaddress name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> + <baseaddress name="BASEADDRESS_WINFAX" value="0x722C0000" /> + <baseaddress name="BASEADDRESS_WINSCARD" value="0x723d0000" /> + <baseaddress name="BASEADDRESS_DEVMGR" value="0x72a90000" /> + <baseaddress name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> + <baseaddress name="BASEADDRESS_LZ32" value="0x73d80000" /> + <baseaddress name="BASEADDRESS_COREDLL" value="0x73d80000" /> + <baseaddress name="BASEADDRESS_ICMP" value="0x741f0000" /> + <baseaddress name="BASEADDRESS_UFAT" value="0x741f0000" /> + <baseaddress name="BASEADDRESS_USERENV" value="0x74850000" /> + <baseaddress name="BASEADDRESS_WS2_32" value="0x74aa0000" /> + <baseaddress name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> + <baseaddress name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> + <baseaddress name="BASEADDRESS_MMDRV" value="0x74c30000" /> + <baseaddress name="BASEADDRESS_OLEDLG" value="0x74d00000" /> + <baseaddress name="BASEADDRESS_SAMSRV" value="0x74f30000" /> + <baseaddress name="BASEADDRESS_SAMLIB" value="0x750C0000" /> + <baseaddress name="BASEADDRESS_CABINET" value="0x75120000" /> + <baseaddress name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> + <baseaddress name="BASEADDRESS_MSGINA" value="0x75970000" /> + <baseaddress name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> + <baseaddress name="BASEADDRESS_RPCRT4" value="0x76000000" /> + <baseaddress name="BASEADDRESS_SHLWAPI" value="0x76120000" /> + <baseaddress name="BASEADDRESS_COMCTL32" value="0x76160000" /> + <baseaddress name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <baseaddress name="BASEADDRESS_OLEAUT32" value="0x76290000" /> + <baseaddress name="BASEADDRESS_RICHED32" value="0x76340000" /> + <baseaddress name="BASEADDRESS_D3D8THK" value="0x76340000" /> + <baseaddress name="BASEADDRESS_RICHED20" value="0x76360000" /> + <baseaddress name="BASEADDRESS_TWAIN_32" value="0x76380000" /> + <baseaddress name="BASEADDRESS_IMM32" value="0x76390000" /> + <baseaddress name="BASEADDRESS_LSASRV" value="0x76540000" /> + <baseaddress name="BASEADDRESS_MIDIMAP" value="0x76600000" /> + <baseaddress name="BASEADDRESS_ODBC32" value="0x76660000" /> + <baseaddress name="BASEADDRESS_ODBCCP32" value="0x76380000" /> + <baseaddress name="BASEADDRESS_WAVEMAP" value="0x76610000" /> + <baseaddress name="BASEADDRESS_MPR" value="0x76620000" /> + <baseaddress name="BASEADDRESS_SETUPAPI" value="0x76660000" /> + <baseaddress name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> + <baseaddress name="BASEADDRESS_SHFOLDER" value="0x76780000" /> + <baseaddress name="BASEADDRESS_NTMARTA" value="0x768A0000" /> + <baseaddress name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> + <baseaddress name="BASEADDRESS_WINTRUST" value="0x76c30000" /> + <baseaddress name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> + <baseaddress name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> + <baseaddress name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> + <baseaddress name="BASEADDRESS_FMIFS" value="0x76df0000" /> + <baseaddress name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> + <baseaddress name="BASEADDRESS_MSVFW32" value="0x77400000" /> + <baseaddress name="BASEADDRESS_MSACM32" value="0x77400000" /> + <baseaddress name="BASEADDRESS_CRTDLL" value="0x77630000" /> + <baseaddress name="BASEADDRESS_AUTHZ" value="0x77690000" /> + <baseaddress name="BASEADDRESS_CFGMGR32" value="0x77700000" /> + <baseaddress name="BASEADDRESS_SENSAPI" value="0x77700000" /> + <baseaddress name="BASEADDRESS_PACKET" value="0x77780000" /> + <baseaddress name="BASEADDRESS_MSAFD" value="0x77780000" /> + <baseaddress name="BASEADDRESS_WINSPOOL" value="0x77800000" /> + <baseaddress name="BASEADDRESS_MSI" value="0x77790000" /> + <baseaddress name="BASEADDRESS_SNMPAPI" value="0x777a0000" /> + <baseaddress name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> + <baseaddress name="BASEADDRESS_WS2HELP" value="0x777e0000" /> + <baseaddress name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> + <baseaddress name="BASEADDRESS_VERSION" value="0x77a40000" /> + <baseaddress name="BASEADDRESS_OLE32" value="0x77a50000" /> + <baseaddress name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> + <baseaddress name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> + <baseaddress name="BASEADDRESS_USER32" value="0x77e30000" /> + <baseaddress name="BASEADDRESS_GDI32" value="0x77f70000" /> + <baseaddress name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> + <baseaddress name="BASEADDRESS_MSVCRT" value="0x78000000" /> + <baseaddress name="BASEADDRESS_MSVCRT20" value="0x78500000" /> + <baseaddress name="BASEADDRESS_KERNEL32" value="0x7c800000" /> + <baseaddress name="BASEADDRESS_NTDLL" value="0x7c900000" /> + <baseaddress name="BASEADDRESS_HHCTRL" value="0x7e410000" /> + <baseaddress name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group> Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Tue Dec 18 22:02:09 2007 @@ -2024,12 +2024,12 @@ { } -BaseAdress::BaseAdress ( const XMLElement& node_, - const Project& project_, - const Module* module_ ) +BaseAddress::BaseAddress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ) : Property( node_ , project_, module_) { - //TODO: Add code to validate baseadress + //TODO: Add code to validate baseaddress } PchFile::PchFile ( Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Tue Dec 18 22:02:09 2007 @@ -606,13 +606,13 @@ else non_if_data.properties.push_back ( property ); } - else if ( e.name == "baseadress" ) - { - BaseAdress* baseadress = new BaseAdress ( e, *this, NULL ); + else if ( e.name == "baseaddress" ) + { + BaseAddress* baseaddress = new BaseAddress ( e, *this, NULL ); if ( parseContext.ifData ) - parseContext.ifData->data.properties.push_back ( baseadress ); - else - non_if_data.properties.push_back ( baseadress ); + parseContext.ifData->data.properties.push_back ( baseaddress ); + else + non_if_data.properties.push_back ( baseaddress ); } if ( subs_invalid && e.subElements.size() ) { Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Tue Dec 18 22:02:09 2007 @@ -119,7 +119,7 @@ class AutoResource; class InstallComponent; class InstallFolder; -class BaseAdress; +class BaseAddress; class BuildFamily; class Family; class PlatformLanguage; @@ -876,12 +876,12 @@ void ProcessXML(); }; -class BaseAdress : public Property -{ -public: - BaseAdress ( const XMLElement& node_, - const Project& project_, - const Module* module_ ); +class BaseAddress : public Property +{ +public: + BaseAddress ( const XMLElement& node_, + const Project& project_, + const Module* module_ ); }; class TestSupportCode

1 0

[dchapyshev] 31308: - Add itself rasman.dll (Part 3/3)
by dchapyshev＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: dchapyshev Date: Tue Dec 18 19:47:49 2007 New Revision: 31308 URL: http://svn.reactos.org/svn/reactos?rev=31308&view=rev Log: - Add itself rasman.dll (Part 3/3) Added: trunk/reactos/dll/win32/rasman/ trunk/reactos/dll/win32/rasman/rasman.c (with props) trunk/reactos/dll/win32/rasman/rasman.rbuild (with props) trunk/reactos/dll/win32/rasman/rasman.rc (with props) trunk/reactos/dll/win32/rasman/rasman.spec (with props) Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/rasman/rasman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.c?… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.c (added) +++ trunk/reactos/dll/win32/rasman/rasman.c Tue Dec 18 19:47:49 2007 @@ -1,0 +1,91 @@ +/* + * RASMAN + * + * Copyright 2007 ReactOS Team + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include <windows.h> +#include <ras.h> +#include "wine/debug.h" +#include <rasshost.h> + +static HINSTANCE hDllInstance; + +WINE_DEFAULT_DEBUG_CHANNEL(rasman); + +VOID WINAPI +RasSecurityDialogComplete(SECURITY_MESSAGE* pSecMsg) +{ + FIXME("(%p),stub!\n",pSecMsg); +} + +DWORD WINAPI +RasSecurityDialogBegin(HPORT hPort, PBYTE pSendBuf, + DWORD SendBufSize, PBYTE pRecvBuf, DWORD RecvBufSize, + VOID (WINAPI *RasSecurityDialogComplete)()) +{ + FIXME("(%p,%p,0x%08x,%p,0x%08x,%p),stub!\n",hPort,pSendBuf,SendBufSize, + pRecvBuf,RecvBufSize,*RasSecurityDialogComplete); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogSend(HPORT hPort, PBYTE pBuffer, WORD BufferLength) +{ + FIXME("(%p,%p,%x),stub!\n",hPort, pBuffer, BufferLength); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogReceive(HPORT hPort, PBYTE pBuffer, PWORD pBufferLength, DWORD Timeout, HANDLE hEvent) +{ + FIXME("(%p,%p,%p,%x,%p),stub!\n",hPort, pBuffer, pBufferLength, Timeout, hEvent); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogEnd(HPORT hPort) +{ + FIXME("(%p),stub!\n",hPort); + return NO_ERROR; +} + +DWORD WINAPI +RasSecurityDialogGetInfo(HPORT hPort, RAS_SECURITY_INFO* pBuffer) +{ + FIXME("(%p,%p),stub!\n",hPort,pBuffer); + return NO_ERROR; +} + +BOOL WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hDllInstance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/win32/rasman/rasman.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasman/rasman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.rb… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.rbuild (added) +++ trunk/reactos/dll/win32/rasman/rasman.rbuild Tue Dec 18 19:47:49 2007 @@ -1,0 +1,12 @@ +<module name="rasman" type="win32dll" baseaddress="${BASEADDRESS_RASMAN}" installbase="system32" installname="rasman.dll"> + <importlibrary definition="rasman.spec.def" /> + <include base="rasman">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <library>uuid</library> + <file>rasman.c</file> + <file>rasman.rc</file> + <file>rasman.spec</file> +</module> Propchange: trunk/reactos/dll/win32/rasman/rasman.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasman/rasman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.rc… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.rc (added) +++ trunk/reactos/dll/win32/rasman/rasman.rc Tue Dec 18 19:47:49 2007 @@ -1,0 +1,9 @@ +#include <windows.h> +#include <reactos/resource.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Remote Access Connection Manager\0" +#define REACTOS_STR_INTERNAL_NAME "rasman\0" +#define REACTOS_STR_ORIGINAL_FILENAME "rasman.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/rasman/rasman.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rasman/rasman.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/rasman.sp… ============================================================================== --- trunk/reactos/dll/win32/rasman/rasman.spec (added) +++ trunk/reactos/dll/win32/rasman/rasman.spec Tue Dec 18 19:47:49 2007 @@ -1,0 +1,164 @@ +@ stub DwRasGetHostByName +@ stub IsRasmanProcess +@ stub RasActivateRoute +@ stub RasActivateRouteEx +@ stub RasAddConnectionPort +@ stub RasAddNotification +@ stub RasAllocateRoute +@ stub RasBundleClearStatistics +@ stub RasBundleClearStatisticsEx +@ stub RasBundleGetPort +@ stub RasBundleGetStatistics +@ stub RasBundleGetStatisticsEx +@ stub RasCompressionGetInfo +@ stub RasCompressionSetInfo +@ stub RasConnectionEnum +@ stub RasConnectionGetStatistics +@ stub RasCreateConnection +@ stub RasDeAllocateRoute +@ stub RasDestroyConnection +@ stub RasDeviceConnect +@ stub RasDeviceEnum +@ stub RasDeviceGetInfo +@ stub RasDeviceSetInfo +@ stub RasDoIke +@ stub RasEnableIpSec +@ stub RasEnableRasAudio +@ stub RasEnumConnectionPorts +@ stub RasEnumLanNets +@ stub RasFindPrerequisiteEntry +@ stub RasFreeBuffer +@ stub RasGetBandwidthUtilization +@ stub RasGetBuffer +@ stub RasGetCalledIdInfo +@ stub RasGetConnectInfo +@ stub RasGetConnectionParams +@ stub RasGetConnectionUserData +@ stub RasGetCustomScriptDll +@ stub RasGetDevConfig +@ stub RasGetDevConfigEx +@ stub RasGetDeviceConfigInfo +@ stub RasGetDeviceName +@ stub RasGetDeviceNameW +@ stub RasGetDialParams +@ stub RasGetEapUserInfo +@ stub RasGetFramingCapabilities +@ stub RasGetHConnFromEntry +@ stub RasGetHportFromConnection +@ stub RasGetInfo +@ stub RasGetInfoEx +@ stub RasGetKey +@ stub RasGetNdiswanDriverCaps +@ stub RasGetNumPortOpen +@ stub RasGetPortUserData +@ stub RasGetProtocolInfo +@ stub RasGetTimeSinceLastActivity +@ stub RasGetUnicodeDeviceName +@ stub RasGetUserCredentials +@ stub RasInitialize +@ stub RasInitializeNoWait +@ stub RasIsIpSecEnabled +@ stub RasIsTrustedCustomDll +@ stub RasLinkGetStatistics +@ stub RasPnPControl +@ stub RasPortBundle +@ stub RasPortCancelReceive +@ stub RasPortClearStatistics +@ stub RasPortClose +@ stub RasPortConnectComplete +@ stub RasPortDisconnect +@ stub RasPortEnum +@ stub RasPortEnumProtocols +@ stub RasPortFree +@ stub RasPortGetBundle +@ stub RasPortGetBundledPort +@ stub RasPortGetFramingEx +@ stub RasPortGetInfo +@ stub RasPortGetProtocolCompression +@ stub RasPortGetStatistics +@ stub RasPortGetStatisticsEx +@ stub RasPortListen +@ stub RasPortOpen +@ stub RasPortOpenEx +@ stub RasPortReceive +@ stub RasPortReceiveEx +@ stub RasPortRegisterSlip +@ stub RasPortReserve +@ stub RasPortRetrieveUserData +@ stub RasPortSend +@ stub RasPortSetFraming +@ stub RasPortSetFramingEx +@ stub RasPortSetInfo +@ stub RasPortSetProtocolCompression +@ stub RasPortStoreUserData +@ stub RasPppCallback +@ stub RasPppChangePassword +@ stub RasPppGetEapInfo +@ stub RasPppGetInfo +@ stub RasPppRetry +@ stub RasPppSetEapInfo +@ stub RasPppStart +@ stub RasPppStarted +@ stub RasPppStop +@ stub RasProtocolEnum +@ stub RasRPCBind +@ stub RasRefConnection +@ stub RasReferenceCustomCount +@ stub RasReferenceRasman +@ stub RasRefreshKerbCreds +@ stub RasRegisterPnPEvent +@ stub RasRegisterPnPHandler +@ stub RasRegisterRedialCallback +@ stub RasRequestNotification +@ stub RasRpcConnect +@ stub RasRpcConnectServer +@ stub RasRpcDeleteEntry +@ stub RasRpcDeviceEnum +@ stub RasRpcDisconnect +@ stub RasRpcDisconnectServer +@ stub RasRpcEnumConnections +@ stub RasRpcGetCountryInfo +@ stub RasRpcGetDevConfig +@ stub RasRpcGetErrorString +@ stub RasRpcGetInstalledProtocols +@ stub RasRpcGetInstalledProtocolsEx +@ stub RasRpcGetSystemDirectory +@ stub RasRpcGetUserPreferences +@ stub RasRpcGetVersion +@ stub RasRpcPortEnum +@ stub RasRpcPortGetInfo +@ stub RasRpcRemoteGetSystemDirectory +@ stub RasRpcRemoteGetUserPreferences +@ stub RasRpcRemoteRasDeleteEntry +@ stub RasRpcRemoteSetUserPreferences +@ stub RasRpcSetUserPreferences +@ stub RasRpcUnloadDll +@ stdcall RasSecurityDialogBegin(ptr ptr long ptr long ptr) +@ stdcall RasSecurityDialogComplete(ptr) +@ stdcall RasSecurityDialogGetInfo(ptr ptr) +@ stdcall RasSecurityDialogReceive(ptr ptr ptr long ptr) +@ stdcall RasSecurityDialogSend(ptr ptr long) +@ stub RasSendCreds +@ stub RasSendNotification +@ stub RasSendPppMessageToRasman +@ stub RasServerPortClose +@ stub RasSetAddressDisable +@ stub RasSetBapPolicy +@ stub RasSetCachedCredentials +@ stub RasSetCalledIdInfo +@ stub RasSetCommSettings +@ stub RasSetConnectionParams +@ stub RasSetConnectionUserData +@ stub RasSetDevConfig +@ stub RasSetDeviceConfigInfo +@ stub RasSetDialParams +@ stub RasSetEapLogonInfo +@ stub RasSetEapUserInfo +@ stub RasSetIoCompletionPort +@ stub RasSetKey +@ stub RasSetPortUserData +@ stub RasSetRasdialInfo +@ stub RasSetRouterUsage +@ stub RasSignalNewConnection +@ stub RasStartRasAutoIfRequired +@ stub RasmanUninitialize Propchange: trunk/reactos/dll/win32/rasman/rasman.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Dec 18 19:47:49 2007 @@ -208,6 +208,9 @@ <directory name="rasdlg"> <xi:include href="rasdlg/rasdlg.rbuild" /> </directory> +<directory name="rasman"> + <xi:include href="rasman/rasman.rbuild" /> +</directory> <directory name="riched20"> <xi:include href="riched20/riched20.rbuild" /> </directory>

1 0

[dchapyshev] 31307: - Add baseaddress for rasman.dll (Part 2/3)
by dchapyshev＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: dchapyshev Date: Tue Dec 18 19:41:37 2007 New Revision: 31307 URL: http://svn.reactos.org/svn/reactos?rev=31307&view=rev Log: - Add baseaddress for rasman.dll (Part 2/3) Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=313… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Tue Dec 18 19:41:37 2007 @@ -126,6 +126,7 @@ <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" /> <property name="BASEADDRESS_RASAPI32" value="0x76ee0000" /> + <property name="BASEADDRESS_RASMAN" value="0x76e90000h" /> <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> <property name="BASEADDRESS_MSVFW32" value="0x76f60000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" />

1 0

[dchapyshev] 31306: - Add header for rasman.dll (Part 1/3)
by dchapyshev＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: dchapyshev Date: Tue Dec 18 19:40:32 2007 New Revision: 31306 URL: http://svn.reactos.org/svn/reactos?rev=31306&view=rev Log: - Add header for rasman.dll (Part 1/3) Added: trunk/reactos/include/psdk/rasshost.h (with props) Added: trunk/reactos/include/psdk/rasshost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rasshost.h?re… ============================================================================== --- trunk/reactos/include/psdk/rasshost.h (added) +++ trunk/reactos/include/psdk/rasshost.h Tue Dec 18 19:40:32 2007 @@ -1,0 +1,44 @@ +#ifndef _RASSHOST_H_ +#define _RASSHOST_H_ +#ifdef __cplusplus +extern "C" { +#endif + +#include <ras.h> +#include <mprapi.h> + +#define SECURITYMSG_SUCCESS 1 +#define SECURITYMSG_FAILURE 2 +#define SECURITYMSG_ERROR 3 + +typedef DWORD HPORT; + +typedef struct _SECURITY_MESSAGE +{ + DWORD dwMsgId; + HPORT hPort; + DWORD dwError; + CHAR UserName[UNLEN + 1]; + CHAR Domain[DNLEN + 1]; +} SECURITY_MESSAGE, *PSECURITY_MESSAGE; + +typedef struct _RAS_SECURITY_INFO +{ + DWORD LastError; + DWORD BytesReceived; + CHAR DeviceName[MAX_DEVICE_NAME + 1]; +} RAS_SECURITY_INFO, *PRAS_SECURITY_INFO; + +typedef DWORD (WINAPI *RASSECURITYPROC)(); + +VOID WINAPI RasSecurityDialogComplete(IN SECURITY_MESSAGE* pSecMsg); +DWORD WINAPI RasSecurityDialogBegin(IN HPORT hPort, IN PBYTE pSendBuf, IN DWORD SendBufSize, IN PBYTE pRecvBuf, IN DWORD RecvBufSize, IN VOID (WINAPI* RasSecurityDialogComplete)(SECURITY_MESSAGE*)); +DWORD WINAPI RasSecurityDialogEnd(IN HPORT hPort); +DWORD WINAPI RasSecurityDialogSend(IN HPORT hPort, IN PBYTE pBuffer, IN WORD BufferLength); +DWORD WINAPI RasSecurityDialogReceive(IN HPORT hPort, IN PBYTE pBuffer, IN PWORD pBufferLength, IN DWORD Timeout, IN HANDLE hEvent); +DWORD WINAPI RasSecurityDialogGetInfo(IN HPORT hPort, IN RAS_SECURITY_INFO* pBuffer); + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/psdk/rasshost.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 31305: add LR_COPYDELETEORG and ignore LR_COPYFROMRESOURCE
by gedmurphy＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: gedmurphy Date: Tue Dec 18 17:56:01 2007 New Revision: 31305 URL: http://svn.reactos.org/svn/reactos?rev=31305&view=rev Log: add LR_COPYDELETEORG and ignore LR_COPYFROMRESOURCE Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Tue Dec 18 17:56:01 2007 @@ -797,9 +797,9 @@ if (!hIconCur) return NULL; - if (flags & LR_COPYFROMRESOURCE || flags & LR_CREATEDIBSECTION) + if (flags & LR_COPYFROMRESOURCE) { - FIXME("FIXME: LR_COPYFROMRESOURCE and LR_CREATEDIBSECTION are yet not implemented for icons\n"); + FIXME("FIXME: LR_COPYFROMRESOURCE is yet not implemented for icons\n"); } if (NtUserGetIconSize(hIconCur, 0, &origSize.cx, &origSize.cy)) @@ -833,6 +833,10 @@ } } + if (hNewIcon && (flags & LR_COPYDELETEORG)) + { + DestroyCursor((HCURSOR)hIconCur); + } return hNewIcon; }

1 0

[gedmurphy] 31304: return the icon bpp in the call to NtUserGetIconInfo
by gedmurphy＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: gedmurphy Date: Tue Dec 18 17:28:56 2007 New Revision: 31304 URL: http://svn.reactos.org/svn/reactos?rev=31304&view=rev Log: return the icon bpp in the call to NtUserGetIconInfo Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Dec 18 17:28:56 2007 @@ -668,6 +668,24 @@ { ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); + + if (pbpp) + { + PBITMAPOBJ bmp; + int colorBpp = 0; + + ProbeForWrite(pbpp, sizeof(DWORD), 1); + + bmp = BITMAPOBJ_LockBitmap(CurIcon->IconInfo.hbmColor); + if (bmp) + { + colorBpp = BitsPerFormat(bmp->SurfObj.iBitmapFormat); + BITMAPOBJ_UnlockBitmap(bmp); + } + + RtlCopyMemory(pbpp, &colorBpp, sizeof(DWORD)); + } + } _SEH_HANDLE {

1 0

[gedmurphy] 31303: update ntuser header
by gedmurphy＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: gedmurphy Date: Tue Dec 18 16:50:56 2007 New Revision: 31303 URL: http://svn.reactos.org/svn/reactos?rev=31303&view=rev Log: update ntuser header Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Dec 18 16:50:56 2007 @@ -1212,12 +1212,12 @@ BOOL NTAPI NtUserGetIconInfo( - HANDLE Handle, - PICONINFO IconInfo, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6); + HANDLE hCurIcon, + PICONINFO IconInfo, + PUNICODE_STRING lpInstName, + PUNICODE_STRING lpResName, + LPDWORD pbpp, + BOOL bInternal); BOOL NTAPI @@ -2066,11 +2066,9 @@ NTAPI NtUserSetCursorIconData( HANDLE Handle, - PBOOL fIcon, - POINT *Hotspot, HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc); + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo); DWORD NTAPI

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