Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 26147: - fix makefiles to depend on TOOLS_OUT_ value than directly hardcoding it to $(OUTPUT)
by janderwald＠svn.reactos.org 20 Mar '07

20 Mar '07

Author: janderwald Date: Tue Mar 20 23:12:10 2007 New Revision: 26147 URL: http://svn.reactos.org/svn/reactos?rev=26147&view=rev Log: - fix makefiles to depend on TOOLS_OUT_ value than directly hardcoding it to $(OUTPUT) Modified: trunk/reactos/tools/bin2c.mak trunk/reactos/tools/bin2res/bin2res.mak trunk/reactos/tools/buildno/buildno.mak trunk/reactos/tools/cdmake/cdmake.mak trunk/reactos/tools/dbgprint/dbgprint.mak trunk/reactos/tools/gendib/gendib.mak trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/pefixup.mak trunk/reactos/tools/rgenstat/rgenstat.mak trunk/reactos/tools/rsym.mak trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wpp/wpp.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/tools/bin2c.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.mak?rev=26147&… ============================================================================== --- trunk/reactos/tools/bin2c.mak (original) +++ trunk/reactos/tools/bin2c.mak Tue Mar 20 23:12:10 2007 @@ -3,7 +3,7 @@ BIN2C_INT = $(INTERMEDIATE_)$(BIN2C_BASE) BIN2C_INT_ = $(BIN2C_INT)$(SEP) -BIN2C_OUT = $(OUTPUT_)$(BIN2C_BASE) +BIN2C_OUT = $(TOOLS_OUT_)$(BIN2C_BASE) BIN2C_OUT_ = $(BIN2C_OUT)$(SEP) BIN2C_TARGET = \ Modified: trunk/reactos/tools/bin2res/bin2res.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2res/bin2res.mak?… ============================================================================== --- trunk/reactos/tools/bin2res/bin2res.mak (original) +++ trunk/reactos/tools/bin2res/bin2res.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ BIN2RES_BASE_ = $(BIN2RES_BASE)$(SEP) BIN2RES_INT = $(INTERMEDIATE_)$(BIN2RES_BASE) BIN2RES_INT_ = $(BIN2RES_INT)$(SEP) -BIN2RES_OUT = $(OUTPUT_)$(BIN2RES_BASE) +BIN2RES_OUT = $(TOOLS_OUT_)$(BIN2RES_BASE) BIN2RES_OUT_ = $(BIN2RES_OUT)$(SEP) $(BIN2RES_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.mak (original) +++ trunk/reactos/tools/buildno/buildno.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ BUILDNO_BASE_ = $(BUILDNO_BASE)$(SEP) BUILDNO_INT = $(INTERMEDIATE_)$(BUILDNO_BASE) BUILDNO_INT_ = $(BUILDNO_INT)$(SEP) -BUILDNO_OUT = $(OUTPUT_)$(BUILDNO_BASE) +BUILDNO_OUT = $(TOOLS_OUT_)$(BUILDNO_BASE) BUILDNO_OUT_ = $(BUILDNO_OUT)$(SEP) $(BUILDNO_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/cdmake/cdmake.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.mak?re… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.mak (original) +++ trunk/reactos/tools/cdmake/cdmake.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ CDMAKE_BASE_ = $(CDMAKE_BASE)$(SEP) CDMAKE_INT = $(INTERMEDIATE_)$(CDMAKE_BASE) CDMAKE_INT_ = $(CDMAKE_INT)$(SEP) -CDMAKE_OUT = $(OUTPUT_)$(CDMAKE_BASE) +CDMAKE_OUT = $(TOOLS_OUT_)$(CDMAKE_BASE) CDMAKE_OUT_ = $(CDMAKE_OUT)$(SEP) $(CDMAKE_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/dbgprint/dbgprint.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/dbgprint/dbgprint.ma… ============================================================================== --- trunk/reactos/tools/dbgprint/dbgprint.mak (original) +++ trunk/reactos/tools/dbgprint/dbgprint.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ DBGPRINT_BASE_ = $(DBGPRINT_BASE)$(SEP) DBGPRINT_INT = $(INTERMEDIATE_)$(DBGPRINT_BASE) DBGPRINT_INT_ = $(DBGPRINT_INT)$(SEP) -DBGPRINT_OUT = $(OUTPUT_)$(DBGPRINT_BASE) +DBGPRINT_OUT = $(TOOLS_OUT_)$(DBGPRINT_BASE) DBGPRINT_OUT_ = $(DBGPRINT_OUT)$(SEP) $(DBGPRINT_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/gendib/gendib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?re… ============================================================================== --- trunk/reactos/tools/gendib/gendib.mak (original) +++ trunk/reactos/tools/gendib/gendib.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ GENDIB_BASE_ = $(GENDIB_BASE)$(SEP) GENDIB_INT = $(INTERMEDIATE_)$(GENDIB_BASE) GENDIB_INT_ = $(GENDIB_INT)$(SEP) -GENDIB_OUT = $(OUTPUT_)$(GENDIB_BASE) +GENDIB_OUT = $(TOOLS_OUT_)$(GENDIB_BASE) GENDIB_OUT_ = $(GENDIB_OUT)$(SEP) $(GENDIB_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ MKHIVE_BASE_ = $(MKHIVE_BASE)$(SEP) MKHIVE_INT = $(INTERMEDIATE_)$(MKHIVE_BASE) MKHIVE_INT_ = $(MKHIVE_INT)$(SEP) -MKHIVE_OUT = $(OUTPUT_)$(MKHIVE_BASE) +MKHIVE_OUT = $(TOOLS_OUT_)$(MKHIVE_BASE) MKHIVE_OUT_ = $(MKHIVE_OUT)$(SEP) $(MKHIVE_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ NCI_BASE_ = $(NCI_BASE)$(SEP) NCI_INT = $(INTERMEDIATE_)$(NCI_BASE) NCI_INT_ = $(NCI_INT)$(SEP) -NCI_OUT = $(OUTPUT_)$(NCI_BASE) +NCI_OUT = $(TOOLS_OUT_)$(NCI_BASE) NCI_OUT_ = $(NCI_OUT)$(SEP) $(NCI_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/pefixup.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/pefixup.mak (original) +++ trunk/reactos/tools/pefixup.mak Tue Mar 20 23:12:10 2007 @@ -3,7 +3,7 @@ PEFIXUP_INT = $(INTERMEDIATE_)$(PEFIXUP_BASE) PEFIXUP_INT_ = $(PEFIXUP_INT)$(SEP) -PEFIXUP_OUT = $(OUTPUT_)$(PEFIXUP_BASE) +PEFIXUP_OUT = $(ROS_TOOLS_)$(PEFIXUP_BASE) PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP) PEFIXUP_TARGET = \ Modified: trunk/reactos/tools/rgenstat/rgenstat.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.ma… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.mak (original) +++ trunk/reactos/tools/rgenstat/rgenstat.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ RGENSTAT_BASE_ = $(RGENSTAT_BASE)$(SEP) RGENSTAT_INT = $(INTERMEDIATE_)$(RGENSTAT_BASE) RGENSTAT_INT_ = $(RGENSTAT_INT)$(SEP) -RGENSTAT_OUT = $(OUTPUT_)$(RGENSTAT_BASE) +RGENSTAT_OUT = $(TOOLS_OUT_)$(RGENSTAT_BASE) RGENSTAT_OUT_ = $(RGENSTAT_OUT)$(SEP) $(RGENSTAT_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=26147&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Tue Mar 20 23:12:10 2007 @@ -3,7 +3,7 @@ RSYM_INT = $(INTERMEDIATE_)$(RSYM_BASE) RSYM_INT_ = $(RSYM_INT)$(SEP) -RSYM_OUT = $(OUTPUT_)$(RSYM_BASE) +RSYM_OUT = $(ROS_TOOLS_)$(RSYM_BASE) RSYM_OUT_ = $(RSYM_OUT)$(SEP) RSYM_TARGET = \ Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ SYSREGBUILD_BASE_ = $(SYSREGBUILD_BASE)$(SEP) SYSREGBUILD_INT = $(INTERMEDIATE_)$(SYSREGBUILD_BASE) SYSREGBUILD_INT_ = $(SYSREGBUILD_INT)$(SEP) -SYSREGBUILD_OUT = $(OUTPUT_)$(SYSREGBUILD_BASE) +SYSREGBUILD_OUT = $(TOOLS_OUT_)$(SYSREGBUILD_BASE) SYSREGBUILD_OUT_ = $(SYSREGBUILD_OUT)$(SEP) $(SYSREGBUILD_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.mak?… ============================================================================== --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ UNICODE_BASE_ = $(UNICODE_BASE)$(SEP) UNICODE_INT = $(INTERMEDIATE_)$(UNICODE_BASE) UNICODE_INT_ = $(UNICODE_INT)$(SEP) -UNICODE_OUT = $(OUTPUT_)$(UNICODE_BASE) +UNICODE_OUT = $(TOOLS_OUT_)$(UNICODE_BASE) UNICODE_OUT_ = $(UNICODE_OUT)$(SEP) $(UNICODE_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=26… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ WIDL_BASE_ = $(WIDL_BASE)$(SEP) WIDL_INT = $(INTERMEDIATE_)$(WIDL_BASE) WIDL_INT_ = $(WIDL_INT)$(SEP) -WIDL_OUT = $(OUTPUT_)$(WIDL_BASE) +WIDL_OUT = $(TOOLS_OUT_)$(WIDL_BASE) WIDL_OUT_ = $(WIDL_OUT)$(SEP) $(WIDL_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ WINEBUILD_BASE_ = $(WINEBUILD_BASE)$(SEP) WINEBUILD_INT = $(INTERMEDIATE_)$(WINEBUILD_BASE) WINEBUILD_INT_ = $(WINEBUILD_INT)$(SEP) -WINEBUILD_OUT = $(OUTPUT_)$(WINEBUILD_BASE) +WINEBUILD_OUT = $(TOOLS_OUT_)$(WINEBUILD_BASE) WINEBUILD_OUT_ = $(WINEBUILD_OUT)$(SEP) $(WINEBUILD_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ WMC_BASE_ = $(WMC_BASE)$(SEP) WMC_INT = $(INTERMEDIATE_)$(WMC_BASE) WMC_INT_ = $(WMC_INT)$(SEP) -WMC_OUT = $(OUTPUT_)$(WMC_BASE) +WMC_OUT = $(TOOLS_OUT_)$(WMC_BASE) WMC_OUT_ = $(WMC_OUT)$(SEP) $(WMC_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/wpp/wpp.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/wpp/wpp.mak (original) +++ trunk/reactos/tools/wpp/wpp.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ WPP_BASE_ = $(WPP_BASE)$(SEP) WPP_INT = $(INTERMEDIATE_)$(WPP_BASE) WPP_INT_ = $(WPP_INT)$(SEP) -WPP_OUT = $(OUTPUT_)$(WPP_BASE) +WPP_OUT = $(TOOLS_OUT_)$(WPP_BASE) WPP_OUT_ = $(WPP_OUT)$(SEP) $(WPP_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Tue Mar 20 23:12:10 2007 @@ -2,7 +2,7 @@ WRC_BASE_ = $(WRC_BASE)$(SEP) WRC_INT = $(INTERMEDIATE_)$(WRC_BASE) WRC_INT_ = $(WRC_INT)$(SEP) -WRC_OUT = $(OUTPUT_)$(WRC_BASE) +WRC_OUT = $(TOOLS_OUT_)$(WRC_BASE) WRC_OUT_ = $(WRC_OUT)$(SEP) $(WRC_INT): | $(TOOLS_INT)

1 0

[fireball] 26146: Fix MSVC compilation with NT4 ddk.
by fireball＠svn.reactos.org 20 Mar '07

20 Mar '07

Author: fireball Date: Tue Mar 20 22:09:55 2007 New Revision: 26146 URL: http://svn.reactos.org/svn/reactos?rev=26146&view=rev Log: Fix MSVC compilation with NT4 ddk. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h Tue Mar 20 22:09:55 2007 @@ -17,6 +17,20 @@ #include <ntddk.h> #include <stdio.h> + +// NT4 DDK-compatibility +#ifndef RTL_CONSTANT_STRING +# define RTL_CONSTANT_STRING(s) { sizeof( s ) - sizeof( (s)[0] ), sizeof( s ), s } +#endif + +#ifndef OBJ_KERNEL_HANDLE +# define OBJ_KERNEL_HANDLE 0x00000200L +#endif + +#ifndef FILE_DEVICE_SECURE_OPEN +# define FILE_DEVICE_SECURE_OPEN 0x00000100 +#endif + #include "debug.h" #include "usb.h" #include "hcd.h"

1 0

[dgorbachev] 26145: Italian translation by Paolo Devoti.
by dgorbachev＠svn.reactos.org 20 Mar '07

20 Mar '07

Author: dgorbachev Date: Tue Mar 20 19:03:32 2007 New Revision: 26145 URL: http://svn.reactos.org/svn/reactos?rev=26145&view=rev Log: Italian translation by Paolo Devoti. Added: trunk/reactos/boot/freeldr/fdebug/It.rc trunk/reactos/subsystems/ntvdm/it-IT.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/subsystems/ntvdm/ntvdm.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Added: trunk/reactos/boot/freeldr/fdebug/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/It.rc?… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/It.rc (added) +++ trunk/reactos/boot/freeldr/fdebug/It.rc Tue Mar 20 19:03:32 2007 @@ -1,0 +1,189 @@ +///////////////////////////////////////////////////////////////////////////// +// Italian language resource file (Paolo Devoti, devotip(a)tiscali.it, 2007-01-10) + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Connetti", ID_FILE_CONNECT + MENUITEM "&Disconnetti", ID_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Inizia Cattura", ID_FILE_STARTCAPTURE + MENUITEM "&Fine Cattura", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Eco &Locale", ID_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "E&sci", IDM_EXIT + END + POPUP "&Aiuto" + BEGIN + MENUITEM "&Informazioni su ...", 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 "Informazioni su 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 "OK",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 "Opzioni di connessione" +FONT 8, "Tahoma" +BEGIN + LTEXT "Indica la porta COM (es: COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Indica il baud rate (e.g. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "Annulla",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Capture File" +FONT 8, "Tahoma" +BEGIN + LTEXT "Nome del file di cattura:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "&Esplora",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "Annulla",IDCANCEL,194,74,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hello World!" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di VENDIBILITA' o ADEGUATEZZA PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." +END + +#endif +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc Tue Mar 20 19:03:32 2007 @@ -10,6 +10,7 @@ #include "Fr.rc" #include "Hu.rc" #include "Id.rc" +#include "It.rc" #include "Ja.rc" #include "No.rc" #include "Pl.rc" Added: trunk/reactos/subsystems/ntvdm/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/it-IT.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/it-IT.rc (added) +++ trunk/reactos/subsystems/ntvdm/it-IT.rc Tue Mar 20 19:03:32 2007 @@ -1,0 +1,17 @@ +#include "resource.h" +/* +* PROJECT: ReactOS Virtual DOS Machine +* LICENSE: GPL - See COPYING in the top level directory +* FILE: subsystems/ntvdm/it-IT.rc +* PURPOSE: Italian Translation of subsystems/ntvdm/en-US.rc +* PROGRAMMERS: Copyright (C) 2005 Magnus Olsen +* Copyright (C) 2007 Daniele Forsi (dforsi at gmail.com) Italian Translation +*/ + +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "Supporto di ReactOS per la macchina virtuale DOS.\n" +STRING_PromptMsg, "Digitare r<invio> per avviare, s<invio> per arrestare o q<invio> per abbandonare ora." +} Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc Tue Mar 20 19:03:32 2007 @@ -12,6 +12,7 @@ #include "fr-FR.rc" #include "hu-HU.rc" #include "id-ID.rc" +#include "it-IT.rc" #include "ja-JP.rc" #include "nb-NO.rc" #include "th-TH.rc" Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc Tue Mar 20 19:03:32 2007 @@ -1,0 +1,57 @@ +/* +* PROJECT: ReactOS Client/Server Runtime subsystem +* LICENSE: GPL - See COPYING in the top level directory +* FILE: subsystems/win32/csrss/win32csr/lang/it-IT.rc +* PURPOSE: Italian Translation of subsystems/win32/csrss/win32csr/lang/en-US.rc +* PROGRAMMERS: +* Copyright (C) 2007 Daniele Forsi (dforsi at gmail.com) Italian Translation +*/ + +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN + +IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fine del programma - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fine del programma... Attendere",IDC_STATIC,7,7,186,11 + CONTROL "Progresso",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "Se si sceglie di terminare il programma immediatamente, si perderanno tutti i dati non salvati. Per terminare il programma ora, selezionare Termina ora.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "T&ermina ora",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Annulla",IDCANCEL,142,98,43,17 + PUSHBUTTON "T&ermina ora",IDC_END_NOW,78,98,43,17 + LTEXT "Il programma non risponde",IDC_STATIC,7,7,178,8 + LTEXT "Per tornare a ReactOS e controllare lo stato del programma, selezionare Annulla", + IDC_STATIC,7,26,178,16 + LTEXT "Se si sceglie di terminare il programma immediatamente, si perderanno tutti i dati non salvati. Per terminare il programma ora, selezionare Termina ora.", + IDC_STATIC,7,53,178,26 +END + +STRINGTABLE +BEGIN + IDS_EDIT "Modifica" + IDS_MARK "Seleziona" + IDS_COPY "Copia\tInvio" + IDS_PASTE "Incolla" + IDS_SELECTALL "Seleziona tutto" + IDS_SCROLL "Scorri" + IDS_FIND "Trova..." + IDS_DEFAULTS "Impostazioni predefinite" + IDS_PROPERTIES "Proprietà" + IDS_SCROLLHERE "Scorri qui" + IDS_SCROLLTOP "Scorri in cima" + IDS_SCROLLBOTTOM "Scorri in fondo" + IDS_SCROLLPAGE_UP "Pagina sù" + IDS_SCROLLPAGE_DOWN "Pagina giù" + IDS_SCROLLUP "Scorri sù" + IDS_SCROLLDOWN "Scorri giù" +END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Tue Mar 20 19:03:32 2007 @@ -7,4 +7,5 @@ #include "lang/en-US.rc" #include "lang/id-ID.rc" +#include "lang/it-IT.rc" #include "lang/uk-UA.rc"

1 0

[dgorbachev] 26144: Italian translation by Paolo Devoti.
by dgorbachev＠svn.reactos.org 20 Mar '07

20 Mar '07

Author: dgorbachev Date: Tue Mar 20 19:02:01 2007 New Revision: 26144 URL: http://svn.reactos.org/svn/reactos?rev=26144&view=rev Log: Italian translation by Paolo Devoti. Added: trunk/reactos/dll/cpl/desk/it-IT.rc trunk/reactos/dll/cpl/hdwwiz/it-IT.rc trunk/reactos/dll/cpl/intl/it-IT.rc trunk/reactos/dll/cpl/intl_new/It.rc trunk/reactos/dll/cpl/main/it-IT.rc trunk/reactos/dll/cpl/mmsys/it-IT.rc trunk/reactos/dll/cpl/ncpa/it-IT.rc trunk/reactos/dll/cpl/powercfg/it-IT.rc trunk/reactos/dll/cpl/sysdm/it-IT.rc trunk/reactos/dll/cpl/timedate/it-IT.rc trunk/reactos/dll/win32/aclui/aclui_It.rc trunk/reactos/dll/win32/devmgr/It.rc trunk/reactos/dll/win32/netid/lang/it-IT.rc trunk/reactos/dll/win32/newdev/lang/it-IT.rc trunk/reactos/dll/win32/shellext/slayer/lang/it-IT.rc trunk/reactos/dll/win32/userenv/It.rc Removed: trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/intl/it.rc trunk/reactos/dll/cpl/main/It.rc trunk/reactos/dll/cpl/sysdm/ru.rc trunk/reactos/dll/cpl/timedate/It.rc Modified: trunk/reactos/dll/cpl/appwiz/It.rc trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/intl_new/intl.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/ncpa/ncpa.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/timedate/timedate.rc trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/netid/netid.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/shellext/slayer/lang/ru-RU.rc trunk/reactos/dll/win32/shellext/slayer/rsrc.rc trunk/reactos/dll/win32/userenv/userenv.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/appwiz/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/It.rc?rev=2… Removed: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=261… Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2… Added: trunk/reactos/dll/cpl/desk/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/it-IT.rc?rev=… Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… Added: trunk/reactos/dll/cpl/hdwwiz/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/it-IT.rc?re… Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… Added: trunk/reactos/dll/cpl/intl/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/it-IT.rc?rev=… Removed: trunk/reactos/dll/cpl/intl/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/it.rc?rev=261… Added: trunk/reactos/dll/cpl/intl_new/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/It.rc?rev… Modified: trunk/reactos/dll/cpl/intl_new/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.rc?r… Removed: trunk/reactos/dll/cpl/main/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/It.rc?rev=261… Added: trunk/reactos/dll/cpl/main/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/it-IT.rc?rev=… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=2… Added: trunk/reactos/dll/cpl/mmsys/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/it-IT.rc?rev… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… Added: trunk/reactos/dll/cpl/ncpa/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/it-IT.rc?rev=… Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=2… Added: trunk/reactos/dll/cpl/powercfg/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/it-IT.rc?… Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… Added: trunk/reactos/dll/cpl/sysdm/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/it-IT.rc?rev… Removed: trunk/reactos/dll/cpl/sysdm/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/ru.rc?rev=26… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… Removed: trunk/reactos/dll/cpl/timedate/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/It.rc?rev… Added: trunk/reactos/dll/cpl/timedate/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/it-IT.rc?… Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… Added: trunk/reactos/dll/win32/aclui/aclui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_It.r… Added: trunk/reactos/dll/win32/devmgr/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/It.rc?rev… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… Added: trunk/reactos/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/it-IT… Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… Added: trunk/reactos/dll/win32/newdev/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Added: trunk/reactos/dll/win32/shellext/slayer/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… Modified: trunk/reactos/dll/win32/shellext/slayer/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… Modified: trunk/reactos/dll/win32/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… Added: trunk/reactos/dll/win32/userenv/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/It.rc?re… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.…

1 0

[dgorbachev] 26143: Italian translation by Paolo Devoti (see bug #2027)
by dgorbachev＠svn.reactos.org 20 Mar '07

20 Mar '07

Author: dgorbachev Date: Tue Mar 20 19:01:19 2007 New Revision: 26143 URL: http://svn.reactos.org/svn/reactos?rev=26143&view=rev Log: Italian translation by Paolo Devoti (see bug #2027) Added: trunk/reactos/base/applications/charmap/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/it-IT.rc trunk/reactos/base/applications/network/ipconfig/it-IT.rc trunk/reactos/base/applications/regedit/clb/lang/it-IT.rc Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/servman/servman.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/wordpad/lang/it-IT.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/system/regsvr32/lang/it-IT.rc Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -136,19 +136,19 @@ VK_F1, IDV_HELP, VIRTKEY END -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "?", IDM_WHATS_THIS - } -} - DLG_ABOUT DIALOG 12,0,120,82 CAPTION "Informazioni su GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Cos'è questo?", IDM_WHATS_THIS + } +} DLG_STATS DIALOG 12,0,125,78 CAPTION "Statistiche" Added: trunk/reactos/base/applications/charmap/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/charmap/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -1,0 +1,35 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Character Map" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Font :", 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 "Aiuto", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Caratteri da copiare :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Selezionare", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Copiare", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Visualizzazione avanzata", 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 "Informazioni su 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 "Chiudi", 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 "&Informazioni su..." +END 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 Tue Mar 20 19:01:19 2007 @@ -8,6 +8,7 @@ IDI_ICON ICON "res/charmap.ico" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/id-ID.rc" -#include "lang/fr-FR.rc" +#include "lang/it-IT.rc" Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -51,7 +51,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di VENDIBILITA' o ADEGUATEZZA PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." + IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." END STRINGTABLE DISCARDABLE @@ -68,8 +68,8 @@ IDS_APPNAME "ReactOS: Gestione Dispositivi" IDS_HINT_BLANK " " IDS_HINT_EXIT " Esci dal programma." - IDS_HINT_REFRESH " Aggiorna la lisa dei servizi." - IDS_HINT_PROP " Apri le proprieta per la selezione attuale." + IDS_HINT_REFRESH " Aggiorna la lista dei servizi." + IDS_HINT_PROP " Apri le proprietà per la selezione attuale." IDS_HINT_HELP " Visualizza la finestra di aiuto." IDS_HINT_ABOUT " Informazioni su Gestione dispositivi di ReactOS." Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc Tue Mar 20 19:01:19 2007 @@ -20,3 +20,4 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/th-TH.rc" + Added: trunk/reactos/base/applications/mscutils/servman/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/it-IT.rc (added) +++ trunk/reactos/base/applications/mscutils/servman/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -1,0 +1,282 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN + +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "Esporta...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "E&sci", ID_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Collega a...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Avvia", ID_START, GRAYED + MENUITEM "Ferma", ID_STOP, GRAYED + MENUITEM "Pausa", ID_PAUSE, GRAYED + MENUITEM "Ripristina", ID_RESUME, GRAYED + MENUITEM "Riavvia", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Aggiorna", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Modifica...", ID_EDIT, GRAYED + MENUITEM "Crea...", ID_CREATE + MENUITEM "Cancella...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Proprietà...", ID_PROP, GRAYED + END + POPUP "View" + BEGIN + MENUITEM "Icone grandi", ID_VIEW_LARGE + MENUITEM "Icone piccole", ID_VIEW_SMALL + MENUITEM "Elenco", ID_VIEW_LIST + MENUITEM "Dettagli", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "Personalizza...",ID_VIEW_CUST, GRAYED + END + POPUP "Aiuto" + BEGIN + MENUITEM "Aiuto", ID_HELP + MENUITEM "Informazioni su...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Avvia", ID_START, GRAYED + MENUITEM "Ferma", ID_STOP, GRAYED + MENUITEM "Pausa", ID_PAUSE, GRAYED + MENUITEM "Ripristina", ID_RESUME, GRAYED + MENUITEM "Riavvia", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Aggiorna", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Modifica...", ID_EDIT, GRAYED + MENUITEM "Cancella...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Proprietà...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Aiuto...", ID_HELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "Informazioni su Gestione Servizi" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Gestione Servizi v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +CAPTION "General" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Avvia", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Ferma", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Pausa", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Ripristina", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "Nome servizio:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "Nome visualizzato:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "Descrizione:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "Percorso dell'eseguibile:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "Tipo di avvio:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "Stato del servizio:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "Puoi indicarei parametri in uso quando il servizio è avviato da qui.",IDC_STATIC, 6,177,240,15 + LTEXT "Parametri di avvio:", IDC_STATIC, 6, 200, 58, 11 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "Dipendenze" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 + LTEXT "Alcuni servizi dipendono da altri servizi, driver di sistema e gruppi di ordine di caricamento. Se un componente di sistema viene fermato o non sta funzionando regolarmente, i servizi dipendenti possono venire influenzati.", IDC_STATIC,8, 7, 238, 26 + LTEXT "Questo servizio dipende dai seguenti componenti", IDC_STATIC, 8, 57, 236, 9 + LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "Crea un servizio" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*Nome del servizio :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*Nome visualizzato :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*Percorso dell'eseguibile :", IDC_STATIC, 10, 51, 68, 9 + LTEXT "Descrizione :", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 + PUSHBUTTON "Annulla", IDCANCEL, 176, 192, 46, 13 + LTEXT "Opzioni aggiuntive (cliccak aiuto per i dettagli)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "Aiuto", ID_CREATE_HELP, 6, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6,6,185,148 +CAPTION "Cancella un servizio" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "Sei sicuro di voler cancellare il seguente servizio ? Non potrà essere ripristinato!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "Nome del servizio:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "Si", IDOK, 26, 129, 54, 13 + PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 +CAPTION "Opzioni" +FONT 8, "MS Shell Dlg",0,0 +STYLE 0x10CF0000 +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 +CAPTION "Service Control" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "&Chiudi", IDOK, 100, 70, 54, 13 +END + + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "Nome" + IDS_SECONDCOLUMN "Descrizione" + IDS_THIRDCOLUMN "Stato" + IDS_FOURTHCOLUMN "Tipo di avvio" + IDS_FITHCOLUMN "Collegati come" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STARTED "Avviato" + IDS_SERVICES_STOPPED "Fermato" + IDS_SERVICES_AUTO "Automatico" + IDS_SERVICES_MAN "Manuale" + IDS_SERVICES_DIS "Disabilitato" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "Numero Servizi: %d" + IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Proprietà" + IDS_TOOLTIP_REFRESH "Aggiorna" + IDS_TOOLTIP_EXPORT "Lista di esportazione" + IDS_TOOLTIP_CREATE "Crea un nuovo servizio" + IDS_TOOLTIP_DELETE "Cancella un servizio esistente" + IDS_TOOLTIP_START "Avvia servizio" + IDS_TOOLTIP_STOP "Ferma servizio" + IDS_TOOLTIP_PAUSE "Pausa servizio" + IDS_TOOLTIP_RESTART "Riavvia servizio" + IDS_TOOLTIP_HELP "Aiuto" + IDS_TOOLTIP_EXIT "Esci" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS sta avviando il seguente servizio" + IDS_PROGRESS_INFO_STOP "ReactOS sta fermando il seguente servizio" + IDS_CREATE_SUCCESS "Servizio creato regolarmente" + IDS_CREATE_REQ "I campi marcati con un asterisco\nsono obbligatori" + IDS_DELETE_STOP "Devi fermare il servizio prima di cancellare!" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTA: Il nome dell'ozione comprende il simbolo di uguale.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" +END +#define IDS_HINT_BLANK 20000 +#define IDS_HINT_EXPORT 20001 +#define IDS_HINT_EXIT 20002 + +#define IDS_HINT_CONNECT 20011 +#define IDS_HINT_START 20012 +#define IDS_HINT_STOP 21013 +#define IDS_HINT_PAUSE 21014 +#define IDS_HINT_RESUME 20015 +#define IDS_HINT_RESTART 20016 +#define IDS_HINT_REFRESH 20017 +#define IDS_HINT_EDIT 20018 +#define IDS_HINT_CREATE 20019 +#define IDS_HINT_DELETE 20020 +#define IDS_HINT_PROP 20021 + +#define IDS_HINT_LARGE 20030 +#define IDS_HINT_SMALL 20031 +#define IDS_HINT_LIST 20032 +#define IDS_HINT_DETAILS 20033 +#define IDS_HINT_CUST 20034 + +#define IDS_HINT_HELP 20040 +#define IDS_HINT_ABOUT 20041 +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " Esporta la lista attuale in un file." + IDS_HINT_EXIT " Esce dal programma." + + IDS_HINT_CONNECT " Gestisce un altro computer." + IDS_HINT_START " Avvia il servizio selezionato." + IDS_HINT_STOP " Ferma il servizio selezionato." + IDS_HINT_PAUSE " Sospende il servizio selezionato." + IDS_HINT_RESUME " Ripristina il servizio selezionato." + IDS_HINT_RESTART " Ferma e riavvia il servizio selezionato." + IDS_HINT_REFRESH " Aggiorna la lista dei servizi." + IDS_HINT_EDIT " Modifica le proprieta del servizio selezionato." + IDS_HINT_CREATE " Crea un nuovo servizio." + IDS_HINT_DELETE " Cancella il servizio selezionato." + IDS_HINT_PROP " Presenta le proprietà per la selezione." + + IDS_HINT_LARGE " Visualizza gli elementi usando icone grandi." + IDS_HINT_SMALL " Visualizza gli elementi usando icone piccole." + IDS_HINT_LIST " Visualizza gli elementi in un elenco." + IDS_HINT_DETAILS " Visualizza le informazioni degli elementi." + IDS_HINT_CUST " Personalizza la vista." + + IDS_HINT_HELP " Visualizza Aiuto." + IDS_HINT_ABOUT " Informazioni su ReactOS Gestione servizi." + + IDS_HINT_SYS_RESTORE " Ripristina la dimensione normale della finestra." + IDS_HINT_SYS_MOVE " Muova la finestra." + IDS_HINT_SYS_SIZE " Modifica la dimensione della finestra." + IDS_HINT_SYS_MINIMIZE " Riduce la finestra a una icona." + IDS_HINT_SYS_MAXIMIZE " Espande la finestra fino a riempire lo schermo." + IDS_HINT_SYS_CLOSE " Chiude questa finestra." +END Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rc Tue Mar 20 19:01:19 2007 @@ -33,5 +33,9 @@ IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" +//#include "de-DE.rc" #include "en-US.rc" +#include "id-ID.rc" +#include "it-IT.rc" +#include "ru-RU.rc" Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Tue Mar 20 19:01:19 2007 @@ -11,3 +11,5 @@ #include "en-US.rc" #include "fr-FR.rc" #include "id-ID.rc" +#include "it-IT.rc" + Added: trunk/reactos/base/applications/network/ipconfig/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/it-IT.rc (added) +++ trunk/reactos/base/applications/network/ipconfig/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -1,0 +1,66 @@ +// Italian language resource file (Paolo Devoti, devotip(a)tiscali.it, 2007-01-11) +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BCAST "Broadcast" + IDS_P2P "Peer To Peer" + IDS_MIXED "Misto" + IDS_HYBRID "Ibrido" + IDS_UNKNOWN "sconosciuto" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_OTHER "Altro tipo di adattatore" + IDS_ETH "Adattatore Ethernet" + IDS_TOKEN "Adattatore Token Ring" + IDS_FDDI "Adattatore FDDI" + IDS_PPP "Adattatore PPP" + IDS_LOOP "Adattatore Loopback" + IDS_SLIP "Adattatore SLIP" +END + +STRINGTABLE DISCARDABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\nUSO:\n \ + ipconfig [/? | /all | /renew [adattatore] | /release [adattatore] |\n \ + /flushdns | /displaydns | /registerdns |\n \ + /showclassid adapter |\n \ + /setclassid adapter [idclasse] ]\n \ + \n \ + where\n \ + adattatore Nome Connessione\n \ + (i caratteri jolly * e ? sono ammessi, vedi esempi)\n \ + \n \ + Opzioni:\n \ + /? Visualizza questo messaggio\n \ + /all Visualizza la configurazione completa.\n \ + /release Libera l'indirizzo IP per l'adattatore indicato.\n \ + /renew Rinnova l'indirizzo IP per l'adattatore indicato.\n \ + /flushdns Svuota la cache del DNS Resolver.\n \ + /registerdns Aggiorna gli indirizzi da DHCP e riacquisisce i nomi DNS.\n \ + /displaydns Visualizza il contenuto della cache del DNS Resolver.\n \ + /showclassid Visualizza tutte le ID di classe del dhcp per l'adattatore.\n \ + /setclassid Modifica l'ID classe del dhcp.\n \ + \n \ + E' predefinita la visualizzazione dei soli indirizzo IP, subnet mask e\n \ + gateway predefinito di ogni adattatore con TCP/IP.\n \ + \n \ + Per Release e Renew, se non è indicato un adattatore, tutti gli indirizzi IP \n \ + di tutti gli adattatori con TCP/IP saranno liberati o rinnovati.\n \ + \n \ + Per Setclassid se non è indicato un ID di classe verrà rimosso l'ID classe.\n \ + \n \ + Esempi:\n \ + > ipconfig ... Mostra le informazioni.\n \ + > ipconfig /all ... Mostra le informazioni in dettaglio\n \ + > ipconfig /renew ... Rinnova tutti gli adattatori\n \ + > ipconfig /renew EL* ... Rinnova tutte le connessioni con il\n \ + nome che inizia per EL\n \ + > ipconfig /release *Con* ... libera tutte le connessioni corrispondenti,\n \ + es: ""Connessione area locale 1"" or\n \ + ""Connessione area locale 2""\n" +END Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/notepad/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -58,21 +58,29 @@ END POPUP "&Modifica" BEGIN - MENUITEM "&Anulla\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Taglia\tCtrl+X", CMD_CUT - MENUITEM "&Copia\tCtrl+C", CMD_COPY - MENUITEM "I&ncolla\tCtrl+V", CMD_PASTE - MENUITEM "E&limina\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Tr&ova\tCtrl+F", CMD_SEARCH - MENUITEM "T&rova successivo\tF3", CMD_SEARCH_NEXT + MENUITEM "&Annulla\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taglia\tCtrl+X", CMD_CUT + MENUITEM "&Copia\tCtrl+C", CMD_COPY + MENUITEM "I&ncolla\tCtrl+V", CMD_PASTE + MENUITEM "E&limina\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Tr&ova\tCtrl+F", CMD_SEARCH + MENUITEM "T&rova successivo\tF3", CMD_SEARCH_NEXT + MENUITEM "Sostituisci\tCtrl+H", CMD_REPLACE + MENUITEM "Vai a...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR MENUITEM "Sele&ziona tutto\tCtrl+A", CMD_SELECT_ALL MENUITEM "Ora/&Data\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&A campo automatico", CMD_WRAP - MENUITEM "&Imposta carattere...", CMD_FONT + END + POPUP "F&ormato" + BEGIN + MENUITEM "&A capo automatico", CMD_WRAP + MENUITEM "&Imposta carattere...", CMD_FONT + END + POPUP "&Visualizza" + BEGIN + MENUITEM "&Barra di stato", CMD_STATUSBAR END POPUP "&?" BEGIN @@ -110,6 +118,31 @@ DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Aiuto", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOG 0, 0, 256, 44 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Codifica" +{ +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "Codifica:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Fine linea:",0x156,5,20,41,12 +} + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOG 0,0,165,50 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Vai a riga" +{ +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Numero di riga:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 @@ -155,9 +188,20 @@ Per favore usare un altro editore." STRING_NOTEXT, "Non è stato inserito alcun testo. \ \nPer favore digitare qualcosa e riprovare" -STRING_DOESNOTEXIST, "Il file '%s'\nnon esiste\nCreare un nuovo file ?" -STRING_NOTSAVED, "Il file '%s'\nè stato modificato\nSalvare le modifiche ?" +STRING_DOESNOTEXIST, "Il file '%s'\nnon esiste\n\n \ +Creare un nuovo file ?" +STRING_NOTSAVED, "Il file '%s'\nè stato modificato\n \ +Salvare le modifiche ?" STRING_NOTFOUND, "'%s' non è stato trovato." -STRING_OUT_OF_MEMORY, "Memoria insufficente per completare questa operazione.\nChiudere una o più applicazioni per aumentare la quantità\n di memoria libera." - -} +STRING_OUT_OF_MEMORY, "Memoria insufficente per completare \ +questa operazione. \nChiudere una o più applicazioni per aumentare la quantità \ +di memoria libera." +STRING_CANNOTFIND "Impossibile trovare '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" +} Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc Tue Mar 20 19:01:19 2007 @@ -27,14 +27,14 @@ IDI_NPICON ICON "res/notepad.ico" -#include "lang/en-US.rc" #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" -#include "lang/el-GR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" @@ -44,10 +44,9 @@ #include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sl-SI.rc" -#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" - Added: trunk/reactos/base/applications/regedit/clb/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/regedit/clb/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -1,0 +1,35 @@ +/* + * PROJECT: System Setup + * LICENSE: GPL - See COPYING in the top level directory + * FILE: \ReactOS\base\applications\regedit\clb\lang\it-IT.rc + * PURPOSE: Italian Translation + * PROGRAMMERS: Copyright (C) 2007 Paolo Devoti devotip at tiscali.it + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Stili dell'intestazione delle liste" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Stili della intestazione delle Liste", -1, 6, 7, 158, 71 + CHECKBOX "&Standard", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Bordi", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ordinamento", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Notifica", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Barra di &scorrimento verticale", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Selezione &multipla", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "Selezione &estesa", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "Intestazione a &comparsa", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Colonne e&lastiche", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Stili di base", -1, 6, 80, 158, 34 + CHECKBOX "&Visibile", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Disabilitato", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Gruppo", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Incolonnamento", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "&Disabilita No-Scroll", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/rsrc.rc (original) +++ trunk/reactos/base/applications/regedit/clb/rsrc.rc Tue Mar 20 19:01:19 2007 @@ -28,9 +28,9 @@ /* include localised resources */ - #include "lang/en-US.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" #include "lang/ja-JP.rc" -#include "lang/id-ID.rc" #include "lang/nb-NO.rc" Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -4,6 +4,7 @@ * Copyright 2002 Robert Dickenson * Copyright 2003-2004 Ivan Leo Murray-Smith * Copyright 2004 Sylvain Pétréolle + * Copyright 2007 Paolo Devoti * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,10 +53,19 @@ POPUP "&Registro" BEGIN MENUITEM "&Importa...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Esporta...", ID_REGISTRY_EXPORTREGISTRYFILE - MENUITEM SEPARATOR - MENUITEM "&Connetti a Registro in rete...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED - MENUITEM "&Disconntti da Registro di rete...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED + + MENUITEM SEPARATOR + MENUITEM "Carica Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Scarica Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Connetti a Registro in rete...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "&Disconnetti da Registro di rete...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + ,GRAYED MENUITEM SEPARATOR MENUITEM "&Stampa\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -67,20 +77,24 @@ MENUITEM SEPARATOR POPUP "&Nuovo" BEGIN - MENUITEM "Chiave", ID_EDIT_NEW_KEY + MENUITEM "Chiave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Valore stringa", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Valore binario", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&Valore DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &multi-stringa", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Valore stringa &espandibile", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR - MENUITEM "&Elimina\tDel", ID_EDIT_DELETE - MENUITEM "&Rinomina", ID_EDIT_RENAME - MENUITEM SEPARATOR - MENUITEM "&Copia nome chiave", ID_EDIT_COPYKEYNAME - MENUITEM SEPARATOR - MENUITEM "&Trova\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "&Trova Successivo\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&Permissions...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Elimina\tDel", ID_EDIT_DELETE + MENUITEM "&Rinomina", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Copia nome chiave", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&Trova\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "&Trova Successivo\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&Visualizza" BEGIN @@ -105,18 +119,113 @@ END END - -IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Edita Stringa" -FONT 8, "System" -BEGIN - LTEXT "Nome del valore:",IDC_STATIC,5,5,119,8 +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Modifica", ID_EDIT_MODIFY + MENUITEM "Modifica dati binari", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Cancella\tCanc", ID_EDIT_DELETE + MENUITEM "&Rinomina", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Nuova" + BEGIN + MENUITEM "&Chiave", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Stringa", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + END + END + POPUP "" + BEGIN + MENUITEM "Espandi/Raccogli", ID_TREE_EXPANDBRANCH + POPUP "&Nuova" + BEGIN + MENUITEM "&Chiave", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Stringa", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Trova", ID_EDIT_FIND + MENUITEM SEPARATOR + MENUITEM "&Cancella", ID_TREE_DELETE + MENUITEM "&Rinomina", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Esporta", ID_TREE_EXPORT + MENUITEM "&Permessi...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Copia il nome della chiave", ID_EDIT_COPYKEYNAME + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edit String" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Nome:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | WS_DISABLED - LTEXT "Data del valore:",IDC_STATIC,5,30,119,8 + LTEXT "Dati:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP DEFPUSHBUTTON "Annulla",IDCANCEL,175,60,30,11,WS_GROUP +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Modifica Multi-Stringa" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Name:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Dati:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Annulla",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Modifica valori binari" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nome:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Annulla",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Modifica DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Name:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Dati:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "Base",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&Esadecimale",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&Decimale",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "Annulla",IDCANCEL,196,82,50,14 END /* @@ -184,9 +293,77 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ERROR "Errore" + IDS_WARNING "Segnalazione" + IDS_BAD_KEY "Impossibile interrogare la chiave '%s'" IDS_BAD_VALUE "Impossibile interrogare il valore '%s'" IDS_UNSUPPORTED_TYPE "Impossibile editare valori di questo tipo (%ld)" IDS_TOO_BIG_VALUE "Valore troppo grande (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "I dati di tipo REG_MULTI_SZ non possono contenere srtinghe vuote.\nLe stringhe vuote sono state rimosse dalla lista." + IDS_QUERY_DELETE_KEY_ONE "Siete sicuro di voler cancellare questa chiave?" + IDS_QUERY_DELETE_KEY_MORE "Siete sicuro di voler cancellare queste chiavi?" + IDS_QUERY_DELETE_KEY_CONFIRM "Confermate la cancellazione della chiave" + IDS_QUERY_DELETE_ONE "Siete sicuro di voler cancellare questo valore?" + IDS_QUERY_DELETE_MORE "Siete sicuro di voler cancellare questi valori?" + IDS_QUERY_DELETE_CONFIRM "Confermate la cancellazione dei valori" + IDS_ERR_DELVAL_CAPTION "Errore nella cancellazione dei valori" + IDS_ERR_DELETEVALUE "Impossibile cancellare tutti i valori indicati!" + IDS_ERR_RENVAL_CAPTION "Errore nel rinominare il valore" + IDS_ERR_RENVAL_TOEMPTY "Impossibile rinominare %s. Il nome indicato è vuoto. Riprovate con un altro nome." + IDS_NEW_KEY "Nuova chiave #%d" + IDS_NEW_VALUE "Nuovo valore #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(valore binario di lunghezza nulla)" + IDS_DEFAULT_VALUE_NAME "(predefinito)" + IDS_VALUE_NOT_SET "(valore non impostato)" + IDS_UNKNOWN_TYPE "Tipo sconosciuto: (0x%lx)" + IDS_MY_COMPUTER "Il mio Computer" + IDS_IMPORT_REG_FILE "Importa file di Registro" + IDS_EXPORT_REG_FILE "Esporta file di Registro" + IDS_INVALID_DWORD "(valore DWORD non valido)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "File di Registratione" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "File di Registratione Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "Tutti i file (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Controllo completo" + IDS_ACCESS_READ "Lettura" + IDS_ACCESS_QUERYVALUE "Interroga il Valore" + IDS_ACCESS_SETVALUE "Imposta il Valore" + IDS_ACCESS_CREATESUBKEY "Crea Sottochiave" + IDS_ACCESS_ENUMERATESUBKEYS "Enumera Sottochiave" + IDS_ACCESS_NOTIFY "Notifica" + IDS_ACCESS_CREATELINK "Crea Collegamento" + IDS_ACCESS_DELETE "Cancella" + IDS_ACCESS_WRITEDAC "Scrivi DAC" + IDS_ACCESS_WRITEOWNER "Scrivi proprietario" + IDS_ACCESS_READCONTROL "Controllo di lettura" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Solo questa chiave" + IDS_INHERIT_THISKEYANDSUBKEYS "Questa chiave e sottochiavi" + IDS_INHERIT_SUBKEYSONLY "Solo sottochiavi" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Espandi" + IDS_COLLAPSE "&Raccogli" + IDS_GOTO_SUGGESTED_KEY "&Vai a '%s'" + IDS_FINISHEDFIND "Fine ricerca nel registro." END /*****************************************************************/ @@ -196,22 +373,72 @@ * Dialog */ -IDD_DIALOG1 DIALOG DISCARDABLE 50, 50, 268, 98 +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER -FONT 8, "MS Sans Serif" -BEGIN -END - -IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Esporta Selezione",IDC_STATIC,2,0,366,48 + CONTROL "&Tutto",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "Ramo S&elezionato",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 +END + +IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialogo" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,130,7,50,14 - PUSHBUTTON "Annulla",IDCANCEL,130,24,50,14 -END - +CAPTION "Aggiungi ai preferiti" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Annulla",IDCANCEL,129,24,50,14 + LTEXT "Nome dei &preferiti:",IDC_STATIC,7,7,70,10 + EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL +END + +IDD_REMOVEFAVORITES DIALOG DISCARDABLE 0, 0, 164, 135 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Rimuovi preferiti" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,107,114,50,14 + PUSHBUTTON "Annulla",IDCANCEL,7,114,50,14 + CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Scegli preferiti:",IDC_STATIC,7,7,99,12 +END + +IDD_FIND DIALOG DISCARDABLE 0, 0, 254, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Trova" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Trova successivo",IDOK,197,7,50,14 + PUSHBUTTON "Annulla",IDCANCEL,197,24,50,14 + GROUPBOX "Guarda a",IDC_STATIC,7,25,63,51 + LTEXT "Trova il:",IDC_STATIC,7,8,37,10 + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Chiavi",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Valori",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,48,36,8 + CONTROL "&Dati",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,60,42,8 + CONTROL "Trova solo stringhe &intere",IDC_MATCHSTRING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 + CONTROL "Confronta &maiuscole e minuscole",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,83,48,90,12 +END + +IDD_FINDING DIALOGEX 0, 0, 145, 50 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Trova" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 + PUSHBUTTON "&Annulla",IDCANCEL,93,29,45,14 + LTEXT "Ricerca in corso nel registro...",IDC_STATIC,33,12,83,8 +END /* * TEXTINCLUDE @@ -231,8 +458,8 @@ /* *STRINGTABLE DISCARDABLE *BEGIN - * ID_HELP_HELPTOPICS "Apre l'aiuto dell'editor del Registro." - * ID_HELP_ABOUT "Visualizza informazioni sul programma, il numero di versione e il copyright." + * ID_HELP_HELPTOPICS "Opens Registry Editor Help." + * ID_HELP_ABOUT "Displays program information, version number, and copyright." *END */ Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -76,7 +76,7 @@ IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "Affianca &Orizontalmente", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Affianca &Orizzontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Affianca &Verticalmente", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimizza", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ssimizza", ID_WINDOWS_MAXIMIZE @@ -103,7 +103,7 @@ MENUITEM "&Passa a", ID_APPLICATION_PAGE_SWITCHTO MENUITEM "&Porta in primo piano", ID_WINDOWS_BRINGTOFRONT MENUITEM SEPARATOR - MENUITEM "Affianca &Orizontalmente", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Affianca &Orizzontalmente", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "Affianca &Verticalmente", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimizza", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ssimizza", ID_WINDOWS_MAXIMIZE @@ -543,8 +543,8 @@ STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEW "Esegue un nuovo programma" - ID_OPTIONS_ALWAYSONTOP "Task Manager rimane di fronta a ogni altra finestra a meno che sia minimizzato" + ID_FILE_NEW "Esegue un nuovo programma" + ID_OPTIONS_ALWAYSONTOP "Task Manager rimane di fronte a ogni altra finestra a meno che sia minimizzato" ID_OPTIONS_MINIMIZEONUSE "Task Manager è minimizzato quando viene eseguita una operazione PassaA" ID_OPTIONS_HIDEWHENMINIMIZED "Nasconde Task Manager Quando è minimizzato" @@ -572,13 +572,13 @@ ID_FILE_EXIT "Esce da Task Manager" ID_OPTIONS_SHOW16BITTASKS "Mostra i task a 16-bit con ntvdm.exe associato" - ID_VIEW_SELECTCOLUMNS "Seleziona quali colonne saranno visibili njella pagina dei processi" + ID_VIEW_SELECTCOLUMNS "Seleziona quali colonne saranno visibili nella pagina dei processi" ID_VIEW_SHOWKERNELTIMES "Mostra il tempo di kernel nel grafico delle prestazioni" ID_VIEW_CPUHISTORY_ONEGRAPHALL "Un singolo grafico mostra l'uso di cpu totale" ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Ogni CPU ha il suo grafico" ID_APPLICATION_PAGE_SWITCHTO - "Porta un task in vista e gli da il focus" + "Porta un task in vista e gli dà il focus" END STRINGTABLE DISCARDABLE @@ -602,7 +602,7 @@ ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Assegna al processo la classe di priorità BELOW NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Assegna al processo la classe di priorità LOW" - IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di VENDIBILITA' o ADEGUATEZZA PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." + IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." END @@ -659,7 +659,7 @@ IDS_MSG_WARNINGTERMINATING "ATTENZIONE: Arrestare un processo può provocare\n effetti indesiderati compresa la perdita di dati o l'instabilità del sistema. \nIl processo non potrà salvare il prorio stato o i dati\nprima del suo arresto.\nSei sicuro di voler procedere?" IDS_MSG_UNABLETERMINATEPRO "Impossibile arrestare il Processo" IDS_MSG_UNABLECHANGEPRIORITY "Impossibile cambiare la Priorità" - IDS_MSG_WARNINGCHANGEPRIORITY "ATTENZIONE: La modifica della classe di prioritàpuò provocare \n effetti indesiderati compresa la perdita di dati o l'instabilità del sistema.\nSei sicuro di voler procedere?" + IDS_MSG_WARNINGCHANGEPRIORITY "ATTENZIONE: La modifica della classe di priorità può provocare\n effetti indesiderati compresa la perdita di dati o l'instabilità del sistema.\nSei sicuro di voler procedere?" IDS_MSG_TRAYICONCPUUSAGE "Uso CPU: %d%%" IDS_STATUS_MEMUSAGE "Uso Mem: %dK / %dK" IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%" Modified: trunk/reactos/base/applications/wordpad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/wordpad/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -110,7 +110,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di VENDIBILITA' o ADEGUATEZZA PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." + IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA'." IDS_DEFAULT_NAME "Documento %1!u!" IDS_READY " Pronto." END @@ -155,8 +155,8 @@ IDS_HINT_EXIT " Esce dal programma." IDS_HINT_CASCADE " Dispone le finestre in modo che siano sovrapposte." - IDS_HINT_TILE_HORZ " Dispone le finestre in modo che non siano sovrapposte." - IDS_HINT_TILE_VERT " Dispone le finestre in modo che non siano sovrapposte." + IDS_HINT_TILE_HORZ " Dispone le finestre orizzontalmente in modo che non siano sovrapposte." + IDS_HINT_TILE_VERT " Dispone le finestre verticalmente in modo che non siano sovrapposte." IDS_HINT_ARRANGE " Dispone le icone in basso nella finestra." IDS_HINT_NEXT " Attiva la finestra successiva." @@ -167,3 +167,5 @@ IDS_HINT_SYS_MAXIMIZE " Espande la finestra fino a riempire lo schermo." END + + Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc Tue Mar 20 19:01:19 2007 @@ -2,7 +2,8 @@ #include <commctrl.h> #include "resource.h" +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/it-IT.rc" #include "lang/nb-NO.rc" -#include "lang/de-DE.rc" + Modified: trunk/reactos/base/system/regsvr32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/it-IT.rc (original) +++ trunk/reactos/base/system/regsvr32/lang/it-IT.rc Tue Mar 20 19:01:19 2007 @@ -23,7 +23,8 @@ IDS_DllNotLoaded, "LoadLibrary('%s') fallita.\nGetLastError restituisce 0x%08x." -IDS_MissingEntry, "%s èstato caricato, ma manca %s.\n\n%s potrebbe essere non esportato, oppure si trova in memoria una versione corrotta della versione di %s. Valutate l'uso di PView per individuarla e rimuoverla." +IDS_MissingEntry, "%s è stato caricato, ma manca %s.\n\n%s potrebbe essere \ +non esportato, oppure si trova in memoria una versione corrotta della versione di %s. Valutate l'uso di PView per individuarla e rimuoverla." IDS_FailureMessage, "%s in %s è fallita.\nIl codice di ritorno è: 0x%08x"

1 0

[ion] 26142: - Fix an important bug which was causing us to incorrectly set the DPC Stack in the Processor Region Control Block. - Enable usage of the DPC Stack during DPCs. - Enable usage of the DPC Stack during Fast System Calls and put back the correct push/pop code in FASTCALL_PROLOG.
by ion＠svn.reactos.org 19 Mar '07

19 Mar '07

Author: ion Date: Tue Mar 20 00:53:38 2007 New Revision: 26142 URL: http://svn.reactos.org/svn/reactos?rev=26142&view=rev Log: - Fix an important bug which was causing us to incorrectly set the DPC Stack in the Processor Region Control Block. - Enable usage of the DPC Stack during DPCs. - Enable usage of the DPC Stack during Fast System Calls and put back the correct push/pop code in FASTCALL_PROLOG. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/krnlinit.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Tue Mar 20 00:53:38 2007 @@ -699,14 +699,13 @@ // @remark None. // .macro FASTCALL_PROLOG Label EndLabel - /* Set FS to PCR */ - //push KGDT_R0_PCR - //pop fs - mov ecx, KGDT_R0_PCR - mov fs, cx /* Set user selector */ mov ecx, KGDT_R3_DATA | RPL_MASK + + /* Set FS to PCR */ + push KGDT_R0_PCR + pop fs /* Set DS/ES to User Selector */ mov ds, cx Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Tue Mar 20 00:53:38 2007 @@ -570,7 +570,7 @@ /* Allocate the DPC Stack */ DpcStack = MmCreateKernelStack(FALSE); if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); - Prcb->DpcStack = DpcStack; + Prcb->DpcStack = (PVOID)((ULONG_PTR)DpcStack + KERNEL_STACK_SIZE); /* Allocate the IOPM save area. */ Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, @@ -715,7 +715,7 @@ do { /* Loop until execution can continue */ - while ((volatile KSPIN_LOCK)KiFreezeExecutionLock == 1); + while (*(volatile PKSPIN_LOCK*)&KiFreezeExecutionLock == (PVOID)1); } while(InterlockedBitTestAndSet((PLONG)&KiFreezeExecutionLock, 0)); /* Setup CPU-related fields */ @@ -745,17 +745,19 @@ KfRaiseIrql(HIGH_LEVEL); /* Align stack and make space for the trap frame and NPX frame */ - InitialStack &= ~KTRAP_FRAME_ALIGN; + InitialStack &= -KTRAP_FRAME_ALIGN; #ifdef __GNUC__ + __asm__ __volatile__("xorl %ebp, %ebp"); __asm__ __volatile__("movl %0,%%esp" : :"r" (InitialStack)); __asm__ __volatile__("subl %0,%%esp" : :"r" (NPX_FRAME_LENGTH + KTRAP_FRAME_LENGTH + KTRAP_FRAME_ALIGN)); __asm__ __volatile__("push %0" : :"r" (CR0_EM + CR0_TS + CR0_MP)); #else + __asm xor ebp, ebp; __asm mov esp, InitialStack; __asm sub esp, NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH; - __asm push CR0_EM + CR0_TS + CR0_MP + __asm push CR0_EM + CR0_TS + CR0_MP; #endif /* Call main kernel initialization */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Tue Mar 20 00:53:38 2007 @@ -2165,7 +2165,7 @@ /* Save the stack and switch to the DPC Stack */ mov edx, esp - //mov esp, [ebx+KPCR_PRCB_DPC_STACK] + mov esp, [ebx+KPCR_PRCB_DPC_STACK] push edx /* Deliver DPCs */ Modified: trunk/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/krnlinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/krnlinit.c (original) +++ trunk/reactos/ntoskrnl/ke/krnlinit.c Tue Mar 20 00:53:38 2007 @@ -289,6 +289,3 @@ KiInitMachineDependent(); return TRUE; } - - -

1 0

[ion] 26141: - Don't use the stack in FASTCALL_PROLOG. It messes up NPX checks (this is a bug, it shouldn't happen... related to DPC stack bug.) - Zero out the trap/npx frame for new user-mode threads. - Use KeI386FxsrPresent and not KEI386XMMIPresent when setting up the context for a new thread.
by ion＠svn.reactos.org 19 Mar '07

19 Mar '07

Author: ion Date: Mon Mar 19 22:43:50 2007 New Revision: 26141 URL: http://svn.reactos.org/svn/reactos?rev=26141&view=rev Log: - Don't use the stack in FASTCALL_PROLOG. It messes up NPX checks (this is a bug, it shouldn't happen... related to DPC stack bug.) - Zero out the trap/npx frame for new user-mode threads. - Use KeI386FxsrPresent and not KEI386XMMIPresent when setting up the context for a new thread. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thrdini.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Mon Mar 19 22:43:50 2007 @@ -700,8 +700,10 @@ // .macro FASTCALL_PROLOG Label EndLabel /* Set FS to PCR */ - push KGDT_R0_PCR - pop fs + //push KGDT_R0_PCR + //pop fs + mov ecx, KGDT_R0_PCR + mov fs, cx /* Set user selector */ mov ecx, KGDT_R3_DATA | RPL_MASK Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Mon Mar 19 22:43:50 2007 @@ -364,11 +364,13 @@ jnz WmiTrace AfterTrace: +#ifdef CONFIG_SMP #ifdef DBG /* Assert that we're on the right CPU */ mov cl, [esi+KTHREAD_NEXT_PROCESSOR] cmp cl, [ebx+KPCR_PROCESSOR_NUMBER] jnz WrongCpu +#endif #endif /* Get CR0 and save it */ Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c Mon Mar 19 22:43:50 2007 @@ -73,6 +73,10 @@ RtlCopyMemory(&LocalContext, ContextPointer, sizeof(CONTEXT)); Context = &LocalContext; ContextFlags = CONTEXT_CONTROL; + + /* Zero out the trap frame and save area */ + RtlZeroMemory(&InitFrame->TrapFrame, + KTRAP_FRAME_LENGTH + sizeof(FX_SAVE_AREA)); /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; @@ -114,7 +118,7 @@ FxSaveArea->NpxSavedCpu = 0; /* Now set the context flags depending on XMM support */ - ContextFlags |= (KeI386XMMIPresent) ? CONTEXT_EXTENDED_REGISTERS : + ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : CONTEXT_FLOATING_POINT; /* Set the Thread's NPX State */ @@ -154,7 +158,7 @@ TrapFrame->PreviousPreviousMode = UserMode; /* Terminate the Exception Handler List */ - TrapFrame->ExceptionList = (PVOID)0xFFFFFFFF; + TrapFrame->ExceptionList = EXCEPTION_CHAIN_END; /* Setup the Stack for KiThreadStartup and Context Switching */ StartFrame = &InitFrame->StartFrame;

1 0

[ion] 26140: - Fix NPX check in context switcher. - Fix ObLogSecurityDescriptor. - Fix some missing features in SeAccessCheck.
by ion＠svn.reactos.org 19 Mar '07

19 Mar '07

Author: ion Date: Mon Mar 19 22:05:39 2007 New Revision: 26140 URL: http://svn.reactos.org/svn/reactos?rev=26140&view=rev Log: - Fix NPX check in context switcher. - Fix ObLogSecurityDescriptor. - Fix some missing features in SeAccessCheck. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ob/sdcache.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Mon Mar 19 22:05:39 2007 @@ -550,7 +550,7 @@ /* Assert NPX State */ test byte ptr [esi+KTHREAD_NPX_STATE], ~(NPX_STATE_NOT_LOADED) jnz InvalidNpx - test dword ptr [eax - (NPX_FRAME_LENGTH - FN_CR0_NPX_STATE)], ~(CR0_MP + CR0_EM + CR0_TS) + test dword ptr [eax - (NPX_FRAME_LENGTH - FN_CR0_NPX_STATE)], ~(CR0_PE + CR0_MP + CR0_EM + CR0_TS) jnz InvalidNpx #endif Modified: trunk/reactos/ntoskrnl/ob/sdcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/sdcache.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/sdcache.c (original) +++ trunk/reactos/ntoskrnl/ob/sdcache.c Mon Mar 19 22:05:39 2007 @@ -371,11 +371,13 @@ { /* HACK: Return the same descriptor back */ PISECURITY_DESCRIPTOR SdCopy; - DPRINT1("ObLogSecurityDescriptor is not implemented!\n", - InputSecurityDescriptor); - - SdCopy = ExAllocatePool(PagedPool, sizeof(*SdCopy)); - RtlCopyMemory(SdCopy, InputSecurityDescriptor, sizeof(*SdCopy)); + ULONG Length; + DPRINT("ObLogSecurityDescriptor is not implemented!\n", + InputSecurityDescriptor); + + Length = RtlLengthSecurityDescriptor(InputSecurityDescriptor); + SdCopy = ExAllocatePool(PagedPool, Length); + RtlCopyMemory(SdCopy, InputSecurityDescriptor, Length); *OutputSecurityDescriptor = SdCopy; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Mon Mar 19 22:05:39 2007 @@ -911,38 +911,87 @@ OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus) { - LUID_AND_ATTRIBUTES Privilege; - ACCESS_MASK CurrentAccess, AccessMask; - PACCESS_TOKEN Token; - ULONG i; - PACL Dacl; - BOOLEAN Present; - BOOLEAN Defaulted; - PACE CurrentAce; - PSID Sid; - NTSTATUS Status; - - PAGED_CODE(); + LUID_AND_ATTRIBUTES Privilege; + ACCESS_MASK CurrentAccess, AccessMask; + PACCESS_TOKEN Token; + ULONG i; + PACL Dacl; + BOOLEAN Present; + BOOLEAN Defaulted; + PACE CurrentAce; + PSID Sid; + NTSTATUS Status; + PAGED_CODE(); + + /* Check if this is kernel mode */ + if (AccessMode == KernelMode) + { + /* Check if kernel wants everything */ + if (DesiredAccess & MAXIMUM_ALLOWED) + { + /* Give it */ + *GrantedAccess = GenericMapping->GenericAll; + *GrantedAccess |= (DesiredAccess &~ MAXIMUM_ALLOWED); + *GrantedAccess |= PreviouslyGrantedAccess; + } + else + { + /* Give the desired and previous access */ + *GrantedAccess = DesiredAccess | PreviouslyGrantedAccess; + } + + /* Success */ + *AccessStatus = STATUS_SUCCESS; + return TRUE; + } + + /* Check if we didn't get an SD */ + if (!SecurityDescriptor) + { + /* Automatic failure */ + *AccessStatus = STATUS_ACCESS_DENIED; + return FALSE; + } + + /* Check for invalid impersonation */ + if ((SubjectSecurityContext->ClientToken) && + (SubjectSecurityContext->ImpersonationLevel < SecurityImpersonation)) + { + *AccessStatus = STATUS_BAD_IMPERSONATION_LEVEL; + return FALSE; + } + + /* Check for no access desired */ + if (!DesiredAccess) + { + /* Check if we had no previous access */ + if (!PreviouslyGrantedAccess) + { + /* Then there's nothing to give */ + *AccessStatus = STATUS_ACCESS_DENIED; + return FALSE; + } + + /* Return the previous access only */ + *GrantedAccess = PreviouslyGrantedAccess; + *AccessStatus = STATUS_SUCCESS; + *Privileges = NULL; + return TRUE; + } + + /* Acquire the lock if needed */ + if (!SubjectContextLocked) SeLockSubjectContext(SubjectSecurityContext); /* Map given accesses */ RtlMapGenericMask(&DesiredAccess, GenericMapping); if (PreviouslyGrantedAccess) RtlMapGenericMask(&PreviouslyGrantedAccess, GenericMapping); - /* Check if we didn't get an SD */ - if (!SecurityDescriptor) - { - /* Automatic failure */ - *AccessStatus = STATUS_ACCESS_DENIED; - return FALSE; - } + CurrentAccess = PreviouslyGrantedAccess; - if (SubjectContextLocked == FALSE) - { - SeLockSubjectContext(SubjectSecurityContext); - } + Token = SubjectSecurityContext->ClientToken ? SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; @@ -1077,7 +1126,9 @@ } } else + { DPRINT1("Unknown Ace type 0x%lx\n", CurrentAce->Header.AceType); + } CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); }

1 0

[ion] 26139: - Change FASTCALL_PROLOG to use the stack to update FS, since we run in the DPC stack. - Implement KeDisableInterrupts to disable interrupts and return whether or not they were enabled. - Implement KiCheckTimerTable, in DBG mode, to validate the timer tables. - Implement DPC Timeout detection, in DBG mode. - Fix a bug in KiQuantumEnd which would've affected real-time threads. - Fix some bugs in KiRetireDpcList to avoid issues should the DPC Queue Depth drop below 0, and solve some p
by ion＠svn.reactos.org 19 Mar '07

19 Mar '07

Author: ion Date: Mon Mar 19 20:55:38 2007 New Revision: 26139 URL: http://svn.reactos.org/svn/reactos?rev=26139&view=rev Log: - Change FASTCALL_PROLOG to use the stack to update FS, since we run in the DPC stack. - Implement KeDisableInterrupts to disable interrupts and return whether or not they were enabled. - Implement KiCheckTimerTable, in DBG mode, to validate the timer tables. - Implement DPC Timeout detection, in DBG mode. - Fix a bug in KiQuantumEnd which would've affected real-time threads. - Fix some bugs in KiRetireDpcList to avoid issues should the DPC Queue Depth drop below 0, and solve some possible races. - Fix KeRemoveQueueDpc only to enable interrupts if it was called with interrupts enabled. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/systimer.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Mon Mar 19 20:55:38 2007 @@ -700,10 +700,8 @@ // .macro FASTCALL_PROLOG Label EndLabel /* Set FS to PCR */ - mov ecx, KGDT_R0_PCR - mov fs, cx - //push KGDT_R0_PCR - //pop fs + push KGDT_R0_PCR + pop fs /* Set user selector */ mov ecx, KGDT_R3_DATA | RPL_MASK Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Mar 19 20:55:38 2007 @@ -922,6 +922,12 @@ NTAPI KeThawExecution(IN BOOLEAN Enable); +BOOLEAN +NTAPI +KeDisableInterrupts( + VOID +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2613… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Mon Mar 19 20:55:38 2007 @@ -24,8 +24,55 @@ FAST_MUTEX KiGenericCallDpcMutex; KDPC KiTimerExpireDpc; ULONG KiTimeLimitIsrMicroseconds; +ULONG KiDPCTimeout = 110; /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KiCheckTimerTable(IN ULARGE_INTEGER CurrentTime) +{ +#if DBG + ULONG i = 0; + PLIST_ENTRY ListHead, NextEntry; + KIRQL OldIrql; + PKTIMER Timer; + + /* Raise IRQL to high and loop timers */ + KeRaiseIrql(HIGH_LEVEL, &OldIrql); + do + { + /* Loop the current list */ + ListHead = &KiTimerTableListHead[i].Entry; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the timer and move to the next one */ + Timer = CONTAINING_RECORD(NextEntry, KTIMER, TimerListEntry); + NextEntry = NextEntry->Flink; + + /* Check if it expired */ + if (Timer->DueTime.QuadPart <= CurrentTime.QuadPart) + { + /* Check if the DPC was queued, but didn't run */ + if (!(KeGetCurrentPrcb()->TimerRequest) && + !(*((volatile PULONG*)(&KiTimerExpireDpc.DpcData)))) + { + /* This is bad, breakpoint! */ + DPRINT1("Invalid timer state!\n"); + DbgBreakPoint(); + } + } + } + + /* Move to the next timer */ + i++; + } while(i < TIMER_TABLE_SIZE); + + /* Lower IRQL and return */ + KeLowerIrql(OldIrql); +#endif +} VOID NTAPI @@ -34,7 +81,8 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - LARGE_INTEGER SystemTime, InterruptTime, Interval; + ULARGE_INTEGER SystemTime, InterruptTime; + LARGE_INTEGER Interval; LONG Limit, Index, i; ULONG Timers, ActiveTimers, DpcCalls; PLIST_ENTRY ListHead, NextEntry; @@ -50,7 +98,7 @@ _disable(); /* Query system and interrupt time */ - KeQuerySystemTime(&SystemTime); + KeQuerySystemTime((PLARGE_INTEGER)&SystemTime); InterruptTime.QuadPart = KeQueryInterruptTime(); Limit = KeTickCount.LowPart; @@ -226,6 +274,9 @@ } } while (Index != Limit); + /* Verify the timer table, on debug builds */ + if (KeNumberProcessors == 1) KiCheckTimerTable(InterruptTime); + /* Check if we still have DPC entries */ if (DpcCalls) { @@ -274,9 +325,14 @@ /* Check if Quantum expired */ if (Thread->Quantum <= 0) { - /* Make sure that we're not real-time or without a quantum */ - if ((Thread->Priority < LOW_REALTIME_PRIORITY) && - !(Thread->ApcState.Process->DisableQuantum)) + /* Check if we're real-time and with quantums disabled */ + if ((Thread->Priority >= LOW_REALTIME_PRIORITY) && + (Thread->ApcState.Process->DisableQuantum)) + { + /* Otherwise, set maximum quantum */ + Thread->Quantum = MAX_QUANTUM; + } + else { /* Reset the new Quantum */ Thread->Quantum = Thread->QuantumReset; @@ -287,7 +343,6 @@ /* Check if a new thread is scheduled */ if (!Prcb->NextThread) { -#ifdef NEW_SCHEDULER /* Get a new ready thread */ NextThread = KiSelectReadyThread(Thread->Priority, Prcb); if (NextThread) @@ -296,13 +351,6 @@ NextThread->State = Standby; Prcb->NextThread = NextThread; } -#else - /* Just leave now */ - KiReleasePrcbLock(Prcb); - KeLowerIrql(DISPATCH_LEVEL); - KiDispatchThread(Ready); - return; -#endif } else { @@ -310,11 +358,6 @@ Thread->Preempted = FALSE; } } - else - { - /* Otherwise, set maximum quantum */ - Thread->Quantum = MAX_QUANTUM; - } } /* Release the thread lock */ @@ -360,13 +403,17 @@ FASTCALL KiRetireDpcList(IN PKPRCB Prcb) { - PKDPC_DATA DpcData = Prcb->DpcData; - PLIST_ENTRY DpcEntry; + PKDPC_DATA DpcData; + PLIST_ENTRY ListHead, DpcEntry; PKDPC Dpc; PKDEFERRED_ROUTINE DeferredRoutine; PVOID DeferredContext, SystemArgument1, SystemArgument2; ULONG_PTR TimerHand; + /* Get data and list variables before starting anything else */ + DpcData = &Prcb->DpcData[DPC_NORMAL]; + ListHead = &DpcData->DpcListHead; + /* Main outer loop */ do { @@ -376,24 +423,28 @@ /* Check if this is a timer expiration request */ if (Prcb->TimerRequest) { + /* It is, get the timer hand and disable timer request */ TimerHand = Prcb->TimerHand; Prcb->TimerRequest = 0; + + /* Expire timers with interrups enabled */ _enable(); - KiTimerExpiration(NULL, NULL, (PVOID) TimerHand, NULL); + KiTimerExpiration(NULL, NULL, (PVOID)TimerHand, NULL); _disable(); } /* Loop while we have entries in the queue */ - while (DpcData->DpcQueueDepth) - { - /* Lock the DPC data */ + while (DpcData->DpcQueueDepth != 0) + { + /* Lock the DPC data and get the DPC entry*/ KefAcquireSpinLockAtDpcLevel(&DpcData->DpcLock); + DpcEntry = ListHead->Flink; /* Make sure we have an entry */ - if (!IsListEmpty(&DpcData->DpcListHead)) + if (DpcEntry != ListHead) { /* Remove the DPC from the list */ - DpcEntry = RemoveHeadList(&DpcData->DpcListHead); + RemoveEntryList(DpcEntry); Dpc = CONTAINING_RECORD(DpcEntry, KDPC, DpcListEntry); /* Clear its DPC data and save its parameters */ @@ -432,7 +483,6 @@ /* Release DPC Lock */ KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); - break; } } @@ -446,7 +496,7 @@ /* FIXME: 2K3-style scheduling not implemeted */ ASSERT(FALSE); } - } while (DpcData->DpcQueueDepth); + } while (DpcData->DpcQueueDepth != 0); } VOID @@ -458,7 +508,7 @@ { /* Setup the DPC Object */ Dpc->Type = Type; - Dpc->Number= 0; + Dpc->Number = 0; Dpc->Importance= MediumImportance; Dpc->DeferredRoutine = DeferredRoutine; Dpc->DeferredContext = DeferredContext; @@ -503,7 +553,7 @@ IN PVOID SystemArgument2) { KIRQL OldIrql; - PKPRCB Prcb, CurrentPrcb = KeGetCurrentPrcb(); + PKPRCB Prcb, CurrentPrcb; ULONG Cpu; PKDPC_DATA DpcData; BOOLEAN DpcConfigured = FALSE, DpcInserted = FALSE; @@ -511,6 +561,7 @@ /* Check IRQL and Raise it to HIGH_LEVEL */ KeRaiseIrql(HIGH_LEVEL, &OldIrql); + CurrentPrcb = KeGetCurrentPrcb(); /* Check if the DPC has more then the maximum number of CPUs */ if (Dpc->Number >= MAXIMUM_PROCESSORS) @@ -525,6 +576,9 @@ Prcb = CurrentPrcb; Cpu = Prcb->Number; } + + /* ROS Sanity Check */ + ASSERT(Prcb == CurrentPrcb); /* Check if this is a threaded DPC and threaded DPCs are enabled */ if ((Dpc->Type == ThreadedDpcObject) && (Prcb->ThreadDpcEnable)) @@ -564,13 +618,14 @@ } /* Check if this is the DPC on the threaded list */ - if (&Prcb->DpcData[DPC_THREADED].DpcListHead == &DpcData->DpcListHead) + if (&Prcb->DpcData[DPC_THREADED] == DpcData) { /* Make sure a threaded DPC isn't already active */ if (!(Prcb->DpcThreadActive) && !(Prcb->DpcThreadRequested)) { /* FIXME: Setup Threaded DPC */ - ASSERT(FALSE); + DPRINT1("Threaded DPC not supported\n"); + while (TRUE); } } else @@ -650,14 +705,13 @@ KeRemoveQueueDpc(IN PKDPC Dpc) { PKDPC_DATA DpcData; - UCHAR DpcType; + BOOLEAN Enable; ASSERT_DPC(Dpc); /* Disable interrupts */ - _disable(); - - /* Get DPC data and type */ - DpcType = Dpc->Type; + Enable = KeDisableInterrupts(); + + /* Get DPC data */ DpcData = Dpc->DpcData; if (DpcData) { @@ -678,7 +732,7 @@ } /* Re-enable interrupts */ - _enable(); + if (Enable) _enable(); /* Return if the DPC was in the queue or not */ return DpcData ? TRUE : FALSE; @@ -691,14 +745,15 @@ NTAPI KeFlushQueuedDpcs(VOID) { + PKPRCB CurrentPrcb = KeGetCurrentPrcb(); PAGED_CODE(); /* Check if this is an UP machine */ if (KeActiveProcessors == 1) { /* Check if there are DPCs on either queues */ - if ((KeGetCurrentPrcb()->DpcData[DPC_NORMAL].DpcQueueDepth) || - (KeGetCurrentPrcb()->DpcData[DPC_THREADED].DpcQueueDepth)) + if ((CurrentPrcb->DpcData[DPC_NORMAL].DpcQueueDepth > 0) || + (CurrentPrcb->DpcData[DPC_THREADED].DpcQueueDepth > 0)) { /* Request an interrupt */ HalRequestSoftwareInterrupt(DISPATCH_LEVEL); Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c Mon Mar 19 20:55:38 2007 @@ -22,6 +22,22 @@ extern ULONG KiChainedDispatch2ndLvl; /* PRIVATE FUNCTIONS *********************************************************/ + +BOOLEAN +NTAPI +KeDisableInterrupts(VOID) +{ + ULONG Flags = 0; + BOOLEAN Return; + + /* Get EFLAGS and check if the interrupt bit is set */ + Ke386SaveFlags(Flags); + Return = (Flags & EFLAGS_INTERRUPT_MASK) ? TRUE: FALSE; + + /* Disable interrupts */ + _disable(); + return Return; +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S Mon Mar 19 20:55:38 2007 @@ -10,6 +10,11 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix + +/* GLOBALS *******************************************************************/ + +_DpcTimeoutMsg: + .asciz "\n*** DPC routine > 1 sec --- This is not a break in KeUpdateSystemTime\n" /* FUNCTIONS ******************************************************************/ @@ -93,7 +98,32 @@ /* At dispatch, increase DPC time */ inc dword ptr [eax+KPCR_PRCB_DPC_TIME] +#ifdef DBG + /* Update the DPC time */ inc dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME] + + /* Check if we've timed out */ + mov edx, _KiDPCTimeout + cmp dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME], edx + jc AfterSet + + /* We did, print out a message */ + push offset _DpcTimeoutMsg + call _DbgPrint + add esp, 4 + + /* Check if the debugger is enabled */ + cmp byte ptr __KdDebuggerEnabled, 0 + je ResetDpcTime + + /* Breakpoint */ + call _DbgBreakPoint@0 + +ResetDpcTime: + /* Restore state */ + mov eax, PCR[KPCR_SELF] + mov dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME], 0 +#endif jmp AfterSet AboveDispatch:

1 0

[ion] 26138: - Change the way DR_TRAP_FIXUP and V86_TRAP_FIXUP work so that they can be combined into TRAP_FIXUPS, which will also handle ABIOS Fixups later. - Modified the way TRAP_FIXUPS and XXX_PROLOGS work, so that the fixup code doesn't depend on numerical values anymore, but instead on unique labels for each function (kitd thus becomes kitd_a and kitd_t, for entry and exit). - Now we can put the TRAP_FIXUPS for the Interrupt Template as part of the code, and at the end. - Enable Dr Save/Re
by ion＠svn.reactos.org 19 Mar '07

19 Mar '07

Author: ion Date: Mon Mar 19 08:56:27 2007 New Revision: 26138 URL: http://svn.reactos.org/svn/reactos?rev=26138&view=rev Log: - Change the way DR_TRAP_FIXUP and V86_TRAP_FIXUP work so that they can be combined into TRAP_FIXUPS, which will also handle ABIOS Fixups later. - Modified the way TRAP_FIXUPS and XXX_PROLOGS work, so that the fixup code doesn't depend on numerical values anymore, but instead on unique labels for each function (kitd thus becomes kitd_a and kitd_t, for entry and exit). - Now we can put the TRAP_FIXUPS for the Interrupt Template as part of the code, and at the end. - Enable Dr Save/Restore in lots of places where it was previously disable. - Implement Dr Save/Restore in V86 traps. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Mon Mar 19 08:56:27 2007 @@ -104,6 +104,9 @@ .long _HalpApcInterrupt2ndEntry /* APC_LEVEL */ .long _HalpDispatchInterrupt2ndEntry /* DISPATCH_LEVEL */ +_UnhandledMsg: + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" + /* FUNCTIONS *****************************************************************/ .globl _HalpInitPICs@0 @@ -630,8 +633,7 @@ .globl _HalpApcInterrupt .func HalpApcInterrupt -Dr_hapc: DR_TRAP_FIXUP -V86_hapc: V86_TRAP_FIXUP +TRAP_FIXUPS hapc_a, hapc_t, DoFixupV86, DoFixupAbios _HalpApcInterrupt: /* Create fake interrupt stack */ @@ -641,7 +643,7 @@ push eax /* Enter interrupt */ - INT_PROLOG hapc, DoPushFakeErrorCode + INT_PROLOG hapc_a, hapc_t, DoPushFakeErrorCode .endfunc .globl _HalpApcInterrupt2ndEntry @@ -679,8 +681,7 @@ .globl _HalpDispatchInterrupt .func HalpDispatchInterrupt -Dr_hdpc: DR_TRAP_FIXUP -V86_hdpc: V86_TRAP_FIXUP +TRAP_FIXUPS hdpc_a, hdpc_t, DoFixupV86, DoFixupAbios _HalpDispatchInterrupt: /* Create fake interrupt stack */ @@ -690,7 +691,7 @@ push eax /* Enter interrupt */ - INT_PROLOG hdpc, DoPushFakeErrorCode + INT_PROLOG hdpc_a, hdpc_t, DoPushFakeErrorCode .endfunc .globl _HalpDispatchInterrupt2ndEntry Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Mon Mar 19 08:56:27 2007 @@ -17,6 +17,9 @@ _HalpLastPerfCounterHigh: .long 0 _HalpPerfCounterLow: .long 0 _HalpPerfCounterHigh: .long 0 + +_UnhandledMsg: + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" /* FUNCTIONS *****************************************************************/ @@ -213,12 +216,11 @@ .globl _HalpClockInterrupt@0 .func HalpClockInterrupt@0 -V86_hci: V86_TRAP_FIXUP -Dr_hci: DR_TRAP_FIXUP +TRAP_FIXUPS hci_a, hci_t, DoFixupV86, DoFixupAbios _HalpClockInterrupt@0: /* Enter trap */ - INT_PROLOG hci, DoPushFakeErrorCode + INT_PROLOG hci_a, hci_t, DoPushFakeErrorCode /* Push vector and make stack for IRQL */ push 0x30 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Mon Mar 19 08:56:27 2007 @@ -17,12 +17,16 @@ #define DoRestoreSegments 1 #define DoRestoreVolatiles 1 #define DoPushFakeErrorCode 1 +#define DoFixupV86 1 +#define DoFixupAbios 1 #define NotFromSystemCall 0 #define DoNotRestorePreviousMode 0 #define DoNotRestoreEverything 0 #define DoNotRestoreSegments 0 #define DoNotRestoreVolatiles 0 #define DoNotPushFakeErrorCode 0 +#define DoNotFixupV86 0 +#define DoNotFixupAbios 0 // Arguments for idt #define INT_32_DPL0 0x8E00 @@ -210,15 +214,90 @@ .endm // -// @name V86_TRAP_FIXUP -// -// This macro sets up the debug header in the trap frame. +// @name TRAP_FIXUPS +// +// This macro contains out-of-line code for various Trap Frame Fixups, such as: +// +// - DR Fixup: Loads and restores DR registers. +// - V86 Fixup: Loads and restores V86 segments. +// - ABIOS Fixup: Loads and restores the ABIOS state and stack. // // @param None. // // @remark ebp = PKTRAP_FRAME // -.macro V86_TRAP_FIXUP +.macro TRAP_FIXUPS Label, EndLabel, V86Fix, AbiosFix +Dr_&Label: + + /* Check if this was V86 mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz 2f + + /* Check if it was user mode */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz Dr_&EndLabel + +2: + /* Get DR0, 1, 2 */ + mov ebx, dr0 + mov ecx, dr1 + mov edi, dr2 + + /* Save them */ + mov [ebp+KTRAP_FRAME_DR0], ebx + mov [ebp+KTRAP_FRAME_DR1], ecx + mov [ebp+KTRAP_FRAME_DR2], edi + + /* Get DR3, 6, 7 */ + mov ebx, dr3 + mov ecx, dr6 + mov edi, dr7 + + /* Save them */ + mov [ebp+KTRAP_FRAME_DR3], ebx + mov [ebp+KTRAP_FRAME_DR6], ecx + mov [ebp+KTRAP_FRAME_DR7], edi + + /* Clear DR7 */ + xor ebx, ebx + mov dr7, ebx + + /* Get the PRCB */ + mov edi, PCR[KPCR_PRCB] + + /* Get DR0, 1 */ + mov ebx, [edi+KPRCB_DR0] + mov ecx, [edi+KPRCB_DR1] + + /* Set them */ + mov dr0, ebx + mov dr1, ecx + + /* Get DR2, 3 */ + mov ebx, [edi+KPRCB_DR2] + mov ecx, [edi+KPRCB_DR3] + + /* Set them */ + mov dr2, ebx + mov dr3, ecx + + /* Get DR6, 7 */ + mov ebx, [edi+KPRCB_DR6] + mov ecx, [edi+KPRCB_DR7] + + /* Set them */ + mov dr6, ebx + mov dr7, ecx + jmp Dr_&EndLabel + +.if \AbiosFix +Abios_&Label: + UNHANDLED_PATH +.endif + +.if \V86Fix +V86_&Label: + /* Get V86 segment registers */ mov eax, [ebp+KTRAP_FRAME_V86_FS] mov ebx, [ebp+KTRAP_FRAME_V86_GS] @@ -232,79 +311,8 @@ mov [ebp+KTRAP_FRAME_DS], dx /* Go back to mainline code */ - jmp 1f -.endm - -// -// @name DR_TRAP_FIXUP -// -// This macro sets up the debug header in the trap frame. -// -// @param None. -// -// @remark ebp = PKTRAP_FRAME -// -.macro DR_TRAP_FIXUP - /* Check if this was V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz 2f - - /* Check if it was user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz 3f - -2: - /* Get DR0, 1, 2 */ - mov ebx, dr0 - mov ecx, dr1 - mov edi, dr2 - - /* Save them */ - mov [ebp+KTRAP_FRAME_DR0], ebx - mov [ebp+KTRAP_FRAME_DR1], ecx - mov [ebp+KTRAP_FRAME_DR2], edi - - /* Get DR3, 6, 7 */ - mov ebx, dr3 - mov ecx, dr6 - mov edi, dr7 - - /* Save them */ - mov [ebp+KTRAP_FRAME_DR3], ebx - mov [ebp+KTRAP_FRAME_DR6], ecx - mov [ebp+KTRAP_FRAME_DR7], edi - - /* Clear DR7 */ - xor ebx, ebx - mov dr7, ebx - - /* Get the PRCB */ - mov edi, PCR[KPCR_PRCB] - - /* Get DR0, 1 */ - mov ebx, [edi+KPRCB_DR0] - mov ecx, [edi+KPRCB_DR1] - - /* Set them */ - mov dr0, ebx - mov dr1, ecx - - /* Get DR2, 3 */ - mov ebx, [edi+KPRCB_DR2] - mov ecx, [edi+KPRCB_DR3] - - /* Set them */ - mov dr2, ebx - mov dr3, ecx - - /* Get DR6, 7 */ - mov ebx, [edi+KPRCB_DR6] - mov ecx, [edi+KPRCB_DR7] - - /* Set them */ - mov dr6, ebx - mov dr7, ecx - jmp 3f + jmp V86_&EndLabel +.endif .endm // @@ -423,7 +431,7 @@ // /* Handle trap */ // <Your Trap Code Here> // -.macro TRAP_PROLOG Label +.macro TRAP_PROLOG Label EndLabel /* Just to be safe, clear out the HIWORD, since it's reserved */ mov word ptr [esp+2], 0 @@ -474,7 +482,7 @@ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz V86_&Label -1: +V86_&EndLabel: /* Get current thread */ mov ecx, PCR[KPCR_CURRENT_THREAD] cld @@ -487,7 +495,7 @@ jnz Dr_&Label /* Set the Trap Frame Debug Header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER .endm @@ -503,7 +511,7 @@ // // @remark For software interrupts, make sure that a fake INT stack is created. // -.macro INT_PROLOG Label FakeErrorCode +.macro INT_PROLOG Label EndLabel FakeErrorCode .if \FakeErrorCode /* Save fake error code */ @@ -533,7 +541,7 @@ jnz V86_&Label /* Check if this was kernel mode */ -1: +V86_&EndLabel: cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R0_CODE jz 1f @@ -597,7 +605,7 @@ jnz Dr_&Label /* Set the trap frame debug header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER .endm @@ -616,7 +624,7 @@ // // @remark None. // -.macro SYSCALL_PROLOG Label +.macro SYSCALL_PROLOG Label EndLabel /* Create a trap frame */ push 0 push ebp @@ -671,7 +679,7 @@ jnz Dr_&Label /* Set the trap frame debug header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER /* Enable interrupts */ @@ -690,7 +698,7 @@ // // @remark None. // -.macro FASTCALL_PROLOG Label +.macro FASTCALL_PROLOG Label EndLabel /* Set FS to PCR */ mov ecx, KGDT_R0_PCR mov fs, cx @@ -769,7 +777,7 @@ jnz Dr_&Label /* Set the trap frame debug header */ -3: +Dr_&EndLabel: SET_TF_DEBUG_HEADER /* Enable interrupts */ @@ -791,7 +799,7 @@ // // @remark None. // -.macro V86_TRAP_PROLOG Label +.macro V86_TRAP_PROLOG Label EndLabel /* Skip everything to the error code */ sub esp, KTRAP_FRAME_ERROR_CODE @@ -838,7 +846,9 @@ mov eax, dr7 test eax, ~DR7_RESERVED_MASK mov [esp+KTRAP_FRAME_DR7], eax - // jnz Dr_&Label + jnz Dr_&Label + +Dr_&EndLabel: .endm // @@ -869,9 +879,10 @@ /* Check if DR registers should be restored */ test dword ptr [ebp+KTRAP_FRAME_DR7], ~DR7_RESERVED_MASK - //jnz V86DebugRestore + jnz V86DebugRestore /* Finish popping the rest of the frame, and return to P-mode */ +V86DebugContinue: add esp, 12 pop edi pop esi @@ -879,6 +890,33 @@ pop ebp add esp, 4 iretd + +V86DebugRestore: + + /* Get DR0, 1 */ + xor ebx, ebx + mov esi, [ebp+KTRAP_FRAME_DR0] + mov edi, [ebp+KTRAP_FRAME_DR1] + + /* Clear DR 7 */ + mov dr7, ebx + + /* Get DR2 and load DR0-2 */ + mov ebx, [ebp+KTRAP_FRAME_DR2] + mov dr0, esi + mov dr1, edi + mov dr2, ebx + + /* Get DR3-7 */ + mov esi, [ebp+KTRAP_FRAME_DR0] + mov edi, [ebp+KTRAP_FRAME_DR1] + mov ebx, [ebp+KTRAP_FRAME_DR7] + + /* Load them */ + mov dr3, esi + mov dr6, edi + mov dr7, ebx + jmp V86DebugContinue PendingUserApc: @@ -1006,7 +1044,7 @@ /* Check for debug registers */ test dword ptr [esp+KTRAP_FRAME_DR7], ~DR7_RESERVED_MASK - //jnz 2f + jnz 2f /* Check for V86 */ 4: Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c Mon Mar 19 08:56:27 2007 @@ -19,6 +19,7 @@ ULONG KiISRTimeout = 55; USHORT KiISROverflow = 30000; +extern ULONG KiChainedDispatch2ndLvl; /* PRIVATE FUNCTIONS *********************************************************/ @@ -188,11 +189,7 @@ } /* Sanity check */ - DPRINT1("Template Size: %lx. Code Size: %lx\n", - (ULONG_PTR)&KiInterruptTemplateDispatch - - (ULONG_PTR)KiInterruptTemplate, - KINTERRUPT_DISPATCH_CODES * 4); - ASSERT((ULONG_PTR)&KiInterruptTemplateDispatch - + ASSERT((ULONG_PTR)&KiChainedDispatch2ndLvl - (ULONG_PTR)KiInterruptTemplate <= (KINTERRUPT_DISPATCH_CODES * 4)); /* Jump to the last 4 bytes */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Mar 19 08:56:27 2007 @@ -136,22 +136,22 @@ UNHANDLED_PATH .func KiSystemService -Dr_kss: DR_TRAP_FIXUP +TRAP_FIXUPS kss_a, kss_t, DoNotFixupV86, DoNotFixupAbios _KiSystemService: /* Enter the shared system call prolog */ - SYSCALL_PROLOG kss + SYSCALL_PROLOG kss_a, kss_t /* Jump to the actual handler */ jmp SharedCode .endfunc .func KiFastCallEntry -Dr_FastCallDrSave: DR_TRAP_FIXUP +TRAP_FIXUPS FastCallDrSave, FastCallDrReturn, DoNotFixupV86, DoNotFixupAbios _KiFastCallEntry: /* Enter the fast system call prolog */ - FASTCALL_PROLOG FastCallDrSave + FASTCALL_PROLOG FastCallDrSave, FastCallDrReturn SharedCode: @@ -461,15 +461,14 @@ UNHANDLED_PATH .func KiDebugService -Dr_kids: DR_TRAP_FIXUP -V86_kids: V86_TRAP_FIXUP +TRAP_FIXUPS kids_a, kids_t, DoFixupV86, DoFixupAbios _KiDebugService: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kids + TRAP_PROLOG kids_a, kids_t /* Increase EIP so we skip the INT3 */ inc dword ptr [ebp+KTRAP_FRAME_EIP] @@ -672,14 +671,13 @@ .endfunc .func KiTrap0 -Dr_kit0: DR_TRAP_FIXUP -V86_kit0: V86_TRAP_FIXUP +TRAP_FIXUPS kit0_a, kit0_t, DoFixupV86, DoNotFixupAbios _KiTrap0: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit0 + TRAP_PROLOG kit0_a, kit0_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -714,14 +712,13 @@ .endfunc .func KiTrap1 -Dr_kit1: DR_TRAP_FIXUP -V86_kit1: V86_TRAP_FIXUP +TRAP_FIXUPS kit1_a, kit1_t, DoFixupV86, DoNotFixupAbios _KiTrap1: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit1 + TRAP_PROLOG kit1_a, kit1_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -767,14 +764,13 @@ .endfunc .func KiTrap3 -Dr_kit3: DR_TRAP_FIXUP -V86_kit3: V86_TRAP_FIXUP +TRAP_FIXUPS kit3_a, kit3_t, DoFixupV86, DoNotFixupAbios _KiTrap3: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit3 + TRAP_PROLOG kit3_a, kit3_t /* Set status code */ mov eax, 0 //STATUS_SUCCESS @@ -822,14 +818,13 @@ .endfunc .func KiTrap4 -Dr_kit4: DR_TRAP_FIXUP -V86_kit4: V86_TRAP_FIXUP +TRAP_FIXUPS kit4_a, kit4_t, DoFixupV86, DoNotFixupAbios _KiTrap4: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit4 + TRAP_PROLOG kit4_a, kit4_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -864,14 +859,13 @@ .endfunc .func KiTrap5 -Dr_kit5: DR_TRAP_FIXUP -V86_kit5: V86_TRAP_FIXUP +TRAP_FIXUPS kit5_a, kit5_t, DoFixupV86, DoNotFixupAbios _KiTrap5: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit5 + TRAP_PROLOG kit5_a, kit5_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -910,8 +904,7 @@ .endfunc .func KiTrap6 -Dr_kit6: DR_TRAP_FIXUP -V86_kit6: V86_TRAP_FIXUP +TRAP_FIXUPS kit6_a, kit6_t, DoFixupV86, DoNotFixupAbios _KiTrap6: /* It this a V86 GPF? */ @@ -919,7 +912,7 @@ jz NotV86UD /* Enter V86 Trap */ - V86_TRAP_PROLOG kit6 + V86_TRAP_PROLOG kit6_a, kit6_v /* Not yet supported (Invalid OPCODE from V86) */ UNHANDLED_PATH @@ -929,7 +922,7 @@ push 0 /* Enter trap */ - TRAP_PROLOG kit6 + TRAP_PROLOG kit6_a, kit6_t /* Check if this happened in kernel mode */ test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK @@ -1025,14 +1018,13 @@ .endfunc .func KiTrap7 -Dr_kit7: DR_TRAP_FIXUP -V86_kit7: V86_TRAP_FIXUP +TRAP_FIXUPS kit7_a, kit7_t, DoFixupV86, DoNotFixupAbios _KiTrap7: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit7 + TRAP_PROLOG kit7_a, kit7_t /* Get the current thread and stack */ StartTrapHandle: @@ -1345,14 +1337,13 @@ .endfunc .func KiTrap9 -Dr_kit9: DR_TRAP_FIXUP -V86_kit9: V86_TRAP_FIXUP +TRAP_FIXUPS kit9_a, kit9_t, DoFixupV86, DoNotFixupAbios _KiTrap9: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit9 + TRAP_PROLOG kit9_a, kit9_t /* Enable interrupts and bugcheck */ sti @@ -1361,11 +1352,10 @@ .endfunc .func KiTrap10 -Dr_kit10: DR_TRAP_FIXUP -V86_kit10: V86_TRAP_FIXUP +TRAP_FIXUPS kita_a, kita_t, DoFixupV86, DoNotFixupAbios _KiTrap10: /* Enter trap */ - TRAP_PROLOG kit10 + TRAP_PROLOG kita_a, kita_t /* Check for V86 */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -1392,11 +1382,10 @@ .endfunc .func KiTrap11 -Dr_kit11: DR_TRAP_FIXUP -V86_kit11: V86_TRAP_FIXUP +TRAP_FIXUPS kitb_a, kitb_t, DoFixupV86, DoNotFixupAbios _KiTrap11: /* Enter trap */ - TRAP_PROLOG kit11 + TRAP_PROLOG kitb_a, kitb_t /* FIXME: ROS Doesn't handle segment faults yet */ mov eax, 11 @@ -1404,11 +1393,10 @@ .endfunc .func KiTrap12 -Dr_kit12: DR_TRAP_FIXUP -V86_kit12: V86_TRAP_FIXUP +TRAP_FIXUPS kitc_a, kitc_t, DoFixupV86, DoNotFixupAbios _KiTrap12: /* Enter trap */ - TRAP_PROLOG kit12 + TRAP_PROLOG kitc_a, kitc_t /* FIXME: ROS Doesn't handle stack faults yet */ mov eax, 12 @@ -1439,8 +1427,7 @@ .endfunc .func KiTrap13 -Dr_kitd: DR_TRAP_FIXUP -V86_kitd: V86_TRAP_FIXUP +TRAP_FIXUPS kitd_a, kitd_t, DoFixupV86, DoNotFixupAbios _KiTrap13: /* It this a V86 GPF? */ @@ -1448,7 +1435,7 @@ jz NotV86 /* Enter V86 Trap */ - V86_TRAP_PROLOG kitd + V86_TRAP_PROLOG kitd_a, kitd_v /* Make sure that this is a V86 process */ mov ecx, PCR[KPCR_CURRENT_THREAD] @@ -1504,7 +1491,7 @@ NotV86: /* Enter trap */ - TRAP_PROLOG kitd + TRAP_PROLOG kitd_a, kitd_t /* Check if this was from kernel-mode */ test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK @@ -1822,12 +1809,11 @@ .endfunc .func KiTrap14 -Dr_kit14: DR_TRAP_FIXUP -V86_kit14: V86_TRAP_FIXUP +TRAP_FIXUPS kite_a, kite_t, DoFixupV86, DoNotFixupAbios _KiTrap14: /* Enter trap */ - TRAP_PROLOG kit14 + TRAP_PROLOG kite_a, kite_t /* Check if we have a VDM alert */ cmp dword ptr PCR[KPCR_VDM_ALERT], 0 @@ -1986,14 +1972,13 @@ .endfunc .func KiTrap0F -Dr_kit15: DR_TRAP_FIXUP -V86_kit15: V86_TRAP_FIXUP +TRAP_FIXUPS kitf_a, kitf_t, DoFixupV86, DoNotFixupAbios _KiTrap0F: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit15 + TRAP_PROLOG kitf_a, kitf_t sti /* Raise a fatal exception */ @@ -2002,14 +1987,13 @@ .endfunc .func KiTrap16 -Dr_kit16: DR_TRAP_FIXUP -V86_kit16: V86_TRAP_FIXUP +TRAP_FIXUPS kit10_a, kit10_t, DoFixupV86, DoNotFixupAbios _KiTrap16: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit16 + TRAP_PROLOG kit10_a, kit10_t /* Check if this is the NPX Thread */ mov eax, PCR[KPCR_CURRENT_THREAD] @@ -2029,14 +2013,13 @@ .endfunc .func KiTrap17 -Dr_kit17: DR_TRAP_FIXUP -V86_kit17: V86_TRAP_FIXUP +TRAP_FIXUPS kit11_a, kit11_t, DoFixupV86, DoNotFixupAbios _KiTrap17: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG kit17 + TRAP_PROLOG kit11_a, kit11_t /* FIXME: ROS Doesn't handle alignment faults yet */ mov eax, 17 @@ -2110,12 +2093,11 @@ jmp _KiUnexpectedInterruptTail .func KiUnexpectedInterruptTail -V86_kui: V86_TRAP_FIXUP -Dr_kui: DR_TRAP_FIXUP +TRAP_FIXUPS kui_a, kui_t, DoFixupV86, DoFixupAbios _KiUnexpectedInterruptTail: /* Enter interrupt trap */ - INT_PROLOG kui, DoNotPushFakeErrorCode + INT_PROLOG kui_a, kui_t, DoNotPushFakeErrorCode /* Increase interrupt count */ inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] @@ -2257,13 +2239,10 @@ .endfunc .func KiInterruptTemplate -V86_kit: V86_TRAP_FIXUP -Dr_kit: DR_TRAP_FIXUP _KiInterruptTemplate: /* Enter interrupt trap */ - INT_PROLOG kit, DoPushFakeErrorCode -.endfunc + INT_PROLOG kit_a, kit_t, DoPushFakeErrorCode _KiInterruptTemplate2ndDispatch: /* Dummy code, will be replaced by the address of the KINTERRUPT */ @@ -2275,6 +2254,9 @@ _KiInterruptTemplateDispatch: /* Marks the end of the template so that the jump above can be edited */ + +TRAP_FIXUPS kit_a, kit_t, DoFixupV86, DoFixupAbios +.endfunc .func KiChainedDispatch2ndLvl@0 _KiChainedDispatch2ndLvl@0:

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