Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[janderwald] 41830: - Fix a few bugs in the sample rate conversion code - Might fix playback for audio samples out of audio adapter supported range
by janderwald＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: janderwald Date: Thu Jul 9 18:09:27 2009 New Revision: 41830 URL: http://svn.reactos.org/svn/reactos?rev=41830&view=rev Log: - Fix a few bugs in the sample rate conversion code - Might fix playback for audio samples out of audio adapter supported range Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Thu Jul 9 18:09:27 2009 @@ -34,6 +34,8 @@ DPRINT("PerformSampleRateConversion OldRate %u NewRate %u BytesPerSample %u NumChannels %u Irql %u\n", OldRate, NewRate, BytesPerSample, NumChannels, KeGetCurrentIrql()); + ASSERT(BytesPerSample == 1 || BytesPerSample == 2 || BytesPerSample == 4); + /* first acquire float save context */ Status = KeSaveFloatingPointState(&FloatSave); @@ -43,9 +45,9 @@ return Status; } - NumSamples = BufferLength / BytesPerSample; - - FloatIn = ExAllocatePool(NonPagedPool, NumSamples * sizeof(FLOAT)); + NumSamples = BufferLength / (BytesPerSample * NumChannels); + + FloatIn = ExAllocatePool(NonPagedPool, NumSamples * NumChannels * sizeof(FLOAT)); if (!FloatIn) { KeRestoreFloatingPointState(&FloatSave); @@ -54,7 +56,7 @@ NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)NewRate / (FLOAT)OldRate))) + 2; - FloatOut = ExAllocatePool(NonPagedPool, NewSamples * sizeof(FLOAT)); + FloatOut = ExAllocatePool(NonPagedPool, NewSamples * NumChannels * sizeof(FLOAT)); if (!FloatOut) { ExFreePool(FloatIn); @@ -62,7 +64,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - ResultOut = ExAllocatePool(NonPagedPool, NewSamples * (BytesPerSample/8)); + ResultOut = ExAllocatePool(NonPagedPool, NewSamples * NumChannels * BytesPerSample); if (!FloatOut) { ExFreePool(FloatIn); @@ -83,31 +85,24 @@ } /* fixme use asm */ - if (BytesPerSample == 8) - { - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)Buffer[Index]; - } - else if (BytesPerSample == 16) - { - PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)_byteswap_ushort(Res[Index]); - } - else - { - UNIMPLEMENTED - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; + if (BytesPerSample == 1) + { + for(Index = 0; Index < NumSamples * NumChannels; Index++) + FloatIn[Index] = (float)(Buffer[Index] / (1.0 * 0x80)); + } + else if (BytesPerSample == 2) + { + src_short_to_float_array((short*)Buffer, FloatIn, NumSamples * NumChannels); + } + else if (BytesPerSample == 4) + { + src_int_to_float_array((int*)Buffer, FloatIn, NumSamples * NumChannels); } Data.data_in = FloatIn; Data.data_out = FloatOut; - Data.input_frames = NumSamples / NumChannels; - Data.output_frames = NewSamples / NumChannels; + Data.input_frames = NumSamples; + Data.output_frames = NewSamples; Data.src_ratio = (double)NewRate / (double)OldRate; error = src_process(State, &Data); @@ -121,26 +116,33 @@ return STATUS_UNSUCCESSFUL; } - if (BytesPerSample == 8) - { + if (BytesPerSample == 1) + { + /* FIXME perform over/under clipping */ + for(Index = 0; Index < Data.output_frames_gen * NumChannels; Index++) - ResultOut[Index] = lrintf(FloatOut[Index]); - } - else if (BytesPerSample == 16) + ResultOut[Index] = (lrintf(FloatOut[Index]) >> 24); + } + else if (BytesPerSample == 2) { PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < Data.output_frames_gen * NumChannels; Index++) - Res[Index] = _byteswap_ushort(lrintf(FloatOut[Index])); - } + src_float_to_short_array(FloatIn, (short*)Res, Data.output_frames_gen * NumChannels); + } + else if (BytesPerSample == 4) + { + PULONG Res = (PULONG)ResultOut; + + src_float_to_int_array(FloatIn, (int*)Res, Data.output_frames_gen * NumChannels); + } + *Result = ResultOut; - *ResultLength = Data.output_frames_gen * (BytesPerSample/8) * NumChannels; + *ResultLength = Data.output_frames_gen * BytesPerSample * NumChannels; ExFreePool(FloatIn); ExFreePool(FloatOut); src_delete(State); KeRestoreFloatingPointState(&FloatSave); - return STATUS_SUCCESS; } @@ -654,7 +656,7 @@ StreamHeader->DataUsed, InputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.nSamplesPerSec, - OutputFormat->WaveFormatEx.wBitsPerSample, + OutputFormat->WaveFormatEx.wBitsPerSample / 8, OutputFormat->WaveFormatEx.nChannels, &BufferOut, &BufferLength);

1 0

[tkreuzer] 41829: - Move GDI_DEBUG stuff to make it compile again - Comment out some GDI_DEBUG prints related to deferred deletion, as this floods the log too much
by tkreuzer＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: tkreuzer Date: Thu Jul 9 17:36:42 2009 New Revision: 41829 URL: http://svn.reactos.org/svn/reactos?rev=41829&view=rev Log: - Move GDI_DEBUG stuff to make it compile again - Comment out some GDI_DEBUG prints related to deferred deletion, as this floods the log too much Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu Jul 9 17:36:42 2009 @@ -8,6 +8,8 @@ /** INCLUDES ******************************************************************/ +//#define GDI_DEBUG + #include <w32k.h> #define NDEBUG #include <debug.h> @@ -25,6 +27,8 @@ #define DelayExecution() \ DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) + +#include "gdidbg.c" /* static */ /* FIXME: -fno-unit-at-a-time breaks this */ BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody); @@ -78,10 +82,6 @@ static LARGE_INTEGER ShortDelay; -/** DEBUGGING *****************************************************************/ -//#define GDI_DEBUG -#include "gdidbg.c" - /** INTERNAL FUNCTIONS ********************************************************/ /* @@ -576,8 +576,8 @@ { Object->BaseFlags |= BASEFLAG_READY_TO_DIE; DPRINT("Object %p, ulShareCount = %d\n", Object->hHmgr, Object->ulShareCount); - GDIDBG_TRACECALLER(); - GDIDBG_TRACESHARELOCKER(GDI_HANDLE_GET_INDEX(hObj)); + //GDIDBG_TRACECALLER(); + //GDIDBG_TRACESHARELOCKER(GDI_HANDLE_GET_INDEX(hObj)); (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); /* Don't wait on shared locks */ return FALSE;

1 0

[janderwald] 41828: - Stop removing good code, Arch!
by janderwald＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: janderwald Date: Thu Jul 9 17:23:00 2009 New Revision: 41828 URL: http://svn.reactos.org/svn/reactos?rev=41828&view=rev Log: - Stop removing good code, Arch! Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Thu Jul 9 17:23:00 2009 @@ -184,6 +184,12 @@ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } + InstanceInfo->Property.Set = KSPROPSETID_Sysaudio; + InstanceInfo->Property.Id = KSPROPERTY_SYSAUDIO_INSTANCE_INFO; + InstanceInfo->Property.Flags = KSPROPERTY_TYPE_SET; + InstanceInfo->Flags = 0; + InstanceInfo->DeviceNumber = FilterId; + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE || DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE ||

1 0

[dreimer] 41827: Apply Colin's changes to the PS Scripts, too where needed.
by dreimer＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: dreimer Date: Thu Jul 9 17:21:56 2009 New Revision: 41827 URL: http://svn.reactos.org/svn/reactos?rev=41827&view=rev Log: Apply Colin's changes to the PS Scripts, too where needed. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Thu Jul 9 17:21:56 2009 @@ -30,3 +30,4 @@ $global:_ROSBE_ROSSOURCEDIR = "$pwd" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +set-location "$_ROSBE_ROSSOURCEDIR" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Thu Jul 9 17:21:56 2009 @@ -40,7 +40,6 @@ # Verify the entered values $local:ErrorActionPreference = "SilentlyContinue" if (Test-Path "$_ROSBE_BASEDIR\$TOOLPATH\.") { - $ENV:ROS_ARCH = "$TOOLPATH" $TOOLPATH = "$_ROSBE_BASEDIR\$TOOLPATH" } elseif (!(Test-Path "$TOOLPATH\.")) { "ERROR: The path specified doesn't seem to exist." @@ -54,9 +53,6 @@ # Set the values if ($TOOLMODE -eq "target") { - if ($ENV:ROS_ARCH -eq $null) { - $ENV:ROS_ARCH = Read-Host "Please specify the arch: " - } $_ROSBE_TARGET_MINGWPATH = $TOOLPATH "Target Location: $_ROSBE_TARGET_MINGWPATH" EOA

1 0

[cfinck] 41826: - Fix confusion between %_ROSBE_ROSPREFIX% and %_ROSBE_PREFIX% introduced in the last commit. We only use %_ROSBE_PREFIX% now, which should fix building with amd64. - Readd chdefdir's feature to switch to the new default directory after changing it. - Revert r40923 for chdefgcc.cmd. This broke switching from amd64 back to i386 (i.e. "charch amd64", "charch i386"). Furthermore, chdefgcc must not mess around with ROS_ARCH. This is exclusively charch's privilege! - Fix inability to
by cfinck＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: cfinck Date: Thu Jul 9 16:54:03 2009 New Revision: 41826 URL: http://svn.reactos.org/svn/reactos?rev=41826&view=rev Log: - Fix confusion between %_ROSBE_ROSPREFIX% and %_ROSBE_PREFIX% introduced in the last commit. We only use %_ROSBE_PREFIX% now, which should fix building with amd64. - Readd chdefdir's feature to switch to the new default directory after changing it. - Revert r40923 for chdefgcc.cmd. This broke switching from amd64 back to i386 (i.e. "charch amd64", "charch i386"). Furthermore, chdefgcc must not mess around with ROS_ARCH. This is exclusively charch's privilege! - Fix inability to switch back to i386 introduced by the last commit. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: 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 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Thu Jul 9 16:54:03 2009 @@ -38,8 +38,8 @@ set HOST_CC=%_ROSBE_CCACHE%gcc set HOST_CPP=%_ROSBE_CCACHE%g++ -set TARGET_CC=%_ROSBE_CCACHE%%_ROSBE_ROSPREFIX%gcc -set TARGET_CPP=%_ROSBE_CCACHE%%_ROSBE_ROSPREFIX%g++ +set TARGET_CC=%_ROSBE_CCACHE%%_ROSBE_PREFIX%gcc +set TARGET_CPP=%_ROSBE_CCACHE%%_ROSBE_PREFIX%g++ :: Get the current date and time for use in in our build log's file name. call "%_ROSBE_BASEDIR%\TimeDate.cmd" 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] Thu Jul 9 16:54:03 2009 @@ -22,13 +22,12 @@ :: Set defaults to work with and override them if edited by :: the options utility. -if "%1%" == "" ( +if "%1" == "" ( set ROS_ARCH=i386 ) else ( set ROS_ARCH=%1 ) -set _ROSBE_ROSPREFIX="" set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_VERSION=1.4.4 Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Thu Jul 9 16:54:03 2009 @@ -42,6 +42,6 @@ ) :EOC -set SOURCEDIR=%CD% title ReactOS Build Environment %_ROSBE_VERSION% -endlocal & set _ROSBE_ROSSOURCEDIR=%SOURCEDIR% +endlocal & set _ROSBE_ROSSOURCEDIR=%CD% +cd /d %_ROSBE_ROSSOURCEDIR% Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Thu Jul 9 16:54:03 2009 @@ -18,7 +18,7 @@ title Change the current MinGW/GCC Host/Target directory... :: Parse the command line arguments. Ask the user if certain parameters are missing. -if .%1. == .. ( +if "%1" == "" ( set /p TOOLPATH="Please enter a MinGW/GCC directory (don't use quotes): " if "!TOOLPATH!" == "" ( @@ -42,7 +42,6 @@ :: Verify the entered values if exist "%_ROSBE_BASEDIR%\%TOOLPATH%\." ( - set ROS_ARCH=%TOOLPATH% set TOOLPATH=%_ROSBE_BASEDIR%\%TOOLPATH% ) else if not exist "%TOOLPATH%\." ( echo ERROR: The path specified doesn't seem to exist. @@ -56,20 +55,17 @@ :: Set the values if /i "%TOOLMODE%" == "target" ( - if "%ROS_ARCH%" == "i386" ( - set /p ROS_ARCH="Please specify the arch: " - ) echo Target Location: %TOOLPATH% - set _ROSBE_TARGET_MINGWPATH=%TOOLPATH% + endlocal & set _ROSBE_TARGET_MINGWPATH=%TOOLPATH% ) else if /i "%TOOLMODE%" == "host" ( echo Host Location: %TOOLPATH% - set _ROSBE_HOST_MINGWPATH=%TOOLPATH% + endlocal & set _ROSBE_HOST_MINGWPATH=%TOOLPATH% ) else ( echo ERROR: You specified wrong parameters. endlocal goto :EOC ) -endlocal & set _ROSBE_HOST_MINGWPATH=%_ROSBE_HOST_MINGWPATH%& set _ROSBE_TARGET_MINGWPATH=%_ROSBE_TARGET_MINGWPATH%& set ROS_ARCH=%ROS_ARCH% + call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" call "%_ROSBE_BASEDIR%\version.cmd" Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Thu Jul 9 16:54:03 2009 @@ -17,10 +17,14 @@ :: Check if we're switching to the AMD64 architecture if "%ROS_ARCH%" == "amd64" ( set ROS_PREFIX=x86_64-pc-mingw32 +) else ( + set ROS_PREFIX= ) -if NOT "%ROS_PREFIX%" == "" ( - set _ROSBE_PREFIX="%ROS_PREFIX%"- +if "%ROS_PREFIX%" == "" ( + set _ROSBE_PREFIX= +) else ( + set _ROSBE_PREFIX=%ROS_PREFIX%- ) set PATH=%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH%

1 0

[dreimer] 41825: Update ChangeLog.txt Prepare Setup Scripts for RosBE64 1.1
by dreimer＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: dreimer Date: Thu Jul 9 16:42:08 2009 New Revision: 41825 URL: http://svn.reactos.org/svn/reactos?rev=41825&view=rev Log: Update ChangeLog.txt Prepare Setup Scripts for RosBE64 1.1 Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi 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] Thu Jul 9 16:42:08 2009 @@ -6,6 +6,12 @@ * Installer uninstalls charch too. * Fixed some line skippers. (care2debug, Daniel Reimer) +- AMD64 Addon Fixes: + * Fix the one dash too much problem. + * Fix the args not checked bug. +(Samuel Serapion) +- Prepare scripts for RosBE64 1.1 which is compatible with the new RosBE Versions (Daniel Reimer) + *** Jun 29th, 2009 - RosBE 1.4.4 Released Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Thu Jul 9 16:42:08 2009 @@ -105,33 +105,13 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !insertmacro MUI_LANGUAGE "English" -Section -BaseFiles SEC01 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\charch.cmd - File /r Root\options.cmd - IfFileExists "$INSTDIR\RosBE.ps1" 0 +3 - File /r Root\charch.ps1 - File /r Root\options.ps1 - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\options64.exe - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options x86-64.lnk" \ - "$INSTDIR\Tools\options64.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section -MinGWGCCNASM SEC02 +Section -MinGWGCCNASM SEC01 SetOutPath "$INSTDIR\amd64" SetOverwrite try File /r Components\amd64\*.* SectionEnd -Section -StartMenuShortcuts SEC03 +Section -StartMenuShortcuts SEC02 SetShellVarContext current ;; @@ -150,6 +130,24 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd +Section /o "Config Tool" SEC03 + SetShellVarContext current + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\options.cmd + IfFileExists "$INSTDIR\RosBE.ps1" 0 +3 + File /r Root\options.ps1 + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Components\Tools\options64.exe + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options x86-64.lnk" \ + "$INSTDIR\Tools\options64.exe" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + Section /o "Desktop Shortcuts" SEC04 SetShellVarContext current @@ -205,8 +203,8 @@ ;; Clean up installed files. ;; RMDir /r /REBOOTOK "$INSTDIR\x86_64" - Delete /REBOOTOK "$INSTDIR\charch.cmd" - Delete /REBOOTOK "$INSTDIR\charch.ps1" + Delete /REBOOTOK "$INSTDIR\Tools\options64.exe + Delete /REBOOTOK "$INSTDIR\Tools\options64.exe Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR"

1 0

[ros-arm-bringup] 41824: - Fix a critical bug in the German hack which was causing the last PDE not to be synched with the ReactOS Memory Manager (or worse, the first, if there was only one PDE). - Add a new file which will hold the executive layer above the pool allocator (the Ex* routines). - This should eventually be moved to \ex. - Note that the current ReactOS pool Ex* routines are in \mm, which is dead wrong. - Define the POOL_DESCRIPTOR and POOL_HEADER structures for the NT 5.2 pool. - De
by ros-arm-bringup＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: ros-arm-bringup Date: Thu Jul 9 13:33:49 2009 New Revision: 41824 URL: http://svn.reactos.org/svn/reactos?rev=41824&view=rev Log: - Fix a critical bug in the German hack which was causing the last PDE not to be synched with the ReactOS Memory Manager (or worse, the first, if there was only one PDE). - Add a new file which will hold the executive layer above the pool allocator (the Ex* routines). - This should eventually be moved to \ex. - Note that the current ReactOS pool Ex* routines are in \mm, which is dead wrong. - Define the POOL_DESCRIPTOR and POOL_HEADER structures for the NT 5.2 pool. - Define, create, and implement the routine to initialize a pool vector. - For now, we assume you want the nonpaged pool vector/descriptor. - Call this routine from the ARM3 initialization routine. - No changes to system behavior other than the bugfix above. Added: trunk/reactos/ntoskrnl/mm/ARM3/expool.c (with props) Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Added: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Thu Jul 9 13:33:49 2009 @@ -1,0 +1,85 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/expool.c + * PURPOSE: ARM Memory Manager Executive Pool Manager + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::EXPOOL" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +POOL_DESCRIPTOR NonPagedPoolDescriptor; +PPOOL_DESCRIPTOR PoolVector[2]; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +ExInitializePoolDescriptor(IN PPOOL_DESCRIPTOR PoolDescriptor, + IN POOL_TYPE PoolType, + IN ULONG PoolIndex, + IN ULONG Threshold, + IN PVOID PoolLock) +{ + PLIST_ENTRY NextEntry, LastEntry; + + // + // Setup the descriptor based on the caller's request + // + PoolDescriptor->PoolType = PoolType; + PoolDescriptor->PoolIndex = PoolIndex; + PoolDescriptor->Threshold = Threshold; + PoolDescriptor->LockAddress = PoolLock; + + // + // Initialize accounting data + // + PoolDescriptor->RunningAllocs = 0; + PoolDescriptor->RunningDeAllocs = 0; + PoolDescriptor->TotalPages = 0; + PoolDescriptor->TotalBytes = 0; + PoolDescriptor->TotalBigPages = 0; + + // + // Nothing pending for now + // + PoolDescriptor->PendingFrees = NULL; + PoolDescriptor->PendingFreeDepth = 0; + + // + // Loop all the descriptor's allocation lists and initialize them + // + NextEntry = PoolDescriptor->ListHeads; + LastEntry = NextEntry + POOL_LISTS_PER_PAGE; + while (NextEntry < LastEntry) InitializeListHead(NextEntry++); +} + +VOID +NTAPI +InitializePool(IN POOL_TYPE PoolType, + IN ULONG Threshold) +{ + ASSERT(PoolType == NonPagedPool); + + // + // Initialize the nonpaged pool descirptor + // + PoolVector[PoolType] = &NonPagedPoolDescriptor; + ExInitializePoolDescriptor(PoolVector[PoolType], + PoolType, + 0, + Threshold, + NULL); +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/expool.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/expool.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Thu Jul 9 13:33:49 2009 @@ -132,7 +132,7 @@ // Puerile piece of junk-grade carbonized horseshit puss sold to the lowest bidder // ULONG Pde = ADDR_TO_PDE_OFFSET(AddressStart); - while (Pde < ADDR_TO_PDE_OFFSET(AddressEnd)) + while (Pde <= ADDR_TO_PDE_OFFSET(AddressEnd)) { // // This both odious and heinous @@ -707,8 +707,13 @@ // Sync us up with ReactOS Mm // MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); - MiSyncARM3WithROS(MmNonPagedPoolStart, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); + MiSyncARM3WithROS(MmArmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); + + // + // Initialize the nonpaged pool + // + InitializePool(NonPagedPool, 0); } else { Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jul 9 13:33:49 2009 @@ -12,6 +12,56 @@ #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_FREE_PAGE_LISTS 4 + +// +// FIXFIX: These should go in ex.h after the pool merge +// +#define POOL_BLOCK_SIZE 8 +#define POOL_LISTS_PER_PAGE (PAGE_SIZE / POOL_BLOCK_SIZE) + +typedef struct _POOL_DESCRIPTOR +{ + POOL_TYPE PoolType; + ULONG PoolIndex; + ULONG RunningAllocs; + ULONG RunningDeAllocs; + ULONG TotalPages; + ULONG TotalBigPages; + ULONG Threshold; + PVOID LockAddress; + PVOID PendingFrees; + LONG PendingFreeDepth; + SIZE_T TotalBytes; + SIZE_T Spare0; + LIST_ENTRY ListHeads[POOL_LISTS_PER_PAGE]; +} POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR; + +typedef struct _POOL_HEADER +{ + union + { + struct + { + USHORT PreviousSize:9; + USHORT PoolIndex:7; + USHORT BlockSize:9; + USHORT PoolType:7; + }; + ULONG Ulong1; + }; + union + { + ULONG PoolTag; + struct + { + USHORT AllocatorBackTraceIndex; + USHORT PoolTagHash; + }; + }; +} POOL_HEADER, *PPOOL_HEADER; +// +// END FIXFIX +// typedef enum _MMSYSTEM_PTE_POOL_TYPE { @@ -60,6 +110,13 @@ NTAPI MiInitializeArmPool( VOID +); + +VOID +NTAPI +InitializePool( // + IN POOL_TYPE PoolType, + IN ULONG Threshold ); VOID Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Jul 9 13:33:49 2009 @@ -363,6 +363,7 @@ <file>contmem.c</file> <file>drvmgmt.c</file> <file>dynamic.c</file> + <file>expool.c</file> <file>hypermap.c</file> <file>init.c</file> <file>iosup.c</file>

1 0

[dchapyshev] 41823: - Update Russian translation
by dchapyshev＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: dchapyshev Date: Thu Jul 9 10:16:10 2009 New Revision: 41823 URL: http://svn.reactos.org/svn/reactos?rev=41823&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/paint/lang/ru-RU.rc Modified: trunk/reactos/base/applications/paint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] Thu Jul 9 10:16:10 2009 @@ -41,7 +41,7 @@ MENUITEM SEPARATOR POPUP "Ìàñ&øòàá" BEGIN - POPUP "User defined" + POPUP "Âûáðàòü" BEGIN MENUITEM "12,5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -52,8 +52,8 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Show grid", IDM_VIEWSHOWGRID - MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Ïîêàçàòü ñåòêó", IDM_VIEWSHOWGRID + MENUITEM "Ïîêàçàòü ýñêèç", IDM_VIEWSHOWMINIATURE END MENUITEM "Ïîëíûé ýêðàí\tCtrl+F", IDM_VIEWFULLSCREEN END @@ -173,7 +173,7 @@ IDS_INFOTEXT, "Paint äëÿ ReactOS ðàñïðîñòðàíÿåòñÿ ïîä ëèöåíçèåé GNU Lesser General Public License (LGPL) âåðñèè 3 (see www.gnu.org)" IDS_SAVEPROMPTTEXT, "Ñîõðàíèòü èçìåíåíèÿ â %s?" IDS_DEFAULTFILENAME, "Áåç_èìåíè.bmp" - IDS_MINIATURETITLE, "Miniature" + IDS_MINIATURETITLE, "Ýñêèç" IDS_TOOLTIP1, "Âûäåëåíèå ïðîèçâîëüíîé îáëàñòè" IDS_TOOLTIP2, "Âûäåëåíèå" IDS_TOOLTIP3, "Ëàñòèê"

1 0

[dreimer] 41822: amd64 fixes by Samuel Serapion: - Fix the one dash too much problem. - Fix the args not checked bug. Thx for the help.
by dreimer＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: dreimer Date: Thu Jul 9 06:00:08 2009 New Revision: 41822 URL: http://svn.reactos.org/svn/reactos?rev=41822&view=rev Log: amd64 fixes by Samuel Serapion: - Fix the one dash too much problem. - Fix the args not checked bug. Thx for the help. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/version.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] Thu Jul 9 06:00:08 2009 @@ -61,8 +61,8 @@ $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++" $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc" $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" - $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "gcc" - $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "g++" + $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" + "gcc" + $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" + "g++" # Get the current date and time for use in in our build log's file name. $TIMERAW = get-date -f t 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] Thu Jul 9 06:00:08 2009 @@ -22,7 +22,7 @@ # Set defaults to work with and override them if edited by # the options utility. -if ("$ENV:ROS_ARCH" -eq "") { +if ($args[0] -eq $null) { $ENV:ROS_ARCH = "i386" } else { $ENV:ROS_ARCH = "$($args)" @@ -30,6 +30,7 @@ $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) +$global:_ROSBE_PREFIX = $null $global:_ROSBE_VERSION = "1.4.4" $global:_ROSBE_ROSSOURCEDIR = "$pwd" $global:_ROSBE_SHOWTIME = 1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Thu Jul 9 06:00:08 2009 @@ -9,13 +9,19 @@ # Check if we're switching to the AMD64 architecture if ("$ENV:ROS_ARCH" -eq "amd64") { - $ENV:ROS_PREFIX = "x86_64-pc-mingw32-" + $ENV:ROS_PREFIX = "x86_64-pc-mingw32" } else { $ENV:ROS_PREFIX = $null } +if ("$ENV:ROS_PREFIX") { + $global:_ROSBE_PREFIX = "$ENV:ROS_PREFIX" + "-" +} else { + $global:_ROSBE_PREFIX = $null +} + $ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" -$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc" +$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" & $TARGETGCC -v 2> gcctvers.tmp $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' $global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Thu Jul 9 06:00:08 2009 @@ -9,14 +9,14 @@ (get-WmiObject Win32_OperatingSystem).caption # GCC -$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc" +$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" & $TARGETGCC -v 2> gcctvers.tmp (select-string -path .\gcctvers.tmp "gcc version") -replace ".*:(.*?)\b",'$1' "gcc target - $_ROSBE_TARGET_GCCTARGET" remove-item gcctvers.tmp # LD -$run = "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX" + "ld.exe" +$run = "$_ROSBE_TARGET_MINGWPATH\bin\$global:_ROSBE_PREFIX" + "ld" & "$run" -v # NASM or YASM Modified: 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 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Thu Jul 9 06:00:08 2009 @@ -38,8 +38,8 @@ 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++ +set TARGET_CC=%_ROSBE_CCACHE%%_ROSBE_ROSPREFIX%gcc +set TARGET_CPP=%_ROSBE_CCACHE%%_ROSBE_ROSPREFIX%g++ :: Get the current date and time for use in in our build log's file name. call "%_ROSBE_BASEDIR%\TimeDate.cmd" 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] Thu Jul 9 06:00:08 2009 @@ -7,7 +7,7 @@ * Fixed some line skippers. (care2debug, Daniel Reimer) -*** Jul 29th, 2009 - RosBE 1.4.4 Released +*** Jun 29th, 2009 - RosBE 1.4.4 Released - Reverted to the old GCC. Because of the optimization we have problems running ROS on Pentium I PCs. (Colin Finck) - Updated SVN to 1.6.3 (Daniel Reimer) 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] Thu Jul 9 06:00:08 2009 @@ -22,12 +22,13 @@ :: Set defaults to work with and override them if edited by :: the options utility. -if "%ROS_ARCH%" == "" ( +if "%1%" == "" ( set ROS_ARCH=i386 ) else ( set ROS_ARCH=%1 ) +set _ROSBE_ROSPREFIX="" set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_VERSION=1.4.4 Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Thu Jul 9 06:00:08 2009 @@ -16,15 +16,17 @@ :: Check if we're switching to the AMD64 architecture if "%ROS_ARCH%" == "amd64" ( - set ROS_PREFIX=x86_64-pc-mingw32- -) else ( - set ROS_PREFIX= + set ROS_PREFIX=x86_64-pc-mingw32 +) + +if NOT "%ROS_PREFIX%" == "" ( + set _ROSBE_PREFIX="%ROS_PREFIX%"- ) set PATH=%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% -for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%gcc -v 2>&1 | find "Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i +for /f "usebackq tokens=3" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_HOST_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_HOST_GCCTARGET=%%i Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Thu Jul 9 06:00:08 2009 @@ -16,11 +16,11 @@ ver :: GCC -"%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%gcc" -v 2>&1 | find "gcc version" +"%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%gcc" -v 2>&1 | find "gcc version" echo gcc target^: %_ROSBE_TARGET_GCCTARGET% :: LD -"%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%ld" -v +"%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%ld" -v :: NASM or YASM if exist "%_ROSBE_HOST_MINGWPATH%\bin\nasm.exe" (

1 0

[sserapion] 41821: The beginning of the Makefile has comments about the usage of special build flags, one of them, ROS_PREFIX has this notice: "Don't include the dash (-) before gcc.". RBuild has grown up and used the documented behavior but RosBE and the makefile itself isn't consistent and ignore this tidbit. Attempt to fix build for amd64 and others that use ROS_PREFIX on windows, current rosbe + addon for amd64 dont work without patching the scripts, call me for details...
by sserapion＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: sserapion Date: Thu Jul 9 05:28:44 2009 New Revision: 41821 URL: http://svn.reactos.org/svn/reactos?rev=41821&view=rev Log: The beginning of the Makefile has comments about the usage of special build flags, one of them, ROS_PREFIX has this notice: "Don't include the dash (-) before gcc.". RBuild has grown up and used the documented behavior but RosBE and the makefile itself isn't consistent and ignore this tidbit. Attempt to fix build for amd64 and others that use ROS_PREFIX on windows, current rosbe + addon for amd64 dont work without patching the scripts, call me for details... Modified: branches/ros-amd64-bringup/reactos/Makefile branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/Makef… ============================================================================== --- branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] Thu Jul 9 05:28:44 2009 @@ -303,31 +303,31 @@ # Set target compiler/linker ifneq ($(ROS_PREFIX),) - PREFIX_ := $(ROS_PREFIX)- + PREFIX_ := $(ROS_PREFIX) else ifeq ($(HOST),mingw32-linux) - PREFIX_ := mingw32- + PREFIX_ := mingw32 else PREFIX_ := endif endif ifeq ($(TARGET_CC),) - TARGET_CC = $(PREFIX_)gcc + TARGET_CC = $(PREFIX_)-gcc endif ifeq ($(TARGET_CPP),) - TARGET_CPP = $(PREFIX_)g++ + TARGET_CPP = $(PREFIX_)-g++ endif gcc = $(Q)$(TARGET_CC) gpp = $(Q)$(TARGET_CPP) gas = $(Q)$(TARGET_CC) -x assembler-with-cpp -ld = $(Q)$(PREFIX_)ld -nm = $(Q)$(PREFIX_)nm -objdump = $(Q)$(PREFIX_)objdump -ar = $(Q)$(PREFIX_)ar -objcopy = $(Q)$(PREFIX_)objcopy -dlltool = $(Q)$(PREFIX_)dlltool -strip = $(Q)$(PREFIX_)strip -windres = $(Q)$(PREFIX_)windres +ld = $(Q)$(PREFIX_)-ld +nm = $(Q)$(PREFIX_)-nm +objdump = $(Q)$(PREFIX_)-objdump +ar = $(Q)$(PREFIX_)-ar +objcopy = $(Q)$(PREFIX_)-objcopy +dlltool = $(Q)$(PREFIX_)-dlltool +strip = $(Q)$(PREFIX_)-strip +windres = $(Q)$(PREFIX_)-windres # Set utilities ifeq ($(OSTYPE),msys) Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Thu Jul 9 05:28:44 2009 @@ -749,7 +749,7 @@ if ( ROS_PREFIXValue.length () > 0 ) { compilerPrefix = ROS_PREFIXValue; - compilerCommand = compilerPrefix + "gcc"; + compilerCommand = compilerPrefix + "-gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } #if defined(WIN32) @@ -993,7 +993,7 @@ if ( ROS_PREFIXValue.length () > 0 ) { binutilsPrefix = ROS_PREFIXValue; - binutilsCommand = binutilsPrefix + "ld"; + binutilsCommand = binutilsPrefix + "-ld"; manualBinutilsSetting = true; detectedBinutils = true; }

1 0

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