Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 40750: - Make debug pool return 8-bytes aligned pointers. The padding area (up to 7 bytes) is not being checked for overruns now. ReactOS fully boots and works with this change and a debug pool.
by fireball＠svn.reactos.org 30 Apr '09

30 Apr '09

Author: fireball Date: Thu Apr 30 13:09:03 2009 New Revision: 40750 URL: http://svn.reactos.org/svn/reactos?rev=40750&view=rev Log: - Make debug pool return 8-bytes aligned pointers. The padding area (up to 7 bytes) is not being checked for overruns now. ReactOS fully boots and works with this change and a debug pool. Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Thu Apr 30 13:09:03 2009 @@ -24,12 +24,23 @@ NTAPI ExpIsPoolTagDebuggable(ULONG Tag) { +#if 0 if (Tag == TAG('C', 'a', 'l', 'l')) return FALSE; if (Tag == TAG('D', 'r', 'i', 'v')) return FALSE; if (Tag == TAG('D', 'e', 'v', 'i')) return FALSE; if (Tag == TAG('A', 'd', 'a', 'p')) return FALSE; - return FALSE;//TRUE; + if (Tag == TAG('S', 'e', 'S', 'd')) return FALSE; + if (Tag == TAG('O', 'b', 'D', 'i')) return FALSE; + if (Tag == TAG('O', 'b', 'N', 'm')) return FALSE; + if (Tag == TAG('O', 'b', 'N', 'D')) return FALSE; + if (Tag == TAG('O', 'b', 't', 'b')) return FALSE; + if (Tag == TAG('O', 'b', 'S', 'c')) return FALSE; + //if (Tag == TAG('S', 'e', 'S', 'i')) return FALSE; + //if (Tag == TAG('S', 'e', 'A', 'c')) return FALSE; +#endif + + return TRUE; } @@ -37,11 +48,15 @@ NTAPI ExpAllocateDebugPool(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Caller, BOOLEAN EndOfPage) { - ULONG UserSize = Size + sizeof(EI_WHOLE_PAGE_HEADER); - ULONG TotalSize = UserSize + 2*PAGE_SIZE; + ULONG UserSize, TotalSize, AlignedSize; ULONG_PTR UserData, GuardArea; PEI_WHOLE_PAGE_HEADER Header; ULONG_PTR Buffer; + + /* Calculate sizes */ + AlignedSize = ROUND_UP(Size, MM_POOL_ALIGNMENT); + UserSize = AlignedSize + sizeof(EI_WHOLE_PAGE_HEADER); + TotalSize = UserSize + 2*PAGE_SIZE; /* Right now we support only end-of-page allocations */ ASSERT(EndOfPage); @@ -70,13 +85,13 @@ GuardArea = PAGE_ROUND_DOWN(Buffer + TotalSize - PAGE_SIZE + 1); /* Calculate user data and header pointers */ - UserData = GuardArea - Size; + UserData = GuardArea - AlignedSize; Header = (PEI_WHOLE_PAGE_HEADER)(UserData - sizeof(EI_WHOLE_PAGE_HEADER)); /* Fill out the header */ Header->ActualAddress = (PVOID)Buffer; Header->Tag = Tag; - Header->Size = Size; + Header->Size = AlignedSize; /* Protect the guard page */ MmSetPageProtect(NULL, (PVOID)GuardArea, PAGE_NOACCESS);

1 0

[dreimer] 40749: Prepare for Version 1.4.2 and 64 bit Version 1.1. Time to mention Physicus now. ; -) The color thingy was his idea.
by dreimer＠svn.reactos.org 30 Apr '09

30 Apr '09

Author: dreimer Date: Thu Apr 30 11:50:57 2009 New Revision: 40749 URL: http://svn.reactos.org/svn/reactos?rev=40749&view=rev Log: Prepare for Version 1.4.2 and 64 bit Version 1.1. Time to mention Physicus now. ;-) The color thingy was his idea. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi 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 Apr 30 11:50:57 2009 @@ -19,7 +19,7 @@ $ENV:APPDATA = $ENV:USERPROFILE } $ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" -$global:_ROSBE_VERSION = 1.4 +$global:_ROSBE_VERSION = 1.4.2 $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" 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 Apr 30 11:50:57 2009 @@ -1,4 +1,21 @@ -*** February xxth, 200x - RosBE 1.4 Released +*** May XXth, 2009 - RosBE 1.4.2 Released + +- Add the environment variables ROSBE_HOST_CFLAGS, ROSBE_HOST_CXXFLAGS, ROSBE_TARGET_CFLAGS, ROSBE_TARGET_CXXFLAGS + They contain existing pathes for the built-in include directories of the Host C/C++ and Target C/C++ compilers as compiler flags. + Required for kjk's rbuild work. (Colin Finck) +- Fixes for the Uninstall Routine to keep most settings, if wished, on a update. (Daniel Reimer) +- Remove some stupid setlocals. (Daniel Reimer) +- New Built GCC which supports the recent variable changes (Colin Finck) +- Make it possible to set different settings for any arch in RosBE. (Daniel Reimer, Timo Kreuzer) + + +*** April 07th, 2009 - RosBE 1.4.1 Released + +- Updated:SVN 1.6 included (Daniel Reimer) +- Fixed: Sped up starting of rosbe (Daniel Reimer) +- Fixed: Hopefully fixed bison. (Daniel Reimer) + +*** February 01st, 2009 - RosBE 1.4 Released "Quote of the year: A loooong time ago there was something called Batch. It was a old scripting "language" which you could use for some stuff, but with hacks, so ugly, you Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Thu Apr 30 11:50:57 2009 @@ -1,4 +1,4 @@ -ReactOS Build Environment v1.3 +ReactOS Build Environment v1.4.2 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document excluding Subversion) @@ -87,7 +87,8 @@ The precise terms and conditions for copying, distribution and modification follow. - + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -142,7 +143,8 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -200,7 +202,8 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -257,7 +260,8 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -310,7 +314,8 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -1103,7 +1108,8 @@ want its recipients to know that what they have is not the original version, so that any problems introduced by others will not reflect on the original authors' reputations. - + + Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that companies distributing free software will individually obtain patent licenses, thus in effect @@ -1150,7 +1156,8 @@ Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - + + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -1197,7 +1204,8 @@ You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -1255,7 +1263,8 @@ ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -1306,7 +1315,8 @@ distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + + 6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -1360,7 +1370,8 @@ accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -1401,7 +1412,8 @@ restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - + + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -1453,7 +1465,8 @@ the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -1487,7 +1500,8 @@ DAMAGES. END OF TERMS AND CONDITIONS - + + Appendix: How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest @@ -1592,7 +1606,8 @@ that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -1648,7 +1663,8 @@ "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -1695,7 +1711,8 @@ You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -1753,7 +1770,8 @@ ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -1804,7 +1822,8 @@ distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -1866,7 +1885,8 @@ accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -1907,7 +1927,8 @@ restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -1959,7 +1980,8 @@ the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -1993,7 +2015,8 @@ DAMAGES. END OF TERMS AND CONDITIONS - + + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. 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 Apr 30 11:50:57 2009 @@ -21,7 +21,7 @@ :: if not defined APPDATA set APPDATA=%USERPROFILE% set PATH=%SystemRoot%\system32;%SystemRoot% -set _ROSBE_VERSION=1.4 +set _ROSBE_VERSION=1.4.2 set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_MODE=RosBE 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 Apr 30 11:50:57 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler" -!define PRODUCT_VERSION "1.0" +!define PRODUCT_VERSION "1.1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,15 +17,15 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.0.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.1.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2008 ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2008 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.0.0.0" +VIProductVersion "1.1.0.0" CRCCheck force SetCompressor /FINAL /SOLID lzma

1 0

[dreimer] 40748: rename the app to options64 and add it to the nsi installer. fix options.cmd/ps1 to select the right options.exe
by dreimer＠svn.reactos.org 30 Apr '09

30 Apr '09

Author: dreimer Date: Thu Apr 30 11:32:09 2009 New Revision: 40748 URL: http://svn.reactos.org/svn/reactos?rev=40748&view=rev Log: rename the app to options64 and add it to the nsi installer. fix options.cmd/ps1 to select the right options.exe Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c - copied, changed from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.exe.Manifest - copied unchanged from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.exe.Manifest trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h - copied, changed from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.ico - copied unchanged from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.ico trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.rc - copied, changed from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.exe.Manifest trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.ico trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Thu Apr 30 11:32:09 2009 @@ -9,20 +9,33 @@ $host.ui.RawUI.WindowTitle = "Options" + +if "%ROS_ARCH%" == "amd64" ( + $options=$_ROSBE_BASEDIR\Tools\options64.exe + $cfgfile=$ENV:APPDATA\RosBE\rosbe-options-amd64.cmd +else + $options=$_ROSBE_BASEDIR\Tools\options.exe + $cfgfile=$ENV:APPDATA\RosBE\rosbe-options.cmd +) + # # Run options.exe # -if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") { + +if (Test-Path "$options") { Push-Location "$_ROSBE_BASEDIR" - & "$_ROSBE_BASEDIR\Tools\options.exe" | out-null + & "$options" | out-null Pop-Location - if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.cmd") { - & "$ENV:APPDATA\RosBE\rosbe-options.cmd" + if (Test-Path "$cfgfile") { + & "$cfgfile" } } else { - "ERROR: options.exe was not found." + "ERROR: options executable was not found." } if ($_ROSBE_VERSION -ne $null) { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" } + +$options = $null +$cfgfile = $null Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Thu Apr 30 11:32:09 2009 @@ -14,20 +14,31 @@ title Options +if "%ROS_ARCH%" == "amd64" ( + set options=%_ROSBE_BASEDIR%\Tools\options64.exe + set cfgfile=%APPDATA%\RosBE\rosbe-options-amd64.cmd +else + set options=%_ROSBE_BASEDIR%\Tools\options.exe + set cfgfile=%APPDATA%\RosBE\rosbe-options.cmd +) + :: :: Run options.exe :: -if exist "%_ROSBE_BASEDIR%\Tools\options.exe" ( +if exist "%options%" ( pushd "%_ROSBE_BASEDIR%" - call "%_ROSBE_BASEDIR%\Tools\options.exe" + call "%options%" popd - if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" + if exist "%cfgfile%" ( + call "%cfgfile%" ) ) else ( - echo ERROR: options.exe was not found. + echo ERROR: options executable was not found. ) if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) + +set options= +set cfgfile= 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 Apr 30 11:32:09 2009 @@ -108,6 +108,18 @@ SetOutPath "$INSTDIR" SetOverwrite try File /r Root\charch.cmd + File /r Root\charch.ps1 + File /r Root\options.cmd + 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 @@ -182,6 +194,7 @@ ;; RMDir /r /REBOOTOK "$INSTDIR\x86_64" Delete /REBOOTOK "$INSTDIR\charch.cmd" + Delete /REBOOTOK "$INSTDIR\charch.ps1" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile [iso-8859-1] Thu Apr 30 11:32:09 2009 @@ -1,4 +1,4 @@ -TARGET := options.exe +TARGET := options64.exe .PHONY: all Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c (removed) @@ -1,641 +1,0 @@ -/* - * PROJECT: RosBE Options Dialog - * LICENSE: GNU General Public License v2. (see LICENSE.txt) - * FILE: Tools/config/options.c - * PURPOSE: Configuring RosBE - * COPYRIGHT: Copyright 2007 Maarten Bosma - * Copyright 2007 Pierre Schweitzer - * - */ - -#include "options.h" - -typedef struct _OPTIONS_DLG -{ - HWND hwndDlg; - HWND hwndToolTip; - HICON hIcon; - HFONT hFont; - SETTINGS Settings; -} OPTIONS_DLG, *POPTIONS_DLG; - -HINSTANCE hInstance; - -BOOL CreateDir(HWND hwnd, WCHAR* dir) -{ - WCHAR msgerror[256]; - - if (0 > (LONG)GetFileAttributes(dir)) - { - if (CreateDirectory(dir, NULL) == 0) - { - LoadString(hInstance, MSG_DIREFAILED, msgerror, 256); - MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); - return FALSE; - } - } - return TRUE; -} - -static -const -WCHAR* -getConfigFileCMD() -{ - static WCHAR filename[MAX_PATH]; - if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) - { - if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-amd64.cmd")) < MAX_PATH) - wcscat(filename, L"\\RosBE\\rosbe-options-amd64.cmd"); - } - else - { - wcscpy(filename, L"rosbe-options-amd64.cmd"); - } - return filename; -} - -static -const -WCHAR* -getConfigFilePS1() -{ - static WCHAR filename[MAX_PATH]; - if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) - { - if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-amd64.ps1")) < MAX_PATH) - wcscat(filename, L"\\RosBE\\rosbe-options-amd64.ps1"); - } - else - { - wcscpy(filename, L"rosbe-options-amd64.ps1"); - } - return filename; -} - -INT -WriteSettings(POPTIONS_DLG infoPtr) -{ - INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; - WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH]; - WCHAR msgerror[256]; - HANDLE hFile; - FILE *pFilecmd, *pFileps1; - - showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); - writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); - useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); - background = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); - GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); - GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); - GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); - GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); - - if (writelog && (logdir[0] != 0)) - if (!CreateDir(infoPtr->hwndDlg, logdir)) - return FALSE; - - if (objstate && (objdir[0] != 0)) - if (!CreateDir(infoPtr->hwndDlg, objdir)) - return FALSE; - - if (outstate && (outdir[0] != 0)) - if (!CreateDir(infoPtr->hwndDlg, outdir)) - return FALSE; - - wcscpy(checkmgw, mingwpath); - if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH) - wcscat(checkmgw, L"\\bin\\gcc.exe"); - hFile = CreateFile(checkmgw, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) - { - LoadString(hInstance, MSG_NOGCCFOUND, msgerror, 256); - MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); - return FALSE; - } - CloseHandle(hFile); - - pFilecmd = _wfopen(getConfigFileCMD(), L"w"); - pFileps1 = _wfopen(getConfigFilePS1(), L"w"); - - if (pFilecmd) - { - fwprintf(pFilecmd, L"::\n"); - fwprintf(pFilecmd, L":: This file has been automatically generated by the ReactOS\n"); - fwprintf(pFilecmd, L":: Build Environment options utility.\n"); - fwprintf(pFilecmd, L"::\n\n"); - fwprintf(pFilecmd, L"color %X%X\n", background, foreground); - fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); - fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); - fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); - fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); - fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); - if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set _ROSBE_OUTPATH=%s\n", outdir); - } - - if (pFileps1) - { - fwprintf(pFileps1, L"#\n"); - fwprintf(pFileps1, L"# This file has been automatically generated by the ReactOS\n"); - fwprintf(pFileps1, L"# Build Environment options utility.\n"); - fwprintf(pFileps1, L"#\n\n"); - fwprintf(pFileps1, L"(Get-Host).UI.RawUI.ForegroundColor = 0x%X\n", foreground); - fwprintf(pFileps1, L"(Get-Host).UI.RawUI.BackgroundColor = 0x%X\n", background); - fwprintf(pFileps1, L"clear-host\n"); - fwprintf(pFileps1, L"$_ROSBE_SHOWTIME = %d\n", showtime); - fwprintf(pFileps1, L"$_ROSBE_USECCACHE = %d\n", useccache); - fwprintf(pFileps1, L"$_ROSBE_STRIP = %d\n", strip); - fwprintf(pFileps1, L"$_ROSBE_NOSTRIP = %d\n", nostrip); - fwprintf(pFileps1, L"$_ROSBE_WRITELOG = %d\n", writelog); - if (logdir[0] != 0) fwprintf(pFileps1, L"$_ROSBE_LOGDIR = \"%s\"\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$_ROSBE_OBJPATH = \"%s\"\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$_ROSBE_OUTPATH = \"%s\"\n", outdir); - } - - if (pFilecmd && pFileps1) - { - fclose(pFilecmd); - fclose(pFileps1); - return TRUE; - } - - if (!pFilecmd) - { - fclose(pFilecmd); - fclose(pFileps1); - LoadString(hInstance, MSG_CMDFFAILED, msgerror, 256); - MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); - } - - if (!pFileps1) - { - fclose(pFilecmd); - fclose(pFileps1); - LoadString(hInstance, MSG_PS1FFAILED, msgerror, 256); - MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); - } - return FALSE; -} - -VOID LoadSettings(POPTIONS_DLG infoPtr) -{ - FILE *pFile; - WCHAR *ptr, *ptr2; - WCHAR WTempLine[25+MAX_PATH]; - WCHAR SBTitle[256]; - PSETTINGS LoadedSettings = &infoPtr->Settings; - - pFile = _wfopen(getConfigFileCMD(), L"r"); - if (pFile) - { - while (fgetws(WTempLine, 24+MAX_PATH, pFile)) - { - ptr = wcstok(WTempLine, L" "); - if (wcscmp(ptr, L"color") == 0) - { - ptr = wcstok(NULL, L" "); - ptr[2] = ptr[1]; - ptr[1] = 0; - LoadedSettings->background = wcstol(&ptr[0], NULL, 16); - LoadedSettings->foreground = wcstol(&ptr[2], NULL, 16); - } - else if (wcscmp(ptr, L"set") == 0) - { - ptr = wcstok(NULL, L"\0"); - ptr = wcstok(ptr, L"="); - ptr2 = wcstok(NULL, L"="); - if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0) - LoadedSettings->showtime = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) - LoadedSettings->useccache = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) - LoadedSettings->strip = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_NOSTRIP") == 0) - LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) - LoadedSettings->writelog = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) - wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0) - wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OBJPATH") == 0) - wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) - wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); - } - } - fclose(pFile); - LoadString(hInstance, MSG_SETLOADSUC, SBTitle, 256); - SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); - } - else - { - LoadedSettings->foreground = 0xb; - LoadedSettings->background = 0; - LoadedSettings->showtime = 1; - LoadedSettings->writelog = 1; - GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); - if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) - wcscat(LoadedSettings->mingwpath, MINGWVERSION); - - LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); - SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); - } - SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); - SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); - SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); - SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); - if (LoadedSettings->writelog) - { - EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSE), TRUE); - EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_LOGDIR), TRUE); - } - SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_SETCHECK, LoadedSettings->useccache, 0); - SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); - SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_SETCHECK, LoadedSettings->nostrip, 0); - SetDlgItemText(infoPtr->hwndDlg, ID_MGWDIR, LoadedSettings->mingwpath); - SetDlgItemText(infoPtr->hwndDlg, ID_LOGDIR, LoadedSettings->logdir); - if (LoadedSettings->objdir[0] != 0) - { - LoadedSettings->objstate = 1; - SetDlgItemText(infoPtr->hwndDlg, ID_OBJDIR, LoadedSettings->objdir); - SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSEOBJ), TRUE); - EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OBJDIR), TRUE); - } - if (LoadedSettings->outdir[0] != 0) - { - LoadedSettings->outstate = 1; - SetDlgItemText(infoPtr->hwndDlg, ID_OUTDIR, LoadedSettings->outdir); - SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSEOUT), TRUE); - EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OUTDIR), TRUE); - } -} - -VOID SetSaveState(POPTIONS_DLG infoPtr) -{ - INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; - WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; - BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; - PSETTINGS DefaultSettings = &infoPtr->Settings; - - showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); - writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); - useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); - background = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); - GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); - GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); - GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); - GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); - - if (objstate) - if ((wcscmp(objdir, DefaultSettings->objdir) != 0) && (wcslen(objdir) > 0)) - StateObj = FALSE; - if (outstate) - if ((wcscmp(outdir, DefaultSettings->outdir) != 0) && (wcslen(outdir) > 0)) - StateOut = FALSE; - if (writelog) - if ((wcscmp(logdir, DefaultSettings->logdir) != 0) && (wcslen(logdir) > 0)) - StateLog = FALSE; - - State ^= ((foreground == DefaultSettings->foreground) && (background == DefaultSettings->background) && - (showtime == DefaultSettings->showtime) && (writelog == DefaultSettings->writelog) && - (useccache == DefaultSettings->useccache) && (strip == DefaultSettings->strip) && - (objstate == DefaultSettings->objstate) && (outstate == DefaultSettings->outstate) && - (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && - (StateObj) && (StateOut) && (nostrip == DefaultSettings->nostrip)); - - EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OK), State); -} - -INT CALLBACK -BrowseProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - HWND hwndParent; - hwndParent = GetWindow(Dlg, GW_OWNER); - switch (Msg) - { - case BFFM_INITIALIZED: - { - WCHAR ActualPath[MAX_PATH]; - GetDlgItemText(hwndParent, (INT) lParam, ActualPath, MAX_PATH); - SendMessage(Dlg, BFFM_SETSELECTION, TRUE, (LPARAM)ActualPath); - break; - } - case BFFM_VALIDATEFAILED: - { - if (lParam != ID_MGWDIR) - { - WCHAR BoxMsg[256], BoxTitle[128]; - size_t PathLen; - LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); - LoadString(hInstance, MSG_INVALIDDIR, BoxMsg, 256); - if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDYES) - { - PathLen = wcslen((LPWSTR)wParam); - if (wcscmp((LPWSTR)wParam+PathLen, L"\\")) - wcsset((LPWSTR)wParam+(PathLen-1), '\0'); - if (CreateDirectory((LPWSTR)wParam, NULL) == 0) - { - LoadString(hInstance, MSG_DIREFAILED, BoxMsg, 256); - MessageBox(Dlg, BoxMsg, NULL, MB_ICONERROR); - } - else - { - SetDlgItemText(hwndParent, (INT) lParam, (LPWSTR)wParam); - } - } - } - break; - } - } - return FALSE; -} - -static VOID -AssociateToolWithControl(POPTIONS_DLG infoPtr, int ControlId, UINT StringId) -{ - HWND hwndControl; - TOOLINFO ti; - - hwndControl = GetDlgItem(infoPtr->hwndDlg, ControlId); - if (infoPtr->hwndToolTip && hwndControl) - { - ZeroMemory(&ti, sizeof(ti)); - ti.cbSize = sizeof(ti); - ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS; - ti.hwnd = infoPtr->hwndDlg; - ti.uId = (UINT_PTR)hwndControl; - ti.hinst = hInstance; - ti.lpszText = MAKEINTRESOURCE(StringId); - - SendMessage(infoPtr->hwndToolTip, TTM_ADDTOOL, 0, (LPARAM)&ti); - } -} - -INT_PTR CALLBACK -DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - POPTIONS_DLG infoPtr = NULL; - - if (Msg != WM_INITDIALOG) - { - infoPtr = (POPTIONS_DLG)GetWindowLongPtr(Dlg, DWLP_USER); - if (infoPtr == NULL) - return FALSE; - } - - switch (Msg) - { - case WM_INITDIALOG: - { - static const struct { - int ControlId; - UINT StringId; - } ToolTipAssociations[] = { - {IDC_BACK, HLP_BACKCOLORC}, - {IDC_FONT, HLP_FONTCOLORC}, - {ID_SHOWBUILDTIME, HLP_SBUILDTIME}, - {ID_USECCACHE, HLP_CCACHEUSED}, - {ID_STRIP, HLP_STRIPEDEXE}, - {ID_NOSTRIP, HLP_NOSTRIP}, - {ID_MGWDIR, HLP_FINDMGWDIR}, - {ID_BROWSEMGW, HLP_FINDMGWDIR}, - {ID_LOGDIR, HLP_FINDLOGDIR}, - {ID_BROWSE, HLP_FINDLOGDIR}, - {ID_SAVELOGS, HLP_FINDLOGDIR}, - {ID_OBJDIR, HLP_FINDOBJDIR}, - {ID_BROWSEOBJ, HLP_FINDOBJDIR}, - {ID_OTHEROBJ, HLP_FINDOBJDIR}, - {ID_OUTDIR, HLP_FINDOUTDIR}, - {ID_BROWSEOUT, HLP_FINDOUTDIR}, - {ID_OTHEROUT, HLP_FINDOUTDIR}, - {ID_OK, HLP_SAVEBUTTON}, - {ID_CANCEL, HLP_QUITBUTTON}, - }; - int i; - UINT j; - LOGFONT lf; - WCHAR TempColor[256]; - - infoPtr = (POPTIONS_DLG)lParam; - infoPtr->hwndDlg = Dlg; - - SetWindowLongPtr(Dlg, DWLP_USER, (LONG_PTR)infoPtr); - - infoPtr->hwndToolTip = CreateWindowEx(0, - TOOLTIPS_CLASS, - NULL, - WS_POPUP | TTS_ALWAYSTIP, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - infoPtr->hwndDlg, - NULL, - hInstance, - NULL); - - for (i = 0; i < sizeof(ToolTipAssociations) / sizeof(ToolTipAssociations[0]); i++) - AssociateToolWithControl(infoPtr, ToolTipAssociations[i].ControlId, ToolTipAssociations[i].StringId); - - infoPtr->hIcon = LoadImage( hInstance, - MAKEINTRESOURCE(ID_OPTICON), - IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - 0); - if(infoPtr->hIcon) - SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)infoPtr->hIcon); - - GetObject(GetStockObject(ANSI_FIXED_FONT), sizeof(LOGFONT), &lf); - lf.lfWeight = FW_BOLD; - infoPtr->hFont = CreateFont(lf.lfHeight, lf.lfWidth, lf.lfEscapement, lf.lfOrientation, lf.lfWeight, - lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, lf.lfOutPrecision, - lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfFaceName); - - for(j = 0; j < 16; j++) - { - LoadString(hInstance, j, TempColor, 256); - SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) TempColor); - SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) TempColor); - } - LoadSettings(infoPtr); - return TRUE; - } - - case WM_COMMAND: - { - if ((HIWORD(wParam) == CBN_SELCHANGE) && ((LOWORD(wParam) == IDC_FONT) || (LOWORD(wParam) == IDC_BACK))) - { - InvalidateRect(GetDlgItem(Dlg, ID_EXAMPLE), NULL, FALSE); - } - else - { - switch (wParam) - { - case ID_OK: - { - if (!WriteSettings(infoPtr)) - break; - } - case ID_CANCEL: - { - WCHAR BoxMsg[256], BoxTitle[128]; - if ((IsWindowEnabled(GetDlgItem(Dlg, ID_OK))) && (wParam == ID_CANCEL)) - { - LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); - LoadString(hInstance, MSG_EXITCHANGE, BoxMsg, 256); - if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDNO) - break; - } - PostMessage(Dlg, WM_CLOSE, 0, 0); - break; - } - case ID_BROWSE: - case ID_BROWSEMGW: - case ID_BROWSEOBJ: - case ID_BROWSEOUT: - { - BROWSEINFO PathInfo; - LPITEMIDLIST pidl; - LPMALLOC pMalloc; - INT Control = ID_LOGDIR; - INT IDText = MSG_FINDLOGDIR; - WCHAR path[MAX_PATH]; - WCHAR Text[512]; - - if (SHGetMalloc(&pMalloc) == NOERROR) - { - ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); - PathInfo.hwndOwner = Dlg; - PathInfo.ulFlags = BIF_EDITBOX | BIF_VALIDATE; - PathInfo.lpfn = (BFFCALLBACK)BrowseProc; - PathInfo.lParam = ID_LOGDIR; - PathInfo.pidlRoot = NULL; - if ((wParam == ID_BROWSEMGW) || (wParam == ID_BROWSEOBJ) || (wParam == ID_BROWSEOUT)) - { - Control = ID_MGWDIR; - IDText = MSG_FINDMGWDIR; - if (wParam == ID_BROWSEOBJ) - { - Control = ID_OBJDIR; - IDText = MSG_FINDOBJDIR; - } - else if (wParam == ID_BROWSEOUT) - { - Control = ID_OUTDIR; - IDText = MSG_FINDOUTDIR; - } - PathInfo.lParam = Control; - } - LoadString(hInstance, IDText, Text, 512); - PathInfo.lpszTitle = Text; - if ((pidl = SHBrowseForFolder(&PathInfo)) != NULL) - { - if (SHGetPathFromIDList(pidl, path)) - SetDlgItemText(Dlg, Control, path); - pMalloc->lpVtbl->Free(pMalloc, pidl); - } - pMalloc->lpVtbl->Release(pMalloc); - } - break; - } - case ID_OTHEROBJ: - case ID_OTHEROUT: - case ID_SAVELOGS: - { - BOOL WriteLogSet; - INT Dialog1 = ID_BROWSE; - INT Dialog2 = ID_LOGDIR; - WriteLogSet = (SendDlgItemMessageW(Dlg, (INT)wParam, BM_GETCHECK, 0, 0) == BST_CHECKED); - if (wParam == ID_OTHEROBJ) - { - Dialog1 = ID_BROWSEOBJ; - Dialog2 = ID_OBJDIR; - } - else if (wParam == ID_OTHEROUT) - { - Dialog1 = ID_BROWSEOUT; - Dialog2 = ID_OUTDIR; - } - EnableWindow(GetDlgItem(Dlg, Dialog1), WriteLogSet); - EnableWindow(GetDlgItem(Dlg, Dialog2), WriteLogSet); - break; - } - } - - } - SetSaveState(infoPtr); - return FALSE; - } - - case WM_CTLCOLORSTATIC: - { - HFONT hFontOld; - // note: do not change the order - it matches to previous order - static const COLORREF ColorsRGB[] = { 0x00000000, 0x00800000, 0x00008000, 0x00808000, 0x00000080, 0x00800080, - 0x00008080, 0x00c0c0c0, 0x00808080, 0x00ff0000, 0x0000ff00, - 0x00ffff00, 0x000000ff, 0x00ff00ff, 0x0000ffff, 0x00ffffff - }; - - if((HWND)lParam == GetDlgItem(Dlg, ID_EXAMPLE)) - { - hFontOld = SelectObject((HDC)wParam, infoPtr->hFont); - SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_FONT, CB_GETCURSEL, 0, 0)]); - SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); - return (INT_PTR)CreateSolidBrush(ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); - } - break; - } - - case WM_DESTROY: - { - if (infoPtr->hIcon) - DestroyIcon(infoPtr->hIcon); - if (infoPtr->hFont) - DeleteObject(infoPtr->hFont); - - } - - case WM_CLOSE: - { - EndDialog(Dlg, 0); - return TRUE; - } - } - return FALSE; -} - -int WINAPI -WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) -{ - POPTIONS_DLG OptionsDlgInfo; - hInstance = hInst; - - OptionsDlgInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*OptionsDlgInfo)); - if (OptionsDlgInfo != NULL) - { - ZeroMemory(OptionsDlgInfo, sizeof(OPTIONS_DLG)); - DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo); - HeapFree(GetProcessHeap(), 0, OptionsDlgInfo); - } - return 0; -} Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.exe.Manifest [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.exe.Manifest (removed) @@ -1,21 +1,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity - name="ReactOS.options" - processorArchitecture="x86" - version="1.1.0.0" - type="win32"/> -<description>Config Tool</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="x86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h (removed) @@ -1,37 +1,0 @@ -/* - * PROJECT: RosBE Options Dialog - * LICENSE: GNU General Public License v2. (see LICENSE.txt) - * FILE: Tools/config/options.h - * PURPOSE: Configuring RosBE - * COPYRIGHT: Copyright 2007 Maarten Bosma - * Copyright 2007 Pierre Schweitzer - * - */ - -#include <windows.h> -#include <stdio.h> -#include <shlobj.h> -#include <wchar.h> -#include "resources.h" - -#define MINGWVERSION L"\\i386" - -typedef struct _SETTINGS -{ - WCHAR logdir[MAX_PATH]; - WCHAR objdir[MAX_PATH]; - WCHAR outdir[MAX_PATH]; - WCHAR mingwpath[MAX_PATH]; - INT foreground; - INT background; - BOOL showtime; - BOOL useccache; - BOOL strip; - BOOL nostrip; - BOOL writelog; - BOOL objstate; - BOOL outstate; -} -SETTINGS, *PSETTINGS; - -wchar_t *wcsset(wchar_t *string, wchar_t c); Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== Binary file - no diff available. Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc (removed) @@ -1,41 +1,0 @@ -#include <windows.h> -#include "resources.h" - -ID_OPTICON ICON "options.ico" - -1 24 "options.exe.Manifest" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,0,0 - PRODUCTVERSION 1,1,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0" - VALUE "FileDescription", "Config Tool for RosBE\0" - VALUE "FileVersion", "1.1.0.0\0" - VALUE "InternalName", "options\0" - VALUE "LegalCopyright", "Copyright © Daniel Reimer 2007\0" - VALUE "OriginalFilename", "options.exe\0" - VALUE "ProductName", "Config Tool for RosBE\0" - VALUE "ProductVersion", "1.1.0.0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#include "rsrc.rc" Copied: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c (from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] Thu Apr 30 11:32:09 2009 @@ -8,7 +8,7 @@ * */ -#include "options.h" +#include "options64.h" typedef struct _OPTIONS_DLG { Copied: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h (from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] Thu Apr 30 11:32:09 2009 @@ -14,7 +14,7 @@ #include <wchar.h> #include "resources.h" -#define MINGWVERSION L"\\i386" +#define MINGWVERSION L"\\x86_64" typedef struct _SETTINGS { Copied: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.rc (from r40747, trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.rc [iso-8859-1] Thu Apr 30 11:32:09 2009 @@ -1,9 +1,9 @@ #include <windows.h> #include "resources.h" -ID_OPTICON ICON "options.ico" +ID_OPTICON ICON "options64.ico" -1 24 "options.exe.Manifest" +1 24 "options64.exe.Manifest" VS_VERSION_INFO VERSIONINFO FILEVERSION 1,1,0,0 @@ -23,12 +23,12 @@ BLOCK "040904b0" BEGIN VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0" - VALUE "FileDescription", "Config Tool for RosBE\0" + VALUE "FileDescription", "Config Tool for RosBE x86-64\0" VALUE "FileVersion", "1.1.0.0\0" - VALUE "InternalName", "options\0" + VALUE "InternalName", "options64\0" VALUE "LegalCopyright", "Copyright © Daniel Reimer 2007\0" - VALUE "OriginalFilename", "options.exe\0" - VALUE "ProductName", "Config Tool for RosBE\0" + VALUE "OriginalFilename", "options64.exe\0" + VALUE "ProductName", "Config Tool for RosBE x86-64\0" VALUE "ProductVersion", "1.1.0.0\0" END END

1 0

[dreimer] 40747: Add a way to set settings for amd64, too. By doing so I found out that the GCC setting in the config tool, did nothing, because it was creating a wrong named variable.
by dreimer＠svn.reactos.org 30 Apr '09

30 Apr '09

Author: dreimer Date: Thu Apr 30 11:09:49 2009 New Revision: 40747 URL: http://svn.reactos.org/svn/reactos?rev=40747&view=rev Log: Add a way to set settings for amd64, too. By doing so I found out that the GCC setting in the config tool, did nothing, because it was creating a wrong named variable. Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.exe.Manifest (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.ico (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/resources.h (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/rsrc.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/makefile (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.ico (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h (with props) trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/rsrc.rc (with props) Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.exe.Manifest trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/options.ico trunk/tools/RosBE/RosBE-Windows/Tools/config/options.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Removed: trunk/tools/RosBE/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co…

1 0

[dreimer] 40746: Change the way RosBE is colored. This makes it possible to colorize every arch RosBE differently. Tbd. Make this possible for all settings and add a neutrality checkbox into the config tool. to get back to the default color.
by dreimer＠svn.reactos.org 30 Apr '09

30 Apr '09

Author: dreimer Date: Thu Apr 30 10:29:11 2009 New Revision: 40746 URL: http://svn.reactos.org/svn/reactos?rev=40746&view=rev Log: Change the way RosBE is colored. This makes it possible to colorize every arch RosBE differently. Tbd. Make this possible for all settings and add a neutrality checkbox into the config tool. to get back to the default color. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi 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 Apr 30 10:29:11 2009 @@ -19,7 +19,6 @@ :: Set defaults to work with and override them if edited by :: the options utility. :: -color 0A if not defined APPDATA set APPDATA=%USERPROFILE% set PATH=%SystemRoot%\system32;%SystemRoot% set _ROSBE_VERSION=1.4 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] Thu Apr 30 10:29:11 2009 @@ -280,7 +280,7 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SetOutPath $INSTDIR 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 Apr 30 10:29:11 2009 @@ -125,7 +125,7 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0B /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe"

1 0

[cgutman] 40744: - Pass IRP_MN_QUERY_DEVICE_RELATIONS down the stack
by cgutman＠svn.reactos.org 30 Apr '09

30 Apr '09

Author: cgutman Date: Thu Apr 30 05:15:04 2009 New Revision: 40744 URL: http://svn.reactos.org/svn/reactos?rev=40744&view=rev Log: - Pass IRP_MN_QUERY_DEVICE_RELATIONS down the stack Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Apr 30 05:15:04 2009 @@ -2044,12 +2044,6 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); break; - case IRP_MN_QUERY_DEVICE_RELATIONS: - Status = STATUS_NOT_SUPPORTED; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - default: IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp);

1 0

[tkreuzer] 40742: reduce difference to trunk
by tkreuzer＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: tkreuzer Date: Thu Apr 30 01:59:36 2009 New Revision: 40742 URL: http://svn.reactos.org/svn/reactos?rev=40742&view=rev Log: reduce difference to trunk Modified: branches/ros-amd64-bringup/reactos/dll/cpl/timedate/timedate.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/timedate/timedate.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/timedate/timedate.rbuild [iso-8859-1] Thu Apr 30 01:59:36 2009 @@ -19,4 +19,3 @@ <file>timezone.c</file> <file>timedate.rc</file> </module> -

1 0

[tkreuzer] 40741: Don't cast pStartInfo->dwCrashDumpEnabled to LPBYTE and use it as pointer in RegSetValueExW, Instead pass &pStartInfo->dwCrashDumpEnabled.
by tkreuzer＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: tkreuzer Date: Thu Apr 30 01:57:47 2009 New Revision: 40741 URL: http://svn.reactos.org/svn/reactos?rev=40741&view=rev Log: Don't cast pStartInfo->dwCrashDumpEnabled to LPBYTE and use it as pointer in RegSetValueExW, Instead pass &pStartInfo->dwCrashDumpEnabled. Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Thu Apr 30 01:57:47 2009 @@ -575,7 +575,7 @@ RegSetValueExW(hKey, L"MinidumpDir", 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (wcslen(pStartInfo->szDumpFile) + 1) * sizeof(WCHAR)); } - RegSetValueExW(hKey, L"CrashDumpEnabled", 0, REG_DWORD, (LPBYTE)pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); + RegSetValueExW(hKey, L"CrashDumpEnabled", 0, REG_DWORD, (LPBYTE)&pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); RegCloseKey(hKey); }

1 0

[cfinck] 40740: - Add a "regtest.cmd" for running other commands (here "ipconfig") before starting rosautotest and call "start rosautotest" to run it asynchronously and let Explorer load completely - Set svn:eol-style for "unattend.inf" to CRLF, this file is a target one, which should also use target line-endings - Fix typo in syssetup debug print
by cfinck＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: cfinck Date: Thu Apr 30 00:14:25 2009 New Revision: 40740 URL: http://svn.reactos.org/svn/reactos?rev=40740&view=rev Log: - Add a "regtest.cmd" for running other commands (here "ipconfig") before starting rosautotest and call "start rosautotest" to run it asynchronously and let Explorer load completely - Set svn:eol-style for "unattend.inf" to CRLF, this file is a target one, which should also use target line-endings - Fix typo in syssetup debug print Added: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd (with props) Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf (contents, props changed) trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/syssetup/wizard.c Added: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd (added) +++ trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd [iso-8859-1] Thu Apr 30 00:14:25 2009 @@ -1,0 +1,3 @@ +@echo off +dbgprint --process "ipconfig" +start rosautotest /r /s Propchange: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Thu Apr 30 00:14:25 2009 @@ -1,54 +1,54 @@ -; In order to get unattended setup working: -; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed -; 2. Uncomment the line in bootdata.rbuild to include it into bootcd - -[Unattend] -Signature = "$ReactOS$" - -; yes - unattend setup enabled -; no - unattend setup disabled -UnattendSetupEnabled = yes - -; Install to \Device\Harddisk0\Partition1\ReactOS -DestinationDiskNumber = 0 -DestinationPartitionNumber = 1 -InstallationDirectory=ReactOS - -; MBRInstallType=0 skips MBR installation -; MBRInstallType=1 install MBR on floppy -; MBRInstallType=2 install MBR on hdd -MBRInstallType=2 - -FullName="MyName" -;OrgName="MyOrg" -ComputerName="MYCOMPUTERNAME"; -AdminPassword="MyPassword" - -; TimeZone is set GMT as default -TimeZoneIndex=85 - -; enable this setting to disable daylight saving changes -; DisableAutoDaylightTimeSet = 1 - -; enable this setting to format the selected partition -; 1 - format enabled -; 0 - format disabled -FormatPartition=1 - -; enable this setting to automatically create a partition -; during installation -; 1 - enabled -; 0 - disabled -AutoPartition = 1 - -; enable this setting to disable vmware driver install -; yes - disabled -; no - enabled -DisableVmwInst = yes -LocaleID = 409 - -; enable this section to automatically launch programs -; after 3rd boot -; -[GuiRunOnce] -%SystemRoot%\system32\rosautotest.exe /r /s +; In order to get unattended setup working: +; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed +; 2. Uncomment the line in bootdata.rbuild to include it into bootcd + +[Unattend] +Signature = "$ReactOS$" + +; yes - unattend setup enabled +; no - unattend setup disabled +UnattendSetupEnabled = yes + +; Install to \Device\Harddisk0\Partition1\ReactOS +DestinationDiskNumber = 0 +DestinationPartitionNumber = 1 +InstallationDirectory=ReactOS + +; MBRInstallType=0 skips MBR installation +; MBRInstallType=1 install MBR on floppy +; MBRInstallType=2 install MBR on hdd +MBRInstallType=2 + +FullName="MyName" +;OrgName="MyOrg" +ComputerName="MYCOMPUTERNAME"; +AdminPassword="MyPassword" + +; TimeZone is set GMT as default +TimeZoneIndex=85 + +; enable this setting to disable daylight saving changes +; DisableAutoDaylightTimeSet = 1 + +; enable this setting to format the selected partition +; 1 - format enabled +; 0 - format disabled +FormatPartition=1 + +; enable this setting to automatically create a partition +; during installation +; 1 - enabled +; 0 - disabled +AutoPartition = 1 + +; enable this setting to disable vmware driver install +; yes - disabled +; no - enabled +DisableVmwInst = yes +LocaleID = 409 + +; enable this section to automatically launch programs +; after 3rd boot +; +[GuiRunOnce] +%SystemRoot%\system32\cmd.exe /c "regtest.cmd" Propchange: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Thu Apr 30 00:14:25 2009 @@ -1,1 +1,1 @@ -native +CRLF Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Apr 30 00:14:25 2009 @@ -631,12 +631,14 @@ ; Ini Files boot\bootdata\system.ini 4 +; Regression Testing +boot\bootdata\bootcdregtest\regtest.cmd 7 optional + ; Subsystems subsystems\win32\csrss\csrss.exe 1 subsystems\win32\csrss\win32csr\win32csr.dll 1 subsystems\ntvdm\ntvdm.exe 1 subsystems\win32\win32k\win32k.sys 1 -boot\bootdata\bootcdregtest\testboot.bat 7 optional ; Modules modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Thu Apr 30 00:14:25 2009 @@ -2133,7 +2133,7 @@ KEY_SET_VALUE, &hKey) != ERROR_SUCCESS) { - DPRINT1("Error: failed to open HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce\n"); + DPRINT1("Error: failed to open HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce\n"); return TRUE; }

1 0

[pschweitzer] 40739: Fixed wrong check
by pschweitzer＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: pschweitzer Date: Wed Apr 29 23:23:29 2009 New Revision: 40739 URL: http://svn.reactos.org/svn/reactos?rev=40739&view=rev Log: Fixed wrong check Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/filtr… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/filtrctx.c [iso-8859-1] Wed Apr 29 23:23:29 2009 @@ -183,7 +183,7 @@ return STATUS_INVALID_PARAMETER; } - if (FileObject->Flags & FO_NAMED_PIPE) + if (FileObject->Flags & FO_FILE_OBJECT_HAS_EXTENSION) { return STATUS_INVALID_DEVICE_REQUEST; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs