Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[dreimer] 37603: Updated changelog. Updated help files. In theory "update status" is meant for startup to show new updates, but not with my sloooow webspace. So, this is skipped for now.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 23 17:46:24 2008 New Revision: 37603 URL: http://svn.reactos.org/svn/reactos?rev=37603&view=rev Log: Updated changelog. Updated help files. In theory "update status" is meant for startup to show new updates, but not with my sloooow webspace. So, this is skipped for now. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -236,9 +236,9 @@ " Usage: update [OPTIONS]" " Updates all files of RosBE to the most recent files." "" - " nocmds - Skips the Updating of the Script Files." - " nogcc - Skips the Updating of GCC." - " notools - Skips the Updating of the Tools." + " reset - Removes the Updates Cache. Not recommended." + " nr X - Re/Installs Update Nr X." + " status - Shows the recent status of available, non installed updates." exit } } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -167,6 +167,8 @@ "For a list of all included commands, type: ""help""" "-------------------------------------------------" "" +# IEX "'$_ROSBE_BASEDIR\sSVN.ps1' status" +# "" # # Load the doskey macros that serve as our commands. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -1,3 +1,14 @@ +*** XXX xxth, 200x - RosBE 1.3.1 Released + +- Updated: The Update Utility now does not blindly sync the script files. It loads + complete Update Packs and installs them. (Daniel Reimer) +- Updated: The Powershell Port is now complete. (Daniel Reimer) +- Fixed: Now config adds the ELF Parameter to the config file to and lets you modify + it. Without this param, build is broken. (Daniel Reimer) +- Modified: Changed the default values of config to the previous setting instead of + the real default one if you don't type in anything for a setting. (Daniel Reimer) + + *** October 26th, 2008 - RosBE 1.3 Released - Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -242,9 +242,9 @@ echo Usage: update [OPTIONS] echo Updates all files of RosBE to the most recent files. echo. - echo nocmds - Skips the Updating of the Script Files. - echo nogcc - Skips the Updating of GCC. - echo notools - Skips the Updating of the Tools. + echo reset - Removes the Updates Cache. Not recommended. + echo nr X - Re/Installs Update Nr X. + echo status - Shows the recent status of available, non installed updates. goto :EOC ) ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun Nov 23 17:46:24 2008 @@ -110,6 +110,8 @@ echo For a list of all included commands, type: "help" echo ------------------------------------------------- echo. +REM "%_ROSBE_BASEDIR%\sSVN.cmd" status +REM echo. :: :: Load the doskey macros that serve as our commands.

15 years, 10 months

[dreimer] 37602: Now it works.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 23 17:28:06 2008 New Revision: 37602 URL: http://svn.reactos.org/svn/reactos?rev=37602&view=rev Log: Now it works. Removed: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sun Nov 23 17:28:06 2008 @@ -8,21 +8,10 @@ :: @echo off -setlocal -setlocal enableextensions -setlocal enabledelayedexpansion - if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on ) -set _ROSBE_UPDFINISH=0 -set _ROSBE_OPATH=0 -set _ROSBE_UPDDATE=0 -set _ROSBE_UPDDATE2=0 -set _ROSBE_UPDATES=0 -set _ROSBE_OPATH=%~dp0 -set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% :: :: Set Title @@ -39,6 +28,7 @@ :: ::First check for a new Updater :: +setlocal enabledelayedexpansion for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF @@ -55,6 +45,10 @@ echo Updater got updated and needs to be restarted. goto :EOC ) +endlocal + +set _ROSBE_OPATH=%~dp0 +set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% if not exist "Updates" mkdir Updates 1> NUL 2> NUL cd Updates @@ -63,58 +57,117 @@ :: Parse the args. :: if "%1" == "" ( - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 next - if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 next - goto :EOC + set _ROSBE_MULTIUPD=1 + set _ROSBE_STATCOUNT=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + set /a _ROSBE_STATCOUNT+=1 + call :UPDCHECK + goto :EOC ) if /i "%1" == "reset" ( del /F /Q "%_ROSBE_BASEDIR%\Updates\*.*" 1> NUL 2> NUL goto :EOC ) if /i "%1" == "nr" ( - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" %2 - goto :EOC + set _ROSBE_STATCOUNT=%2 + call :UPDCHECK + goto :EOC ) if /i "%1" == "status" ( mkdir tmp 1> NUL 2> NUL copy *.txt .\tmp\. 1> NUL 2> NUL - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 status - if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) - call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 status + set _ROSBE_STATCOUNT=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + set /a _ROSBE_STATCOUNT+=1 + call :STATUS + goto :UPDFIN ) +:STATUS + +cd tmp +if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% + ) +) +cd.. +goto :EOF + :UPDFIN + del /F /Q tmp\*.* -echo Following Updates available: %_ROSBE_UPDATES% +if not "%_ROSBE_UPDATES%" == "" ( + echo Following Updates available: %_ROSBE_UPDATES% +) else ( + echo RosBE is up to Date. +) +goto :EOC + +:UPDCHECK + +if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL +) +if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( + type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" + echo. + echo Install? + setlocal enabledelayedexpansion + set /p YESNO="(yes), (no)" + if /i "!YESNO!"=="yes" ( + if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z 1> NUL 2> NUL + ) + if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" + cd "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%" + call "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.cmd" + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) + ) else if /i "!YESNO!"=="no" ( + del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL + goto :EOF + ) + endlocal +) else ( + if not "_ROSBE_MULTIUPD" == "1" ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) +) +goto :EOF :EOC @@ -127,4 +180,6 @@ set _ROSBE_OPATH= set _ROSBE_UPDDATE= set _ROSBE_UPDATES= -set _ROSBE_UPDDATE2= +set _ROSBE_UPDDATE2= +set _ROSBE_MULTIUPD= +set _ROSBE_STATCOUNT= Removed: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd (removed) @@ -1,65 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GNU General Public License v2. (see LICENSE.txt) -:: FILE: Root/update.cmd -:: PURPOSE: RosBE Updater. -:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off - -setlocal -setlocal enableextensions -setlocal enabledelayedexpansion - -if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 1 ( - @echo on -) - -if "%2" == "status" ( - cd tmp - if not exist "%_ROSBE_VERSION%-%1.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL - if exist "%_ROSBE_VERSION%-%1.txt" ( - echo %1 - set _ROSBE_UPDATES=%_ROSBE_UPDATES%, %1 - ) else ( - set _ROSBE_UPDFINISH=1 - ) - ) - goto :EOF -) -if not exist "%_ROSBE_VERSION%-%1.txt" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL -) -if exist "%_ROSBE_VERSION%-%1.txt" ( - type "%_ROSBE_VERSION%-%1.txt" - echo. - echo Install? - set /p YESNO="(yes), (no)" - if /i "!YESNO!"=="yes" ( - if not exist "%_ROSBE_VERSION%-%1.7z" ( - "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.7z 1> NUL 2> NUL - ) - if exist "%_ROSBE_VERSION%-%1.7z" ( - "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%1.7z" - cd "%_ROSBE_VERSION%-%1" - call "%_ROSBE_VERSION%-%1.cmd" - ) else ( - echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. - goto :EOF - ) - ) else if /i "!YESNO!"=="no" ( - del "%_ROSBE_VERSION%-%1.txt" 1> NUL 2> NUL - goto :EOF - ) -) else ( - if "%2" == "next" ( - echo set %2 - set _ROSBE_UPDFINISH=1 - ) else ( - echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. - goto :EOF - ) -)

15 years, 10 months

[hyperion] 37601: Allow pseh.h and pseh2.h to be included in the same compilation unit. Mixing PSEH and PSEH 2.0 macros in the same function isn't safe yet, though

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 23 17:00:37 2008 New Revision: 37601 URL: http://svn.reactos.org/svn/reactos?rev=37601&view=rev Log: Allow pseh.h and pseh2.h to be included in the same compilation unit. Mixing PSEH and PSEH 2.0 macros in the same function isn't safe yet, though Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Nov 23 17:00:37 2008 @@ -31,7 +31,7 @@ struct _EXCEPTION_POINTERS; struct _CONTEXT; -typedef int (__cdecl * _SEHFrameHandler_t) +typedef int (__cdecl * _SEH2FrameHandler_t) ( struct _EXCEPTION_RECORD *, void *, @@ -94,12 +94,12 @@ /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") -typedef struct __SEHRegistration -{ - struct __SEHRegistration * SER_Prev; - _SEHFrameHandler_t SER_Handler; -} -_SEHRegistration_t; +typedef struct __SEH2Registration +{ + struct __SEH2Registration * SER_Prev; + _SEH2FrameHandler_t SER_Handler; +} +_SEH2Registration_t; #define __SEH_FORCE_NEST \ __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) @@ -118,24 +118,24 @@ #define __SEH_RETURN_EXCEPT(R_) return (int)(R_) #define __SEH_RETURN_FINALLY() return -typedef struct __SEHFrame -{ - _SEHRegistration_t SF_Registration; - volatile struct __SEHTryLevel * volatile SF_TopTryLevel; +typedef struct __SEH2Frame +{ + _SEH2Registration_t SF_Registration; + volatile struct __SEH2TryLevel * volatile SF_TopTryLevel; void * volatile SF_FramePointer; void * volatile SF_StackPointer; volatile unsigned long SF_Code; } -_SEHFrame_t; - -typedef struct __SEHTryLevel -{ - volatile struct __SEHTryLevel * ST_Next; +_SEH2Frame_t; + +typedef struct __SEH2TryLevel +{ + volatile struct __SEH2TryLevel * ST_Next; void * ST_FramePointer; void * ST_Filter; void * ST_Body; } -_SEHTryLevel_t; +_SEH2TryLevel_t; #define __SEH_BEGIN_TRY \ { \ @@ -157,16 +157,16 @@ #define __SEH_SET_TRYLEVEL(TRYLEVEL_) \ { \ - __SEH_BARRIER; _SEHFrameP->SF_TopTryLevel = (TRYLEVEL_); __SEH_BARRIER; \ + __SEH_BARRIER; _SEH2FrameP->SF_TopTryLevel = (TRYLEVEL_); __SEH_BARRIER; \ } #define __SEH_ENTER_TRYLEVEL() __SEH_SET_TRYLEVEL(&_SEHTryLevel) #define __SEH_LEAVE_TRYLEVEL() __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP) #define __SEH_END_SCOPE_CHAIN \ - static const int _SEHScopeKind = 1; \ - static _SEHFrame_t * const _SEHFrameP = 0; \ - static _SEHTryLevel_t * const _SEHTryLevelP = 0; + static const int _SEH2ScopeKind = 1; \ + static _SEH2Frame_t * const _SEH2FrameP = 0; \ + static _SEH2TryLevel_t * const _SEH2TryLevelP = 0; #define __SEH_BEGIN_SCOPE \ for(;;) \ @@ -176,9 +176,9 @@ \ _SEHBeginScope: __SEH_SIDE_EFFECT; \ \ - const int _SEHTopTryLevel = (_SEHScopeKind != 0); \ - _SEHFrame_t * const _SEHCurFrameP = _SEHFrameP; \ - volatile _SEHTryLevel_t * const _SEHPrevTryLevelP = _SEHTryLevelP; \ + const int _SEHTopTryLevel = (_SEH2ScopeKind != 0); \ + _SEH2Frame_t * const _SEHCurFrameP = _SEH2FrameP; \ + volatile _SEH2TryLevel_t * const _SEHPrevTryLevelP = _SEH2TryLevelP; \ \ (void)_SEHTopTryLevel; \ (void)_SEHCurFrameP; \ @@ -191,17 +191,17 @@ __label__ _SEHBeforeTry; \ __label__ _SEHDoTry; \ __label__ _SEHAfterTry; \ - static const int _SEHScopeKind = 0; \ - _SEHFrame_t _SEHFrame; \ - volatile _SEHTryLevel_t _SEHTryLevel; \ - _SEHFrame_t * const _SEHFrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ - volatile _SEHTryLevel_t * const _SEHTryLevelP = &_SEHTryLevel; \ - \ - (void)_SEHScopeKind; \ + static const int _SEH2ScopeKind = 0; \ + _SEH2Frame_t _SEHFrame; \ + volatile _SEH2TryLevel_t _SEHTryLevel; \ + _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ + volatile _SEH2TryLevel_t * const _SEH2TryLevelP = &_SEHTryLevel; \ + \ + (void)_SEH2ScopeKind; \ (void)_SEHFrame; \ (void)_SEHTryLevel; \ - (void)_SEHFrameP; \ - (void)_SEHTryLevelP; \ + (void)_SEH2FrameP; \ + (void)_SEH2TryLevelP; \ \ _SEHTryLevel.ST_Next = _SEHPrevTryLevelP; \ goto _SEHBeforeTry; \ @@ -274,9 +274,9 @@ { \ __SEH_END_SCOPE_CHAIN; \ \ - (void)_SEHScopeKind; \ - (void)_SEHFrameP; \ - (void)_SEHTryLevelP; \ + (void)_SEH2ScopeKind; \ + (void)_SEH2FrameP; \ + (void)_SEH2TryLevelP; \ \ __SEH_NESTED_PROLOG; \ \ @@ -299,7 +299,7 @@ _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ _SEHTryLevel.ST_Filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEHFrameP->SF_StackPointer)); __SEH_BARRIER; \ + __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEH2FrameP->SF_StackPointer)); __SEH_BARRIER; \ \ goto _SEHDoTry; \ \ @@ -324,8 +324,8 @@ _SEHBeginExcept: __SEH_SIDE_EFFECT; \ { \ { \ - _SEHFrame_t * const _SEHFrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ - (void)_SEHFrameP; \ + _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ + (void)_SEH2FrameP; \ __SEH_BARRIER; #define _SEH2_END \ @@ -337,12 +337,12 @@ __SEH_END_SCOPE; #define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) -#define _SEH2_GetExceptionCode() ((_SEHFrameP)->SF_Code) +#define _SEH2_GetExceptionCode() ((_SEH2FrameP)->SF_Code) #define _SEH2_YIELD(STMT_) \ for(;;) \ { \ - if(!_SEHScopeKind) \ + if(!_SEH2ScopeKind) \ _SEH2Return(); \ \ STMT_; \ @@ -357,7 +357,7 @@ { #endif -extern void __cdecl _SEH2EnterFrame(_SEHFrame_t *); +extern void __cdecl _SEH2EnterFrame(_SEH2Frame_t *); extern void __cdecl _SEH2LeaveFrame(void); extern void __cdecl _SEH2Return(void);

15 years, 10 months

[hyperion] 37600: GCC can't appreciate my genius. _SEH2_EXCEPT temporarily broken until I figure out a simpler way

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 23 16:47:16 2008 New Revision: 37600 URL: http://svn.reactos.org/svn/reactos?rev=37600&view=rev Log: GCC can't appreciate my genius. _SEH2_EXCEPT temporarily broken until I figure out a simpler way Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Nov 23 16:47:16 2008 @@ -333,12 +333,6 @@ } \ } \ _SEHEndExcept: __SEH_SIDE_EFFECT; \ - \ - void _SEHJumpToHandler(void) \ - { \ - if(_SEHFrameP == (_SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP) && _SEHPrevTryLevelP == _SEHTryLevelP) \ - goto _SEHBeginExcept; \ - } \ } \ __SEH_END_SCOPE;

15 years, 10 months

[ekohl] 37599: - Start the RPC-Server from a separate thread so the initial call to the DLL doesn't get blocked. - Ensure the server accepts more than a single call from clients.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 23 16:39:43 2008 New Revision: 37599 URL: http://svn.reactos.org/svn/reactos?rev=37599&view=rev Log: - Start the RPC-Server from a separate thread so the initial call to the DLL doesn't get blocked. - Ensure the server accepts more than a single call from clients. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Nov 23 16:39:43 2008 @@ -57,6 +57,7 @@ return Status; } + /*static*/ VOID DereferencePolicyHandle(IN OUT PLSAR_POLICY_HANDLE Policy, IN BOOLEAN Delete) @@ -81,17 +82,13 @@ RtlLeaveCriticalSection(&PolicyHandleTableLock); } -VOID -LsarStartRpcServer(VOID) + +DWORD STDCALL +LsapRpcThreadRoutine(LPVOID lpParameter) { RPC_STATUS Status; - RtlInitializeCriticalSection(&PolicyHandleTableLock); - RtlInitializeHandleTable(0x1000, - sizeof(LSAR_POLICY_HANDLE), - &PolicyHandleTable); - - TRACE("LsarStartRpcServer() called"); + TRACE("LsapRpcThreadRoutine() called"); Status = RpcServerUseProtseqEpW(L"ncacn_np", 10, @@ -100,7 +97,7 @@ if (Status != RPC_S_OK) { WARN("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); - return; + return 0; } Status = RpcServerRegisterIf(lsarpc_v0_0_s_ifspec, @@ -109,17 +106,51 @@ if (Status != RPC_S_OK) { WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status); - return; + return 0; } - Status = RpcServerListen(1, 20, TRUE); + Status = RpcServerListen(1, 20, FALSE); if (Status != RPC_S_OK) { WARN("RpcServerListen() failed (Status %lx)\n", Status); - return; + return 0; } - TRACE("LsarStartRpcServer() done\n"); + TRACE("LsapRpcThreadRoutine() done\n"); + + return 0; +} + + +VOID +LsarStartRpcServer(VOID) +{ + HANDLE hThread; + + TRACE("LsarStartRpcServer() called"); + + RtlInitializeCriticalSection(&PolicyHandleTableLock); + RtlInitializeHandleTable(0x1000, + sizeof(LSAR_POLICY_HANDLE), + &PolicyHandleTable); + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE) + LsapRpcThreadRoutine, + NULL, + 0, + NULL); + if (!hThread) + { + WARN("Starting LsapRpcThreadRoutine-Thread failed!\n"); + } + else + { + CloseHandle(hThread); + } + + TRACE("LsarStartRpcServer() done"); } @@ -220,8 +251,16 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *PolicyHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ERR("LsarOpenPolicy called!\n"); + + *PolicyHandle = (LSAPR_HANDLE)0xcafe; + + ERR("LsarOpenPolicy done!\n"); + + return STATUS_SUCCESS; + +// UNIMPLEMENTED; +// return STATUS_NOT_IMPLEMENTED; }

15 years, 10 months

[ekohl] 37598: Fix formatting. No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 23 16:36:15 2008 New Revision: 37598 URL: http://svn.reactos.org/svn/reactos?rev=37598&view=rev Log: Fix formatting. No code changes! Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg…

15 years, 10 months

[dreimer] 37597: Almost finished new Updater System. Last Problem remaining, some missing error behavior and theres a problem with vars being set in updcheckproc are NOT set globally??! No idea how this could be possible...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 23 14:38:15 2008 New Revision: 37597 URL: http://svn.reactos.org/svn/reactos?rev=37597&view=rev Log: Almost finished new Updater System. Last Problem remaining, some missing error behavior and theres a problem with vars being set in updcheckproc are NOT set globally??! No idea how this could be possible... Added: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sun Nov 23 14:38:15 2008 @@ -16,11 +16,20 @@ if %_ROSBE_DEBUG% == 1 ( @echo on ) +set _ROSBE_UPDFINISH=0 +set _ROSBE_OPATH=0 +set _ROSBE_UPDDATE=0 +set _ROSBE_UPDDATE2=0 +set _ROSBE_UPDATES=0 +set _ROSBE_OPATH=%~dp0 +set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% :: :: Set Title :: title Updating... + +cd /d %_ROSBE_BASEDIR% :: :: The Update Server. @@ -28,252 +37,94 @@ set _ROSBE_URL=http://mitglied.lycos.de/reimerdaniel/rosbe :: -:: Default Variables. +::First check for a new Updater :: -set _ROSBE_OPATH=%~dp0 -set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% -set _ROSBE_CMDS=yes -set _ROSBE_GCC=yes -set _ROSBE_TOOLS=yes +for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF +"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL +for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF +if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( + cls + echo Updater got updated and needs to be restarted. + goto :EOC +) +for %%F in (updcheckproc.cmd) do set _ROSBE_UPDDATE=%%~tF +"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL +for %%F in (updcheckproc.cmd) do set _ROSBE_UPDDATE2=%%~tF +if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( + cls + echo Updater got updated and needs to be restarted. + goto :EOC +) + +if not exist "Updates" mkdir Updates 1> NUL 2> NUL +cd Updates :: -:: Update the Vars if the params say so. +:: Parse the args. :: if "%1" == "" ( - goto :next + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 next + goto :EOC ) -elseif "%1" == "nocmds" ( - set _ROSBE_CMDS=no +if /i "%1" == "reset" ( + del /F /Q "%_ROSBE_BASEDIR%\Updates\*.*" 1> NUL 2> NUL + goto :EOC ) -elseif "%1" == "nogcc" ( - set _ROSBE_GCC=no +if /i "%1" == "nr" ( + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" %2 + goto :EOC ) -elseif "%1" == "notools" ( - set _ROSBE_TOOLS=no -) else ( - cls - echo Unknown first parameter specified. Exiting. - goto :EOU +if /i "%1" == "status" ( + mkdir tmp 1> NUL 2> NUL + copy *.txt .\tmp\. 1> NUL 2> NUL + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 status ) -if "%2" == "" ( - goto :next -) -elseif "%2" == "nocmds" ( - set _ROSBE_CMDS=no -) -elseif "%2" == "nogcc" ( - set _ROSBE_GCC=no -) -elseif "%2" == "notools" ( - set _ROSBE_TOOLS=no -) else ( - cls - echo Unknown second parameter specified. Exiting. - goto :EOU -) +:UPDFIN +del /F /Q tmp\*.* +echo Following Updates available: %_ROSBE_UPDATES% -if "%3" == "" ( - goto :next -) -elseif "%3" == "nocmds" ( - set _ROSBE_CMDS=no -) -elseif "%3" == "nogcc" ( - set _ROSBE_GCC=no -) -elseif "%3" == "notools" ( - set _ROSBE_TOOLS=no -) else ( - cls - echo Unknown third parameter specified. Exiting. - goto :EOU -) +:EOC -:next - -cd /d "%_ROSBE_BASEDIR%" - -if %_ROSBE_CMDS% == yes ( - - REM First check for a new Updater - - for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd - for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF - - if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( - cls - echo Updater got updated and needs to be restarted. - goto :EOU - ) - - REM PS1 Files. - - if exist "Build.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.ps1 - ) - if exist "chdefgcc.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.ps1 - ) - if exist "Clean.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.ps1 - ) - if exist "Help.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.ps1 - ) - if exist "MinGW.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.ps1 - ) - if exist "RosBE.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.ps1 - ) - if exist "rosbe-gcc-env.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.ps1 - ) - - REM Arch Changer Files. - - if exist "charch.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/charch.cmd - ) - if exist "charch.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/charch.ps1 - ) - - REM Options Files. - - if exist "options.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.cmd - ) - if exist "options.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.ps1 - ) - - REM SVN Files. - - if exist "sSVN.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.cmd - ) - if exist "sSVN.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.ps1 - ) - - REM SCut Files. - - if exist "scut.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.cmd - ) - if exist "scut.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.ps1 - ) - - REM RelAddr2Line Files. - - if exist "reladdr2line.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.cmd - ) - if exist "reladdr2line.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.ps1 - ) - - REM Other Tools Files. - - if exist "Config.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.cmd - ) - if exist "Config.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.ps1 - ) - if exist "chdefdir.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.cmd - ) - if exist "chdefdir.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.ps1 - ) - - REM Default Files. - - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/ChangeLog.txt - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/LICENSE.TXT - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/mingw.ico - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.mac - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/README.pdf - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe.ico - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.mac - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/TimeDate.cmd -) - -if %_ROSBE_GCC% == yes ( - - REM Add Dates into Vars and load GCC packages if needed. - - if exist GCC.7z ( - for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF - ) - - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z - - REM Add the maybe Updated Dates to another Var. - - for %%F in (GCC.7z) do set _ROSBE_GCCDATE2=%%~tF - - REM Extract GCC. - - if !_ROSBE_GCCDATE! NEQ !_ROSBE_GCCDATE2! ( - "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\i386" - ) -) -if %_ROSBE_TOOLS% == yes ( - - REM Add Dates into Vars and load Tool SRC packages if needed. - - if exist Tools.7z ( - for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF - ) - - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z - - REM Add the maybe Updated Dates to another Var. - - for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE2=%%~tF - - if !_ROSBE_TOOLSDATE! NEQ !_ROSBE_TOOLSDATE2! ( - "Tools\7z.exe" x Tools.7z "%TEMP%" - - REM Build the tools - - make -f %TEMP%\makefile - copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" - ) -) - -:EOU - -cd /d "%_ROSBE_OPATH%" - +cd /d %_ROSBE_OPATH% if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) -:: -:: Unload Vars. -:: -set _ROSBE_URL= -set _ROSBE_GCCDATE= -set _ROSBE_TOOLSDATE= -set _ROSBE_GCCDATE2= -set _ROSBE_TOOLSDATE2= -set _ROSBE_CMDS= -set _ROSBE_GCC= -set _ROSBE_TOOLS= +set _ROSBE_UPDFINISH= set _ROSBE_OPATH= set _ROSBE_UPDDATE= -set _ROSBE_UPDDATE2= +set _ROSBE_UPDATES= +set _ROSBE_UPDDATE2= Added: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd [iso-8859-1] Sun Nov 23 14:38:15 2008 @@ -1,0 +1,65 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/update.cmd +:: PURPOSE: RosBE Updater. +:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +setlocal +setlocal enableextensions +setlocal enabledelayedexpansion + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +if "%2" == "status" ( + cd tmp + if not exist "%_ROSBE_VERSION%-%1.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-%1.txt" ( + echo %1 + set _ROSBE_UPDATES=%_ROSBE_UPDATES%, %1 + ) else ( + set _ROSBE_UPDFINISH=1 + ) + ) + goto :EOF +) +if not exist "%_ROSBE_VERSION%-%1.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL +) +if exist "%_ROSBE_VERSION%-%1.txt" ( + type "%_ROSBE_VERSION%-%1.txt" + echo. + echo Install? + set /p YESNO="(yes), (no)" + if /i "!YESNO!"=="yes" ( + if not exist "%_ROSBE_VERSION%-%1.7z" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.7z 1> NUL 2> NUL + ) + if exist "%_ROSBE_VERSION%-%1.7z" ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%1.7z" + cd "%_ROSBE_VERSION%-%1" + call "%_ROSBE_VERSION%-%1.cmd" + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) + ) else if /i "!YESNO!"=="no" ( + del "%_ROSBE_VERSION%-%1.txt" 1> NUL 2> NUL + goto :EOF + ) +) else ( + if "%2" == "next" ( + echo set %2 + set _ROSBE_UPDFINISH=1 + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) +) Propchange: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 10 months

[greatlrd] 37596: Implement WinWatchDidStatusChange

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 23 11:50:15 2008 New Revision: 37596 URL: http://svn.reactos.org/svn/reactos?rev=37596&view=rev Log: Implement WinWatchDidStatusChange Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Sun Nov 23 11:50:15 2008 @@ -16,7 +16,7 @@ GetDCRegionData@12 GetWindowRegionData@12 WinWatchClose@4 -; WinWatchDidStatusChange + WinWatchDidStatusChange@4 ; WinWatchGetClipList WinWatchNotify@12 WinWatchOpen@4 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 11:50:15 2008 @@ -16,6 +16,7 @@ typedef struct _WINWATCH_INT { HWND hWnd; + BOOL WinWtachStatus; } WINWATCH_INT, *LPWINWATCH_INT; @@ -429,6 +430,12 @@ LeaveCriticalSection(&ddcs); } +BOOL WINAPI +WinWatchDidStatusChange(HWINWATCH hWW) +{ + LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; + return pWinwatch_int->WinWtachStatus; +} /***********************************************************************************************************/

15 years, 10 months

[greatlrd] 37595: Implement WinWatchClose

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 23 11:11:52 2008 New Revision: 37595 URL: http://svn.reactos.org/svn/reactos?rev=37595&view=rev Log: Implement WinWatchClose Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Sun Nov 23 11:11:52 2008 @@ -15,8 +15,8 @@ DCISetSrcDestClip@16 GetDCRegionData@12 GetWindowRegionData@12 -; WinWatchClose + WinWatchClose@4 ; WinWatchDidStatusChange ; WinWatchGetClipList WinWatchNotify@12 -; WinWatchOpen + WinWatchOpen@4 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 11:11:52 2008 @@ -416,6 +416,19 @@ return (HWINWATCH) pWinwatch_int; } +void WINAPI +WinWatchClose(HWINWATCH hWW) +{ + EnterCriticalSection(&ddcs); + + if (hWW != NULL) + { + HeapFree(GetProcessHeap(), 0, hWW); + } + + LeaveCriticalSection(&ddcs); +} + /***********************************************************************************************************/

15 years, 10 months

[cgutman] 37594: - Merge r37593 which I accidentally committed to trunk

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Nov 23 10:58:14 2008 New Revision: 37594 URL: http://svn.reactos.org/svn/reactos?rev=37594&view=rev Log: - Merge r37593 which I accidentally committed to trunk Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Nov 23 10:58:14 2008 @@ -270,6 +270,7 @@ KIRQL OldIrql; NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + NdisMIndicateStatusComplete(Adapter); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);

15 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008