Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[mjmartin] 40894: - MmCreateSection: SectionPageProtection of PAGE_NOACCESS is valid in <=Win98, but not valid in the NT family. More kernel32_winetest fixes for virtual memory.
by mjmartin＠svn.reactos.org 12 May '09

12 May '09

Author: mjmartin Date: Tue May 12 13:00:06 2009 New Revision: 40894 URL: http://svn.reactos.org/svn/reactos?rev=40894&view=rev Log: - MmCreateSection: SectionPageProtection of PAGE_NOACCESS is valid in <=Win98, but not valid in the NT family. More kernel32_winetest fixes for virtual memory. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue May 12 13:00:06 2009 @@ -4990,8 +4990,7 @@ * Check the protection */ Protection = SectionPageProtection & ~(PAGE_GUARD|PAGE_NOCACHE); - if (Protection != PAGE_NOACCESS && - Protection != PAGE_READONLY && + if (Protection != PAGE_READONLY && Protection != PAGE_READWRITE && Protection != PAGE_WRITECOPY && Protection != PAGE_EXECUTE &&

1 0

[mjmartin] 40893: - CreateFileMapping: SetLastError to ERROR_ALREADY_EXISTS for sections that already exists. SetLastError to ERROR_SUCCESS on success for all API's. More kernel32_winetest fixes for virtual.
by mjmartin＠svn.reactos.org 12 May '09

12 May '09

Author: mjmartin Date: Tue May 12 12:58:38 2009 New Revision: 40893 URL: http://svn.reactos.org/svn/reactos?rev=40893&view=rev Log: - CreateFileMapping: SetLastError to ERROR_ALREADY_EXISTS for sections that already exists. SetLastError to ERROR_SUCCESS on success for all API's. More kernel32_winetest fixes for virtual. Modified: trunk/reactos/dll/win32/kernel32/mem/section.c Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] Tue May 12 12:58:38 2009 @@ -138,13 +138,21 @@ flProtect, Attributes, hFile); - if (!NT_SUCCESS(Status)) - { - /* We failed */ - SetLastErrorByStatus(Status); - return NULL; - } - + + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + SetLastError(ERROR_ALREADY_EXISTS); + return SectionHandle; + } + + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + SetLastError(ERROR_SUCCESS); /* Return the section */ return SectionHandle; } @@ -211,6 +219,7 @@ return NULL; } + SetLastError(ERROR_SUCCESS); /* Return the base */ return ViewBase; } @@ -253,6 +262,7 @@ return FALSE; } + SetLastError(ERROR_SUCCESS); /* Otherwise, return sucess */ return TRUE; } @@ -343,6 +353,7 @@ return NULL; } + SetLastError(ERROR_SUCCESS); /* Otherwise, return the handle */ return SectionHandle; } @@ -374,6 +385,7 @@ return FALSE; } + SetLastError(ERROR_SUCCESS); /* Return success */ return TRUE; }

1 0

[jimtabor] 40892: - Remove client thread information from w32 thread information.
by jimtabor＠svn.reactos.org 12 May '09

12 May '09

Author: jimtabor Date: Tue May 12 05:56:39 2009 New Revision: 40892 URL: http://svn.reactos.org/svn/reactos?rev=40892&view=rev Log: - Remove client thread information from w32 thread information. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 12 05:56:39 2009 @@ -366,11 +366,7 @@ { PPROCESSINFO ppi; /* [KERNEL] */ PDESKTOPINFO pDeskInfo; -// PVOID DesktopHeapBase; -// ULONG_PTR DesktopHeapLimit; - /* A mask of what hooks are currently active */ ULONG fsHooks; - CLIENTTHREADINFO ClientThreadInfo; } W32THREADINFO, *PW32THREADINFO; /* Window Client Information structure */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue May 12 05:56:39 2009 @@ -44,6 +44,8 @@ UINT cTimersReady; /* Count of timers pending. */ ULONG fsHooks; LIST_ENTRY PtiLink; + + CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Tue May 12 05:56:39 2009 @@ -280,11 +280,6 @@ } Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); - if (Win32Thread->ThreadInfo) - { - Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0; -// Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo; - } } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue May 12 05:56:39 2009 @@ -1998,7 +1998,7 @@ { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) { - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook++; + ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook++; return TRUE; } return FALSE; @@ -2009,11 +2009,11 @@ { if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo) { - if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook <= 0) + if (((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook <= 0) { return FALSE; } - ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->ThreadInfo->ClientThreadInfo.dwcPumpHook--; + ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->pcti->dwcPumpHook--; return TRUE; } return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue May 12 05:56:39 2009 @@ -525,8 +525,7 @@ /* initialize it */ ti->ppi = GetW32ProcessInfo(); ti->fsHooks = W32Thread->fsHooks; -// W32Thread->pcti = &ti->ClientThreadInfo; - W32Thread->pcti = NULL; // FIXME + W32Thread->pcti = &W32Thread->cti; // FIXME if (W32Thread->Desktop != NULL) { ti->pDeskInfo = W32Thread->Desktop->DesktopInfo;

1 0

[jimtabor] 40891: - Move update thread information hooks.
by jimtabor＠svn.reactos.org 12 May '09

12 May '09

Author: jimtabor Date: Tue May 12 05:31:07 2009 New Revision: 40891 URL: http://svn.reactos.org/svn/reactos?rev=40891&view=rev Log: - Move update thread information hooks. Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Tue May 12 05:31:07 2009 @@ -18,7 +18,7 @@ #define NB_HOOKS (WH_MAXHOOK-WH_MINHOOK+1) #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) -#define ISITHOOKED(HookId) (((PTHREADINFO)PsGetCurrentThreadWin32Thread())->Hooks & HOOKID_TO_FLAG(HookId)) +#define ISITHOOKED(HookId) (((PTHREADINFO)PsGetCurrentThreadWin32Thread())->fsHooks & HOOKID_TO_FLAG(HookId)) typedef struct tagHOOKTABLE { Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue May 12 05:31:07 2009 @@ -42,13 +42,13 @@ HANDLE hDesktop; UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ + ULONG fsHooks; LIST_ENTRY PtiLink; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; BOOLEAN IsExiting; SINGLE_LIST_ENTRY ReferencesList; - ULONG Hooks; PW32THREADINFO ThreadInfo; } THREADINFO, *PTHREADINFO; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue May 12 05:31:07 2009 @@ -108,12 +108,12 @@ { W32Thread = ((PTHREADINFO)Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL); - W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); - - GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; + W32Thread->fsHooks |= HOOKID_TO_FLAG(HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -222,12 +222,12 @@ W32Thread = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL); - W32Thread->Hooks &= ~HOOKID_TO_FLAG(Hook->HookId); - - GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; + W32Thread->fsHooks &= ~HOOKID_TO_FLAG(Hook->HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->Hooks; + W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue May 12 05:31:07 2009 @@ -524,8 +524,9 @@ /* initialize it */ ti->ppi = GetW32ProcessInfo(); - ti->fsHooks = W32Thread->Hooks; - W32Thread->pcti = &ti->ClientThreadInfo; + ti->fsHooks = W32Thread->fsHooks; +// W32Thread->pcti = &ti->ClientThreadInfo; + W32Thread->pcti = NULL; // FIXME if (W32Thread->Desktop != NULL) { ti->pDeskInfo = W32Thread->Desktop->DesktopInfo;

1 0

[dgoette] 414: import favicon
by dgoette＠svn.reactos.org 11 May '09

11 May '09

Author: dgoette Date: Tue May 12 01:54:29 2009 New Revision: 414 URL: http://svn.reactos.org/svn/reactos?rev=414&view=rev Log: import favicon Added: branches/danny-web/www/www.reactos.org/favicon.ico (with props) Added: branches/danny-web/www/www.reactos.org/favicon.ico URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/f… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/favicon.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[dgoette] 413: implement a hack for adding dependencies of dynamic pages
by dgoette＠svn.reactos.org 11 May '09

11 May '09

Author: dgoette Date: Tue May 12 01:48:51 2009 New Revision: 413 URL: http://svn.reactos.org/svn/reactos?rev=413&view=rev Log: implement a hack for adding dependencies of dynamic pages Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_EntryTabl… [iso-8859-1] Tue May 12 01:48:51 2009 @@ -283,6 +283,37 @@ return false; } + // @HACK + if (1) { + $stmt=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_ENTRIES." WHERE id=:data_id"); + $stmt->bindParam('data_id',$revision['data_id'],PDO::PARAM_INT); + $stmt->execute(); + $name = $stmt->fetchColumn(); + + $stmt=&DBConnection::getInstance()->prepare("SELECT r.id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id WHERE d.name = :name AND d.type='dynamic' AND r.archive IS FALSE AND r.status = 'stable' ORDER BY r.datetime DESC LIMIT 1"); + if (strpos($name,'newsletter_') === 0) { + $stmt->bindValue('name','newsletter',PDO::PARAM_STR); + } + elseif (strpos($name,'news_page_') === 0) { + $stmt->bindValue('name','news_page',PDO::PARAM_STR); + } + elseif (strpos($name,'interview_') === 0) { + $stmt->bindValue('name','interview',PDO::PARAM_STR); + } + elseif (strpos($name,'blog_') === 0) { + $stmt->bindValue('name','blog',PDO::PARAM_STR); + } + else { + $stmt=null; + } + + if ($stmt !== null) { + $stmt->execute(); + $data = $stmt->fetchColumn(); + Dependencies::addManual($data,$name,'content'); + } + } // HACK END + // make entry stable Revision::setStatus($revision['id'],'stable');

1 0

[dreimer] 40890: ook. I don't understand why I need this twice. Well, But now it works.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Tue May 12 01:15:02 2009 New Revision: 40890 URL: http://svn.reactos.org/svn/reactos?rev=40890&view=rev Log: ook. I don't understand why I need this twice. Well, But now it works. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue May 12 01:15:02 2009 @@ -90,11 +90,11 @@ if ($_ROSBE_WRITELOG -eq 1) { $sw.Start() $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" - &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} 2>&1 | tee-object $file + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file $sw.Stop() } else { $sw.Start() - &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $($args) $sw.Stop() } write-host "Total Build Time:" $sw.Elapsed.ToString()

1 0

[dreimer] 40889: Circumvent another Batch silliness with a if block and some code not be parsed in a row problem... thx to Colin for the suggestion to fix it this way
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 23:06:15 2009 New Revision: 40889 URL: http://svn.reactos.org/svn/reactos?rev=40889&view=rev Log: Circumvent another Batch silliness with a if block and some code not be parsed in a row problem... thx to Colin for the suggestion to fix it this way Added: trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd (with props) trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Added: trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd [iso-8859-1] Mon May 11 23:06:15 2009 @@ -1,0 +1,24 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/Build-Multi.cmd +:: PURPOSE: Perform a multiprocessor build +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Colin Finck <colin(a)reactos.org> +:: Peter Ward <dralnix(a)gmail.com> +:: + +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +setlocal enabledelayedexpansion + +:: Set the options for a multiprocessor build +set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% +set TITLE_COMMAND=makex %* + +call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* +endlocal Propchange: trunk/tools/RosBE/RosBE-Windows/Root/Build-Multi.cmd ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Mon May 11 23:06:15 2009 @@ -1,0 +1,65 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/Build-Shared.cmd +:: PURPOSE: Perform the build of ReactOS. +:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Colin Finck <colin(a)reactos.org> +:: Peter Ward <dralnix(a)gmail.com> +:: + +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +:: Check if config.template.rbuild is newer than config.rbuild, if it is then +:: abort the build and inform the user. +if exist .\config.rbuild ( + "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild + if !errorlevel! == 1 ( + echo. + echo *** config.template.rbuild is newer than config.rbuild *** + echo *** aborting build. Please check for changes and *** + echo *** update your config.rbuild. *** + echo. + goto :EOC + ) +) + +call "%_ROSBE_BASEDIR%\TranslateOptions.cmd" + +if "%_ROSBE_USECCACHE%" == "1" ( + set _ROSBE_CCACHE=ccache +) else ( + set _ROSBE_CCACHE= +) + +set HOST_CC=%_ROSBE_CCACHE%gcc +set HOST_CPP=%_ROSBE_CCACHE%g++ +set TARGET_CC=%_ROSBE_CCACHE%%ROS_PREFIX%gcc +set TARGET_CPP=%_ROSBE_CCACHE%%ROS_PREFIX%g++ + +:: Get the current date and time for use in in our build log's file name. +call "%_ROSBE_BASEDIR%\TimeDate.cmd" + +title '%TITLE_COMMAND%' build started: %TIMERAW% (%ROS_ARCH%) + +:: Do the actual building +if %_ROSBE_SHOWTIME% == 1 ( + set BUILDTIME_COMMAND="%_ROSBE_BASEDIR%\Tools\buildtime.exe" +) else ( + set BUILDTIME_COMMAND= +) + +if %_ROSBE_WRITELOG% == 1 ( + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" +) else ( + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %* +) + +:EOC +:: Highlight the fact that building has ended. +"%_ROSBE_BASEDIR%\Tools\flash.exe" +title ReactOS Build Environment %_ROSBE_VERSION% Propchange: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon May 11 23:06:15 2009 @@ -2,7 +2,7 @@ :: PROJECT: RosBE - ReactOS Build Environment for Windows :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Build.cmd -:: PURPOSE: Perform the build of ReactOS. +:: PURPOSE: Perform a uniprocessor build :: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> :: Colin Finck <colin(a)reactos.org> :: Peter Ward <dralnix(a)gmail.com> @@ -16,63 +16,9 @@ setlocal enabledelayedexpansion -:: Check if config.template.rbuild is newer than config.rbuild, if it is then -:: abort the build and inform the user. -if exist .\config.rbuild ( - "%_ROSBE_BASEDIR%\Tools\chknewer.exe" .\config.template.rbuild .\config.rbuild - if !errorlevel! == 1 ( - echo. - echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please check for changes and *** - echo *** update your config.rbuild. *** - echo. - goto :EOC - ) -) +:: Set the options for a uniprocessor build +set MAKE_JOBS=1 +set TITLE_COMMAND=make %* -call "%_ROSBE_BASEDIR%\TranslateOptions.cmd" - -if "%_ROSBE_USECCACHE%" == "1" ( - set _ROSBE_CCACHE=ccache -) else ( - set _ROSBE_CCACHE= -) - -set HOST_CC=%_ROSBE_CCACHE%gcc -set HOST_CPP=%_ROSBE_CCACHE%g++ -set TARGET_CC=%_ROSBE_CCACHE%%ROS_PREFIX%gcc -set TARGET_CPP=%_ROSBE_CCACHE%%ROS_PREFIX%g++ - -:: Get the current date and time for use in in our build log's file name. -call "%_ROSBE_BASEDIR%\TimeDate.cmd" - -:: Check whether we were called as "makex" or "make" -if "%1" == "multi" ( - shift - set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% - set TITLE_COMMAND=makex %2%3%4%5%6%7%8%9 -) else ( - set MAKE_JOBS=1 - set TITLE_COMMAND=make %* -) - -title '%TITLE_COMMAND%' build started: %TIMERAW% (%ROS_ARCH%) - -:: Do the actual building -if %_ROSBE_SHOWTIME% == 1 ( - set BUILDTIME_COMMAND="%_ROSBE_BASEDIR%\Tools\buildtime.exe" -) else ( - set BUILDTIME_COMMAND= -) - -if %_ROSBE_WRITELOG% == 1 ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" -) else ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 -) - -:EOC -:: Highlight the fact that building has ended. -"%_ROSBE_BASEDIR%\Tools\flash.exe" -title ReactOS Build Environment %_ROSBE_VERSION% +call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Mon May 11 23:06:15 2009 @@ -7,7 +7,7 @@ ENV = set HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* -MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* +MAKEX = "%_ROSBE_BASEDIR%\Build-Multi.cmd" $* RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Mon May 11 23:06:15 2009 @@ -131,6 +131,8 @@ WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" ${else} File /r Root\Build.cmd + File /r Root\Build-Multi.cmd + File /r Root\Build-Shared.cmd File /r Root\charch.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd @@ -297,6 +299,8 @@ SetOutPath "$INSTDIR" SetOverwrite try File /r Root\Build.cmd + File /r Root\Build-Multi.cmd + File /r Root\Build-Shared.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd File /r Root\Help.cmd @@ -447,6 +451,8 @@ RMDir /r /REBOOTOK "$INSTDIR\Tools" RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" Delete /REBOOTOK "$INSTDIR\Build.cmd" + Delete /REBOOTOK "$INSTDIR\Build-Multi.cmd" + Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd" Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.ps1"

1 0

[dreimer] 40888: if ($global:var -eq $null) { "buildno.h not found y00 n00b!!!111" } Now fixed :-D
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 22:26:47 2009 New Revision: 40888 URL: http://svn.reactos.org/svn/reactos?rev=40888&view=rev Log: if ($global:var -eq $null) { "buildno.h not found y00 n00b!!!111" } Now fixed :-D Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 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] Mon May 11 22:26:47 2009 @@ -38,8 +38,6 @@ $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" -$global:_ROSBE_OBJPATH = $null -$global:_ROSBE_OUTPATH = $null $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" $global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH"

1 0

[dreimer] 40887: Fix support for commands like: "make bootcd livecd install" Fix tee command in PS
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 22:01:29 2009 New Revision: 40887 URL: http://svn.reactos.org/svn/reactos?rev=40887&view=rev Log: Fix support for commands like: "make bootcd livecd install" Fix tee command in PS Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 22:01:29 2009 @@ -90,11 +90,11 @@ if ($_ROSBE_WRITELOG -eq 1) { $sw.Start() $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" - IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" | tee-object $file + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} 2>&1 | tee-object $file $sw.Stop() } else { $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" + &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"} $sw.Stop() } write-host "Total Build Time:" $sw.Elapsed.ToString() Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon May 11 22:01:29 2009 @@ -50,10 +50,10 @@ if "%1" == "multi" ( shift set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% - set TITLE_COMMAND=makex %2 + set TITLE_COMMAND=makex %2%3%4%5%6%7%8%9 ) else ( set MAKE_JOBS=1 - set TITLE_COMMAND=make %1 + set TITLE_COMMAND=make %* ) title '%TITLE_COMMAND%' build started: %TIMERAW% (%ROS_ARCH%) @@ -66,9 +66,9 @@ ) if %_ROSBE_WRITELOG% == 1 ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 + %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6 %7 %8 %9 ) :EOC

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
51
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 May 2009