Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[dreimer] 27556: - SVN is now useable the way you know it. - Cut paths to apps. Useless and looks better.
by dreimer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: dreimer Date: Tue Jul 10 13:13:23 2007 New Revision: 27556 URL: http://svn.reactos.org/svn/reactos?rev=27556&view=rev Log: - SVN is now useable the way you know it. - Cut paths to apps. Useless and looks better. Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RAddr.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/RosBE.nsi 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 13:13:23 2007 @@ -25,7 +25,7 @@ :: -x1 - Number of CPUs, Plus 1. :: -x2 - Number of CPUs, Doubled. :: -for /f "usebackq" %%i in (`"%ROSBEBASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +for /f "usebackq" %%i in (`cpucount -x1`) do set CPUCOUNT=%%i :: :: Set the build command 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 13:13:23 2007 @@ -41,7 +41,7 @@ :: abort the build and inform the user. :: if exist "%_ROSSOURCEDIR%\config.rbuild" ( - "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" + test "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -60,12 +60,12 @@ :: :: Now use mingw32-make to build ReactOS, passing along options, if any. :: -call "%ROSBEBASEDIR%\Tools\buildtime.exe" %MAKE_COMMAND% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" +call buildtime %MAKE_COMMAND% 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" :: :: Highlight the fact that building has ended. :: -call "%ROSBEBASEDIR%\Tools\flash.exe" +call flash goto :EOB 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 13:13:23 2007 @@ -17,8 +17,8 @@ ) else ( echo Main Configuration File was not found in ReactOS Source Tree. ) - if exist "%ROSBEBASEDIR%\Tools\config.rbuild" ( - del %ROSBEBASEDIR%\Tools\config.rbuild + if exist "%ROSBEBASEDIR%\config.rbuild" ( + del %ROSBEBASEDIR%\config.rbuild echo Working Configuration File was found and deleted. ) else ( echo Working Configuration File was not found in ReactOS Source Tree. @@ -30,8 +30,8 @@ goto :NOK ) -if not exist "%ROSBEBASEDIR%\Tools\config.rbuild" ( - copy "%_ROSSOURCEDIR%\config.template.rbuild" "%ROSBEBASEDIR%\Tools\config.rbuild" +if not exist "%ROSBEBASEDIR%\config.rbuild" ( + copy "%_ROSSOURCEDIR%\config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" ) echo WARNING: @@ -50,16 +50,16 @@ echo Architecture to build for. Not Editable. echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"ARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"ARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 echo. echo Sub-architecture to build for. echo Default is: none echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"SARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"SARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P X= (), (xbox) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" %ROSBEBASEDIR%\Tools\config.rbuild > %ROSBEBASEDIR%\Tools\config2.rbuild +call sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" %ROSBEBASEDIR%\config.rbuild > %ROSBEBASEDIR%\config2.rbuild cls echo Which CPU ReactOS should be optimized for. @@ -70,9 +70,9 @@ echo Default is: pentium echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"OARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"OARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P XX= -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" %ROSBEBASEDIR%\Tools\config2.rbuild > %ROSBEBASEDIR%\Tools\config21.rbuild +call sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" %ROSBEBASEDIR%\config2.rbuild > %ROSBEBASEDIR%\config21.rbuild cls echo What level do you want ReactOS to be optimized at. @@ -83,27 +83,27 @@ echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"OPTIMIZE\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"OPTIMIZE\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" %ROSBEBASEDIR%\Tools\config21.rbuild > %ROSBEBASEDIR%\Tools\config3.rbuild +call sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" %ROSBEBASEDIR%\config21.rbuild > %ROSBEBASEDIR%\config3.rbuild cls echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"MP\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"MP\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P Z= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" %ROSBEBASEDIR%\Tools\config3.rbuild > %ROSBEBASEDIR%\Tools\config4.rbuild +call sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" %ROSBEBASEDIR%\config3.rbuild > %ROSBEBASEDIR%\config4.rbuild cls echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"KDBG\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"KDBG\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P A= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" %ROSBEBASEDIR%\Tools\config4.rbuild > %ROSBEBASEDIR%\Tools\config5.rbuild +call sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" %ROSBEBASEDIR%\config4.rbuild > %ROSBEBASEDIR%\config5.rbuild cls echo Whether to compile for debugging. No compiler optimizations will be @@ -111,9 +111,9 @@ echo Default is: 1 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"DBG\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"DBG\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P B= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" %ROSBEBASEDIR%\Tools\config5.rbuild > %ROSBEBASEDIR%\Tools\config6.rbuild +call sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" %ROSBEBASEDIR%\config5.rbuild > %ROSBEBASEDIR%\config6.rbuild cls echo Whether to compile for debugging with GDB. If you don't use GDB, @@ -121,9 +121,9 @@ echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"GDB\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"GDB\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P C= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" %ROSBEBASEDIR%\Tools\config6.rbuild > %ROSBEBASEDIR%\Tools\config7.rbuild +call sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" %ROSBEBASEDIR%\config6.rbuild > %ROSBEBASEDIR%\config7.rbuild cls echo Whether to compile apps/libs with features covered software patents @@ -133,18 +133,18 @@ echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"NSWPAT\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"NSWPAT\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P D= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" %ROSBEBASEDIR%\Tools\config7.rbuild > %ROSBEBASEDIR%\Tools\config8.rbuild +call sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" %ROSBEBASEDIR%\config7.rbuild > %ROSBEBASEDIR%\config8.rbuild cls echo Whether to compile with NT-compatible LPC Semantics. This should echo always be 1. echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"NTLPC\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"NTLPC\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P E= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" %ROSBEBASEDIR%\Tools\config8.rbuild > %ROSBEBASEDIR%\Tools\config9.rbuild +call sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" %ROSBEBASEDIR%\config8.rbuild > %ROSBEBASEDIR%\config9.rbuild cls echo Whether to compile with the KD protocol. This will disable support for @@ -156,15 +156,15 @@ echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" \"_WINKD_\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +call grep \"_WINKD_\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 SET /P F= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" %ROSBEBASEDIR%\Tools\config9.rbuild > %ROSBEBASEDIR%\Tools\config10.rbuild +call sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" %ROSBEBASEDIR%\config9.rbuild > %ROSBEBASEDIR%\config10.rbuild -copy %ROSBEBASEDIR%\Tools\config10.rbuild %ROSBEBASEDIR%\Tools\config.tmp -del %ROSBEBASEDIR%\Tools\*.rbuild -copy %ROSBEBASEDIR%\Tools\config.tmp %ROSBEBASEDIR%\Tools\config.rbuild -del %ROSBEBASEDIR%\Tools\*.tmp -copy %ROSBEBASEDIR%\Tools\config.rbuild %_ROSSOURCEDIR%\config.rbuild +copy %ROSBEBASEDIR%\config10.rbuild %ROSBEBASEDIR%\config.tmp +del %ROSBEBASEDIR%\*.rbuild +copy %ROSBEBASEDIR%\config.tmp %ROSBEBASEDIR%\config.rbuild +del %ROSBEBASEDIR%\*.tmp +copy %ROSBEBASEDIR%\config.rbuild %_ROSSOURCEDIR%\config.rbuild goto :NOK 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 13:13:23 2007 @@ -35,15 +35,15 @@ SET /P ADDR= echo. echo. -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %EXE% %ADDR% +raddr2line %EXE% %ADDR% goto :EOF :AUTO1 echo Set the Address you wanna analyze inside the Executable. SET /P ADDR= -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %ADDR% +raddr2line %1 %ADDR% goto :EOF :AUTO2 -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 +raddr2line %1 %2 goto :EOF 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 13:13:23 2007 @@ -27,10 +27,12 @@ :EndCommandParse :: -:: Save our initial directory (should be the ReactOS source directory) +:: Save our initial directory (should be the ReactOS source directory) +:: and add PATH for Tools Folder. :: set _ROSSOURCEDIR=%CD% set _ROSSRCDIRBCK=%CD% +set PATH=%ROSBEBASEDIR%\Tools;%PATH% :: :: Display the current version of GCC, NASM, ld and make. @@ -55,7 +57,7 @@ :: :: Look if the Source Folder is empty. If so, ask for using "svn create". :: -dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul +dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul if errorlevel 1 ( echo No ReactOS Source detected. Please use "svn create" to download it. goto :ExitRosBE Modified: trunk/tools/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/TimeDate.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE-Windows/Root/TimeDate.cmd Tue Jul 10 13:13:23 2007 @@ -20,7 +20,7 @@ :: :: Get the raw date and time. :: -for /f "usebackq tokens=1" %%u in (`"%ROSBEBASEDIR%\Tools\getdate.exe"`) do set DATERAW=%%u +for /f "usebackq tokens=1" %%u in (`getdate`) do set DATERAW=%%u for /f "usebackq tokens=1" %%u in (`time /t`) do set TIMERAW=%%u :: 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 13:13:23 2007 @@ -18,15 +18,15 @@ if "%1" == "update" ( title Updating... if not "%2" == "" ( - %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% -r %2 + svn update %_ROSSOURCEDIR% -r %2 ) else ( - %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% + svn update %_ROSSOURCEDIR% ) goto :ExitSVN ) if "%1" == "cleanup" ( title Cleaning... - %ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR% + svn cleanup %_ROSSOURCEDIR% goto :ExitSVN ) :: @@ -39,9 +39,9 @@ echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) - dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul + dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul if errorlevel 1 ( - %ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% + svn checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% ) else ( echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -49,14 +49,14 @@ ) if "%1" == "status" ( title Status - call "%ROSBEBASEDIR%\Tools\svn.exe" info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" + call svn info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" echo Recent Offline Revision: - call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2 del "%ROSBEBASEDIR%\x.tmp" - call "%ROSBEBASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" + call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" echo Online HEAD Revision: - call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2 del "%ROSBEBASEDIR%\x.tmp" goto :ExitSVN ) 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 Tue Jul 10 13:13:23 2007 @@ -197,6 +197,7 @@ Delete /REBOOTOK "$INSTDIR\readme.pdf" Delete /REBOOTOK "$INSTDIR\reactos.ico" Delete /REBOOTOK "$INSTDIR\RosBE.mac" + Delete /REBOOTOK "$INSTDIR\config.rbuild" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk"

1 0

[dreimer] 27555: First step to make FULL svn available to users. Rename svn.cmd to ssvn.cmd (simpleSVN)
by dreimer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: dreimer Date: Tue Jul 10 12:29:07 2007 New Revision: 27555 URL: http://svn.reactos.org/svn/reactos?rev=27555&view=rev Log: First step to make FULL svn available to users. Rename svn.cmd to ssvn.cmd (simpleSVN) Added: trunk/tools/RosBE-Windows/Root/sSVN.cmd Removed: trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac 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 12:29:07 2007 @@ -32,7 +32,7 @@ echo raddr2line [OPTIONS] - Translates program addresses into file names and echo line numbers to assist Developers to find echo specific Bugs in ReactOS. - echo svn [OPTIONS] - Create, Update or Clean-up your ReactOS Source + echo ssvn [OPTIONS] - Create, Update or Clean-up your ReactOS Source echo Tree or show the Revision Number of the Offline echo Tree and Online HEAD Revision. @@ -66,8 +66,8 @@ echo Shows help for the specified command or lists all available commands. goto :EOF ) -if "%1" == "svn" ( - echo Usage: svn [OPTIONS] +if "%1" == "ssvn" ( + echo Usage: ssvn [OPTIONS] echo Creates, Updates or cleans up your ReactOS Source Tree or shows the echo Revision Number of the Offline Tree and Online HEAD Revision. echo. Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Tue Jul 10 12:29:07 2007 @@ -1,6 +1,6 @@ BASEDIR = cd /d "%_ROSSOURCEDIR%" CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* -SVN = "%ROSBEBASEDIR%\SVN.cmd" $* +SSVN = "%ROSBEBASEDIR%\sSVN.cmd" $* CONFIG = "%ROSBEBASEDIR%\Config.cmd" $* HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* Removed: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd (removed) @@ -1,70 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See COPYING in the top level directory -:: FILE: Root/SVN.cmd -:: PURPOSE: Integrated SVN Client. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off - -:: -:: Receive the first Parameter and decide what to do. -:: -if "%1" == "" ( - echo No parameter specified. Try 'help [COMMAND]'. - goto :ExitSVN -) -if "%1" == "update" ( - title Updating... - if not "%2" == "" ( - %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% -r %2 - ) else ( - %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% - ) -goto :ExitSVN -) -if "%1" == "cleanup" ( - title Cleaning... - %ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR% - goto :ExitSVN -) -:: -:: Check if the Folder is empty. If not, output an error. -:: - -if "%1" == "create" ( - title Creating... - if exist "%_ROSSOURCEDIR%\.svn\." ( - echo Folder already cotains a Reposority. Exiting - goto :ExitSVN - ) - dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul - if errorlevel 1 ( - %ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% - ) else ( - echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED - ) - goto :ExitSVN -) -if "%1" == "status" ( - title Status - call "%ROSBEBASEDIR%\Tools\svn.exe" info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" - echo Recent Offline Revision: - call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 - del "%ROSBEBASEDIR%\x.tmp" - - call "%ROSBEBASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" - echo Online HEAD Revision: - call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 - del "%ROSBEBASEDIR%\x.tmp" - goto :ExitSVN -) - -if not "%1" == "" ( - echo Unknown parameter specified. Try 'help [COMMAND]'. - goto :ExitSVN -) - -:ExitSVN -title ReactOS Build Environment 0.3.7 Added: 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 (added) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Tue Jul 10 12:29:07 2007 @@ -1,0 +1,70 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/SVN.cmd +:: PURPOSE: Integrated SVN Client. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +:: +:: Receive the first Parameter and decide what to do. +:: +if "%1" == "" ( + echo No parameter specified. Try 'help [COMMAND]'. + goto :ExitSVN +) +if "%1" == "update" ( + title Updating... + if not "%2" == "" ( + %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% -r %2 + ) else ( + %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% + ) +goto :ExitSVN +) +if "%1" == "cleanup" ( + title Cleaning... + %ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR% + goto :ExitSVN +) +:: +:: Check if the Folder is empty. If not, output an error. +:: + +if "%1" == "create" ( + title Creating... + if exist "%_ROSSOURCEDIR%\.svn\." ( + echo Folder already cotains a Reposority. Exiting + goto :ExitSVN + ) + dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul + if errorlevel 1 ( + %ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% + ) else ( + echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + goto :ExitSVN +) +if "%1" == "status" ( + title Status + call "%ROSBEBASEDIR%\Tools\svn.exe" info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" + echo Recent Offline Revision: + call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + del "%ROSBEBASEDIR%\x.tmp" + + call "%ROSBEBASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" + echo Online HEAD Revision: + call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + del "%ROSBEBASEDIR%\x.tmp" + goto :ExitSVN +) + +if not "%1" == "" ( + echo Unknown parameter specified. Try 'help [COMMAND]'. + goto :ExitSVN +) + +:ExitSVN +title ReactOS Build Environment 0.3.7

1 0

[dreimer] 27554: - add some "" to prevent bugs - Fix Title setting in clean.cmd - Add a better way to set another Default Source Dir.
by dreimer＠svn.reactos.org 10 Jul '07

10 Jul '07

Author: dreimer Date: Tue Jul 10 12:24:31 2007 New Revision: 27554 URL: http://svn.reactos.org/svn/reactos?rev=27554&view=rev Log: - add some "" to prevent bugs - Fix Title setting in clean.cmd - Add a better way to set another Default Source Dir. Added: trunk/tools/RosBE-Windows/Root/chdefdir.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac 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 12:24:31 2007 @@ -41,7 +41,7 @@ :: abort the build and inform the user. :: if exist "%_ROSSOURCEDIR%\config.rbuild" ( - %ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" + "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** 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 12:24:31 2007 @@ -91,6 +91,7 @@ ) else ( echo There is nothing to clean. ) + title ReactOS Build Environment 0.3.7 goto :EOC ) if "%1" == "logs" ( 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 12:24:31 2007 @@ -29,11 +29,8 @@ :: :: Save our initial directory (should be the ReactOS source directory) :: -echo If you want to use RosBE with another Tree than the Default one, please set the Path to it now: -SET /P XY= - -if /I "%XY%"=="" set _ROSSOURCEDIR=%CD% -if /I not "%XY%"=="" set _ROSSOURCEDIR=%XY% +set _ROSSOURCEDIR=%CD% +set _ROSSRCDIRBCK=%CD% :: :: Display the current version of GCC, NASM, ld and make. Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Tue Jul 10 12:24:31 2007 @@ -5,4 +5,5 @@ HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* +CHDEFDIR = "%ROSBEBASEDIR%\chdefdir.cmd" $* RADDR2LINE = "%ROSBEBASEDIR%\RAddr.cmd" $* Added: 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 (added) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Tue Jul 10 12:24:31 2007 @@ -1,0 +1,36 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/chdefdir.cmd +:: PURPOSE: Tool to change the Default Work Dir in RosBE. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +if /I "%1"=="" ( + goto :DEF +) +if /I "%1"=="default" ( + set "%_ROSSOURCEDIR%" == "%_ROSSRCDIRBCK%" +) else ( + set "%_ROSSOURCEDIR%" == "%1" +) +goto :END + +:DEF + +echo in a Path to use RosBE in or "default" to revert to Default Dir: +SET /P XY= + +if /I "%XY%"=="" ( + goto :END +) +if /I "%XY%"=="default" ( + set "%_ROSSOURCEDIR%" == "%_ROSSRCDIRBCK%" +) else ( + set "%_ROSSOURCEDIR%" == "%XY%" +) +goto :END + +:END

1 0

[hpoussin] 27553: [FORMATTING] Fix formatting, to have an indentation of 4 spaces No code change
by hpoussin＠svn.reactos.org 09 Jul '07

09 Jul '07

Author: hpoussin Date: Tue Jul 10 03:22:43 2007 New Revision: 27553 URL: http://svn.reactos.org/svn/reactos?rev=27553&view=rev Log: [FORMATTING] Fix formatting, to have an indentation of 4 spaces No code change Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2…

1 0

[gedmurphy] 27552: - Rewrite the service handler and parts of the main control thread. The rest will be rewritten bit by bit. - tcpsvcs now cleanly starts serves and stops in Windows.
by gedmurphy＠svn.reactos.org 09 Jul '07

09 Jul '07

Author: gedmurphy Date: Tue Jul 10 03:13:09 2007 New Revision: 27552 URL: http://svn.reactos.org/svn/reactos?rev=27552&view=rev Log: - Rewrite the service handler and parts of the main control thread. The rest will be rewritten bit by bit. - tcpsvcs now cleanly starts serves and stops in Windows. Modified: trunk/reactos/base/services/tcpsvcs/chargen.c trunk/reactos/base/services/tcpsvcs/daytime.c trunk/reactos/base/services/tcpsvcs/discard.c trunk/reactos/base/services/tcpsvcs/echo.c trunk/reactos/base/services/tcpsvcs/qotd.c trunk/reactos/base/services/tcpsvcs/skelserver.c trunk/reactos/base/services/tcpsvcs/tcpsvcs.c trunk/reactos/base/services/tcpsvcs/tcpsvcs.h Modified: trunk/reactos/base/services/tcpsvcs/chargen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/char… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/chargen.c (original) +++ trunk/reactos/base/services/tcpsvcs/chargen.c Tue Jul 10 03:13:09 2007 @@ -10,84 +10,6 @@ #include "tcpsvcs.h" extern BOOL bShutDown; - -DWORD WINAPI ChargenHandler(VOID* Sock_) -{ - INT RetVal = 0; - SOCKET Sock = (SOCKET)Sock_; - - if (!GenerateChars(Sock)) - { - LogEvent(_T("Chargen: Char generation failed\n"), 0, FALSE); - RetVal = 1; - } - - LogEvent(_T("Chargen: Shutting connection down...\n"), 0, FALSE); - if (ShutdownConnection(Sock, FALSE)) - LogEvent(_T("Chargen: Connection is down.\n"), 0, FALSE); - else - { - LogEvent(_T("Chargen: Connection shutdown failed\n"), 0, FALSE); - RetVal = 1; - } - - LogEvent(_T("Chargen: Terminating thread\n"), 0, FALSE); - ExitThread(RetVal); - -} - - -BOOL GenerateChars(SOCKET Sock) -{ - int i; - int charIndex; /* internal loop */ - int loopIndex; /* line loop */ - char ring[END-START]; - char *endring; - char Line[LINESIZ]; - - /* fill ring with printable characters */ - for (charIndex=0, i=START; i<=END; charIndex++, i++) - ring[charIndex] = (char)i; - /* save the address of the end character in the ring */ - endring = &ring[charIndex]; - - /* where we will start output from */ - loopIndex = 0; - while (! bShutDown) - { - /* if the loop index is equal to the last char, - * start the loop again from the beginning */ - if (loopIndex == END-START) - loopIndex = 0; - - /* start printing from char controled by loopIndex */ - charIndex = loopIndex; - for (i=0; i < LINESIZ - 2; i++) - { - Line[i] = ring[charIndex]; - - if (ring[charIndex] == *endring) - charIndex = 0; - else - charIndex++; - } - - Line[LINESIZ - 2] = '\r'; - Line[LINESIZ - 1] = '\n'; - - if (! SendLine(Sock, Line)) - break; - - /* increment loop index to start printing from next char in ring */ - loopIndex++; - } - - if (bShutDown) - return FALSE; - else - return TRUE; -} BOOL SendLine(SOCKET Sock, char* Line) { @@ -123,3 +45,79 @@ LogEvent(_T("Chargen: Connection closed by peer.\n"), 0, FALSE); return TRUE; } + +BOOL GenerateChars(SOCKET Sock) +{ + int i; + int charIndex; /* internal loop */ + int loopIndex; /* line loop */ + char ring[ASCII_END - ASCII_START]; + char *endring; + char Line[LINESIZ]; + + /* fill ring with printable characters */ + for (charIndex=0, i=ASCII_START; i<=ASCII_END; charIndex++, i++) + ring[charIndex] = (char)i; + /* save the address of the end character in the ring */ + endring = &ring[charIndex]; + + /* where we will start output from */ + loopIndex = 0; + while (! bShutDown) + { + /* if the loop index is equal to the last char, + * start the loop again from the beginning */ + if (loopIndex == ASCII_END-ASCII_START) + loopIndex = 0; + + /* start printing from char controled by loopIndex */ + charIndex = loopIndex; + for (i=0; i < LINESIZ - 2; i++) + { + Line[i] = ring[charIndex]; + + if (ring[charIndex] == *endring) + charIndex = 0; + else + charIndex++; + } + + Line[LINESIZ - 2] = '\r'; + Line[LINESIZ - 1] = '\n'; + + if (! SendLine(Sock, Line)) + break; + + /* increment loop index to start printing from next char in ring */ + loopIndex++; + } + + if (bShutDown) + return FALSE; + else + return TRUE; +} + +DWORD WINAPI ChargenHandler(VOID* Sock_) +{ + INT RetVal = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!GenerateChars(Sock)) + { + LogEvent(_T("Chargen: Char generation failed\n"), 0, FALSE); + RetVal = 1; + } + + LogEvent(_T("Chargen: Shutting connection down...\n"), 0, FALSE); + if (ShutdownConnection(Sock, FALSE)) + LogEvent(_T("Chargen: Connection is down.\n"), 0, FALSE); + else + { + LogEvent(_T("Chargen: Connection shutdown failed\n"), 0, FALSE); + RetVal = 1; + } + + LogEvent(_T("Chargen: Terminating thread\n"), 0, FALSE); + ExitThread(RetVal); +} Modified: trunk/reactos/base/services/tcpsvcs/daytime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/dayt… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/daytime.c (original) +++ trunk/reactos/base/services/tcpsvcs/daytime.c Tue Jul 10 03:13:09 2007 @@ -8,6 +8,19 @@ */ #include "tcpsvcs.h" + +BOOL SendTime(SOCKET Sock, CHAR *time) +{ + INT StringSize = (INT)strlen(time); + INT RetVal = send(Sock, time, sizeof(CHAR) * StringSize, 0); + + if (RetVal == SOCKET_ERROR) + return FALSE; + + LogEvent(_T("DayTime: Connection closed by peer.\n"), 0, FALSE); + return TRUE; +} + DWORD WINAPI DaytimeHandler(VOID* Sock_) { @@ -35,16 +48,3 @@ LogEvent(_T("DayTime: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } - - -BOOL SendTime(SOCKET Sock, CHAR *time) -{ - INT StringSize = (INT)strlen(time); - INT RetVal = send(Sock, time, sizeof(CHAR) * StringSize, 0); - - if (RetVal == SOCKET_ERROR) - return FALSE; - - LogEvent(_T("DayTime: Connection closed by peer.\n"), 0, FALSE); - return TRUE; -} Modified: trunk/reactos/base/services/tcpsvcs/discard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/disc… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/discard.c (original) +++ trunk/reactos/base/services/tcpsvcs/discard.c Tue Jul 10 03:13:09 2007 @@ -10,32 +10,6 @@ #include "tcpsvcs.h" extern BOOL bShutDown; - -DWORD WINAPI DiscardHandler(VOID* Sock_) -{ - DWORD RetVal = 0; - SOCKET Sock = (SOCKET)Sock_; - - if (!RecieveIncomingPackets(Sock)) - { - LogEvent(_T("Discard: RecieveIncomingPackets failed\n"), 0, FALSE); - RetVal = 1; - } - - LogEvent(_T("Discard: Shutting connection down...\n"), 0, FALSE); - if (ShutdownConnection(Sock, TRUE)) - LogEvent(_T("Discard: Connection is down.\n"), 0, FALSE); - else - { - LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE); - RetVal = 1; - } - - LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE); - ExitThread(RetVal); -} - - BOOL RecieveIncomingPackets(SOCKET Sock) { @@ -64,3 +38,27 @@ return TRUE; } + +DWORD WINAPI DiscardHandler(VOID* Sock_) +{ + DWORD RetVal = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!RecieveIncomingPackets(Sock)) + { + LogEvent(_T("Discard: RecieveIncomingPackets failed\n"), 0, FALSE); + RetVal = 1; + } + + LogEvent(_T("Discard: Shutting connection down...\n"), 0, FALSE); + if (ShutdownConnection(Sock, TRUE)) + LogEvent(_T("Discard: Connection is down.\n"), 0, FALSE); + else + { + LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE); + RetVal = 1; + } + + LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE); + ExitThread(RetVal); +} Modified: trunk/reactos/base/services/tcpsvcs/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/echo… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/echo.c (original) +++ trunk/reactos/base/services/tcpsvcs/echo.c Tue Jul 10 03:13:09 2007 @@ -10,32 +10,6 @@ #include "tcpsvcs.h" extern BOOL bShutDown; - -DWORD WINAPI EchoHandler(VOID* Sock_) -{ - DWORD RetVal = 0; - SOCKET Sock = (SOCKET)Sock_; - - if (!EchoIncomingPackets(Sock)) { - LogEvent(_T("Echo: EchoIncomingPackets failed\n"), 0, FALSE); - RetVal = 1; - } - - LogEvent(_T("Echo: Shutting connection down...\n"), 0, FALSE); - - if (ShutdownConnection(Sock, TRUE)) - LogEvent(_T("Echo: Connection is down\n"), 0, FALSE); - else - { - LogEvent(_T("Echo: Connection shutdown failed\n"), 0, FALSE); - RetVal = 1; - } - - LogEvent(_T("Echo: Terminating thread\n"), 0, FALSE); - ExitThread(RetVal); -} - - BOOL EchoIncomingPackets(SOCKET Sock) { @@ -88,3 +62,27 @@ return TRUE; } + +DWORD WINAPI EchoHandler(VOID* Sock_) +{ + DWORD RetVal = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!EchoIncomingPackets(Sock)) { + LogEvent(_T("Echo: EchoIncomingPackets failed\n"), 0, FALSE); + RetVal = 1; + } + + LogEvent(_T("Echo: Shutting connection down...\n"), 0, FALSE); + + if (ShutdownConnection(Sock, TRUE)) + LogEvent(_T("Echo: Connection is down\n"), 0, FALSE); + else + { + LogEvent(_T("Echo: Connection shutdown failed\n"), 0, FALSE); + RetVal = 1; + } + + LogEvent(_T("Echo: Terminating thread\n"), 0, FALSE); + ExitThread(RetVal); +} Modified: trunk/reactos/base/services/tcpsvcs/qotd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/qotd… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/qotd.c (original) +++ trunk/reactos/base/services/tcpsvcs/qotd.c Tue Jul 10 03:13:09 2007 @@ -12,6 +12,22 @@ #define QBUFSIZ 60 LPCTSTR FilePath = _T("\\drivers\\etc\\quotes"); /* 19 chars */ + +BOOL SendQuote(SOCKET Sock, char* Quote) +{ + INT StringSize; + INT RetVal; + + StringSize = (INT)strlen(Quote); + RetVal = send(Sock, Quote, sizeof(char) * StringSize, 0); + + if (RetVal == SOCKET_ERROR) + return FALSE; + + LogEvent(_T("QOTD: Connection closed by peer\n"), 0, FALSE); + return TRUE; +} + DWORD WINAPI QotdHandler(VOID* Sock_) { @@ -74,19 +90,3 @@ ExitThread(0); } - - -BOOL SendQuote(SOCKET Sock, char* Quote) -{ - INT StringSize; - INT RetVal; - - StringSize = (INT)strlen(Quote); - RetVal = send(Sock, Quote, sizeof(char) * StringSize, 0); - - if (RetVal == SOCKET_ERROR) - return FALSE; - - LogEvent(_T("QOTD: Connection closed by peer\n"), 0, FALSE); - return TRUE; -} Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/skel… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/skelserver.c (original) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c Tue Jul 10 03:13:09 2007 @@ -12,34 +12,8 @@ extern BOOL bShutDown; extern BOOL bPause; -DWORD WINAPI StartServer(LPVOID lpParam) -{ - SOCKET ListeningSocket; - PSERVICES pServices; - TCHAR buf[256]; - - pServices = (PSERVICES)lpParam; - -//DebugBreak(); - ListeningSocket = SetUpListener(htons(pServices->Port)); - if (ListeningSocket == INVALID_SOCKET) - { - LogEvent(_T("Socket error when setting up listener\n"), 0, TRUE); - return 3; - } - - _stprintf(buf, _T("%s is waiting for connections on port %d...\n"), - pServices->Name, pServices->Port); - LogEvent(buf, 0, FALSE); - - if (! bShutDown) - AcceptConnections(ListeningSocket, pServices->Service, pServices->Name); - - ExitThread(0); -} - - -SOCKET SetUpListener(USHORT Port) +static SOCKET +SetUpListener(USHORT Port) { SOCKET Sock; SOCKADDR_IN Server; @@ -59,6 +33,7 @@ LogEvent(_T("bind() failed\n"), 0, TRUE); } + return INVALID_SOCKET; } @@ -74,8 +49,10 @@ */ -VOID AcceptConnections(SOCKET ListeningSocket, - LPTHREAD_START_ROUTINE Service, TCHAR *Name) +static VOID +AcceptConnections(SOCKET ListeningSocket, + LPTHREAD_START_ROUTINE Service, + TCHAR *Name) { SOCKADDR_IN Client; SOCKET Sock; @@ -86,8 +63,6 @@ DWORD ThreadID; TCHAR buf[256]; INT TimeOut = 2000; // 2 seconds - -//DebugBreak(); /* set timeout values */ TimeVal.tv_sec = TimeOut / 1000; @@ -144,7 +119,9 @@ } } -BOOL ShutdownConnection(SOCKET Sock, BOOL bRec) +BOOL +ShutdownConnection(SOCKET Sock, + BOOL bRec) { TCHAR buf[256]; @@ -181,3 +158,36 @@ return TRUE; } + + +DWORD WINAPI +StartServer(LPVOID lpParam) +{ + SOCKET ListeningSocket; + PSERVICES pServices; + TCHAR buf[256]; + + pServices = (PSERVICES)lpParam; + + ListeningSocket = SetUpListener(htons(pServices->Port)); + if (ListeningSocket == INVALID_SOCKET) + { + LogEvent(_T("Socket error when setting up listener"), 0, TRUE); + return 3; + } + + _stprintf(buf, + _T("%s is waiting for connections on port %d"), + pServices->Name, + pServices->Port); + LogEvent(buf, 0, FALSE); + + if (!bShutDown) + AcceptConnections(ListeningSocket, pServices->Service, pServices->Name); + + _stprintf(buf, + _T("Exiting %s thread"), + pServices->Name); + LogEvent(buf, 0, FALSE); + ExitThread(0); +} Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Tue Jul 10 03:13:09 2007 @@ -3,128 +3,148 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: /base/services/tcpsvcs/tcpsvcs.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005 - 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ -/* - * TODO: - * - fix bug when terminating chargen server - * - log info in the event logger (when it's implemented) - */ - #include "tcpsvcs.h" -//#define NDEBUG -//#include <debug.h> - - -/* - * globals - */ -VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]); +#define DEBUG + +volatile BOOL bShutDown = FALSE; +volatile BOOL bPause = FALSE; static SERVICE_STATUS hServStatus; static SERVICE_STATUS_HANDLE hSStat; -FILE *hLogFile; -BOOL bShutDown = FALSE; -BOOL bPause = FALSE; - -LPCTSTR LogFileName = _T("\\tcpsvcs_log.log"); +LPCTSTR LogFileName = _T("C:\\tcpsvcs_log.log"); LPTSTR ServiceName = _T("Simp Tcp"); -//LPTSTR DisplayName = _T("Simple TCP/IP Services"); static SERVICES Services[NUM_SERVICES] = { - {ECHO_PORT, _T("Echo"), EchoHandler}, + {ECHO_PORT, _T("Echo"), EchoHandler}, {DISCARD_PORT, _T("Discard"), DiscardHandler}, {DAYTIME_PORT, _T("Daytime"), DaytimeHandler}, - {QOTD_PORT, _T("QOTD"), QotdHandler}, + {QOTD_PORT, _T("QOTD"), QotdHandler}, {CHARGEN_PORT, _T("Chargen"), ChargenHandler} }; - -int -main(void) -{ - SERVICE_TABLE_ENTRY ServiceTable[] = - { - {ServiceName, ServiceMain}, - {NULL, NULL} - }; - - //DPRINT("Starting tcpsvcs service. See \system32%s for logs\n", LogFileName); - - if (! StartServiceCtrlDispatcher(ServiceTable)) - LogEvent(_T("failed to start the service control dispatcher\n"), -1, TRUE); - - //DPRINT("Shutdown tcpsvcs service\n"); - - return 0; -} +VOID +LogEvent(LPCTSTR UserMessage, + DWORD ExitCode, + BOOL PrintErrorMsg) +{ +#ifdef DEBUG + DWORD eMsgLen; + DWORD ErrNum = GetLastError(); + LPTSTR lpvSysMsg; + TCHAR MessageBuffer[512]; + FILE *hLogFile = NULL; + + hLogFile = _tfopen(LogFileName, _T("a")); + if (hLogFile == NULL) return; + + if (PrintErrorMsg) + { + eMsgLen = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + ErrNum, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpvSysMsg, + 0, + NULL); + + _stprintf(MessageBuffer, + _T("\n%s %s ErrNum = %lu ExitCode = %lu"), + UserMessage, + lpvSysMsg, + ErrNum, + ExitCode); + + HeapFree(GetProcessHeap(), + 0, + lpvSysMsg); + + } + else + { + _stprintf(MessageBuffer, + _T("\n%s"), + UserMessage); + } + + _fputts(MessageBuffer, hLogFile); + + fclose(hLogFile); +#endif + if (ExitCode > 0) + ExitProcess(ExitCode); + else + return; +} + + +VOID +UpdateStatus(DWORD NewStatus, + DWORD Check) +{ + TCHAR szSet[50]; + + if (Check > 0) + hServStatus.dwCheckPoint += Check; + else + hServStatus.dwCheckPoint = Check; + + if (NewStatus > 0) + hServStatus.dwCurrentState = NewStatus; + + _sntprintf(szSet, 49, _T("setting service to 0x%lu, CheckPoint %lu"), NewStatus, hServStatus.dwCheckPoint); + LogEvent(szSet, 0, FALSE); + + if (!SetServiceStatus(hSStat, &hServStatus)) + LogEvent(_T("Cannot set service status"), 101, TRUE); + + return; +} + VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]) { - TCHAR LogFilePath[MAX_PATH + 17]; - - if(! GetSystemDirectory(LogFilePath, MAX_PATH)) - return; - - _tcsncat(LogFilePath, LogFileName, 17); - - hLogFile = _tfopen(LogFilePath, _T("a+")); - if (hLogFile == NULL) - { - TCHAR buf[300]; - - _sntprintf(buf, 300, _T("Could not open log file: %s\n"), LogFilePath); - MessageBox(NULL, buf, NULL, MB_OK); - return; - } - - - LogEvent(_T("Entering ServiceMain\n"), 0, FALSE); - - hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; - hServStatus.dwCurrentState = SERVICE_START_PENDING; - hServStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | - SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_PAUSE_CONTINUE; - hServStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; - hServStatus.dwServiceSpecificExitCode = NO_ERROR; - hServStatus.dwCheckPoint = 0; - hServStatus.dwWaitHint = 2*CS_TIMEOUT; + LogEvent(_T("Starting service. First log entry."), 0, FALSE); + LogEvent (_T("Entering ServiceMain."), 0, FALSE); + + hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + hServStatus.dwCurrentState = SERVICE_STOPPED; + hServStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_PAUSE_CONTINUE; + hServStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + hServStatus.dwServiceSpecificExitCode = 0; + hServStatus.dwCheckPoint = 0; + hServStatus.dwWaitHint = 2 * CS_TIMEOUT; hSStat = RegisterServiceCtrlHandler(ServiceName, ServerCtrlHandler); if (hSStat == 0) - LogEvent(_T("Failed to register service\n"), -1, TRUE); - - LogEvent(_T("Control handler registered successfully\n"), 0, FALSE); - SetServiceStatus (hSStat, &hServStatus); - LogEvent(_T("Service status set to SERVICE_START_PENDING\n"), 0, FALSE); + LogEvent(_T("Failed to register service\n"), 100, TRUE); + + LogEvent(_T("Control handler registered successfully"), 0, FALSE); + UpdateStatus(SERVICE_START_PENDING, 1); + LogEvent(_T("Service status set to SERVICE_START_PENDING"), 0, FALSE); if (CreateServers() != 0) { - hServStatus.dwCurrentState = SERVICE_STOPPED; hServStatus.dwServiceSpecificExitCode = 1; - SetServiceStatus(hSStat, &hServStatus); + UpdateStatus(SERVICE_STOPPED, 0); return; } - LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status\n"), 0, FALSE); - /* We will only return here when the ServiceSpecific function - completes, indicating system shutdown. */ - UpdateStatus (SERVICE_STOPPED, 0); - LogEvent(_T("Service status set to SERVICE_STOPPED\n"), 0, FALSE); - LogEvent(_T("Leaving ServiceMain\n"), 0, FALSE); - - fclose(hLogFile); - - return; - + LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status"), 0, FALSE); + UpdateStatus(SERVICE_STOPPED, 0); + LogEvent(_T("Service status set to SERVICE_STOPPED\n"), 0, FALSE); + LogEvent(_T("Leaving ServiceMain\n"), 0, FALSE); + + return; } VOID WINAPI @@ -132,55 +152,46 @@ { switch (Control) { - case SERVICE_CONTROL_SHUTDOWN: /* fall through */ + case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_STOP: - LogEvent(_T("stopping service\n"), 0, FALSE); + LogEvent(_T("\nSetting the service to SERVICE_STOP_PENDING"), 0, FALSE); InterlockedExchange((LONG *)&bShutDown, TRUE); - UpdateStatus(SERVICE_STOP_PENDING, -1); - break; + hServStatus.dwWin32ExitCode = 0; + hServStatus.dwWaitHint = 0; + UpdateStatus(SERVICE_STOP_PENDING, 1); + break; + case SERVICE_CONTROL_PAUSE: /* not yet implemented */ - LogEvent(_T("pausing service\n"), 0, FALSE); + LogEvent(_T("Setting the service to SERVICE_PAUSED"), 0, FALSE); InterlockedExchange((LONG *)&bPause, TRUE); - break; + UpdateStatus(SERVICE_PAUSED, 0); + break; + case SERVICE_CONTROL_CONTINUE: - LogEvent(_T("continuing service\n"), 0, FALSE); + LogEvent(_T("Setting the service to SERVICE_RUNNING"), 0, FALSE); InterlockedExchange((LONG *)&bPause, FALSE); - break; + UpdateStatus(SERVICE_RUNNING, 0); + break; + case SERVICE_CONTROL_INTERROGATE: break; + default: if (Control > 127 && Control < 256) /* user defined */ break; } - UpdateStatus(-1, -1); /* increment checkpoint */ + return; } - -void UpdateStatus (int NewStatus, int Check) -/* Set a new service status and checkpoint (either specific value or increment) */ -{ - if (Check < 0 ) - hServStatus.dwCheckPoint++; - else - hServStatus.dwCheckPoint = Check; - - if (NewStatus >= 0) - hServStatus.dwCurrentState = NewStatus; - - if (! SetServiceStatus (hSStat, &hServStatus)) - LogEvent(_T("Cannot set service status\n"), -1, TRUE); - - return; -} INT CreateServers() { DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; - WSADATA wsaData; - TCHAR buf[256]; + WSADATA wsaData; + TCHAR buf[256]; INT i; DWORD RetVal; @@ -191,86 +202,64 @@ return -1; } - UpdateStatus(-1, -1); /* increment checkpoint */ - - LogEvent(_T("Creating server Threads\n"), 0, FALSE); - - /* Create MAX_THREADS worker threads. */ - for( i=0; i<NUM_SERVICES; i++ ) - { - _stprintf(buf, _T("Starting %s server....\n"), Services[i].Name); + UpdateStatus(0, 1); /* increment checkpoint */ + + LogEvent(_T("\nCreating server Threads"), 0, FALSE); + + /* Create worker threads. */ + for(i = 0; i < NUM_SERVICES; i++) + { + _stprintf(buf, _T("Starting %s server"), Services[i].Name); LogEvent(buf, 0, FALSE); - hThread[i] = CreateThread( - NULL, // default security attributes - 0, // use default stack size - StartServer, // thread function - &Services[i], // argument to thread function - 0, // use default creation flags - &dwThreadId[i]); // returns the thread identifier - - /* Check the return value for success. */ + hThread[i] = CreateThread(NULL, // default security attributes + 0, // use default stack size + StartServer, // thread function + &Services[i], // argument to thread function + 0, // use default creation flags + &dwThreadId[i]); // returns the thread identifier + if (hThread[i] == NULL) { - _stprintf(buf, _T("Failed to start %s server....\n"), Services[i].Name); + _stprintf(buf, _T("\nFailed to start %s server\n"), Services[i].Name); /* don't exit process via LogEvent. We want to exit via the server * which failed to start, which could mean i=0 */ LogEvent(buf, 0, TRUE); - ExitProcess(i); } - } - - LogEvent(_T("setting service status to running\n"), 0, FALSE); + + UpdateStatus(0, 1); /* increment checkpoint */ + } + + LogEvent(_T("setting service status to running"), 0, FALSE); UpdateStatus(SERVICE_RUNNING, 0); /* Wait until all threads have terminated. */ WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); - /* Close all thread handles upon completion. */ - for(i=0; i<NUM_SERVICES; i++) + for(i = 0; i < NUM_SERVICES; i++) { CloseHandle(hThread[i]); } - LogEvent(_T("Detaching Winsock2...\n"), 0, FALSE); + LogEvent(_T("Detaching Winsock2"), 0, FALSE); WSACleanup(); return 0; } - -/* This is a temperary log system until our eventlog is in place */ - -VOID -LogEvent (LPCTSTR UserMessage, INT ExitCode, BOOL PrintErrorMsg) -{ - DWORD eMsgLen, ErrNum = GetLastError (); - LPTSTR lpvSysMsg; - TCHAR MessageBuffer[1024]; - - - - if (PrintErrorMsg) - { - eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, NULL, - ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpvSysMsg, 0, NULL); - - _sntprintf(MessageBuffer, 1024, _T("%s %s ErrNum = %lu. ExitCode = %d."), - UserMessage, lpvSysMsg, ErrNum, ExitCode); - HeapFree(GetProcessHeap (), 0, lpvSysMsg); - } - else - { - _sntprintf(MessageBuffer, 1024, _T("%s"), UserMessage); - } - - _fputts(MessageBuffer, hLogFile); - - if (ExitCode != 0) - ExitProcess(ExitCode); - else - return; -} +int _tmain (int argc, LPTSTR argv []) +{ + SERVICE_TABLE_ENTRY ServiceTable[] = + { + {ServiceName, ServiceMain}, + {NULL, NULL } + }; + + remove(LogFileName); + + if (!StartServiceCtrlDispatcher(ServiceTable)) + LogEvent(_T("failed to start the service control dispatcher\n"), 100, TRUE); + + return 0; +} Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.h (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.h Tue Jul 10 03:13:09 2007 @@ -1,12 +1,6 @@ -/* - * PROJECT: ReactOS simple TCP/IP services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: /base/services/tcpsvcs/tcpsvcs.h - * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * - */ - +#ifdef _MSC_VER +#define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -28,8 +22,8 @@ #define MAX_QUOTE_BUF 512 /* printable ASCII's characters for chargen */ -#define START 32 -#define END 126 +#define ASCII_START 32 +#define ASCII_END 126 /* number of chars to put on a line */ #define LINESIZ 74 // 72 + /r and /n @@ -42,38 +36,18 @@ } SERVICES, *PSERVICES; /* tcpsvcs functions */ -//static VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]); VOID WINAPI ServerCtrlHandler(DWORD control); INT CreateServers(VOID); -VOID LogEvent (LPCTSTR UserMessage, INT ExitCode, BOOL PrintErrorMsg); -void UpdateStatus (int NewStatus, int Check); - +VOID LogEvent(LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg); +void UpdateStatus(DWORD NewStatus, DWORD Check); /* skelserver functions */ DWORD WINAPI StartServer(LPVOID lpParam); -SOCKET SetUpListener(USHORT Port); -VOID AcceptConnections(SOCKET ListeningSocket, - LPTHREAD_START_ROUTINE Service, TCHAR *Name); -BOOL EchoIncomingPackets(SOCKET sd); BOOL ShutdownConnection(SOCKET Sock, BOOL bRec); -/* chargen functions */ +/* server thread handlers */ DWORD WINAPI ChargenHandler(VOID* Sock_); -BOOL GenerateChars(SOCKET Sock); -BOOL SendLine(SOCKET Sock, char* Line); - -/* daytime functions */ DWORD WINAPI DaytimeHandler(VOID* Sock_); -BOOL SendTime(SOCKET Sock, char *time); - -/* echo functions */ DWORD WINAPI EchoHandler(VOID* Sock_); -BOOL EchoIncomingPackets(SOCKET Sock); - -/* discard functions */ DWORD WINAPI DiscardHandler(VOID* Sock_); -BOOL RecieveIncomingPackets(SOCKET Sock); - -/* qotd functions */ DWORD WINAPI QotdHandler(VOID* Sock_); -BOOL SendQuote(SOCKET Sock, char* Quote);

1 0

[jimtabor] 27551: Fix Linux build.
by jimtabor＠svn.reactos.org 09 Jul '07

09 Jul '07

Author: jimtabor Date: Tue Jul 10 00:39:05 2007 New Revision: 27551 URL: http://svn.reactos.org/svn/reactos?rev=27551&view=rev Log: Fix Linux build. Added: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc - copied unchanged from r27550, trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc Removed: trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc Removed: trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc (removed) @@ -1,144 +1,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Slovak translation by Kario 2007 <kario(a)szm.sk> - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Zrui",IDCANCEL,129,24,50,14 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_MENU1 MENU DISCARDABLE -BEGIN - POPUP "&Hra" - BEGIN - MENUITEM "&Rozda\tF2", IDM_GAME_NEW - MENUITEM SEPARATOR - MENUITEM "&Balíèek...", IDM_GAME_DECK - MENUITEM "&Monosti...", IDM_GAME_OPTIONS - MENUITEM SEPARATOR - MENUITEM "Sk&onèi", IDM_GAME_EXIT - END - POPUP "&Pomocník" - BEGIN - MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS - MENUITEM "&Èo je Solitaire", IDM_HELP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE -BEGIN - VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT - VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Slovak resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED -

1 0

[greatlrd] 27550: fixed most of the compinning errors of ddraw but not all
by greatlrd＠svn.reactos.org 09 Jul '07

09 Jul '07

Author: greatlrd Date: Mon Jul 9 23:56:19 2007 New Revision: 27550 URL: http://svn.reactos.org/svn/reactos?rev=27550&view=rev Log: fixed most of the compinning errors of ddraw but not all Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c Mon Jul 9 23:56:19 2007 @@ -30,13 +30,13 @@ #define COBJMACROS #define NONAMELESSUNION -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif +//#endif #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h Mon Jul 9 23:56:19 2007 @@ -34,12 +34,10 @@ # include <windows.h> #endif -/* Bug in ReactOS PSDK */ -typedef struct _RGNDATA -{ - RGNDATAHEADER rdh; - char Buffer[1]; -} RGNDATA, *PRGNDATA, *NPRGNDATA, *LPRGNDATA; + + + + #include "ddraw.h" #include "ddrawi.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c Mon Jul 9 23:56:19 2007 @@ -27,15 +27,13 @@ #define COBJMACROS #define NONAMELESSUNION -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c Mon Jul 9 23:56:19 2007 @@ -36,15 +36,14 @@ #define COBJMACROS -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c Mon Jul 9 23:56:19 2007 @@ -26,15 +26,14 @@ #define COBJMACROS -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c Mon Jul 9 23:56:19 2007 @@ -31,15 +31,14 @@ #define COBJMACROS #define NONAMELESSUNION -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c Mon Jul 9 23:56:19 2007 @@ -28,15 +28,14 @@ #define COBJMACROS -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c Mon Jul 9 23:56:19 2007 @@ -29,15 +29,14 @@ #define COBJMACROS -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c Mon Jul 9 23:56:19 2007 @@ -33,14 +33,14 @@ #define COBJMACROS -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" # include "winreg.h" -#endif +//#endif /* using the GPL PSEH libary for SEH Support */ #include <pseh/pseh.h> @@ -594,7 +594,7 @@ { Ret = E_INVALIDARG; } - SEH_END; + _SEH_END; TRACE(" End of enumeration\n"); return Ret; @@ -633,7 +633,7 @@ { Ret = E_INVALIDARG; } - SEH_END; + _SEH_END; TRACE("End of enumeration\n"); return Ret; @@ -1056,7 +1056,7 @@ } HRESULT WINAPI -D3DParseUnknownCommand(DWORD arg0, DWORD arg1) +D3DParseUnknownCommand(LPVOID arg0, LPVOID* arg1) { if (IsPassthrough()) return pD3DParseUnknownCommand(arg0, arg1); Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c Mon Jul 9 23:56:19 2007 @@ -30,15 +30,14 @@ #define COBJMACROS #define NONAMELESSUNION -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c Mon Jul 9 23:56:19 2007 @@ -31,15 +31,14 @@ #define COBJMACROS -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c Mon Jul 9 23:56:19 2007 @@ -34,15 +34,14 @@ #define COBJMACROS #define NONAMELESSUNION -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c Mon Jul 9 23:56:19 2007 @@ -30,15 +30,13 @@ #define COBJMACROS #define NONAMELESSUNION -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c Mon Jul 9 23:56:19 2007 @@ -29,15 +29,14 @@ #define COBJMACROS -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h" Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/Wine… ============================================================================== --- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c (original) +++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c Mon Jul 9 23:56:19 2007 @@ -30,15 +30,14 @@ #define COBJMACROS #define NONAMELESSUNION -#ifndef WINE_NATIVEWIN32 +//#ifndef WINE_NATIVEWIN32 # include "windef.h" # include "winbase.h" # include "winnls.h" # include "winerror.h" # include "wingdi.h" -#endif -#include "wine/exception.h" -#include "excpt.h" +//#endif + #include "ddraw.h" #include "d3d.h"

1 0

[greatlrd] 27549: delete wrong header
by greatlrd＠svn.reactos.org 09 Jul '07

09 Jul '07

Author: greatlrd Date: Mon Jul 9 23:48:12 2007 New Revision: 27549 URL: http://svn.reactos.org/svn/reactos?rev=27549&view=rev Log: delete wrong header Removed: branches/reactx/reactos/include/psdk/d3d.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/reactx/reactos/include/psdk/d3d.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/psdk/d3d…

1 0

[greatlrd] 27548: remove wrong header from reactx
by greatlrd＠svn.reactos.org 09 Jul '07

09 Jul '07

Author: greatlrd Date: Mon Jul 9 23:28:59 2007 New Revision: 27548 URL: http://svn.reactos.org/svn/reactos?rev=27548&view=rev Log: remove wrong header from reactx Removed: branches/reactx/reactos/include/psdk/d3dtypes.h Removed: branches/reactx/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/psdk/d3d… ============================================================================== --- branches/reactx/reactos/include/psdk/d3dtypes.h (original) +++ branches/reactx/reactos/include/psdk/d3dtypes.h (removed) @@ -1,1359 +1,0 @@ -/* - * Copyright (C) 2000 Peter Hunnisett - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* FIXME: Need to add C++ code for certain structs for headers - this is going to be a problem - if WINE continues to only use C code - I suppose that we could always inline in - the header file to get around that little problem... */ -/* FIXME: We need to implement versioning on everything directx 5 and up if these headers - are going to be generically useful for directx stuff */ - -#ifndef __WINE_D3DTYPES_H -#define __WINE_D3DTYPES_H - -/* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */ - -#include <float.h> -#include <ddraw.h> - -#define D3DVALP(val, prec) ((float)(val)) -#define D3DVAL(val) ((float)(val)) -#define D3DDivide(a, b) (float)((double) (a) / (double) (b)) -#define D3DMultiply(a, b) ((a) * (b)) - -typedef LONG D3DFIXED; - - -#ifndef RGB_MAKE -#define CI_GETALPHA(ci) ((ci) >> 24) -#define CI_GETINDEX(ci) (((ci) >> 8) & 0xffff) -#define CI_GETFRACTION(ci) ((ci) & 0xff) -#define CI_ROUNDINDEX(ci) CI_GETINDEX((ci) + 0x80) -#define CI_MASKALPHA(ci) ((ci) & 0xffffff) -#define CI_MAKE(a, i, f) (((a) << 24) | ((i) << 8) | (f)) - -#define RGBA_GETALPHA(rgb) ((rgb) >> 24) -#define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff) -#define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff) -#define RGBA_GETBLUE(rgb) ((rgb) & 0xff) -#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))) - -#define D3DRGB(r, g, b) \ - (0xff000000L | ( ((long)((r) * 255)) << 16) | (((long)((g) * 255)) << 8) | (long)((b) * 255)) -#define D3DRGBA(r, g, b, a) \ - ( (((long)((a) * 255)) << 24) | (((long)((r) * 255)) << 16) \ - | (((long)((g) * 255)) << 8) | (long)((b) * 255) \ - ) - -#define RGB_GETRED(rgb) (((rgb) >> 16) & 0xff) -#define RGB_GETGREEN(rgb) (((rgb) >> 8) & 0xff) -#define RGB_GETBLUE(rgb) ((rgb) & 0xff) -#define RGBA_SETALPHA(rgba, x) (((x) << 24) | ((rgba) & 0x00ffffff)) -#define RGB_MAKE(r, g, b) ((D3DCOLOR) (((r) << 16) | ((g) << 8) | (b))) -#define RGBA_TORGB(rgba) ((D3DCOLOR) ((rgba) & 0xffffff)) -#define RGB_TORGBA(rgb) ((D3DCOLOR) ((rgb) | 0xff000000)) - -#endif - -#define D3DENUMRET_CANCEL DDENUMRET_CANCEL -#define D3DENUMRET_OK DDENUMRET_OK - -typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset); -typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext); -typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext); - -#ifndef DX_SHARED_DEFINES - -typedef float D3DVALUE,*LPD3DVALUE; - -#ifndef D3DCOLOR_DEFINED -typedef DWORD D3DCOLOR, *LPD3DCOLOR; -#define D3DCOLOR_DEFINED -#endif - -#ifndef D3DVECTOR_DEFINED -typedef struct _D3DVECTOR { - union { - D3DVALUE x; - D3DVALUE dvX; - } DUMMYUNIONNAME1; - union { - D3DVALUE y; - D3DVALUE dvY; - } DUMMYUNIONNAME2; - union { - D3DVALUE z; - D3DVALUE dvZ; - } DUMMYUNIONNAME3; -#if defined(__cplusplus) && defined(D3D_OVERLOADS) - /* the definitions for these methods are in d3dvec.inl */ -public: - /*** constructors ***/ - _D3DVECTOR() {} - _D3DVECTOR(D3DVALUE f); - _D3DVECTOR(D3DVALUE _x, D3DVALUE _y, D3DVALUE _z); - _D3DVECTOR(const D3DVALUE f[3]); - - /*** assignment operators ***/ - _D3DVECTOR& operator += (const _D3DVECTOR& v); - _D3DVECTOR& operator -= (const _D3DVECTOR& v); - _D3DVECTOR& operator *= (const _D3DVECTOR& v); - _D3DVECTOR& operator /= (const _D3DVECTOR& v); - _D3DVECTOR& operator *= (D3DVALUE s); - _D3DVECTOR& operator /= (D3DVALUE s); - - /*** unary operators ***/ - friend _D3DVECTOR operator + (const _D3DVECTOR& v); - friend _D3DVECTOR operator - (const _D3DVECTOR& v); - - /*** binary operators ***/ - friend _D3DVECTOR operator + (const _D3DVECTOR& v1, const _D3DVECTOR& v2); - friend _D3DVECTOR operator - (const _D3DVECTOR& v1, const _D3DVECTOR& v2); - - friend _D3DVECTOR operator * (const _D3DVECTOR& v, D3DVALUE s); - friend _D3DVECTOR operator * (D3DVALUE s, const _D3DVECTOR& v); - friend _D3DVECTOR operator / (const _D3DVECTOR& v, D3DVALUE s); - - friend D3DVALUE SquareMagnitude(const _D3DVECTOR& v); - friend D3DVALUE Magnitude(const _D3DVECTOR& v); - - friend _D3DVECTOR Normalize(const _D3DVECTOR& v); - - friend D3DVALUE DotProduct(const _D3DVECTOR& v1, const _D3DVECTOR& v2); - friend _D3DVECTOR CrossProduct(const _D3DVECTOR& v1, const _D3DVECTOR& v2); -#endif -} D3DVECTOR,*LPD3DVECTOR; -#define D3DVECTOR_DEFINED -#endif - -#define DX_SHARED_DEFINES -#endif /* DX_SHARED_DEFINES */ - -typedef DWORD D3DMATERIALHANDLE, *LPD3DMATERIALHANDLE; -typedef DWORD D3DTEXTUREHANDLE, *LPD3DTEXTUREHANDLE; -typedef DWORD D3DMATRIXHANDLE, *LPD3DMATRIXHANDLE; - -typedef struct _D3DCOLORVALUE { - union { - D3DVALUE r; - D3DVALUE dvR; - }; - union { - D3DVALUE g; - D3DVALUE dvG; - }; - union { - D3DVALUE b; - D3DVALUE dvB; - }; - union { - D3DVALUE a; - D3DVALUE dvA; - }; -} D3DCOLORVALUE,*LPD3DCOLORVALUE; - -typedef struct _D3DRECT { - union { - LONG x1; - LONG lX1; - } DUMMYUNIONNAME1; - union { - LONG y1; - LONG lY1; - } DUMMYUNIONNAME2; - union { - LONG x2; - LONG lX2; - } DUMMYUNIONNAME3; - union { - LONG y2; - LONG lY2; - } DUMMYUNIONNAME4; -} D3DRECT, *LPD3DRECT; - -typedef struct _D3DHVERTEX { - DWORD dwFlags; - union { - D3DVALUE hx; - D3DVALUE dvHX; - } DUMMYUNIONNAME1; - union { - D3DVALUE hy; - D3DVALUE dvHY; - } DUMMYUNIONNAME2; - union { - D3DVALUE hz; - D3DVALUE dvHZ; - } DUMMYUNIONNAME3; -} D3DHVERTEX, *LPD3DHVERTEX; - -/* - * Transformed/lit vertices - */ -typedef struct _D3DTLVERTEX { - union { - D3DVALUE sx; - D3DVALUE dvSX; - } DUMMYUNIONNAME1; - union { - D3DVALUE sy; - D3DVALUE dvSY; - } DUMMYUNIONNAME2; - union { - D3DVALUE sz; - D3DVALUE dvSZ; - } DUMMYUNIONNAME3; - union { - D3DVALUE rhw; - D3DVALUE dvRHW; - } DUMMYUNIONNAME4; - union { - D3DCOLOR color; - D3DCOLOR dcColor; - } DUMMYUNIONNAME5; - union { - D3DCOLOR specular; - D3DCOLOR dcSpecular; - } DUMMYUNIONNAME6; - union { - D3DVALUE tu; - D3DVALUE dvTU; - } DUMMYUNIONNAME7; - union { - D3DVALUE tv; - D3DVALUE dvTV; - } DUMMYUNIONNAME8; -#if defined(__cplusplus) && defined(D3D_OVERLOADS) -public: - _D3DTLVERTEX() {} - _D3DTLVERTEX(const D3DVECTOR& v, float _rhw, D3DCOLOR _color, D3DCOLOR _specular, float _tu, float _tv) { - sx = v.x; sy = v.y; sz = v.z; rhw = _rhw; - color = _color; specular = _specular; - tu = _tu; tv = _tv; - } -#endif -} D3DTLVERTEX, *LPD3DTLVERTEX; - -typedef struct _D3DLVERTEX { - union { - D3DVALUE x; - D3DVALUE dvX; - } DUMMYUNIONNAME1; - union { - D3DVALUE y; - D3DVALUE dvY; - } DUMMYUNIONNAME2; - union { - D3DVALUE z; - D3DVALUE dvZ; - } DUMMYUNIONNAME3; - DWORD dwReserved; - union { - D3DCOLOR color; - D3DCOLOR dcColor; - } DUMMYUNIONNAME4; - union { - D3DCOLOR specular; - D3DCOLOR dcSpecular; - } DUMMYUNIONNAME5; - union { - D3DVALUE tu; - D3DVALUE dvTU; - } DUMMYUNIONNAME6; - union { - D3DVALUE tv; - D3DVALUE dvTV; - } DUMMYUNIONNAME7; -} D3DLVERTEX, *LPD3DLVERTEX; - -typedef struct _D3DVERTEX { - union { - D3DVALUE x; - D3DVALUE dvX; - } DUMMYUNIONNAME1; - union { - D3DVALUE y; - D3DVALUE dvY; - } DUMMYUNIONNAME2; - union { - D3DVALUE z; - D3DVALUE dvZ; - } DUMMYUNIONNAME3; - union { - D3DVALUE nx; - D3DVALUE dvNX; - } DUMMYUNIONNAME4; - union { - D3DVALUE ny; - D3DVALUE dvNY; - } DUMMYUNIONNAME5; - union { - D3DVALUE nz; - D3DVALUE dvNZ; - } DUMMYUNIONNAME6; - union { - D3DVALUE tu; - D3DVALUE dvTU; - } DUMMYUNIONNAME7; - union { - D3DVALUE tv; - D3DVALUE dvTV; - } DUMMYUNIONNAME8; -#if defined(__cplusplus) && defined(D3D_OVERLOADS) -public: - _D3DVERTEX() {} - _D3DVERTEX(const D3DVECTOR& v, const D3DVECTOR& n, float _tu, float _tv) { - x = v.x; y = v.y; z = v.z; - nx = n.x; ny = n.y; nz = n.z; - tu = _tu; tv = _tv; - } -#endif -} D3DVERTEX, *LPD3DVERTEX; - -typedef struct _D3DMATRIX { - D3DVALUE _11, _12, _13, _14; - D3DVALUE _21, _22, _23, _24; - D3DVALUE _31, _32, _33, _34; - D3DVALUE _41, _42, _43, _44; -#if defined(__cplusplus) && defined(D3D_OVERLOADS) - _D3DMATRIX() { } - - /* This is different from MS, but avoids anonymous structs. */ - D3DVALUE &operator () (int r, int c) - { return ((D3DVALUE [4][4])&_11)[r][c]; } - const D3DVALUE &operator() (int r, int c) const - { return ((const D3DVALUE [4][4])&_11)[r][c]; } -#endif -} D3DMATRIX, *LPD3DMATRIX; - -#if defined(__cplusplus) && defined(D3D_OVERLOADS) -#include <d3dvec.inl> -#endif - -typedef struct _D3DVIEWPORT { - DWORD dwSize; - DWORD dwX; - DWORD dwY; - DWORD dwWidth; - DWORD dwHeight; - D3DVALUE dvScaleX; - D3DVALUE dvScaleY; - D3DVALUE dvMaxX; - D3DVALUE dvMaxY; - D3DVALUE dvMinZ; - D3DVALUE dvMaxZ; -} D3DVIEWPORT, *LPD3DVIEWPORT; - -typedef struct _D3DVIEWPORT2 { - DWORD dwSize; - DWORD dwX; - DWORD dwY; - DWORD dwWidth; - DWORD dwHeight; - D3DVALUE dvClipX; - D3DVALUE dvClipY; - D3DVALUE dvClipWidth; - D3DVALUE dvClipHeight; - D3DVALUE dvMinZ; - D3DVALUE dvMaxZ; -} D3DVIEWPORT2, *LPD3DVIEWPORT2; - -typedef struct _D3DVIEWPORT7 { - DWORD dwX; - DWORD dwY; - DWORD dwWidth; - DWORD dwHeight; - D3DVALUE dvMinZ; - D3DVALUE dvMaxZ; -} D3DVIEWPORT7, *LPD3DVIEWPORT7; - -#define D3DMAXUSERCLIPPLANES 32 - -#define D3DCLIPPLANE0 (1 << 0) -#define D3DCLIPPLANE1 (1 << 1) -#define D3DCLIPPLANE2 (1 << 2) -#define D3DCLIPPLANE3 (1 << 3) -#define D3DCLIPPLANE4 (1 << 4) -#define D3DCLIPPLANE5 (1 << 5) - -#define D3DCLIP_LEFT 0x00000001 -#define D3DCLIP_RIGHT 0x00000002 -#define D3DCLIP_TOP 0x00000004 -#define D3DCLIP_BOTTOM 0x00000008 -#define D3DCLIP_FRONT 0x00000010 -#define D3DCLIP_BACK 0x00000020 -#define D3DCLIP_GEN0 0x00000040 -#define D3DCLIP_GEN1 0x00000080 -#define D3DCLIP_GEN2 0x00000100 -#define D3DCLIP_GEN3 0x00000200 -#define D3DCLIP_GEN4 0x00000400 -#define D3DCLIP_GEN5 0x00000800 - -#define D3DSTATUS_CLIPUNIONLEFT D3DCLIP_LEFT -#define D3DSTATUS_CLIPUNIONRIGHT D3DCLIP_RIGHT -#define D3DSTATUS_CLIPUNIONTOP D3DCLIP_TOP -#define D3DSTATUS_CLIPUNIONBOTTOM D3DCLIP_BOTTOM -#define D3DSTATUS_CLIPUNIONFRONT D3DCLIP_FRONT -#define D3DSTATUS_CLIPUNIONBACK D3DCLIP_BACK -#define D3DSTATUS_CLIPUNIONGEN0 D3DCLIP_GEN0 -#define D3DSTATUS_CLIPUNIONGEN1 D3DCLIP_GEN1 -#define D3DSTATUS_CLIPUNIONGEN2 D3DCLIP_GEN2 -#define D3DSTATUS_CLIPUNIONGEN3 D3DCLIP_GEN3 -#define D3DSTATUS_CLIPUNIONGEN4 D3DCLIP_GEN4 -#define D3DSTATUS_CLIPUNIONGEN5 D3DCLIP_GEN5 - -#define D3DSTATUS_CLIPINTERSECTIONLEFT 0x00001000 -#define D3DSTATUS_CLIPINTERSECTIONRIGHT 0x00002000 -#define D3DSTATUS_CLIPINTERSECTIONTOP 0x00004000 -#define D3DSTATUS_CLIPINTERSECTIONBOTTOM 0x00008000 -#define D3DSTATUS_CLIPINTERSECTIONFRONT 0x00010000 -#define D3DSTATUS_CLIPINTERSECTIONBACK 0x00020000 -#define D3DSTATUS_CLIPINTERSECTIONGEN0 0x00040000 -#define D3DSTATUS_CLIPINTERSECTIONGEN1 0x00080000 -#define D3DSTATUS_CLIPINTERSECTIONGEN2 0x00100000 -#define D3DSTATUS_CLIPINTERSECTIONGEN3 0x00200000 -#define D3DSTATUS_CLIPINTERSECTIONGEN4 0x00400000 -#define D3DSTATUS_CLIPINTERSECTIONGEN5 0x00800000 -#define D3DSTATUS_ZNOTVISIBLE 0x01000000 - -#define D3DSTATUS_CLIPUNIONALL ( \ - D3DSTATUS_CLIPUNIONLEFT | \ - D3DSTATUS_CLIPUNIONRIGHT | \ - D3DSTATUS_CLIPUNIONTOP | \ - D3DSTATUS_CLIPUNIONBOTTOM | \ - D3DSTATUS_CLIPUNIONFRONT | \ - D3DSTATUS_CLIPUNIONBACK | \ - D3DSTATUS_CLIPUNIONGEN0 | \ - D3DSTATUS_CLIPUNIONGEN1 | \ - D3DSTATUS_CLIPUNIONGEN2 | \ - D3DSTATUS_CLIPUNIONGEN3 | \ - D3DSTATUS_CLIPUNIONGEN4 | \ - D3DSTATUS_CLIPUNIONGEN5 \ - ) - -#define D3DSTATUS_CLIPINTERSECTIONALL ( \ - D3DSTATUS_CLIPINTERSECTIONLEFT | \ - D3DSTATUS_CLIPINTERSECTIONRIGHT | \ - D3DSTATUS_CLIPINTERSECTIONTOP | \ - D3DSTATUS_CLIPINTERSECTIONBOTTOM | \ - D3DSTATUS_CLIPINTERSECTIONFRONT | \ - D3DSTATUS_CLIPINTERSECTIONBACK | \ - D3DSTATUS_CLIPINTERSECTIONGEN0 | \ - D3DSTATUS_CLIPINTERSECTIONGEN1 | \ - D3DSTATUS_CLIPINTERSECTIONGEN2 | \ - D3DSTATUS_CLIPINTERSECTIONGEN3 | \ - D3DSTATUS_CLIPINTERSECTIONGEN4 | \ - D3DSTATUS_CLIPINTERSECTIONGEN5 \ - ) - -#define D3DSTATUS_DEFAULT ( \ - D3DSTATUS_CLIPINTERSECTIONALL | \ - D3DSTATUS_ZNOTVISIBLE) - -#define D3DTRANSFORM_CLIPPED 0x00000001 -#define D3DTRANSFORM_UNCLIPPED 0x00000002 - -typedef struct _D3DTRANSFORMDATA { - DWORD dwSize; - LPVOID lpIn; - DWORD dwInSize; - LPVOID lpOut; - DWORD dwOutSize; - LPD3DHVERTEX lpHOut; - DWORD dwClip; - DWORD dwClipIntersection; - DWORD dwClipUnion; - D3DRECT drExtent; -} D3DTRANSFORMDATA, *LPD3DTRANSFORMDATA; - -typedef struct _D3DLIGHTINGELEMENT { - D3DVECTOR dvPosition; - D3DVECTOR dvNormal; -} D3DLIGHTINGELEMENT, *LPD3DLIGHTINGELEMENT; - -typedef struct _D3DMATERIAL { - DWORD dwSize; - union { - D3DCOLORVALUE diffuse; - D3DCOLORVALUE dcvDiffuse; - } DUMMYUNIONNAME; - union { - D3DCOLORVALUE ambient; - D3DCOLORVALUE dcvAmbient; - } DUMMYUNIONNAME1; - union { - D3DCOLORVALUE specular; - D3DCOLORVALUE dcvSpecular; - } DUMMYUNIONNAME2; - union { - D3DCOLORVALUE emissive; - D3DCOLORVALUE dcvEmissive; - } DUMMYUNIONNAME3; - union { - D3DVALUE power; - D3DVALUE dvPower; - } DUMMYUNIONNAME4; - D3DTEXTUREHANDLE hTexture; - DWORD dwRampSize; -} D3DMATERIAL, *LPD3DMATERIAL; - -typedef struct _D3DMATERIAL7 { - union { - D3DCOLORVALUE diffuse; - D3DCOLORVALUE dcvDiffuse; - } DUMMYUNIONNAME; - union { - D3DCOLORVALUE ambient; - D3DCOLORVALUE dcvAmbient; - } DUMMYUNIONNAME1; - union { - D3DCOLORVALUE specular; - D3DCOLORVALUE dcvSpecular; - } DUMMYUNIONNAME2; - union { - D3DCOLORVALUE emissive; - D3DCOLORVALUE dcvEmissive; - } DUMMYUNIONNAME3; - union { - D3DVALUE power; - D3DVALUE dvPower; - } DUMMYUNIONNAME4; -} D3DMATERIAL7, *LPD3DMATERIAL7; - -typedef enum { - D3DLIGHT_POINT = 1, - D3DLIGHT_SPOT = 2, - D3DLIGHT_DIRECTIONAL = 3, - D3DLIGHT_PARALLELPOINT = 4, - D3DLIGHT_GLSPOT = 5, - D3DLIGHT_FORCE_DWORD = 0x7fffffff -} D3DLIGHTTYPE; - -typedef struct _D3DLIGHT { - DWORD dwSize; - D3DLIGHTTYPE dltType; - D3DCOLORVALUE dcvColor; - D3DVECTOR dvPosition; - D3DVECTOR dvDirection; - D3DVALUE dvRange; - D3DVALUE dvFalloff; - D3DVALUE dvAttenuation0; - D3DVALUE dvAttenuation1; - D3DVALUE dvAttenuation2; - D3DVALUE dvTheta; - D3DVALUE dvPhi; -} D3DLIGHT,*LPD3DLIGHT; - -typedef struct _D3DLIGHT7 { - D3DLIGHTTYPE dltType; - D3DCOLORVALUE dcvDiffuse; - D3DCOLORVALUE dcvSpecular; - D3DCOLORVALUE dcvAmbient; - D3DVECTOR dvPosition; - D3DVECTOR dvDirection; - D3DVALUE dvRange; - D3DVALUE dvFalloff; - D3DVALUE dvAttenuation0; - D3DVALUE dvAttenuation1; - D3DVALUE dvAttenuation2; - D3DVALUE dvTheta; - D3DVALUE dvPhi; -} D3DLIGHT7, *LPD3DLIGHT7; - -#define D3DLIGHT_ACTIVE 0x00000001 -#define D3DLIGHT_NO_SPECULAR 0x00000002 -#define D3DLIGHT_ALL (D3DLIGHT_ACTIVE | D3DLIGHT_NO_SPECULAR) /* 0x3 */ - -#define D3DLIGHT_RANGE_MAX ((float)sqrt(FLT_MAX)) - -typedef struct _D3DLIGHT2 { - DWORD dwSize; - D3DLIGHTTYPE dltType; - D3DCOLORVALUE dcvColor; - D3DVECTOR dvPosition; - D3DVECTOR dvDirection; - D3DVALUE dvRange; - D3DVALUE dvFalloff; - D3DVALUE dvAttenuation0; - D3DVALUE dvAttenuation1; - D3DVALUE dvAttenuation2; - D3DVALUE dvTheta; - D3DVALUE dvPhi; - DWORD dwFlags; -} D3DLIGHT2, *LPD3DLIGHT2; - -typedef struct _D3DLIGHTDATA { - DWORD dwSize; - LPD3DLIGHTINGELEMENT lpIn; - DWORD dwInSize; - LPD3DTLVERTEX lpOut; - DWORD dwOutSize; -} D3DLIGHTDATA, *LPD3DLIGHTDATA; - -#define D3DCOLOR_MONO 1 -#define D3DCOLOR_RGB 2 - -typedef DWORD D3DCOLORMODEL; - - -#define D3DCLEAR_TARGET 0x00000001 -#define D3DCLEAR_ZBUFFER 0x00000002 -#define D3DCLEAR_STENCIL 0x00000004 - -typedef enum _D3DOPCODE { - D3DOP_POINT = 1, - D3DOP_LINE = 2, - D3DOP_TRIANGLE = 3, - D3DOP_MATRIXLOAD = 4, - D3DOP_MATRIXMULTIPLY = 5, - D3DOP_STATETRANSFORM = 6, - D3DOP_STATELIGHT = 7, - D3DOP_STATERENDER = 8, - D3DOP_PROCESSVERTICES = 9, - D3DOP_TEXTURELOAD = 10, - D3DOP_EXIT = 11, - D3DOP_BRANCHFORWARD = 12, - D3DOP_SPAN = 13, - D3DOP_SETSTATUS = 14, - - D3DOP_FORCE_DWORD = 0x7fffffff -} D3DOPCODE; - -typedef struct _D3DINSTRUCTION { - BYTE bOpcode; - BYTE bSize; - WORD wCount; -} D3DINSTRUCTION, *LPD3DINSTRUCTION; - -typedef struct _D3DTEXTURELOAD { - D3DTEXTUREHANDLE hDestTexture; - D3DTEXTUREHANDLE hSrcTexture; -} D3DTEXTURELOAD, *LPD3DTEXTURELOAD; - -typedef struct _D3DPICKRECORD { - BYTE bOpcode; - BYTE bPad; - DWORD dwOffset; - D3DVALUE dvZ; -} D3DPICKRECORD, *LPD3DPICKRECORD; - -typedef enum { - D3DSHADE_FLAT = 1, - D3DSHADE_GOURAUD = 2, - D3DSHADE_PHONG = 3, - D3DSHADE_FORCE_DWORD = 0x7fffffff -} D3DSHADEMODE; - -typedef enum { - D3DFILL_POINT = 1, - D3DFILL_WIREFRAME = 2, - D3DFILL_SOLID = 3, - D3DFILL_FORCE_DWORD = 0x7fffffff -} D3DFILLMODE; - -typedef struct _D3DLINEPATTERN { - WORD wRepeatFactor; - WORD wLinePattern; -} D3DLINEPATTERN; - -typedef enum { - D3DFILTER_NEAREST = 1, - D3DFILTER_LINEAR = 2, - D3DFILTER_MIPNEAREST = 3, - D3DFILTER_MIPLINEAR = 4, - D3DFILTER_LINEARMIPNEAREST = 5, - D3DFILTER_LINEARMIPLINEAR = 6, - D3DFILTER_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREFILTER; - -typedef enum { - D3DBLEND_ZERO = 1, - D3DBLEND_ONE = 2, - D3DBLEND_SRCCOLOR = 3, - D3DBLEND_INVSRCCOLOR = 4, - D3DBLEND_SRCALPHA = 5, - D3DBLEND_INVSRCALPHA = 6, - D3DBLEND_DESTALPHA = 7, - D3DBLEND_INVDESTALPHA = 8, - D3DBLEND_DESTCOLOR = 9, - D3DBLEND_INVDESTCOLOR = 10, - D3DBLEND_SRCALPHASAT = 11, - D3DBLEND_BOTHSRCALPHA = 12, - D3DBLEND_BOTHINVSRCALPHA = 13, - D3DBLEND_FORCE_DWORD = 0x7fffffff -} D3DBLEND; - -typedef enum { - D3DTBLEND_DECAL = 1, - D3DTBLEND_MODULATE = 2, - D3DTBLEND_DECALALPHA = 3, - D3DTBLEND_MODULATEALPHA = 4, - D3DTBLEND_DECALMASK = 5, - D3DTBLEND_MODULATEMASK = 6, - D3DTBLEND_COPY = 7, - D3DTBLEND_ADD = 8, - D3DTBLEND_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREBLEND; - -typedef enum _D3DTEXTUREADDRESS { - D3DTADDRESS_WRAP = 1, - D3DTADDRESS_MIRROR = 2, - D3DTADDRESS_CLAMP = 3, - D3DTADDRESS_BORDER = 4, - D3DTADDRESS_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREADDRESS; - -typedef enum { - D3DCULL_NONE = 1, - D3DCULL_CW = 2, - D3DCULL_CCW = 3, - D3DCULL_FORCE_DWORD = 0x7fffffff -} D3DCULL; - -typedef enum { - D3DCMP_NEVER = 1, - D3DCMP_LESS = 2, - D3DCMP_EQUAL = 3, - D3DCMP_LESSEQUAL = 4, - D3DCMP_GREATER = 5, - D3DCMP_NOTEQUAL = 6, - D3DCMP_GREATEREQUAL = 7, - D3DCMP_ALWAYS = 8, - D3DCMP_FORCE_DWORD = 0x7fffffff -} D3DCMPFUNC; - -typedef enum _D3DSTENCILOP { - D3DSTENCILOP_KEEP = 1, - D3DSTENCILOP_ZERO = 2, - D3DSTENCILOP_REPLACE = 3, - D3DSTENCILOP_INCRSAT = 4, - D3DSTENCILOP_DECRSAT = 5, - D3DSTENCILOP_INVERT = 6, - D3DSTENCILOP_INCR = 7, - D3DSTENCILOP_DECR = 8, - D3DSTENCILOP_FORCE_DWORD = 0x7fffffff -} D3DSTENCILOP; - -typedef enum _D3DFOGMODE { - D3DFOG_NONE = 0, - D3DFOG_EXP = 1, - D3DFOG_EXP2 = 2, - D3DFOG_LINEAR = 3, - D3DFOG_FORCE_DWORD = 0x7fffffff -} D3DFOGMODE; - -typedef enum _D3DZBUFFERTYPE { - D3DZB_FALSE = 0, - D3DZB_TRUE = 1, - D3DZB_USEW = 2, - D3DZB_FORCE_DWORD = 0x7fffffff -} D3DZBUFFERTYPE; - -typedef enum _D3DANTIALIASMODE { - D3DANTIALIAS_NONE = 0, - D3DANTIALIAS_SORTDEPENDENT = 1, - D3DANTIALIAS_SORTINDEPENDENT = 2, - D3DANTIALIAS_FORCE_DWORD = 0x7fffffff -} D3DANTIALIASMODE; - -typedef enum { - D3DVT_VERTEX = 1, - D3DVT_LVERTEX = 2, - D3DVT_TLVERTEX = 3, - D3DVT_FORCE_DWORD = 0x7fffffff -} D3DVERTEXTYPE; - -typedef enum { - D3DPT_POINTLIST = 1, - D3DPT_LINELIST = 2, - D3DPT_LINESTRIP = 3, - D3DPT_TRIANGLELIST = 4, - D3DPT_TRIANGLESTRIP = 5, - D3DPT_TRIANGLEFAN = 6, - D3DPT_FORCE_DWORD = 0x7fffffff -} D3DPRIMITIVETYPE; - -#define D3DSTATE_OVERRIDE_BIAS 256 - -#define D3DSTATE_OVERRIDE(type) (D3DRENDERSTATETYPE)(((DWORD) (type) + D3DSTATE_OVERRIDE_BIAS)) - -typedef enum _D3DTRANSFORMSTATETYPE { - D3DTRANSFORMSTATE_WORLD = 1, - D3DTRANSFORMSTATE_VIEW = 2, - D3DTRANSFORMSTATE_PROJECTION = 3, - D3DTRANSFORMSTATE_WORLD1 = 4, - D3DTRANSFORMSTATE_WORLD2 = 5, - D3DTRANSFORMSTATE_WORLD3 = 6, - D3DTRANSFORMSTATE_TEXTURE0 = 16, - D3DTRANSFORMSTATE_TEXTURE1 = 17, - D3DTRANSFORMSTATE_TEXTURE2 = 18, - D3DTRANSFORMSTATE_TEXTURE3 = 19, - D3DTRANSFORMSTATE_TEXTURE4 = 20, - D3DTRANSFORMSTATE_TEXTURE5 = 21, - D3DTRANSFORMSTATE_TEXTURE6 = 22, - D3DTRANSFORMSTATE_TEXTURE7 = 23, - D3DTRANSFORMSTATE_FORCE_DWORD = 0x7fffffff -} D3DTRANSFORMSTATETYPE; - -typedef enum { - D3DLIGHTSTATE_MATERIAL = 1, - D3DLIGHTSTATE_AMBIENT = 2, - D3DLIGHTSTATE_COLORMODEL = 3, - D3DLIGHTSTATE_FOGMODE = 4, - D3DLIGHTSTATE_FOGSTART = 5, - D3DLIGHTSTATE_FOGEND = 6, - D3DLIGHTSTATE_FOGDENSITY = 7, - D3DLIGHTSTATE_COLORVERTEX = 8, - D3DLIGHTSTATE_FORCE_DWORD = 0x7fffffff -} D3DLIGHTSTATETYPE; - -typedef enum { - D3DRENDERSTATE_TEXTUREHANDLE = 1, - D3DRENDERSTATE_ANTIALIAS = 2, - D3DRENDERSTATE_TEXTUREADDRESS = 3, - D3DRENDERSTATE_TEXTUREPERSPECTIVE = 4, - D3DRENDERSTATE_WRAPU = 5, - D3DRENDERSTATE_WRAPV = 6, - D3DRENDERSTATE_ZENABLE = 7, - D3DRENDERSTATE_FILLMODE = 8, - D3DRENDERSTATE_SHADEMODE = 9, - D3DRENDERSTATE_LINEPATTERN = 10, - D3DRENDERSTATE_MONOENABLE = 11, - D3DRENDERSTATE_ROP2 = 12, - D3DRENDERSTATE_PLANEMASK = 13, - D3DRENDERSTATE_ZWRITEENABLE = 14, - D3DRENDERSTATE_ALPHATESTENABLE = 15, - D3DRENDERSTATE_LASTPIXEL = 16, - D3DRENDERSTATE_TEXTUREMAG = 17, - D3DRENDERSTATE_TEXTUREMIN = 18, - D3DRENDERSTATE_SRCBLEND = 19, - D3DRENDERSTATE_DESTBLEND = 20, - D3DRENDERSTATE_TEXTUREMAPBLEND = 21, - D3DRENDERSTATE_CULLMODE = 22, - D3DRENDERSTATE_ZFUNC = 23, - D3DRENDERSTATE_ALPHAREF = 24, - D3DRENDERSTATE_ALPHAFUNC = 25, - D3DRENDERSTATE_DITHERENABLE = 26, - D3DRENDERSTATE_ALPHABLENDENABLE = 27, - D3DRENDERSTATE_FOGENABLE = 28, - D3DRENDERSTATE_SPECULARENABLE = 29, - D3DRENDERSTATE_ZVISIBLE = 30, - D3DRENDERSTATE_SUBPIXEL = 31, - D3DRENDERSTATE_SUBPIXELX = 32, - D3DRENDERSTATE_STIPPLEDALPHA = 33, - D3DRENDERSTATE_FOGCOLOR = 34, - D3DRENDERSTATE_FOGTABLEMODE = 35, - D3DRENDERSTATE_FOGTABLESTART = 36, - D3DRENDERSTATE_FOGTABLEEND = 37, - D3DRENDERSTATE_FOGTABLEDENSITY = 38, - D3DRENDERSTATE_FOGSTART = 36, - D3DRENDERSTATE_FOGEND = 37, - D3DRENDERSTATE_FOGDENSITY = 38, - D3DRENDERSTATE_STIPPLEENABLE = 39, - D3DRENDERSTATE_EDGEANTIALIAS = 40, - D3DRENDERSTATE_COLORKEYENABLE = 41, - D3DRENDERSTATE_BORDERCOLOR = 43, - D3DRENDERSTATE_TEXTUREADDRESSU = 44, - D3DRENDERSTATE_TEXTUREADDRESSV = 45, - D3DRENDERSTATE_MIPMAPLODBIAS = 46, - D3DRENDERSTATE_ZBIAS = 47, - D3DRENDERSTATE_RANGEFOGENABLE = 48, - D3DRENDERSTATE_ANISOTROPY = 49, - D3DRENDERSTATE_FLUSHBATCH = 50, - D3DRENDERSTATE_TRANSLUCENTSORTINDEPENDENT = 51, - - D3DRENDERSTATE_STENCILENABLE = 52, - D3DRENDERSTATE_STENCILFAIL = 53, - D3DRENDERSTATE_STENCILZFAIL = 54, - D3DRENDERSTATE_STENCILPASS = 55, - D3DRENDERSTATE_STENCILFUNC = 56, - D3DRENDERSTATE_STENCILREF = 57, - D3DRENDERSTATE_STENCILMASK = 58, - D3DRENDERSTATE_STENCILWRITEMASK = 59, - D3DRENDERSTATE_TEXTUREFACTOR = 60, - - D3DRENDERSTATE_STIPPLEPATTERN00 = 64, - D3DRENDERSTATE_STIPPLEPATTERN01 = 65, - D3DRENDERSTATE_STIPPLEPATTERN02 = 66, - D3DRENDERSTATE_STIPPLEPATTERN03 = 67, - D3DRENDERSTATE_STIPPLEPATTERN04 = 68, - D3DRENDERSTATE_STIPPLEPATTERN05 = 69, - D3DRENDERSTATE_STIPPLEPATTERN06 = 70, - D3DRENDERSTATE_STIPPLEPATTERN07 = 71, - D3DRENDERSTATE_STIPPLEPATTERN08 = 72, - D3DRENDERSTATE_STIPPLEPATTERN09 = 73, - D3DRENDERSTATE_STIPPLEPATTERN10 = 74, - D3DRENDERSTATE_STIPPLEPATTERN11 = 75, - D3DRENDERSTATE_STIPPLEPATTERN12 = 76, - D3DRENDERSTATE_STIPPLEPATTERN13 = 77, - D3DRENDERSTATE_STIPPLEPATTERN14 = 78, - D3DRENDERSTATE_STIPPLEPATTERN15 = 79, - D3DRENDERSTATE_STIPPLEPATTERN16 = 80, - D3DRENDERSTATE_STIPPLEPATTERN17 = 81, - D3DRENDERSTATE_STIPPLEPATTERN18 = 82, - D3DRENDERSTATE_STIPPLEPATTERN19 = 83, - D3DRENDERSTATE_STIPPLEPATTERN20 = 84, - D3DRENDERSTATE_STIPPLEPATTERN21 = 85, - D3DRENDERSTATE_STIPPLEPATTERN22 = 86, - D3DRENDERSTATE_STIPPLEPATTERN23 = 87, - D3DRENDERSTATE_STIPPLEPATTERN24 = 88, - D3DRENDERSTATE_STIPPLEPATTERN25 = 89, - D3DRENDERSTATE_STIPPLEPATTERN26 = 90, - D3DRENDERSTATE_STIPPLEPATTERN27 = 91, - D3DRENDERSTATE_STIPPLEPATTERN28 = 92, - D3DRENDERSTATE_STIPPLEPATTERN29 = 93, - D3DRENDERSTATE_STIPPLEPATTERN30 = 94, - D3DRENDERSTATE_STIPPLEPATTERN31 = 95, - - D3DRENDERSTATE_WRAP0 = 128, - D3DRENDERSTATE_WRAP1 = 129, - D3DRENDERSTATE_WRAP2 = 130, - D3DRENDERSTATE_WRAP3 = 131, - D3DRENDERSTATE_WRAP4 = 132, - D3DRENDERSTATE_WRAP5 = 133, - D3DRENDERSTATE_WRAP6 = 134, - D3DRENDERSTATE_WRAP7 = 135, - D3DRENDERSTATE_CLIPPING = 136, - D3DRENDERSTATE_LIGHTING = 137, - D3DRENDERSTATE_EXTENTS = 138, - D3DRENDERSTATE_AMBIENT = 139, - D3DRENDERSTATE_FOGVERTEXMODE = 140, - D3DRENDERSTATE_COLORVERTEX = 141, - D3DRENDERSTATE_LOCALVIEWER = 142, - D3DRENDERSTATE_NORMALIZENORMALS = 143, - D3DRENDERSTATE_COLORKEYBLENDENABLE = 144, - D3DRENDERSTATE_DIFFUSEMATERIALSOURCE = 145, - D3DRENDERSTATE_SPECULARMATERIALSOURCE = 146, - D3DRENDERSTATE_AMBIENTMATERIALSOURCE = 147, - D3DRENDERSTATE_EMISSIVEMATERIALSOURCE = 148, - D3DRENDERSTATE_VERTEXBLEND = 151, - D3DRENDERSTATE_CLIPPLANEENABLE = 152, - - D3DRENDERSTATE_FORCE_DWORD = 0x7fffffff - - /* FIXME: We have some retired values that are being reused for DirectX 7 */ -} D3DRENDERSTATETYPE; - -typedef enum _D3DMATERIALCOLORSOURCE -{ - D3DMCS_MATERIAL = 0, - D3DMCS_COLOR1 = 1, - D3DMCS_COLOR2 = 2, - D3DMCS_FORCE_DWORD = 0x7fffffff -} D3DMATERIALCOLORSOURCE; - -#define D3DRENDERSTATE_BLENDENABLE D3DRENDERSTATE_ALPHABLENDENABLE -#define D3DRENDERSTATE_WRAPBIAS 128UL -#define D3DWRAP_U 0x00000001L -#define D3DWRAP_V 0x00000002L - -#define D3DWRAPCOORD_0 0x00000001L -#define D3DWRAPCOORD_1 0x00000002L -#define D3DWRAPCOORD_2 0x00000004L -#define D3DWRAPCOORD_3 0x00000008L - -#define D3DRENDERSTATE_STIPPLEPATTERN(y) (D3DRENDERSTATE_STIPPLEPATTERN00 + (y)) - -typedef struct _D3DSTATE { - union { - D3DTRANSFORMSTATETYPE dtstTransformStateType; - D3DLIGHTSTATETYPE dlstLightStateType; - D3DRENDERSTATETYPE drstRenderStateType; - } DUMMYUNIONNAME1; - union { - DWORD dwArg[1]; - D3DVALUE dvArg[1]; - } DUMMYUNIONNAME2; -} D3DSTATE, *LPD3DSTATE; - -typedef struct _D3DMATRIXLOAD { - D3DMATRIXHANDLE hDestMatrix; - D3DMATRIXHANDLE hSrcMatrix; -} D3DMATRIXLOAD, *LPD3DMATRIXLOAD; - -typedef struct _D3DMATRIXMULTIPLY { - D3DMATRIXHANDLE hDestMatrix; - D3DMATRIXHANDLE hSrcMatrix1; - D3DMATRIXHANDLE hSrcMatrix2; -} D3DMATRIXMULTIPLY, *LPD3DMATRIXMULTIPLY; - -typedef struct _D3DPROCESSVERTICES { - DWORD dwFlags; - WORD wStart; - WORD wDest; - DWORD dwCount; - DWORD dwReserved; -} D3DPROCESSVERTICES, *LPD3DPROCESSVERTICES; - -#define D3DPROCESSVERTICES_TRANSFORMLIGHT 0x00000000L -#define D3DPROCESSVERTICES_TRANSFORM 0x00000001L -#define D3DPROCESSVERTICES_COPY 0x00000002L -#define D3DPROCESSVERTICES_OPMASK 0x00000007L - -#define D3DPROCESSVERTICES_UPDATEEXTENTS 0x00000008L -#define D3DPROCESSVERTICES_NOCOLOR 0x00000010L - -typedef enum _D3DTEXTURESTAGESTATETYPE -{ - D3DTSS_COLOROP = 1, - D3DTSS_COLORARG1 = 2, - D3DTSS_COLORARG2 = 3, - D3DTSS_ALPHAOP = 4, - D3DTSS_ALPHAARG1 = 5, - D3DTSS_ALPHAARG2 = 6, - D3DTSS_BUMPENVMAT00 = 7, - D3DTSS_BUMPENVMAT01 = 8, - D3DTSS_BUMPENVMAT10 = 9, - D3DTSS_BUMPENVMAT11 = 10, - D3DTSS_TEXCOORDINDEX = 11, - D3DTSS_ADDRESS = 12, - D3DTSS_ADDRESSU = 13, - D3DTSS_ADDRESSV = 14, - D3DTSS_BORDERCOLOR = 15, - D3DTSS_MAGFILTER = 16, - D3DTSS_MINFILTER = 17, - D3DTSS_MIPFILTER = 18, - D3DTSS_MIPMAPLODBIAS = 19, - D3DTSS_MAXMIPLEVEL = 20, - D3DTSS_MAXANISOTROPY = 21, - D3DTSS_BUMPENVLSCALE = 22, - D3DTSS_BUMPENVLOFFSET = 23, - D3DTSS_TEXTURETRANSFORMFLAGS = 24, - D3DTSS_FORCE_DWORD = 0x7fffffff -} D3DTEXTURESTAGESTATETYPE; - -#define D3DTSS_TCI_PASSTHRU 0x00000000 -#define D3DTSS_TCI_CAMERASPACENORMAL 0x00010000 -#define D3DTSS_TCI_CAMERASPACEPOSITION 0x00020000 -#define D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x00030000 - -typedef enum _D3DTEXTUREOP -{ - D3DTOP_DISABLE = 1, - D3DTOP_SELECTARG1 = 2, - D3DTOP_SELECTARG2 = 3, - - D3DTOP_MODULATE = 4, - D3DTOP_MODULATE2X = 5, - D3DTOP_MODULATE4X = 6, - - D3DTOP_ADD = 7, - D3DTOP_ADDSIGNED = 8, - D3DTOP_ADDSIGNED2X = 9, - D3DTOP_SUBTRACT = 10, - D3DTOP_ADDSMOOTH = 11, - - D3DTOP_BLENDDIFFUSEALPHA = 12, - D3DTOP_BLENDTEXTUREALPHA = 13, - D3DTOP_BLENDFACTORALPHA = 14, - D3DTOP_BLENDTEXTUREALPHAPM = 15, - D3DTOP_BLENDCURRENTALPHA = 16, - - D3DTOP_PREMODULATE = 17, - D3DTOP_MODULATEALPHA_ADDCOLOR = 18, - D3DTOP_MODULATECOLOR_ADDALPHA = 19, - D3DTOP_MODULATEINVALPHA_ADDCOLOR = 20, - D3DTOP_MODULATEINVCOLOR_ADDALPHA = 21, - - D3DTOP_BUMPENVMAP = 22, - D3DTOP_BUMPENVMAPLUMINANCE = 23, - D3DTOP_DOTPRODUCT3 = 24, - - D3DTOP_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREOP; - -#define D3DTA_SELECTMASK 0x0000000f -#define D3DTA_DIFFUSE 0x00000000 -#define D3DTA_CURRENT 0x00000001 -#define D3DTA_TEXTURE 0x00000002 -#define D3DTA_TFACTOR 0x00000003 -#define D3DTA_SPECULAR 0x00000004 -#define D3DTA_COMPLEMENT 0x00000010 -#define D3DTA_ALPHAREPLICATE 0x00000020 - -typedef enum _D3DTEXTUREMAGFILTER -{ - D3DTFG_POINT = 1, - D3DTFG_LINEAR = 2, - D3DTFG_FLATCUBIC = 3, - D3DTFG_GAUSSIANCUBIC = 4, - D3DTFG_ANISOTROPIC = 5, - D3DTFG_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREMAGFILTER; - -typedef enum _D3DTEXTUREMINFILTER -{ - D3DTFN_POINT = 1, - D3DTFN_LINEAR = 2, - D3DTFN_ANISOTROPIC = 3, - D3DTFN_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREMINFILTER; - -typedef enum _D3DTEXTUREMIPFILTER -{ - D3DTFP_NONE = 1, - D3DTFP_POINT = 2, - D3DTFP_LINEAR = 3, - D3DTFP_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREMIPFILTER; - -#define D3DTRIFLAG_START 0x00000000L -#define D3DTRIFLAG_STARTFLAT(len) (len) -#define D3DTRIFLAG_ODD 0x0000001eL -#define D3DTRIFLAG_EVEN 0x0000001fL - -#define D3DTRIFLAG_EDGEENABLE1 0x00000100L -#define D3DTRIFLAG_EDGEENABLE2 0x00000200L -#define D3DTRIFLAG_EDGEENABLE3 0x00000400L -#define D3DTRIFLAG_EDGEENABLETRIANGLE \ - (D3DTRIFLAG_EDGEENABLE1 | D3DTRIFLAG_EDGEENABLE2 | D3DTRIFLAG_EDGEENABLE3) - -typedef struct _D3DTRIANGLE { - union { - WORD v1; - WORD wV1; - } DUMMYUNIONNAME1; - union { - WORD v2; - WORD wV2; - } DUMMYUNIONNAME2; - union { - WORD v3; - WORD wV3; - } DUMMYUNIONNAME3; - WORD wFlags; -} D3DTRIANGLE, *LPD3DTRIANGLE; - -typedef struct _D3DLINE { - union { - WORD v1; - WORD wV1; - } DUMMYUNIONNAME1; - union { - WORD v2; - WORD wV2; - } DUMMYUNIONNAME2; -} D3DLINE, *LPD3DLINE; - -typedef struct _D3DSPAN { - WORD wCount; - WORD wFirst; -} D3DSPAN, *LPD3DSPAN; - -typedef struct _D3DPOINT { - WORD wCount; - WORD wFirst; -} D3DPOINT, *LPD3DPOINT; - -typedef struct _D3DBRANCH { - DWORD dwMask; - DWORD dwValue; - BOOL bNegate; - DWORD dwOffset; -} D3DBRANCH, *LPD3DBRANCH; - -typedef struct _D3DSTATUS { - DWORD dwFlags; - DWORD dwStatus; - D3DRECT drExtent; -} D3DSTATUS, *LPD3DSTATUS; - -#define D3DSETSTATUS_STATUS 0x00000001L -#define D3DSETSTATUS_EXTENTS 0x00000002L -#define D3DSETSTATUS_ALL (D3DSETSTATUS_STATUS | D3DSETSTATUS_EXTENTS) - -typedef struct _D3DCLIPSTATUS { - DWORD dwFlags; - DWORD dwStatus; - float minx, maxx; - float miny, maxy; - float minz, maxz; -} D3DCLIPSTATUS, *LPD3DCLIPSTATUS; - -#define D3DCLIPSTATUS_STATUS 0x00000001L -#define D3DCLIPSTATUS_EXTENTS2 0x00000002L -#define D3DCLIPSTATUS_EXTENTS3 0x00000004L - -typedef struct { - DWORD dwSize; - DWORD dwTrianglesDrawn; - DWORD dwLinesDrawn; - DWORD dwPointsDrawn; - DWORD dwSpansDrawn; - DWORD dwVerticesProcessed; -} D3DSTATS, *LPD3DSTATS; - -#define D3DEXECUTE_CLIPPED 0x00000001l -#define D3DEXECUTE_UNCLIPPED 0x00000002l - -typedef struct _D3DEXECUTEDATA { - DWORD dwSize; - DWORD dwVertexOffset; - DWORD dwVertexCount; - DWORD dwInstructionOffset; - DWORD dwInstructionLength; - DWORD dwHVertexOffset; - D3DSTATUS dsStatus; -} D3DEXECUTEDATA, *LPD3DEXECUTEDATA; - -#define D3DPAL_FREE 0x00 -#define D3DPAL_READONLY 0x40 -#define D3DPAL_RESERVED 0x80 - -typedef struct _D3DVERTEXBUFFERDESC { - DWORD dwSize; - DWORD dwCaps; - DWORD dwFVF; - DWORD dwNumVertices; -} D3DVERTEXBUFFERDESC, *LPD3DVERTEXBUFFERDESC; - -#define D3DVBCAPS_SYSTEMMEMORY 0x00000800l -#define D3DVBCAPS_WRITEONLY 0x00010000l -#define D3DVBCAPS_OPTIMIZED 0x80000000l -#define D3DVBCAPS_DONOTCLIP 0x00000001l - -#define D3DVOP_LIGHT (1 << 10) -#define D3DVOP_TRANSFORM (1 << 0) -#define D3DVOP_CLIP (1 << 2) -#define D3DVOP_EXTENTS (1 << 3) - -#define D3DMAXNUMVERTICES ((1<<16) - 1) - -#define D3DMAXNUMPRIMITIVES ((1<<16) - 1) - -#define D3DPV_DONOTCOPYDATA (1 << 0) - -#define D3DFVF_RESERVED0 0x001 -#define D3DFVF_POSITION_MASK 0x00E -#define D3DFVF_XYZ 0x002 -#define D3DFVF_XYZRHW 0x004 -#define D3DFVF_XYZB1 0x006 -#define D3DFVF_XYZB2 0x008 -#define D3DFVF_XYZB3 0x00a -#define D3DFVF_XYZB4 0x00c -#define D3DFVF_XYZB5 0x00e - -#define D3DFVF_NORMAL 0x010 -#define D3DFVF_RESERVED1 0x020 -#define D3DFVF_DIFFUSE 0x040 -#define D3DFVF_SPECULAR 0x080 -#define D3DFVF_TEXCOUNT_MASK 0xf00 -#define D3DFVF_TEXCOUNT_SHIFT 8 -#define D3DFVF_TEX0 0x000 -#define D3DFVF_TEX1 0x100 -#define D3DFVF_TEX2 0x200 -#define D3DFVF_TEX3 0x300 -#define D3DFVF_TEX4 0x400 -#define D3DFVF_TEX5 0x500 -#define D3DFVF_TEX6 0x600 -#define D3DFVF_TEX7 0x700 -#define D3DFVF_TEX8 0x800 - -#define D3DFVF_RESERVED2 0xf000 - -#define D3DFVF_VERTEX ( D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_TEX1 ) -#define D3DFVF_LVERTEX ( D3DFVF_XYZ | D3DFVF_RESERVED1 | D3DFVF_DIFFUSE | \ - D3DFVF_SPECULAR | D3DFVF_TEX1 ) -#define D3DFVF_TLVERTEX ( D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | \ - D3DFVF_TEX1 ) - -typedef struct _D3DDP_PTRSTRIDE { - LPVOID lpvData; - DWORD dwStride; -} D3DDP_PTRSTRIDE; - -#define D3DDP_MAXTEXCOORD 8 - -typedef struct _D3DDRAWPRIMITIVESTRIDEDDATA { - D3DDP_PTRSTRIDE position; - D3DDP_PTRSTRIDE normal; - D3DDP_PTRSTRIDE diffuse; - D3DDP_PTRSTRIDE specular; - D3DDP_PTRSTRIDE textureCoords[D3DDP_MAXTEXCOORD]; -} D3DDRAWPRIMITIVESTRIDEDDATA ,*LPD3DDRAWPRIMITIVESTRIDEDDATA; - -#define D3DVIS_INSIDE_FRUSTUM 0 -#define D3DVIS_INTERSECT_FRUSTUM 1 -#define D3DVIS_OUTSIDE_FRUSTUM 2 -#define D3DVIS_INSIDE_LEFT 0 -#define D3DVIS_INTERSECT_LEFT (1 << 2) -#define D3DVIS_OUTSIDE_LEFT (2 << 2) -#define D3DVIS_INSIDE_RIGHT 0 -#define D3DVIS_INTERSECT_RIGHT (1 << 4) -#define D3DVIS_OUTSIDE_RIGHT (2 << 4) -#define D3DVIS_INSIDE_TOP 0 -#define D3DVIS_INTERSECT_TOP (1 << 6) -#define D3DVIS_OUTSIDE_TOP (2 << 6) -#define D3DVIS_INSIDE_BOTTOM 0 -#define D3DVIS_INTERSECT_BOTTOM (1 << 8) -#define D3DVIS_OUTSIDE_BOTTOM (2 << 8) -#define D3DVIS_INSIDE_NEAR 0 -#define D3DVIS_INTERSECT_NEAR (1 << 10) -#define D3DVIS_OUTSIDE_NEAR (2 << 10) -#define D3DVIS_INSIDE_FAR 0 -#define D3DVIS_INTERSECT_FAR (1 << 12) -#define D3DVIS_OUTSIDE_FAR (2 << 12) - -#define D3DVIS_MASK_FRUSTUM (3 << 0) -#define D3DVIS_MASK_LEFT (3 << 2) -#define D3DVIS_MASK_RIGHT (3 << 4) -#define D3DVIS_MASK_TOP (3 << 6) -#define D3DVIS_MASK_BOTTOM (3 << 8) -#define D3DVIS_MASK_NEAR (3 << 10) -#define D3DVIS_MASK_FAR (3 << 12) - -#define D3DDEVINFOID_TEXTUREMANAGER 1 -#define D3DDEVINFOID_D3DTEXTUREMANAGER 2 -#define D3DDEVINFOID_TEXTURING 3 - -typedef enum _D3DSTATEBLOCKTYPE -{ - D3DSBT_ALL = 1, - D3DSBT_PIXELSTATE = 2, - D3DSBT_VERTEXSTATE = 3, - D3DSBT_FORCE_DWORD = 0xffffffff -} D3DSTATEBLOCKTYPE; - -typedef enum _D3DVERTEXBLENDFLAGS -{ - D3DVBLEND_DISABLE = 0, - D3DVBLEND_1WEIGHT = 1, - D3DVBLEND_2WEIGHTS = 2, - D3DVBLEND_3WEIGHTS = 3, -} D3DVERTEXBLENDFLAGS; - -typedef enum _D3DTEXTURETRANSFORMFLAGS { - D3DTTFF_DISABLE = 0, - D3DTTFF_COUNT1 = 1, - D3DTTFF_COUNT2 = 2, - D3DTTFF_COUNT3 = 3, - D3DTTFF_COUNT4 = 4, - D3DTTFF_PROJECTED = 256, - D3DTTFF_FORCE_DWORD = 0x7fffffff -} D3DTEXTURETRANSFORMFLAGS; - -#define D3DFVF_TEXTUREFORMAT2 0 -#define D3DFVF_TEXTUREFORMAT1 3 -#define D3DFVF_TEXTUREFORMAT3 1 -#define D3DFVF_TEXTUREFORMAT4 2 - -#define D3DFVF_TEXCOORDSIZE3(CoordIndex) (D3DFVF_TEXTUREFORMAT3 << (CoordIndex*2 + 16)) -#define D3DFVF_TEXCOORDSIZE2(CoordIndex) (D3DFVF_TEXTUREFORMAT2) -#define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) -#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) - -#endif

1 0

[dreimer] 27547: Set eol:style native
by dreimer＠svn.reactos.org 09 Jul '07

09 Jul '07

Author: dreimer Date: Mon Jul 9 22:11:53 2007 New Revision: 27547 URL: http://svn.reactos.org/svn/reactos?rev=27547&view=rev Log: Set eol:style native Modified: trunk/reactos/base/applications/control/lang/sk-SK.rc (contents, props changed) trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc (contents, props changed) trunk/reactos/base/setup/reactos/lang/sk-SK.rc (contents, props changed) trunk/reactos/base/setup/welcome/lang/sk-SK.rc (contents, props changed) Modified: trunk/reactos/base/applications/control/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/control/lang/sk-SK.rc Mon Jul 9 22:11:53 2007 @@ -1,27 +1,27 @@ -// Slovak language resource file (Kario, 2007-02-25) <kario(a)szm.sk> - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Súbor" - BEGIN - MENUITEM "&Zavrie", IDM_CLOSE - END - POPUP "&Zobrazenia" - BEGIN - MENUITEM "&Ve¾ké ikony", IDM_LARGEICONS - MENUITEM "&Malé ikony", IDM_SMALLICONS - MENUITEM "&Zoznam", IDM_LIST - MENUITEM "&Podrobnosti", IDM_DETAILS - END - POPUP "&Pomocník" - BEGIN - MENUITEM "È&o je...", IDM_ABOUT - END -END +// Slovak language resource file (Kario, 2007-02-25) <kario(a)szm.sk> + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Zavrie", IDM_CLOSE + END + POPUP "&Zobrazenia" + BEGIN + MENUITEM "&Ve¾ké ikony", IDM_LARGEICONS + MENUITEM "&Malé ikony", IDM_SMALLICONS + MENUITEM "&Zoznam", IDM_LIST + MENUITEM "&Podrobnosti", IDM_DETAILS + END + POPUP "&Pomocník" + BEGIN + MENUITEM "È&o je...", IDM_ABOUT + END +END Propchange: trunk/reactos/base/applications/control/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc Mon Jul 9 22:11:53 2007 @@ -1,144 +1,144 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Slovak translation by Kario 2007 <kario(a)szm.sk> - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Zrui",IDCANCEL,129,24,50,14 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_MENU1 MENU DISCARDABLE -BEGIN - POPUP "&Hra" - BEGIN - MENUITEM "&Rozda\tF2", IDM_GAME_NEW - MENUITEM SEPARATOR - MENUITEM "&Balíèek...", IDM_GAME_DECK - MENUITEM "&Monosti...", IDM_GAME_OPTIONS - MENUITEM SEPARATOR - MENUITEM "Sk&onèi", IDM_GAME_EXIT - END - POPUP "&Pomocník" - BEGIN - MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS - MENUITEM "&Èo je Solitaire", IDM_HELP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE -BEGIN - VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT - VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Slovak resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Slovak translation by Kario 2007 <kario(a)szm.sk> + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Zrui",IDCANCEL,129,24,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Hra" + BEGIN + MENUITEM "&Rozda\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Balíèek...", IDM_GAME_DECK + MENUITEM "&Monosti...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "Sk&onèi", IDM_GAME_EXIT + END + POPUP "&Pomocník" + BEGIN + MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS + MENUITEM "&Èo je Solitaire", IDM_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // Slovak resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/applications/games/solitaire/lang/sk-Sk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc Mon Jul 9 22:11:53 2007 @@ -1,12 +1,12 @@ -// Slovak translation by Kario 2007 <kario(a)szm.sk> - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -/* String Tables */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_CAPTION "Intalácia ReactOS" - IDS_TEXT "ReactOS sa z tohto CD nedá naintalova hneï teraz!\n\nRetartujte prosím poèítaè s vloeným CD, aby sa mohol ReactOS naitalova." -END - -/* EOF */ +// Slovak translation by Kario 2007 <kario(a)szm.sk> + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Intalácia ReactOS" + IDS_TEXT "ReactOS sa z tohto CD nedá naintalova hneï teraz!\n\nRetartujte prosím poèítaè s vloeným CD, aby sa mohol ReactOS naitalova." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/reactos/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sk… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/sk-SK.rc (original) +++ trunk/reactos/base/setup/welcome/lang/sk-SK.rc Mon Jul 9 22:11:53 2007 @@ -1,62 +1,62 @@ -// Slovak translation by Kario 2007 <kario(a)szm.sk> - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Vitajte" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Vitajte v operaènom systéme ReactOS.\n\nKliknite na tlaèidlo v ¾avom ståpci." -// IDS_CHECKTEXT "Zobrazi toto okno aj nabudúce" -// IDS_CLOSETEXT "Koniec" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Intalova ReactOS" - IDS_TOPICBUTTON1 "Prezera toto CD" - IDS_TOPICBUTTON2 "Koniec" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Intalova ReactOS" - IDS_TOPICTITLE1 "Prezera toto CD" - IDS_TOPICTITLE2 "Koniec" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Naintaluje ReactOS na Vá poèítaè alebo zaktualizuje u existujúci systém." - IDS_TOPICDESC1 "Prezera toto CD." - IDS_TOPICDESC2 "Kliknutím ukonèíte tento program." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ +// Slovak translation by Kario 2007 <kario(a)szm.sk> + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - Vitajte" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "Vitajte v operaènom systéme ReactOS.\n\nKliknite na tlaèidlo v ¾avom ståpci." +// IDS_CHECKTEXT "Zobrazi toto okno aj nabudúce" +// IDS_CLOSETEXT "Koniec" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "Intalova ReactOS" + IDS_TOPICBUTTON1 "Prezera toto CD" + IDS_TOPICBUTTON2 "Koniec" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "Intalova ReactOS" + IDS_TOPICTITLE1 "Prezera toto CD" + IDS_TOPICTITLE2 "Koniec" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "Naintaluje ReactOS na Vá poèítaè alebo zaktualizuje u existujúci systém." + IDS_TOPICDESC1 "Prezera toto CD." + IDS_TOPICDESC2 "Kliknutím ukonèíte tento program." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/welcome/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
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