Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[dgorbachev] 26483: Undo r26482 change, waste more stack space.
by dgorbachev＠svn.reactos.org 24 Apr '07

24 Apr '07

Author: dgorbachev Date: Tue Apr 24 09:05:49 2007 New Revision: 26483 URL: http://svn.reactos.org/svn/reactos?rev=26483&view=rev Log: Undo r26482 change, waste more stack space. Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Apr 24 09:05:49 2007 @@ -106,9 +106,15 @@ // #ifdef __GNUC__ -#define DEFINE_WAIT_BLOCK(x) \ - PEX_PUSH_LOCK_WAIT_BLOCK x = __builtin_alloca(sizeof(EX_PUSH_LOCK_WAIT_BLOCK)); - +#define DEFINE_WAIT_BLOCK(x) \ + struct _AlignHack \ + { \ + UCHAR Hack[15]; \ + EX_PUSH_LOCK_WAIT_BLOCK UnalignedBlock; \ + } WaitBlockBuffer; \ + PEX_PUSH_LOCK_WAIT_BLOCK x = (PEX_PUSH_LOCK_WAIT_BLOCK) \ + ((ULONG_PTR)&WaitBlockBuffer.UnalignedBlock &~ 0xF); + #else // @@ -116,8 +122,8 @@ // local variable (the actual pointer) away, so we don't take any perf hit // by doing this. // -#define DEFINE_WAIT_BLOCK(x) \ - EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ +#define DEFINE_WAIT_BLOCK(x) \ + EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ PEX_PUSH_LOCK_WAIT_BLOCK x = &WaitBlockBuffer; #endif

1 0

[dgorbachev] 26482: Use allocation function instead of hack, save 12 bytes.
by dgorbachev＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: dgorbachev Date: Tue Apr 24 02:06:34 2007 New Revision: 26482 URL: http://svn.reactos.org/svn/reactos?rev=26482&view=rev Log: Use allocation function instead of hack, save 12 bytes. Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Apr 24 02:06:34 2007 @@ -102,22 +102,13 @@ #define MAX_HIGH_INDEX (MID_LEVEL_ENTRIES * MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) // -// Detect GCC 4.1.2+ +// Detect GCC // -#if 1 // (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40102 - -// -// Broken GCC with Alignment Bug. We'll do alignment ourselves at higher cost. -// -#define DEFINE_WAIT_BLOCK(x) \ - struct _AlignHack \ - { \ - UCHAR Hack[15]; \ - EX_PUSH_LOCK_WAIT_BLOCK UnalignedBlock; \ - } WaitBlockBuffer; \ - PEX_PUSH_LOCK_WAIT_BLOCK x = (PEX_PUSH_LOCK_WAIT_BLOCK) \ - ((ULONG_PTR)&WaitBlockBuffer.UnalignedBlock &~ 0xF); - +#ifdef __GNUC__ + +#define DEFINE_WAIT_BLOCK(x) \ + PEX_PUSH_LOCK_WAIT_BLOCK x = __builtin_alloca(sizeof(EX_PUSH_LOCK_WAIT_BLOCK)); + #else // @@ -125,8 +116,8 @@ // local variable (the actual pointer) away, so we don't take any perf hit // by doing this. // -#define DEFINE_WAIT_BLOCK(x) \ - EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ +#define DEFINE_WAIT_BLOCK(x) \ + EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ PEX_PUSH_LOCK_WAIT_BLOCK x = &WaitBlockBuffer; #endif @@ -725,7 +716,7 @@ if (InterlockedBitTestAndSet((PLONG)PushLock, EX_PUSH_LOCK_LOCK_V)) { /* Someone changed it, use the slow path */ - DbgPrint("%s - Contention!\n", __FUNCTION__); + // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockExclusive(PushLock); } @@ -763,7 +754,7 @@ if (ExpChangePushlock(PushLock, NewValue.Ptr, 0)) { /* Someone changed it, use the slow path */ - DbgPrint("%s - Contention!\n", __FUNCTION__); + // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockShared(PushLock); } @@ -977,7 +968,7 @@ OldValue.Ptr)) { /* We have waiters, use the long path */ - DbgPrint("%s - Contention!\n", __FUNCTION__); + // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfReleasePushLock(PushLock); } }

1 0

[janderwald] 26481: - fix rbuild file for modules - avtest - downloader - gettype - green - imagesoft - ramdrv - roshttpd - screenshot - winefile - winver
by janderwald＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: janderwald Date: Mon Apr 23 22:54:51 2007 New Revision: 26481 URL: http://svn.reactos.org/svn/reactos?rev=26481&view=rev Log: - fix rbuild file for modules - avtest - downloader - gettype - green - imagesoft - ramdrv - roshttpd - screenshot - winefile - winver Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=26481… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Mon Apr 23 22:54:51 2007 @@ -1,3 +1,7 @@ +<directory name="avtest"> + <xi:include href="avtest/avtest.rbuild" /> +</directory> + <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory> @@ -13,6 +17,23 @@ <directory name="dflat32"> <xi:include href="dflat32/dflat32.rbuild" /> </directory> + +<directory name="downloader"> + <xi:include href="downloader/downloader.rbuild" /> +</directory> + +<directory name="gettype"> + <xi:include href="gettype/gettype.rbuild" /> +</directory> + +<directory name="green"> + <xi:include href="green/green.rbuild" /> +</directory> + +<directory name="imagesoft"> + <xi:include href="imagesoft/imagesoft.rbuild" /> +</directory> +  +<directory name="ramdrv"> + <xi:include href="ramdrv/ramdrv.rbuild" /> +</directory> + +<directory name="roshttpd"> + <xi:include href="roshttpd/roshttpd.rbuild" /> +</directory> + +<directory name="screenshot"> + <xi:include href="screenshot/screenshot.rbuild" /> +</directory> + <directory name="sysutils"> <xi:include href="sysutils/sysutils.rbuild" /> </directory> @@ -44,4 +77,10 @@ <xi:include href="templates/directory.rbuild" /> </directory> +<directory name="winefile"> + <xi:include href="winefile/winefile.rbuild" /> +</directory> +<directory name="winver"> + <xi:include href="winver/winver.rbuild" /> +</directory>

1 0

[janderwald] 26480: - add a few spanish translations by Javier Remacha, remialdo@gmail.com See issue #2110, 2111 for more details.
by janderwald＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: janderwald Date: Mon Apr 23 22:30:35 2007 New Revision: 26480 URL: http://svn.reactos.org/svn/reactos?rev=26480&view=rev Log: - add a few spanish translations by Javier Remacha, remialdo(a)gmail.com See issue #2110,2111 for more details. Added: trunk/rosapps/downloader/translations/es.rc (with props) trunk/rosapps/imagesoft/lang/es-ES.rc (with props) Modified: trunk/rosapps/downloader/rsrc.rc trunk/rosapps/imagesoft/rsrc.rc Modified: trunk/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/rsrc.rc?rev=264… ============================================================================== --- trunk/rosapps/downloader/rsrc.rc (original) +++ trunk/rosapps/downloader/rsrc.rc Mon Apr 23 22:30:35 2007 @@ -25,3 +25,4 @@ #include "translations/fr.rc" #include "translations/id.rc" #include "translations/it.rc" +#include "translations/es.rc" Added: trunk/rosapps/downloader/translations/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/es… ============================================================================== --- trunk/rosapps/downloader/translations/es.rc (added) +++ trunk/rosapps/downloader/translations/es.rc Mon Apr 23 22:30:35 2007 @@ -1,0 +1,32 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_DOWNLOAD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Descargar..." +FONT 8, "MS Shell Dlg" +{ + 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 +} + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "¡Descargar! - Descargador de ReactOS" + 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.0." + 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_UPDATE_TITLE "Actualizar" + IDS_UPDATE "Perdona 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_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." + IDS_CHOOSE_CATEGORY "Por favor selecciona una categoría." + IDS_CHOOSE_BOTH "Por favor selecciona una subcategoria o una aplicación." + 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." +END Propchange: trunk/rosapps/downloader/translations/es.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/imagesoft/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/es-ES.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/es-ES.rc (added) +++ trunk/rosapps/imagesoft/lang/es-ES.rc Mon Apr 23 22:30:35 2007 @@ -1,0 +1,234 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END + +IDR_MAINMENU MENU +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Nuevo...", ID_NEW + MENUITEM "&Abrir...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Cerrar\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "C&errar todo", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "&Guardar", ID_SAVE, GRAYED + MENUITEM "G&uardar Como...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Vista Preliminar", ID_PRINTPRE,GRAYED + MENUITEM "&Imprimir...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pr&opiedades...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Salir\tAlt+F4", ID_EXIT + END + POPUP "&Editar" + BEGIN + MENUITEM "&Deshacer", ID_UNDO, GRAYED + MENUITEM "&Rehacer", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Cor&tar", ID_CUT, GRAYED + MENUITEM "&Copiar", ID_COPY, GRAYED + MENUITEM "&Pegar", ID_PASTE, GRAYED + MENUITEM "Pegar como nueva &imagen", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Seleccionar t&odo", ID_SELALL, GRAYED + END + POPUP "&Ver" + BEGIN + MENUITEM "&Tools", ID_TOOLS + MENUITEM "&Colores", ID_COLOR + MENUITEM "&Historia", ID_HISTORY + MENUITEM "&Barra de estado", ID_STATUSBAR + END + POPUP "&Adjust" + BEGIN + MENUITEM "Brillo...", ID_BRIGHTNESS + MENUITEM "Contraste...", ID_CONTRAST + MENUITEM "Matiz/Saturación...", -1, GRAYED + POPUP "Color" + BEGIN + MENUITEM "Blanco y negro" ID_BLACKANDWHITE + MENUITEM "Invertir Colores" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "Contorno", ID_BLUR + MENUITEM "Afilar", ID_SHARPEN + MENUITEM "Suavizar bordes", -1, GRAYED + MENUITEM "Añadir Sombra", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Tamaño de la Imagen...", -1, GRAYED + MENUITEM "Flip", -1, GRAYED + MENUITEM "Voltear", -1, GRAYED + MENUITEM "Rotar", -1, GRAYED + + END + POPUP "&Colores" + BEGIN + MENUITEM "&Editar Colores...", ID_EDITCOLOURS + END + POPUP "&Ventana" + BEGIN + MENUITEM "&Cascada", ID_WINDOW_CASCADE + MENUITEM "Dividir &Horizontalmente", ID_WINDOW_TILE_HORZ + MENUITEM "Dividir &Verticalmente", ID_WINDOW_TILE_VERT + MENUITEM "&Organizar Iconos", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Siguien&te\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "Ay&uda" + BEGIN + MENUITEM "&Acerca de...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "Brillo" +FONT 8,"MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "Color de:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "Completo (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "Rojo", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Verde", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Azul", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "Aceptar", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Cancelar", IDCANCEL, 142, 105, 48, 13 +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Acerca de ImageSoft" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +//EXSTYLE WS_EX_LAYERED +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 +CAPTION "Propiedades de la Imagen" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Nombre:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 + LTEXT "Tipo de Imagen:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "Anchura:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "Altura:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "Resolución:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Unidades:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "Tamaño de la Imagen:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + PUSHBUTTON "Aceptar", IDOK, 50, 144, 48, 13 + PUSHBUTTON "Cancelar", IDCANCEL, 102, 144, 48, 13 +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., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_READY " Preparado." + IDS_TOOLBAR_STANDARD "Estándar" + IDS_TOOLBAR_TEST "Prueba" + IDS_IMAGE_NAME "Imagen %1!u!" + IDS_FLT_TOOLS "Herramientas" + IDS_FLT_COLORS "Colores" + IDS_FLT_HISTORY "Historia" +END + +/* imageprop.c */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGE_MONOCHROME "Monocromo (1 bit)" + IDS_IMAGE_GREYSCALE "Escala de Grises (8 bit)" + IDS_IMAGE_PALETTE "Paleta o 256 colores (8 bit)" + IDS_IMAGE_TRUECOLOR "Color verdadero (24 bit)" + + IDS_UNIT_PIXELS "Pixels" + IDS_UNIT_CM "Cm" + IDS_UNIT_INCHES "Pulgadas" + IDS_UNIT_DOTSCM "Puntos / Cm" + IDS_UNIT_DPI "DPI" + IDS_UNIT_KB "%d KB" + IDS_UNIT_MB "%d MB" +END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "Nuevo" + IDS_TOOLTIP_OPEN "Abrir" + IDS_TOOLTIP_SAVE "Guardar" + IDS_TOOLTIP_PRINTPRE "Vista preliminar" + IDS_TOOLTIP_PRINT "Imprimir" + IDS_TOOLTIP_CUT "Cortar" + IDS_TOOLTIP_COPY "Copiar" + IDS_TOOLTIP_PASTE "Pegar" + IDS_TOOLTIP_UNDO "Deshacer" + IDS_TOOLTIP_REDO "Rehacer" +END + + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Crear un documento nuevo." + IDS_HINT_OPEN " Abrir un documento existente." + IDS_HINT_CLOSE " Cerrar esta ventana." + IDS_HINT_CLOSEALL " Cerrar todas las ventanas." + IDS_HINT_SAVE " Guardar el documento activo." + IDS_HINT_SAVEAS " Guardar el documento activo con un nuevo nombre." + IDS_HINT_PRINTPRE " Previews the printed documento." + IDS_HINT_PRINT " Imprimir el documento activo." + IDS_HINT_PROP " Mostrar las propiedades de la imagen activa." + IDS_HINT_EXIT " Cerrar esta aplicación." + + IDS_HINT_TOOLS " Mostrar u ocultar la ventana flotante de herramientas." + IDS_HINT_COLORS " Mostrar u ocultar la ventana flotante de colores." + IDS_HINT_HISTORY " Mostrar u ocultar la ventana flotande de historial." + IDS_HINT_STATUS " Mostrar u ocultar la barra de estado." + + IDS_HINT_CASCADE " Colocar las ventanas superpuestas." + IDS_HINT_TILE_HORZ " Colocar las ventanas sin superponer los títulos." + IDS_HINT_TILE_VERT " Colocar las ventanas sin superponer los títulos." + IDS_HINT_ARRANGE " Colocar los iconos en la parte baja de la ventana." + IDS_HINT_NEXT " Activar la siguiente ventana." + + IDS_HINT_SYS_RESTORE " Restaurar esta ventana al tamaño normal." + IDS_HINT_SYS_MOVE " Mover esta ventana." + IDS_HINT_SYS_SIZE " Redimensionar esta ventana." + IDS_HINT_SYS_MINIMIZE " Minimizar esta ventana a un icono." + IDS_HINT_SYS_MAXIMIZE " Expandir esta ventana para llenar la pantalla." +END Propchange: trunk/rosapps/imagesoft/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/rsrc.rc?rev=2648… ============================================================================== --- trunk/rosapps/imagesoft/rsrc.rc (original) +++ trunk/rosapps/imagesoft/rsrc.rc Mon Apr 23 22:30:35 2007 @@ -13,4 +13,5 @@ #include "lang/it-IT.rc" #include "lang/nb-NO.rc" #include "lang/th-TH.rc" +#include "lang/es-ES.rc"

1 0

[janderwald] 26479: - fix sublang ids
by janderwald＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: janderwald Date: Mon Apr 23 22:13:03 2007 New Revision: 26479 URL: http://svn.reactos.org/svn/reactos?rev=26479&view=rev Log: - fix sublang ids Modified: trunk/reactos/base/applications/charmap/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/system/expand/lang/es-ES.rc trunk/reactos/base/system/rundll32/lang/es-ES.rc Modified: trunk/reactos/base/applications/charmap/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/charmap/lang/es-ES.rc Mon Apr 23 22:13:03 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa de Caracteres" 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 Mon Apr 23 22:13:03 2007 @@ -22,7 +22,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) #ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL #pragma code_page(1252) #endif //_WIN32 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 Mon Apr 23 22:13:03 2007 @@ -1,6 +1,6 @@ #include "resource.h" -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE { IDS_APPNAME, "WineMine" Modified: trunk/reactos/base/system/expand/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/es… ============================================================================== --- trunk/reactos/base/system/expand/lang/es-ES.rc (original) +++ trunk/reactos/base/system/expand/lang/es-ES.rc Mon Apr 23 22:13:03 2007 @@ -4,7 +4,7 @@ * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/base/system/rundll32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/es-ES.rc (original) +++ trunk/reactos/base/system/rundll32/lang/es-ES.rc Mon Apr 23 22:13:03 2007 @@ -4,7 +4,7 @@ * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_DllNotLoaded, "El cargador de Librerias falló al cargar '%s'"

1 0

[ekohl] 26478: Use the IDs of the default cursors to load the default cursor scheme.
by ekohl＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: ekohl Date: Mon Apr 23 22:10:14 2007 New Revision: 26478 URL: http://svn.reactos.org/svn/reactos?rev=26478&view=rev Log: Use the IDs of the default cursors to load the default cursor scheme. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Mon Apr 23 22:10:14 2007 @@ -108,7 +108,8 @@ typedef struct _CURSOR_DATA { UINT uStringId; - LPWSTR uDefaultCursorId; + UINT uDefaultCursorId; + LPWSTR lpValueName; HCURSOR hCursor; TCHAR szCursorName[MAX_PATH]; TCHAR szCursorPath[MAX_PATH]; @@ -116,21 +117,21 @@ CURSOR_DATA g_CursorData[] = -{{IDS_ARROW, IDC_ARROW, 0, _T(""), _T("")}, - {IDS_HELP, IDC_HELP, 0, _T(""), _T("")}, - {IDS_APPSTARTING, IDC_APPSTARTING, 0, _T(""), _T("")}, - {IDS_WAIT, IDC_WAIT, 0, _T(""), _T("")}, - {IDS_CROSSHAIR, IDC_CROSS, 0, _T(""), _T("")}, - {IDS_IBEAM, IDC_IBEAM, 0, _T(""), _T("")}, - {IDS_NWPEN, 0/*IDC_NWPEN*/, 0, _T(""), _T("")}, /* FIXME */ - {IDS_NO, IDC_NO, 0, _T(""), _T("")}, - {IDS_SIZENS, IDC_SIZENS, 0, _T(""), _T("")}, - {IDS_SIZEWE, IDC_SIZEWE, 0, _T(""), _T("")}, - {IDS_SIZENWSE, IDC_SIZENWSE, 0, _T(""), _T("")}, - {IDS_SIZENESW, IDC_SIZENESW, 0, _T(""), _T("")}, - {IDS_SIZEALL, IDC_SIZEALL, 0, _T(""), _T("")}, - {IDS_UPARROW, IDC_UPARROW, 0, _T(""), _T("")}, - {IDS_HAND, IDC_HAND, 0, _T(""), _T("")}}; +{{IDS_ARROW, 100/*OCR_NORMAL*/, _T("Arrow"), 0, _T(""), _T("")}, + {IDS_HELP, 112/*OCR_HELP*/, _T("Help"), 0, _T(""), _T("")}, + {IDS_APPSTARTING, 111/*OCR_APPSTARTING*/, _T("AppStarting"), 0, _T(""), _T("")}, + {IDS_WAIT, 102/*OCR_WAIT*/, _T("Wait"), 0, _T(""), _T("")}, + {IDS_CROSSHAIR, 103/*OCR_CROSS*/, _T("Crosshair"), 0, _T(""), _T("")}, + {IDS_IBEAM, 101/*OCR_IBEAM*/, _T("IBeam"), 0, _T(""), _T("")}, + {IDS_NWPEN, 113/*OCR_NWPEN*/, _T("NWPen"), 0, _T(""), _T("")}, + {IDS_NO, 110/*OCR_NO*/, _T("No"), 0, _T(""), _T("")}, + {IDS_SIZENS, 108/*OCR_SIZENS*/, _T("SizeNS"), 0, _T(""), _T("")}, + {IDS_SIZEWE, 107/*OCR_SIZEWE*/, _T("SizeWE"), 0, _T(""), _T("")}, + {IDS_SIZENWSE, 105/*OCR_SIZENWSE*/, _T("SizeNWSE"), 0, _T(""), _T("")}, + {IDS_SIZENESW, 106/*OCR_SIZENESW*/, _T("SizeNESW"), 0, _T(""), _T("")}, + {IDS_SIZEALL, 109/*OCR_SIZEALL*/, _T("SizeAll"), 0, _T(""), _T("")}, + {IDS_UPARROW, 104/*OCR_UP*/, _T("UpArrow"), 0, _T(""), _T("")}, + {IDS_HAND, 114/*OCR_HAND*/, _T("Hand"), 0, _T(""), _T("")}}; #if 0 @@ -848,7 +849,7 @@ for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) { if (g_CursorData[i].szCursorPath[0] == 0) - g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].uDefaultCursorId, + g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(g_CursorData[i].uDefaultCursorId), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED); else @@ -870,7 +871,7 @@ DestroyCursor(g_CursorData[i].hCursor); if (g_CursorData[i].szCursorPath[0] == 0) - g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].uDefaultCursorId, + g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(g_CursorData[i].uDefaultCursorId), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED); else

1 0

[janderwald] 26477: - add a few spanish translations by Javier Remacha, remialdo@gmail.com (bug 2113) (bug 2114) (bug 2115) (bug 2116) (bug 2117)
by janderwald＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: janderwald Date: Mon Apr 23 21:58:43 2007 New Revision: 26477 URL: http://svn.reactos.org/svn/reactos?rev=26477&view=rev Log: - add a few spanish translations by Javier Remacha, remialdo(a)gmail.com (bug 2113) (bug 2114) (bug 2115) (bug 2116) (bug 2117) Added: trunk/reactos/base/applications/charmap/lang/es-ES.rc (with props) trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (with props) trunk/reactos/base/applications/games/winemine/lang/es-ES.rc (with props) trunk/reactos/base/system/expand/lang/es-ES.rc (with props) trunk/reactos/base/system/rundll32/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/system/expand/rsrc.rc trunk/reactos/base/system/rundll32/rsrc.rc Added: trunk/reactos/base/applications/charmap/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/charmap/lang/es-ES.rc Mon Apr 23 21:58:43 2007 @@ -1,0 +1,35 @@ +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Mapa de Caracteres" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Fuente :", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Ayuda", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Caracteres a copiar :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Seleccionar", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Copiar", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Vista Avanzada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Acerca de Character Map" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +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., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "&Acerca de ..." +END Propchange: trunk/reactos/base/applications/charmap/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Mon Apr 23 21:58:43 2007 @@ -8,9 +8,8 @@ IDI_ICON ICON "res/charmap.ico" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/pl-PL.rc" - - Added: 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 (added) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Mon Apr 23 21:58:43 2007 @@ -1,0 +1,128 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/en.rc + * PURPOSE: Spanish Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///// + +#undef APSTUDIO_READONLY_SYMBOLS + +///// +// Spanish (Spain) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +#pragma code_page(1252) +#endif //_WIN32 + +///// +// Dialog + +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialogo" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,129,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,129,24,50,14 +END + + +///// +// DESIGNINFO + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOGEX + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED + +///// +// TEXTINCLUDE + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///// +// Menu + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Juego" + BEGIN + MENUITEM "&Repartir\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Barajar...", IDM_GAME_DECK + MENUITEM "&Opciones...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Salir", IDM_GAME_EXIT + END + POPUP "&Ayuda" + BEGIN + MENUITEM "&Temas de ayuda\tF1", IDM_HELP_CONTENTS + MENUITEM "&Acerca de", IDM_HELP_ABOUT + END +END + +///// +// Accelerator + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///// +// Icon + +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // Spanish (Spain) resources + +///// + + +#ifndef APSTUDIO_INVOKED + +///// +#endif // not APSTUDIO_INVOKED Propchange: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Mon Apr 23 21:58:43 2007 @@ -3,6 +3,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" Added: 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 (added) +++ trunk/reactos/base/applications/games/winemine/lang/es-ES.rc Mon Apr 23 21:58:43 2007 @@ -1,0 +1,87 @@ +#include "resource.h" + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN + +STRINGTABLE { + IDS_APPNAME, "WineMine" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Opciones" { + MENUITEM "&Nuevo", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Marcar Interrogantes", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Principiante", IDM_BEGINNER + MENUITEM "&Advanzado", IDM_ADVANCED + MENUITEM "&Experto", IDM_EXPERT + MENUITEM "&Juego Personalizado", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Salir", IDM_EXIT + } + POPUP "&Información" { + MENUITEM "&Mejores Tiempos", IDM_TIMES + MENUITEM "&Acerca de", IDM_ABOUT + } +} + +DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Fastest Times" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + GROUPBOX "Mejores Tiempos", IDNONE, 10, 10, 140, 45 + LTEXT "Principiante", IDNONE, 20, 20, 40, 8 + LTEXT "Advanzado", IDNONE, 20, 30, 40, 8 + LTEXT "Experto", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "Aceptar", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "¡Felicidades!" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + LTEXT "Por Favor, introduce tu nombre", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Aceptar", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Juego Personalizado" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + LTEXT "Filas", IDNONE, 5, 5, 30, 10 + LTEXT "Columnas", IDNONE, 5, 35, 30, 10 + LTEXT "Minas", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Aceptar", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Acerca de" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +{ + LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "under the Wine license", IDNONE, 35, 35, 100, 10 + ICON "WINEMINE", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Aceptar", IDOK, 50, 60, 55, 15 +} Propchange: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc Mon Apr 23 21:58:43 2007 @@ -14,6 +14,7 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" Added: trunk/reactos/base/system/expand/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/es… ============================================================================== --- trunk/reactos/base/system/expand/lang/es-ES.rc (added) +++ trunk/reactos/base/system/expand/lang/es-ES.rc Mon Apr 23 21:58:43 2007 @@ -1,0 +1,16 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "ReactOS Utilidad de Descompresión de Archivos Versión 1.0\n\ +Copyright Victor Schneider 1997\n\n\ +Usage: %s archivo entrada [archivo salida]\n" + +IDS_FAILS "LZCopy falló: el resultado es %ld\n" +} Propchange: trunk/reactos/base/system/expand/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/expand/rsrc.rc (original) +++ trunk/reactos/base/system/expand/rsrc.rc Mon Apr 23 21:58:43 2007 @@ -6,6 +6,7 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" Added: trunk/reactos/base/system/rundll32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/es-ES.rc (added) +++ trunk/reactos/base/system/rundll32/lang/es-ES.rc Mon Apr 23 21:58:43 2007 @@ -1,0 +1,12 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "El cargador de Librerias falló al cargar '%s'" +IDS_MissingEntry, "Punto de entrada perdido:%s\nIn %s" +} Propchange: trunk/reactos/base/system/rundll32/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… ============================================================================== --- trunk/reactos/base/system/rundll32/rsrc.rc (original) +++ trunk/reactos/base/system/rundll32/rsrc.rc Mon Apr 23 21:58:43 2007 @@ -6,6 +6,7 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc"

1 0

[ekohl] 26476: Add default cursors using IDs 100 to 116 because these IDs are used by Windows and the Mouse Control Panel Applet will use these IDs to show the default cursor scheme. The old cursor resources will be removed as soon as cursor schemes are properly loaded by user32.dll and win32k.sys.
by ekohl＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: ekohl Date: Mon Apr 23 21:07:46 2007 New Revision: 26476 URL: http://svn.reactos.org/svn/reactos?rev=26476&view=rev Log: Add default cursors using IDs 100 to 116 because these IDs are used by Windows and the Mouse Control Panel Applet will use these IDs to show the default cursor scheme. The old cursor resources will be removed as soon as cursor schemes are properly loaded by user32.dll and win32k.sys. Modified: trunk/reactos/dll/win32/user32/user32.rc Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc (original) +++ trunk/reactos/dll/win32/user32/user32.rc Mon Apr 23 21:07:46 2007 @@ -19,6 +19,26 @@ // Cursors // +/* New cursor resources */ +100 CURSOR "resources/ocr_normal.cur" +101 CURSOR "resources/ocr_ibeam.cur" +102 CURSOR "resources/ocr_wait.cur" +103 CURSOR "resources/ocr_cross.cur" +104 CURSOR "resources/ocr_up.cur" +105 CURSOR "resources/ocr_sizenwse.cur" +106 CURSOR "resources/ocr_sizenesw.cur" +107 CURSOR "resources/ocr_sizewe.cur" +108 CURSOR "resources/ocr_sizens.cur" +109 CURSOR "resources/ocr_sizeall.cur" +110 CURSOR "resources/ocr_no.cur" +111 CURSOR "resources/ocr_appstarting.cur" +112 CURSOR "resources/ocr_help.cur" +113 CURSOR "resources/ocr_pen.cur" +114 CURSOR "resources/ocr_hand.cur" +115 CURSOR "resources/ocr_icon.cur" +116 CURSOR "resources/ocr_cdautostart.cur" + +/* Compatible cursor resources (will be removed) */ 32512 CURSOR "resources/ocr_normal.cur" 32513 CURSOR "resources/ocr_ibeam.cur" 32514 CURSOR "resources/ocr_wait.cur"

1 0

[tkreuzer] 26475: - fix indentation, no code change
by tkreuzer＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: tkreuzer Date: Mon Apr 23 19:48:37 2007 New Revision: 26475 URL: http://svn.reactos.org/svn/reactos?rev=26475&view=rev Log: - fix indentation, no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Mon Apr 23 19:48:37 2007 @@ -116,7 +116,7 @@ DestRect.right = XDest+Width; DestRect.bottom = YDest+Height; - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); + IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); SourcePoint.x = XSrc; SourcePoint.y = YSrc; @@ -128,7 +128,7 @@ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); if (UsesSource) { - if (DCSrc->w.hBitmap == DCDest->w.hBitmap) + if (DCSrc->w.hBitmap == DCDest->w.hBitmap) BitmapSrc = BitmapDest; else BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); @@ -149,11 +149,11 @@ } if(BitmapDest != NULL) { - BITMAPOBJ_UnlockBitmap(BitmapDest); + BITMAPOBJ_UnlockBitmap(BitmapDest); } if(BitmapSrc != NULL && BitmapSrc != BitmapDest) { - BITMAPOBJ_UnlockBitmap(BitmapSrc); + BITMAPOBJ_UnlockBitmap(BitmapSrc); } DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -204,15 +204,15 @@ DC_UnlockDc(DCDest); if(BitmapDest != NULL) { - BITMAPOBJ_UnlockBitmap(BitmapDest); + BITMAPOBJ_UnlockBitmap(BitmapDest); } if(BitmapSrc != NULL && BitmapSrc != BitmapDest) { - BITMAPOBJ_UnlockBitmap(BitmapSrc); + BITMAPOBJ_UnlockBitmap(BitmapSrc); } if(BrushObj != NULL) { - BRUSHOBJ_UnlockBrush(BrushObj); + BRUSHOBJ_UnlockBrush(BrushObj); } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return FALSE; @@ -222,18 +222,18 @@ /* Perform the bitblt operation */ Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, - DCDest->CombinedClip, XlateObj, &DestRect, - &SourcePoint, NULL, - BrushObj ? &BrushInst.BrushObject : NULL, - &BrushOrigin, ROP3_TO_ROP4(ROP)); + DCDest->CombinedClip, XlateObj, &DestRect, + &SourcePoint, NULL, + BrushObj ? &BrushInst.BrushObject : NULL, + &BrushOrigin, ROP3_TO_ROP4(ROP)); if (UsesSource && XlateObj != NULL) EngDeleteXlate(XlateObj); - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } + if(BitmapDest != NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } if (UsesSource && BitmapSrc != BitmapDest) { BITMAPOBJ_UnlockBitmap(BitmapSrc); @@ -439,8 +439,8 @@ bmp = BITMAPOBJ_LockBitmap( hBitmap ); if (bmp == NULL) { - /* FIXME should we free the hBitmap or return it ?? */ - return 0; + /* FIXME should we free the hBitmap or return it ?? */ + return 0; } bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; @@ -462,11 +462,11 @@ HBITMAP STDCALL NtGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - IN OPTIONAL LPBYTE Bits) + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + IN OPTIONAL LPBYTE Bits) { BITMAP BM; @@ -484,9 +484,9 @@ BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody) { - PBITMAPOBJ pBmp = (PBITMAPOBJ)ObjectBody; + PBITMAPOBJ pBmp = (PBITMAPOBJ)ObjectBody; if (pBmp->SurfObj.pvBits != NULL && - (pBmp->flFlags & BITMAPOBJ_IS_APIBITMAP)) + (pBmp->flFlags & BITMAPOBJ_IS_APIBITMAP)) { if (pBmp->dib == NULL) { @@ -616,9 +616,9 @@ COLORREF Color, UINT FillType) { - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); - - /* lie and say we succeded */ + DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); + + /* lie and say we succeded */ return TRUE; } @@ -662,7 +662,7 @@ SURFOBJ *SurfaceObject; HPALETTE Pal = 0; XLATEOBJ *XlateObj; - HBITMAP hBmpTmp; + HBITMAP hBmpTmp; dc = DC_LockDc (hDC); @@ -1530,12 +1530,16 @@ BITMAP bm; BITMAPOBJ *Bitmap; - if (hBitmap == NULL) + if (hBitmap == NULL) + { return 0; + } Bitmap = GDIOBJ_LockObj(GdiHandleTable, hBitmap, GDI_OBJECT_TYPE_BITMAP); - if (Bitmap == NULL) + if (Bitmap == NULL) + { return 0; + } BITMAP_GetObject(Bitmap, sizeof(BITMAP), &bm); bm.bmBits = NULL; @@ -1588,7 +1592,7 @@ { BITMAP Bitmap; - Count = sizeof(BITMAP); + Count = sizeof(BITMAP); Bitmap.bmType = 0; Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy;

1 0

[tkreuzer] 26474: GetObject rewrite part 2 (NtGdiExtGetObjectW, ...) - hanlde GDI_OBJECT_TYPE_EXTPEN - PALETTEOBJ* -> PPALGDI - fix return value of BITMAP_GetObject & BRUSH_GetObject - implement PALETTE_GetObject - handle cases where the buffer gets filled partly
by tkreuzer＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: tkreuzer Date: Mon Apr 23 19:32:04 2007 New Revision: 26474 URL: http://svn.reactos.org/svn/reactos?rev=26474&view=rev Log: GetObject rewrite part 2 (NtGdiExtGetObjectW, ...) - hanlde GDI_OBJECT_TYPE_EXTPEN - PALETTEOBJ* -> PPALGDI - fix return value of BITMAP_GetObject & BRUSH_GetObject - implement PALETTE_GetObject - handle cases where the buffer gets filled partly Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/palobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Mon Apr 23 19:32:04 2007 @@ -47,6 +47,8 @@ #endif INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); +INT FASTCALL PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); + PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); #endif /* _WIN32K_PALETTE_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Mon Apr 23 19:32:04 2007 @@ -1561,19 +1561,25 @@ INT STDCALL BITMAP_GetObject(BITMAPOBJ * bmp, INT Count, LPVOID buffer) { - if( buffer == NULL ) return sizeof(BITMAP); - if (Count < sizeof(BITMAP)) return 0; + if ((UINT)Count < sizeof(BITMAP)) return 0; + if( buffer == NULL ) + { + if ((UINT)Count < sizeof(DIBSECTION)) + { + return sizeof(BITMAP); + } + return sizeof(DIBSECTION); + } if(bmp->dib) { - - if(Count < (INT) sizeof(DIBSECTION)) - { - if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP); + if((UINT)Count < sizeof(DIBSECTION)) + { + Count = sizeof(BITMAP); } else { - if (Count > (INT) sizeof(DIBSECTION)) Count = sizeof(DIBSECTION); + Count = sizeof(DIBSECTION); } memcpy(buffer, bmp->dib, Count); return Count; @@ -1581,7 +1587,8 @@ else { BITMAP Bitmap; - if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP); + + Count = sizeof(BITMAP); Bitmap.bmType = 0; Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy; Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Mon Apr 23 19:32:04 2007 @@ -53,8 +53,8 @@ BRUSH_GetObject (PGDIBRUSHOBJ BrushObject, INT Count, LPLOGBRUSH Buffer) { if( Buffer == NULL ) return sizeof(BRUSHOBJ); - if (Count < sizeof(BRUSHOBJ)) return 0; - if (Count > sizeof(BRUSHOBJ)) Count = sizeof(BRUSHOBJ); + if (Count == 0) return 0; + if ((UINT)Count < sizeof(BRUSHOBJ)) return 0; /* Set colour */ Buffer->lbColor = BrushObject->BrushAttr.lbColor; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Apr 23 19:32:04 2007 @@ -1755,123 +1755,117 @@ INT FASTCALL -IntGdiGetObject(HANDLE Handle, INT Count, LPVOID Buffer) -{ - PVOID GdiObject; +IntGdiGetObject(HANDLE Handle, INT cbCount, LPVOID lpBuffer) +{ + PVOID pGdiObject; INT Result = 0; - DWORD ObjectType; - - GdiObject = GDIOBJ_LockObj(GdiHandleTable, Handle, GDI_OBJECT_TYPE_DONTCARE); - if (NULL == GdiObject) + DWORD dwObjectType; + + pGdiObject = GDIOBJ_LockObj(GdiHandleTable, Handle, GDI_OBJECT_TYPE_DONTCARE); + if (!pGdiObject) { SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - ObjectType = GDIOBJ_GetObjectType(Handle); - switch (ObjectType) - { - + dwObjectType = GDIOBJ_GetObjectType(Handle); + switch (dwObjectType) + { case GDI_OBJECT_TYPE_PEN: - Result = PEN_GetObject((PGDIBRUSHOBJ) GdiObject, Count, (PLOGPEN) Buffer); // IntGdiCreatePenIndirect + case GDI_OBJECT_TYPE_EXTPEN: + Result = PEN_GetObject((PGDIBRUSHOBJ) pGdiObject, cbCount, (PLOGPEN) lpBuffer); // IntGdiCreatePenIndirect break; case GDI_OBJECT_TYPE_BRUSH: - Result = BRUSH_GetObject((PGDIBRUSHOBJ ) GdiObject, Count, (LPLOGBRUSH)Buffer); + Result = BRUSH_GetObject((PGDIBRUSHOBJ ) pGdiObject, cbCount, (LPLOGBRUSH)lpBuffer); break; case GDI_OBJECT_TYPE_BITMAP: - Result = BITMAP_GetObject((BITMAPOBJ *) GdiObject, Count, Buffer); + Result = BITMAP_GetObject((BITMAPOBJ *) pGdiObject, cbCount, lpBuffer); break; case GDI_OBJECT_TYPE_FONT: - Result = FontGetObject((PTEXTOBJ) GdiObject, Count, Buffer); + Result = FontGetObject((PTEXTOBJ) pGdiObject, cbCount, lpBuffer); #if 0 // Fix the LOGFONT structure for the stock fonts if (FIRST_STOCK_HANDLE <= Handle && Handle <= LAST_STOCK_HANDLE) { - FixStockFontSizeW(Handle, Count, Buffer); + FixStockFontSizeW(Handle, cbCount, lpBuffer); } #endif break; -#if 0 + case GDI_OBJECT_TYPE_PALETTE: - Result = PALETTE_GetObject((PALETTEOBJ *) GdiObject, Count, Buffer); + Result = PALETTE_GetObject((PPALGDI) pGdiObject, cbCount, lpBuffer); break; -#endif + default: - DPRINT1("GDI object type 0x%08x not implemented\n", ObjectType); + DPRINT1("GDI object type 0x%08x not implemented\n", dwObjectType); break; } - GDIOBJ_UnlockObjByPtr(GdiHandleTable, GdiObject); + GDIOBJ_UnlockObjByPtr(GdiHandleTable, pGdiObject); return Result; } INT STDCALL -NtGdiExtGetObjectW(HANDLE handle, INT count, LPVOID buffer) -{ - INT Ret = 0; - LPVOID SafeBuf; +NtGdiExtGetObjectW(HANDLE hGdiObj, INT cbCount, LPVOID lpUnsafeBuf) +{ + LPVOID lpSafeBuf; NTSTATUS Status = STATUS_SUCCESS; INT RetCount = 0; /* From Wine: GetObject does not SetLastError() on a null object */ - if (!handle) return Ret; - - RetCount = IntGdiGetObject(handle, 0, NULL); - if ((count <= 0) || (!buffer)) - { - return RetCount; - } - - _SEH_TRY - { - ProbeForWrite(buffer, count, 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + if (!hGdiObj) + { + return 0; + } + + if (!lpUnsafeBuf) + { + return IntGdiGetObject(hGdiObj, 0, NULL); + } + + if (!cbCount) + { + return 0; + } + + RetCount = IntGdiGetObject(hGdiObj, cbCount, NULL); + if ((UINT)cbCount > RetCount) + { + cbCount = RetCount; + } + lpSafeBuf = ExAllocatePoolWithTag(PagedPool, RetCount, TAG_GDIOBJ); + if(!lpSafeBuf) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + RetCount = IntGdiGetObject(hGdiObj, cbCount, lpSafeBuf); + if (RetCount) + { + _SEH_TRY + { + ProbeForWrite(lpUnsafeBuf, cbCount, 1); + RtlCopyMemory(lpUnsafeBuf, lpSafeBuf, cbCount); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + ExFreePool(lpSafeBuf); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - return Ret; - } - - if ((RetCount) && (count)) - { - SafeBuf = ExAllocatePoolWithTag(PagedPool, count, TAG_GDIOBJ); - if(!SafeBuf) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return Ret; - } - Ret = IntGdiGetObject(handle, count, SafeBuf); - - _SEH_TRY - { - /* pointer already probed! */ - RtlCopyMemory(buffer, SafeBuf, count); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - ExFreePool(SafeBuf); - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - } - - return Ret; + return 0; + } + + return RetCount; } Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c Mon Apr 23 19:32:04 2007 @@ -339,4 +339,16 @@ } #endif +INT FASTCALL +PALETTE_GetObject(PPALGDI pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer) +{ + if (!lpBuffer) + { + return sizeof(WORD); + } + if ((UINT)cbCount < sizeof(WORD)) return 0; + *((WORD*)lpBuffer) = (WORD)pGdiObject->NumColors; + return sizeof(WORD); +} + /* EOF */

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
38
Older →

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 April 2007