Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[dreimer] 27576: - Get rid of the eevil Admin rights check. Be aware, its more hacked away than replaced by something better, but I kept a Warning Message.
by dreimer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: dreimer Date: Wed Jul 11 00:35:49 2007 New Revision: 27576 URL: http://svn.reactos.org/svn/reactos?rev=27576&view=rev Log: - Get rid of the eevil Admin rights check. Be aware, its more hacked away than replaced by something better, but I kept a Warning Message. Modified: trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Wed Jul 11 00:35:49 2007 @@ -10,7 +10,7 @@ ;; Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "RosBE-${PRODUCT_VERSION}.exe" -InstallDir "C:\RosBE" +InstallDir "$PROFILE\RosBE" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -251,8 +251,8 @@ Return IsNotAdmin: messageBox MB_OK|MB_ICONEXCLAMATION \ - "You do not have administrative privileges. Log on as Administrator and run the installer again." - Quit + "You do not have administrative privileges. Installing on Default Account is more than BETA!!!" + Return FunctionEnd Function un.CheckAdminOrCurrent @@ -263,6 +263,6 @@ Return IsNotAdmin: messageBox MB_OK|MB_ICONEXCLAMATION \ - "You do not have administrative privileges. Log on as Administrator and run the uninstaller again." - Quit -FunctionEnd + "You do not have administrative privileges. Installing on Default Account is more than BETA!!!" + Return +FunctionEnd

1 0

[tkreuzer] 27575: UTF8 -> ANSI encoding, so the file will not get messed up again with notepad
by tkreuzer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: tkreuzer Date: Wed Jul 11 00:18:58 2007 New Revision: 27575 URL: http://svn.reactos.org/svn/reactos?rev=27575&view=rev Log: UTF8 -> ANSI encoding, so the file will not get messed up again with notepad Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc Wed Jul 11 00:18:58 2007 @@ -75,7 +75,7 @@ MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE MENUITEM "&Naam wijzigen", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Sleutelnaam kopiÃ«ren", ID_EDIT_COPYKEYNAME + MENUITEM "&Sleutelnaam kopiëren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Zoeken\tCtrl+F", ID_EDIT_FIND, GRAYED MENUITEM "Volgende Zoeken\tF3", ID_EDIT_FINDNEXT, GRAYED @@ -160,7 +160,7 @@ ID_VIEW_REFRESH "Het venster vernieuwen" ID_EDIT_DELETE "De selectie verwijderen" ID_EDIT_RENAME "De naam van de selectie wijzigen" - ID_EDIT_COPYKEYNAME "De naam van de geselecteerde sleutel naar het Klembord kopiÃ«ren" + ID_EDIT_COPYKEYNAME "De naam van de geselecteerde sleutel naar het Klembord kopiëren" ID_EDIT_FIND "Een tekenreeks zoeken in een sleutel, een waarde of gegevens" ID_EDIT_FINDNEXT "De opgegeven tekst nogmaals zoeken" END

1 0

[tkreuzer] 27574: - fix messed up file beginning. Do not use ms notepad to edit rc files!
by tkreuzer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: tkreuzer Date: Tue Jul 10 23:39:49 2007 New Revision: 27574 URL: http://svn.reactos.org/svn/reactos?rev=27574&view=rev Log: - fix messed up file beginning. Do not use ms notepad to edit rc files! Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc Tue Jul 10 23:39:49 2007 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Regedit (Dutch resources) * * Copyright 2003 Hans Leidekker

1 0

[janderwald] 27573: Lithuanian localization support. Name: CMan Mail: cman at cman dot us See issue #2383 for more details.
by janderwald＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: janderwald Date: Tue Jul 10 22:46:10 2007 New Revision: 27573 URL: http://svn.reactos.org/svn/reactos?rev=27573&view=rev Log: Lithuanian localization support. Name: CMan Mail: cman at cman dot us See issue #2383 for more details. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Jul 10 22:46:10 2007 @@ -240,7 +240,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0424",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0425",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0426",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0427",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0427",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0429",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042a",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042b",0x00000000,"l_intl.nls" @@ -348,7 +348,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000424",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000425",0x00000000,"3" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00000000,"3" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,""

1 0

[janderwald] 27572: Lithuanian localization support. Name: CMan Mail: cman at cman dot us See issue #2383 for more details.
by janderwald＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: janderwald Date: Tue Jul 10 22:45:06 2007 New Revision: 27572 URL: http://svn.reactos.org/svn/reactos?rev=27572&view=rev Log: Lithuanian localization support. Name: CMan Mail: cman at cman dot us See issue #2383 for more details. Added: trunk/reactos/dll/win32/kernel32/nls/lth.nls (with props) Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc Tue Jul 10 22:45:06 2007 @@ -169,7 +169,7 @@ #include "nls/lvi.nls" /* 0x0426 LANG_LATVIAN, SUBLANG_NEUTRAL */ -//#include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ +#include "nls/lth.nls" /* 0x0427 LANG_LITHUANIAN, SUBLANG_LITHUANIAN */ //#include "nls/far.nls" /* 0x0429 LANG_FARSI, SUBLANG_NEUTRAL */ Added: trunk/reactos/dll/win32/kernel32/nls/lth.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/lth… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/lth.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/lth.nls Tue Jul 10 22:45:06 2007 @@ -1,0 +1,154 @@ +/* + * Locale definitions for Lithuanian + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(1257) + +STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x0007\x8000\x3848\x1000\x0000\x0000\x0000\x0000\x0080\x0000\x0000\x0800\x0092\x0000\x0000\xcdd4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "370" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "2" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1257" + LOCALE_IDEFAULTCODEPAGE "775" + LOCALE_IDEFAULTCOUNTRY "370" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0427" + LOCALE_IDEFAULTMACCODEPAGE "10029" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "28603" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0427" + LOCALE_ILDATE "2" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "LTU" + LOCALE_SABBREVDAYNAME1 "Pr" + LOCALE_SABBREVDAYNAME2 "An" + LOCALE_SABBREVDAYNAME3 "Tr" + LOCALE_SABBREVDAYNAME4 "Kt" + LOCALE_SABBREVDAYNAME5 "Pn" + LOCALE_SABBREVDAYNAME6 "Ðt" + LOCALE_SABBREVDAYNAME7 "Sk" + LOCALE_SABBREVLANGNAME "LTH" + LOCALE_SABBREVMONTHNAME1 "Sau" + LOCALE_SABBREVMONTHNAME2 "Vas" + LOCALE_SABBREVMONTHNAME3 "Kov" + LOCALE_SABBREVMONTHNAME4 "Bal" + LOCALE_SABBREVMONTHNAME5 "Geg" + LOCALE_SABBREVMONTHNAME6 "Bir" + LOCALE_SABBREVMONTHNAME7 "Lie" + LOCALE_SABBREVMONTHNAME8 "Rgp" + LOCALE_SABBREVMONTHNAME9 "Rgs" + LOCALE_SABBREVMONTHNAME10 "Spl" + LOCALE_SABBREVMONTHNAME11 "Lap" + LOCALE_SABBREVMONTHNAME12 "Grd" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Lithuania" + LOCALE_SCURRENCY "Lt" + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "pirmadienis" + LOCALE_SDAYNAME2 "antradienis" + LOCALE_SDAYNAME3 "treèiadienis" + LOCALE_SDAYNAME4 "ketvirtadienis" + LOCALE_SDAYNAME5 "penktadienis" + LOCALE_SDAYNAME6 "ðeðtadienis" + LOCALE_SDAYNAME7 "sekmadienis" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Lithuania" + LOCALE_SENGCURRNAME "Lithuanian Litas" + LOCALE_SENGLANGUAGE "Lithuanian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "LTL" + LOCALE_SISO3166CTRYNAME "LT" + LOCALE_SISO639LANGNAME "lt" + LOCALE_SLANGUAGE "Lithuanian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "yyyy 'm.' MMMM d 'd.'" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "sausis" + LOCALE_SMONTHNAME2 "vasaris" + LOCALE_SMONTHNAME3 "kovas" + LOCALE_SMONTHNAME4 "balandis" + LOCALE_SMONTHNAME5 "geguþë" + LOCALE_SMONTHNAME6 "birþelis" + LOCALE_SMONTHNAME7 "liepa" + LOCALE_SMONTHNAME8 "rugpjûtis" + LOCALE_SMONTHNAME9 "rugsëjis" + LOCALE_SMONTHNAME10 "spalis" + LOCALE_SMONTHNAME11 "lapkritis" + LOCALE_SMONTHNAME12 "gruodis" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNATIVECTRYNAME "Lietuva" + LOCALE_SNATIVECURRNAME "Litas" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "lietuviø" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "yyyy.MM.dd" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "yyyy 'm.' MMMM" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/nls/lth.nls ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 27571: - Made one Variable containing the Version and use this one now everywhere. - Fixed titles in RAddr.cmd and reladdr2line.cmd
by dreimer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: dreimer Date: Tue Jul 10 22:38:36 2007 New Revision: 27571 URL: http://svn.reactos.org/svn/reactos?rev=27571&view=rev Log: - Made one Variable containing the Version and use this one now everywhere. - Fixed titles in RAddr.cmd and reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RAddr.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mul… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Multi.cmd Tue Jul 10 22:38:36 2007 @@ -37,4 +37,4 @@ :: call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 -title ReactOS Build Environment 0.3.7 +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Tue Jul 10 22:38:36 2007 @@ -70,4 +70,4 @@ goto :EOB :EOB -title ReactOS Build Environment 0.3.7 +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Tue Jul 10 22:38:36 2007 @@ -22,4 +22,4 @@ :: call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 -title ReactOS Build Environment 0.3.7 +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Tue Jul 10 22:38:36 2007 @@ -91,7 +91,7 @@ ) else ( echo There is nothing to clean. ) - title ReactOS Build Environment 0.3.7 + title ReactOS Build Environment %_VER% goto :EOC ) if "%1" == "logs" ( @@ -115,4 +115,4 @@ ) :EOC -title ReactOS Build Environment 0.3.7 +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Tue Jul 10 22:38:36 2007 @@ -169,4 +169,4 @@ goto :NOK :NOK -title ReactOS Build Environment 0.3.7 +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Tue Jul 10 22:38:36 2007 @@ -9,7 +9,7 @@ :: @echo off -title ReactOS Build Environment 0.3.7 +title ReactOS Build Environment %_VER% if "%1" == "" ( echo. Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RAddr.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Tue Jul 10 22:38:36 2007 @@ -36,14 +36,17 @@ echo. echo. raddr2line %EXE% %ADDR% -goto :EOF +goto :EOC :AUTO1 echo Set the Address you wanna analyze inside the Executable. SET /P ADDR= raddr2line %1 %ADDR% -goto :EOF +goto :EOC :AUTO2 raddr2line %1 %2 -goto :EOF +goto :EOC + +:EOC +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Tue Jul 10 22:38:36 2007 @@ -10,7 +10,9 @@ :: @echo off -title ReactOS Build Environment 0.3.7 +set _VER=0.3.7 + +title ReactOS Build Environment %_VER% if "%1" == "" ( color 0A @@ -24,6 +26,7 @@ echo Unknown parameter specified. Exiting. goto :ExitRosBE ) + :EndCommandParse :: Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Tue Jul 10 22:38:36 2007 @@ -7,6 +7,8 @@ :: :: @echo off + +title Change the Default Dir... if /I "%1"=="" ( goto :DEF @@ -34,3 +36,4 @@ goto :END :END +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Jul 10 22:38:36 2007 @@ -8,7 +8,11 @@ :: @echo off +title RAddr2Line... + for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i set /a baseaddr += 0x%2 for /f %%i in ('echoh %baseaddr%"') do set relbase=%%i raddr2line %1 %relbase% 2>NUL + +title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Tue Jul 10 22:38:36 2007 @@ -67,4 +67,4 @@ ) :ExitSVN -title ReactOS Build Environment 0.3.7 +title ReactOS Build Environment %_VER%

1 0

[janderwald] 27570: - forgot one file
by janderwald＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: janderwald Date: Tue Jul 10 22:24:17 2007 New Revision: 27570 URL: http://svn.reactos.org/svn/reactos?rev=27570&view=rev Log: - forgot one file Added: trunk/reactos/tools/sysreg/data_source.h (with props) Added: trunk/reactos/tools/sysreg/data_source.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/data_source.h… ============================================================================== --- trunk/reactos/tools/sysreg/data_source.h (added) +++ trunk/reactos/tools/sysreg/data_source.h Tue Jul 10 22:24:17 2007 @@ -1,0 +1,49 @@ +#ifndef DATA_SOURCE_H__ +#define DATA_SOURCE_H__ + + +/* $Id$ + * + * PROJECT: System regression tool for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: tools/sysreg/conf_parser.h + * PURPOSE: data source abstraction + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) + */ + +#include <vector> +#include "user_types.h" + +namespace System_ +{ + + +class DataSource +{ +public: + + DataSource() + {} + + virtual ~DataSource() + {} + + virtual bool open(const string & opencmd) = 0; + + virtual bool close() = 0; + + virtual bool read(std::vector<string> & vect) = 0; + +}; // end of class DataSource + + + +} // end of namespace System_ + + + + + + + +#endif /* end of DATA_SOURCE_H__ */ Propchange: trunk/reactos/tools/sysreg/data_source.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/sysreg/data_source.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[janderwald] 27569: - major rewrite of sysreg - refactor code to abstract os differences more cleaner - code needs still be tested
by janderwald＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: janderwald Date: Tue Jul 10 22:23:07 2007 New Revision: 27569 URL: http://svn.reactos.org/svn/reactos?rev=27569&view=rev Log: - major rewrite of sysreg - refactor code to abstract os differences more cleaner - code needs still be tested Modified: trunk/reactos/tools/sysreg/file_reader.cpp trunk/reactos/tools/sysreg/file_reader.h trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/pipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sysreg.mak Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Tue Jul 10 22:23:07 2007 @@ -13,7 +13,7 @@ namespace System_ { //--------------------------------------------------------------------------------------- - FileReader::FileReader() : m_File(NULL) + FileReader::FileReader() : DataSource(), m_File(NULL) { } //--------------------------------------------------------------------------------------- @@ -21,12 +21,12 @@ { } //--------------------------------------------------------------------------------------- - bool FileReader::openFile(TCHAR const * filename) + bool FileReader::open(const string & filename) { #ifdef UNICODE - m_File = _tfopen(filename, _T("rb,ccs=UNICODE")); + m_File = _tfopen(filename.c_str(), _T("rb,ccs=UNICODE")); #else - m_File = _tfopen(filename, _T("rb")); + m_File = _tfopen(filename.c_str(), _T("rb")); #endif if (m_File) @@ -39,7 +39,7 @@ } } //--------------------------------------------------------------------------------------- - bool FileReader::closeFile() + bool FileReader::close() { if (!m_File) { @@ -55,7 +55,7 @@ return false; } //--------------------------------------------------------------------------------------- - bool FileReader::readFile(vector<string> & lines) + bool FileReader::read(vector<string> & lines) { if (!m_File) { Modified: trunk/reactos/tools/sysreg/file_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.h (original) +++ trunk/reactos/tools/sysreg/file_reader.h Tue Jul 10 22:23:07 2007 @@ -12,6 +12,7 @@ #include "user_types.h" +#include "data_source.h" #include <vector> namespace System_ @@ -23,7 +24,7 @@ /// /// Description: this class implements reading from a file - class FileReader + class FileReader : public DataSource { public: //--------------------------------------------------------------------------------------- @@ -51,7 +52,7 @@ /// @param filename name of the file to open /// @return bool - bool openFile(TCHAR const * filename); + virtual bool open(const string & filename); //--------------------------------------------------------------------------------------- /// @@ -61,7 +62,7 @@ /// /// @return bool - bool closeFile(); + virtual bool close(); //--------------------------------------------------------------------------------------- /// @@ -72,7 +73,7 @@ /// Note: returns true on success /// - bool readFile(vector<string> & lines); + virtual bool read(vector<string> & lines); Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Tue Jul 10 22:23:07 2007 @@ -20,7 +20,7 @@ using std::vector; //--------------------------------------------------------------------------------------- - NamedPipeReader::NamedPipeReader() : h_Pipe(NULLVAL) + NamedPipeReader::NamedPipeReader() : DataSource(), h_Pipe(NULLVAL) { } @@ -33,7 +33,7 @@ //--------------------------------------------------------------------------------------- - bool NamedPipeReader::openPipe(string const & PipeCmd) + bool NamedPipeReader::open(const string & PipeCmd) { if (h_Pipe != NULLVAL) { @@ -41,7 +41,6 @@ return false; } -#ifdef WIN32 h_Pipe = CreateFile(PipeCmd.c_str(), GENERIC_WRITE | GENERIC_READ, 0, @@ -65,40 +64,19 @@ ConnectNamedPipe( h_Pipe, 0); -#else - h_Pipe = open("PipeCmd.c_str()", O_RDONLY); - - if(INVALID_HANDLE_VALUE == h_Pipe) { - cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << endl; - h_Pipe = NULLVAL; - return false; - } - else - { - cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; - return true; - } -#endif - - } - -//--------------------------------------------------------------------------------------- - - bool NamedPipeReader::closePipe() + } + +//--------------------------------------------------------------------------------------- + + bool NamedPipeReader::close() { if (!h_Pipe) { cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; return false; } - - -#ifndef WIN32 - close(h_Pipe); -#else DisconnectNamedPipe(h_Pipe); CloseHandle(h_Pipe); -#endif h_Pipe = NULLVAL; return true; @@ -193,13 +171,12 @@ //--------------------------------------------------------------------------------------- - size_t NamedPipeReader::readPipe(vector<string> & vect) + bool NamedPipeReader::read(vector<string> & vect) { char * localbuf; DWORD localsize = 100; size_t lines = vect.size (); -#ifdef WIN32 BOOL fSuccess; localbuf = (char*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(char)); #ifdef UNICODE @@ -253,46 +230,6 @@ return 0; } -#else /* WIN32 */ - - localbuf = (char*) malloc(localsize * sizeof(char)); - if (localbuf != NULL) - { - - DWORD cbRead; - - bool append_line = false; - do - { - do - { - memset(localbuf, 0, localsize * sizeof(char)); - - cbRead = read(h_Pipe, - localbuf, - (localsize-1) * sizeof(char)); - - if (cbRead > 0) - { - extractLines(localbuf, vect, append_line, cbRead); - } - - } while (!cbRead); // repeat loop as long as there is data to read - } while (append_line); - - if (cbRead < 0) - return 0; - - - free(localbuf); - } - else - { - return 0; - } - -#endif /* WIN32 */ - return (vect.size () - lines); } Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Tue Jul 10 22:23:07 2007 @@ -14,6 +14,7 @@ #include "user_types.h" +#include "data_source.h" #include <vector> #include <stdio.h> #include <stdlib.h> @@ -42,7 +43,7 @@ /// /// Description: this class implements a named pipe reader. - class NamedPipeReader + class NamedPipeReader : public DataSource { public: @@ -64,7 +65,7 @@ //--------------------------------------------------------------------------------------- /// -/// openPipe +/// open /// /// Description: this function attempts to open a pipe. If an pipe is already open or /// it fails to open a pipe, the function returns false @@ -73,17 +74,17 @@ /// /// @return bool - bool openPipe(const string & PipeCmd); + virtual bool open(const string & PipeCmd); //--------------------------------------------------------------------------------------- /// -/// closePipe +/// close /// /// Description: closes a pipe. Returns true on success /// /// @return bool - bool closePipe(); + virtual bool close(); //--------------------------------------------------------------------------------------- /// @@ -95,7 +96,7 @@ /// @param Buffer to be written to /// @return size_t - size_t readPipe(std::vector<string> & vect); + virtual bool read(std::vector<string> & vect); //--------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Tue Jul 10 22:23:07 2007 @@ -57,6 +57,10 @@ free(command); return pid; } + void OsSupport::sleep(long value) + { + _sleep(value); + } #else /********************************************************************************************************************/ OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) @@ -83,6 +87,11 @@ return true; } + void OsSupport::sleep(long value) + { + sleep(value); + } + #endif Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Tue Jul 10 22:23:07 2007 @@ -10,7 +10,7 @@ * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) */ -#if 0 +#if 1 #include <windows.h> #else #include <unistd.h> @@ -39,7 +39,7 @@ #else typedef pid_t ProcessID; - #endif +#endif //--------------------------------------------------------------------------------------- /// @@ -76,6 +76,8 @@ static bool terminateProcess(ProcessID pid); + static void sleep(long value); + protected: //--------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h (original) +++ trunk/reactos/tools/sysreg/pipe_reader.h Tue Jul 10 22:23:07 2007 @@ -13,6 +13,7 @@ #include "user_types.h" +#include "data_source.h" #include <stdio.h> #include <stdlib.h> @@ -25,7 +26,7 @@ /// Description: this class implements a pipe reader. It uses _popen to perform opening of /// pipe / _pclose - class PipeReader + class PipeReader : public DataSource { public: Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Jul 10 22:23:07 2007 @@ -65,31 +65,143 @@ { } - -//--------------------------------------------------------------------------------------- - bool RosBootTest::execute(ConfigParser &conf_parser) - { - string boot_cmd; - string debug_port; - string timeout; - string delayread; - bool ret; - +//--------------------------------------------------------------------------------------- + void RosBootTest::getPidFromFile() + { + FileReader file; + if (file.open(m_PidFile.c_str ())) + { + vector<string> lines; + file.read(lines); + if (lines.size() == 1) + { + string line = lines[0]; + m_Pid = _ttoi(line.c_str ()); + } + file.close(); + } + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::executeBootCmd() + { + m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL); + if (!m_Pid) + { + cerr << "Error: failed to launch boot cmd" << m_BootCmd << endl; + return false; + } + + return true; + } +//--------------------------------------------------------------------------------------- + void RosBootTest::delayRead() + { + if (m_Delayread) + { + /// + /// delay reading until emulator is ready + /// + + OsSupport::sleep(m_Delayread * CLOCKS_PER_SEC ); + } + } + + +//--------------------------------------------------------------------------------------- + bool RosBootTest::configurePipe() + { + if (!_tcscmp(m_DebugPort.c_str(), _T("qemupipe"))) + { + string::size_type pipe_pos = m_BootCmd.find(_T("-serial pipe:")); + if (pipe_pos != string::npos) + { + pipe_pos += 12; + string::size_type pipe_pos_end = m_BootCmd.find (_T(" "), pipe_pos); + if (pipe_pos != string::npos && pipe_pos_end != string::npos) + { + m_Pipe = _T("\\\\.\\pipe\\") + m_BootCmd.substr (pipe_pos, pipe_pos_end - pipe_pos); +#ifdef __LINUX__ + m_DataSource = new PipeReader(); +#else + m_DataSource = new NamedPipeReader(); +#endif + return true; + } + } + } + else if (!_tcscmp(m_DebugPort.c_str(), _T("vmwarepipe"))) + { + cerr << "VmWare debug pipe is currently fixed to \\\\.\\pipe\\vmwaredebug" << endl; + m_Pipe = _T("\\\\.\\pipe\\vmwaredebug"); +#ifdef __LINUX__ + m_DataSource = new PipeReader(); +#else + m_DataSource = new NamedPipeReader(); +#endif + + return true; + } + + // + // FIXME + // support other emulators + + return false; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::configureFile() + { + if (!_tcscmp(m_DebugPort.c_str(), _T("qemufile"))) + { + string::size_type file_pos = m_BootCmd.find(_T("-serial file:")); + if (file_pos != string::npos) + { + file_pos += 12; + string::size_type file_pos_end = m_BootCmd.find (_T(" "), file_pos); + if (file_pos != string::npos && file_pos_end != string::npos) + { + m_File = m_BootCmd.substr (file_pos, file_pos_end - file_pos); + m_DataSource = new FileReader(); + return true; + } + cerr << "Error: missing space at end of option" << endl; + } + } + else if (!_tcscmp(m_DebugPort.c_str(), _T("vmwarefile"))) + { + cerr << "VmWare debug file is currently fixed to debug.log" << endl; + m_File = "debug.log"; + m_DataSource = new FileReader(); + return true; + } + + // + // FIXME + // support other emulators + + return false; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::readConfigurationValues(ConfigParser &conf_parser) + { /// /// read required configuration arguments /// - if (!conf_parser.getStringValue (RosBootTest::DEBUG_PORT, debug_port)) + + + if (!conf_parser.getStringValue (RosBootTest::DEBUG_PORT, m_DebugPort)) { cerr << "Error: ROSBOOT_DEBUG_TYPE is not set in configuration file" << endl; return false; } - if (!conf_parser.getStringValue(RosBootTest::VARIABLE_NAME, boot_cmd)) + if (!conf_parser.getStringValue(RosBootTest::VARIABLE_NAME, m_BootCmd)) { cerr << "Error: ROSBOOT_CMD is not set in configuration file" << endl; return false; } + string timeout; if (conf_parser.getStringValue(RosBootTest::TIME_OUT, timeout)) { TCHAR * stop; @@ -101,6 +213,19 @@ m_Timeout = 60.0; } } + if (m_DebugPort.find(_T("pipe")) != string::npos) + { +#ifdef __LINUX__ + if (!conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile)) + { + cerr << "Error: linux hosts must provide pid file option" << endl; + return false; + } + _tremove(m_PidFile.c_str ()); +#endif + } + + string delayread; if (conf_parser.getStringValue(RosBootTest::DELAY_READ, delayread)) { @@ -121,30 +246,66 @@ conf_parser.getStringValue (RosBootTest::CRITICAL_APP, m_CriticalApp); conf_parser.getStringValue (RosBootTest::DEBUG_FILE, m_DebugFile); - if (conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile)) - { - _tremove(m_PidFile.c_str ()); - } - - if (!_tcscmp(debug_port.c_str(), _T("pipe"))) - { - ret = fetchDebugByPipe(boot_cmd); - } - else if (!_tcscmp(debug_port.c_str(), _T("file"))) - { - if (!m_DebugFile.length()) - { - cerr << "Error: ROSBOOT_DEBUG_FILE is not set in configuration file" << endl; - return false; - } - ret = fetchDebugByFile(boot_cmd); - } - else - { - cerr <<"Error: unknown debug port " << debug_port <<endl - <<" Currently only file|pipe is supported" <<endl; - return false; - } + return true; + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::execute(ConfigParser &conf_parser) + { + + if (!readConfigurationValues(conf_parser)) + { + return false; + } + + string src; + + if (m_DebugPort.find(_T("pipe")) != string::npos) + { + if (!configurePipe()) + { + cerr << "Error: failed to configure pipe" << endl; + return false; + } + +#ifndef __LINUX__ + if (!executeBootCmd()) + { + cerr << "Error: failed to launch emulator" << endl; + return false; + } +#endif + src = m_Pipe; + } + else if (m_DebugPort.find(_T("file")) != string::npos) + { + if (!configureFile()) + { + cerr << "Error: failed to configure pipe" << endl; + return false; + } + if (!executeBootCmd()) + { + cerr << "Error: failed to launch emulator" << endl; + return false; + } + + src = m_File; + } + + if (!m_DataSource->open(src)) + { + cerr << "Error: failed to open data source with " << src << endl; + return false; + } + + bool ret = analyzeDebugData(); + + m_DataSource->close(); + OsSupport::sleep(3 * CLOCKS_PER_SEC); + if (m_Pid) + { + OsSupport::terminateProcess (m_Pid); + } return ret; } @@ -338,65 +499,21 @@ } //--------------------------------------------------------------------------------------- - bool RosBootTest::fetchDebugByPipe(string boot_cmd) - { - string pipecmd = _T(""); - bool ret = true; - - /// - /// FIXME - /// split up arguments - - - OsSupport::ProcessID pid = OsSupport::createProcess ((TCHAR*)boot_cmd.c_str (), 0, NULL); - string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:")); - - NamedPipeReader namedpipe_reader; - if (pipe_pos != string::npos) - { - pipe_pos += 12; - string::size_type pipe_pos_end = boot_cmd.find (_T(" "), pipe_pos); - if (pipe_pos != string::npos && pipe_pos > 0 && pipe_pos < boot_cmd.size()) - { - pipecmd = _T("\\\\.\\pipe\\") + boot_cmd.substr (pipe_pos, pipe_pos_end - pipe_pos); - } - } - - if (!pipecmd.length ()) - { - //FIXME - pipecmd = _T("\\\\.\\pipe\\vmwaredebug"); - } - - if (m_Delayread) - { - /// - /// delay reading until emulator is ready - /// - - sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); - } - - if (!namedpipe_reader.openPipe(pipecmd)) - { - cerr << "Error: failed to open pipe with cmd: " << boot_cmd <<endl; - return false; - } - string Buffer; - Buffer.reserve (500); - + bool RosBootTest::analyzeDebugData() + { vector<string> vect; size_t lines = 0; bool write_log; ofstream file; - if (m_DebugFile.length ()) + bool ret = true; + + if (m_DebugFile.length ()) { _tremove(m_DebugFile.c_str ()); file.open (m_DebugFile.c_str ()); } write_log = file.is_open (); - while(1) { if (isTimeout(m_Timeout)) @@ -404,8 +521,8 @@ break; } size_t prev_count = vect.size (); - size_t line_count = namedpipe_reader.readPipe (vect); - if (!line_count) + + if (!m_DataSource->read (vect)) { cerr << "No data read" << endl; continue; @@ -429,109 +546,14 @@ { break; } - lines += line_count; - } - namedpipe_reader.closePipe (); + lines += (vect.size() -prev_count); //WTF? + } + m_DataSource->close(); if (write_log) { file.close(); } - _sleep(3* CLOCKS_PER_SEC); - OsSupport::terminateProcess (pid); - - return ret; - } -//--------------------------------------------------------------------------------------- - bool RosBootTest::fetchDebugByFile(string boot_cmd) - { - PipeReader pipe_reader; - _tremove(m_DebugFile.c_str ()); - - if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) - { - cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; - return false; - } - - if (m_Delayread) - { - /// - /// delay reading until emulator is ready - /// - - sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC ); - } - - OsSupport::ProcessID pid = 0; - - if (m_PidFile != _T("")) - { - FileReader file; - if (file.openFile(m_PidFile.c_str ())) - { - vector<string> lines; - file.readFile(lines); - if (lines.size()) - { - string line = lines[0]; - pid = _ttoi(line.c_str ()); - } - file.closeFile(); - } - } - FileReader file; - if (!file.openFile (m_DebugFile.c_str ())) - { - cerr << "Error: failed to open debug log " << m_DebugFile<< endl; - pipe_reader.closePipe (); - return false; - } - - vector<string> lines; - bool ret = true; - - while(!pipe_reader.isEof ()) - { - if (file.readFile (lines)) - { - DebugState state = checkDebugData(lines); - - if (state == DebugStateBSODDetected || state == DebugStateUMEDetected) - { - ret = false; - break; - } - else if (state == DebugStateCPReached) - { - break; - } - } - if (isTimeout(m_Timeout)) - { - /// - /// timeout has been reached - /// - if (m_Checkpoint != _T("")) - { - /// - /// timeout was reached but - /// the checkpoint was not reached - /// we see this as a "hang" - /// - ret = false; - } - break; - } - } - file.closeFile (); - - if (pid) - { - OsSupport::terminateProcess (pid); - } - - pipe_reader.closePipe (); - return ret; - } - + + return ret; + } } // end of namespace Sysreg_ Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Tue Jul 10 22:23:07 2007 @@ -12,16 +12,16 @@ #include "reg_test.h" +#include "data_source.h" #include <vector> #ifndef WIN32 #include <unistd.h> -#define _sleep sleep #endif namespace Sysreg_ { using std::vector; - + using System_::DataSource; //--------------------------------------------------------------------------------------- /// /// class RosBootTest @@ -74,31 +74,15 @@ virtual bool execute(ConfigParser & conf_parser); protected: -//--------------------------------------------------------------------------------------- -/// -/// fetchDebugByPipe -/// -/// Description: this functions debugs ReactOS by PipeReader class -/// -/// Note: if an error occurs, this function returns false -/// -/// @param BootCmd the command which is passed to PipeReader class -/// @return bool - bool fetchDebugByPipe(string BootCmd); + void getPidFromFile(); + bool executeBootCmd(); + void delayRead(); + bool configurePipe(); + bool configureFile(); + bool analyzeDebugData(); + bool readConfigurationValues(ConfigParser & conf_parser); -//--------------------------------------------------------------------------------------- -/// -/// fetchDebugByFile -/// -/// Description: this functions fetches debug info by reading a debug log -/// -/// Note: if an error occurs, this function returns false -/// -/// @param BootCmd the command which is passed to PipeReader class -/// @return bool - - bool fetchDebugByFile(string BootCmd); //--------------------------------------------------------------------------------------- /// @@ -144,8 +128,15 @@ string m_Checkpoint; string m_CriticalApp; string m_DebugFile; + string m_BootCmd; + string m_DebugPort; + string m_Pipe; + string m_File; + DataSource * m_DataSource; vector <string> m_Checkpoints; unsigned long m_Delayread; + long m_Pid; + long m_DelayRead; }; // end of class RosBootTest 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 Jul 10 22:23:07 2007 @@ -18,11 +18,11 @@ SYSREGBUILD_TARGET = \ $(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) +ifeq ($(HOST),mingw32-linux) SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ conf_parser.cpp \ env_var.cpp \ pipe_reader.cpp \ - namedpipe_reader.cpp \ rosboot_test.cpp \ sysreg.cpp \ file_reader.cpp \ @@ -30,10 +30,28 @@ unicode.cpp \ ) +else +SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ + conf_parser.cpp \ + env_var.cpp \ + rosboot_test.cpp \ + namedpipe_reader.cpp \ + sysreg.cpp \ + file_reader.cpp \ + os_support.cpp \ + unicode.cpp \ + ) +endif + SYSREGBUILD_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(SYSREGBUILD_SOURCES:.cpp=.o)) -SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk + +ifeq ($(HOST),mingw32-linux) +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -D__LINUX__ -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude/reactos/libs +else +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk -Iinclude/reactos/libs +endif SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -56,11 +74,11 @@ $(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - +ifneq ($(HOST),mingw32-linux) $(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - +endif $(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@

1 0

[greatlrd] 27568: patch from Yaroslav Ponomarenko yarryp at gmail dot com NtGdiExtTextOut did try render no existed glyth in the glyth cache
by greatlrd＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: greatlrd Date: Tue Jul 10 21:44:23 2007 New Revision: 27568 URL: http://svn.reactos.org/svn/reactos?rev=27568&view=rev Log: patch from Yaroslav Ponomarenko yarryp at gmail dot com NtGdiExtTextOut did try render no existed glyth in the glyth cache Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Jul 10 21:44:23 2007 @@ -1872,15 +1872,22 @@ if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - } - - glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + } + + glyph = face->glyph; + realglyph = NtGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + if (!realglyph) + { + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + goto fail; + } + } /* retrieve kerning distance */ if (use_kerning && previous && glyph_index) @@ -1927,10 +1934,9 @@ TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + DPRINT1("Failed to load and render glyph! [index: %u]\n", glyph_index); IntUnLockFreeType; goto fail; } @@ -1940,6 +1946,12 @@ TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + if (!realglyph) + { + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + goto fail; + } } // DbgPrint("realglyph: %x\n", realglyph); // DbgPrint("TextLeft: %d\n", TextLeft);

1 0

[gedmurphy] 27567: fix the SetServiceStatus idl definition
by gedmurphy＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: gedmurphy Date: Tue Jul 10 18:55:14 2007 New Revision: 27567 URL: http://svn.reactos.org/svn/reactos?rev=27567&view=rev Log: fix the SetServiceStatus idl definition Modified: trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl Tue Jul 10 18:55:14 2007 @@ -78,7 +78,8 @@ /* Function 7 */ DWORD R(SetServiceStatus) ([in] handle_t BindingHandle, - [in] SERVICE_STATUS_HANDLE hServiceStatus); /* FIXME */ + [in] SERVICE_STATUS_HANDLE hServiceStatus, + [in] SERVICE_STATUS *lpServiceStatus); /* Function 8 */ DWORD R(UnlockServiceDatabase) ([in] handle_t BindingHandle,

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007