Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 66111: [FOSDEM2015] - Update readme.txt with CD contents (à la CLT). - Add wallpapers (and one based on artwork by Henry Tang, that was already used in the official 0.3.17 release) and a...
by hbelusca＠svn.reactos.org 29 Jan '15

29 Jan '15

Author: hbelusca Date: Thu Jan 29 01:01:58 2015 New Revision: 66111 URL: http://svn.reactos.org/svn/reactos?rev=66111&view=rev Log: [FOSDEM2015] - Update readme.txt with CD contents (à la CLT). - Add wallpapers (and one based on artwork by Henry Tang, that was already used in the official 0.3.17 release) and activate the fosdem one. - Fix the autorun path (should be done globally in trunk later on, i.e. after FOSDEM2015 is over). - Add user-friendliness to the boot menu. Added: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ (with props) branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/Angelus_02_ROSWP.bmp - copied unchanged from r66089, branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/Angelus_02_ROSWP.bmp branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/CMakeLists.txt - copied, changed from r66089, branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/CMakeLists.txt branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ReadMe.txt - copied, changed from r66089, branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/ReadMe.txt branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/e36x_fosdem2015.bmp (with props) branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/lake.bmp - copied unchanged from r66089, branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/lake.bmp Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hivedef.inf branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/readme.txt Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react… ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf [iso-8859-1] Thu Jan 29 01:01:58 2015 @@ -1,3 +1,3 @@ [autorun] -open=reactos\welcome.exe +open=livecd\reactos\welcome.exe icon=icon.ico Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react… ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Thu Jan 29 01:01:58 2015 @@ -63,7 +63,7 @@ HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\e36x_fosdem2015.bmp" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001 Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react… ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Thu Jan 29 01:01:58 2015 @@ -1,9 +1,9 @@ [FREELOADER] -DefaultOS=Setup -TimeOut=5 +DefaultOS=LiveCD_RamDisk +TimeOut=20 [Display] -TitleText=ReactOS Hybrid-CD +TitleText=ReactOS 0.3.17 Hybrid-CD - FOSDEM 2015 StatusBarColor=Cyan StatusBarTextColor=Black BackdropTextColor=White @@ -13,26 +13,22 @@ TitleBoxColor=Red MessageBoxTextColor=White MessageBoxColor=Blue -MenuTextColor=Gray -MenuColor=Black -TextColor=Gray +MenuTextColor=White +MenuColor=Blue +TextColor=Yellow SelectedTextColor=Black SelectedColor=Gray -ShowTime=No -MenuBox=No -CenterMenu=No -MinimalUI=Yes -TimeText=Seconds until highlighted choice will be started automatically: +SpecialEffects=Yes [Operating Systems] -Setup="Setup" -LiveCD="LiveCD" -LiveCD_Debug="LiveCD (Debug)" -LiveCD_Screen="LiveCD (Screen)" -LiveCD_LogFile="LiveCD (Log file)" -LiveCD_RamDisk="LiveCD in RAM" -LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)" -LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)" +Setup="ReactOS Setup" +LiveCD="ReactOS Live" +LiveCD_Debug="ReactOS Live (Debug)" +LiveCD_Screen="ReactOS Live (Screen)" +LiveCD_RamDisk="ReactOS Live on RAM" +LiveCD_RamDisk_Debug="ReactOS Live on RAM (Debug)" +LiveCD_RamDisk_Screen="ReactOS Live on RAM (Screen)" +HddBoot="Boot from first hard disk" [Setup] BootType=ReactOSSetup @@ -53,11 +49,6 @@ SystemPath=\livecd\reactos Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT -[LiveCD_LogFile] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT - [LiveCD_RamDisk] BootType=Windows2003 SystemPath=ramdisk(0)\reactos @@ -72,3 +63,7 @@ BootType=Windows2003 SystemPath=ramdisk(0)\reactos Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD + +[HddBoot] +BootType=Drive +BootDrive=hd0 Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react… ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/readme.txt [iso-8859-1] Thu Jan 29 01:01:58 2015 @@ -1,7 +1,23 @@ ======================== -ReactOS Version 0.3.x -Updated March 3, 2013 +ReactOS Version 0.3.17 +For FOSDEM 2015 ======================== + +0. CD-ROM Contents +------------------ + +* ReactOS LiveCD and Installation +* ReactOS on QEMU virtual machine +* ReactOS Build Environment (RosBE) for Windows and Unix-like OSes +* ReactOS source code + +This CD-ROM starts an AutoRun program under Windows. Alternatively you can +browse the contents of this CD-ROM with any file browser. The folder names +should be self-explanatory. + +The source code of ReactOS can be compiled using the ReactOS Build Environment +under Windows or Unix-like operating systems such as Linux. + 1. What is ReactOS? ------------------- @@ -47,9 +63,3 @@ The tutorials contain more information on the project, compiling and testing ReactOS - amongst other topics. Contributors to the project are always welcome. - - -6. Author ---------- - -This document was written by Jason Filby (jasonfilby(a)yahoo.com). Propchange: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 29 01:01:58 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/CMakeLists.txt (from r66089, branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react… ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/CMakeLists.txt [iso-8859-1] Thu Jan 29 01:01:58 2015 @@ -1,2 +1,4 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP.bmp DESTINATION reactos FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/lake.bmp DESTINATION reactos FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/e36x_fosdem2015.bmp DESTINATION reactos FOR all) Copied: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ReadMe.txt (from r66089, branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/ReadMe.txt) URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react… ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/wallpaper/ReadMe.txt [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/ReadMe.txt [iso-8859-1] Thu Jan 29 01:01:58 2015 @@ -4,5 +4,5 @@ File Name | Author | Origin -------------------------------------------------------------------------------------------------------------------------------------------------- Angelus_02_ROSWP_4-3_1440x1080.jpg | Forum User "Angelus" (jedi.knight(a)wanadoo.es) | http://www.reactos.org/forum/viewtopic.php?p=50543#p50543 -clouds.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 lake.jpg | Andreas Bjerkeholt (harteex(a)gmail.com) | http://www.reactos.org/forum/viewtopic.php?p=17732#p17732 +e36x_fosdem2015.bmp | Based on artwork by Henry Tang | http://www.reactos.org/forum/viewtopic.php?f=25&t=13385#p109529 Added: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/e36x_fosdem2015.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.3.17-FOSDEM2015/reactos/modules/wallpaper/e36x_fosdem2015.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[hbelusca] 66110: [PACKAGES]: Update GNUTLS package files (tested by Sylvain & Daniel).
by hbelusca＠svn.reactos.org 29 Jan '15

29 Jan '15

Author: hbelusca Date: Thu Jan 29 00:43:44 2015 New Revision: 66110 URL: http://svn.reactos.org/svn/reactos?rev=66110&view=rev Log: [PACKAGES]: Update GNUTLS package files (tested by Sylvain & Daniel). Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Thu Jan 29 00:43:44 2015 @@ -104,8 +104,8 @@ "modules/optional/gnutls/libgcc_s_sjlj-1.dll" 53 optional "modules/optional/gnutls/libgmp-10.dll" 53 optional "modules/optional/gnutls/libgnutls-28.dll" 53 optional +"modules/optional/gnutls/libgnutls-xssl-0.dll" 53 optional "modules/optional/gnutls/libhogweed-2-5.dll" 53 optional +"modules/optional/gnutls/libnettle-4-7.dll" 53 optional "modules/optional/gnutls/libp11-kit-0.dll" 53 optional -"modules/optional/gnutls/libnettle-4-7.dll" 53 optional -"modules/optional/gnutls/libwinpthread-1.dll" 53 optional "modules/optional/gnutls/zlib1.dll" 53 optional

1 0

[hbelusca] 66109: [LIVE|HYBRIDCD]: We also need an empty "Default User/Start Menu/Programs" directory.
by hbelusca＠svn.reactos.org 29 Jan '15

29 Jan '15

Author: hbelusca Date: Thu Jan 29 00:20:56 2015 New Revision: 66109 URL: http://svn.reactos.org/svn/reactos?rev=66109&view=rev Log: [LIVE|HYBRIDCD]: We also need an empty "Default User/Start Menu/Programs" directory. Modified: trunk/reactos/boot/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=66… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Thu Jan 29 00:20:56 2015 @@ -17,8 +17,12 @@ VERBATIM) ##livecd -#clear it out and create the empty Desktop folder -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop\n") +#clear it out +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "") + +#create the empty Desktop and Start Menu folders +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs\n") add_custom_target(livecd COMMAND native-cdmake -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin @${CMAKE_CURRENT_BINARY_DIR}/livecd.lst REACTOS ${REACTOS_BINARY_DIR}/livecd.iso @@ -26,8 +30,12 @@ VERBATIM) ##hybridcd -#clear it out and create the empty Desktop folder -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") +#clear it out +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "") + +#create the empty Desktop and Start Menu folders +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs\n") add_custom_target(hybridcd COMMAND native-cdmake -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin @${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst REACTOS ${REACTOS_BINARY_DIR}/hybridcd.iso

1 0

[hbelusca] 66108: [ROS***]: Add few more information in the readme's.
by hbelusca＠svn.reactos.org 29 Jan '15

29 Jan '15

Author: hbelusca Date: Thu Jan 29 00:15:35 2015 New Revision: 66108 URL: http://svn.reactos.org/svn/reactos?rev=66108&view=rev Log: [ROS***]: Add few more information in the readme's. Modified: trunk/rosapps/readme.txt trunk/rostests/readme.txt Modified: trunk/rosapps/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/readme.txt?rev=66108&r1=66… ============================================================================== --- trunk/rosapps/readme.txt [iso-8859-1] (original) +++ trunk/rosapps/readme.txt [iso-8859-1] Thu Jan 29 00:15:35 2015 @@ -8,3 +8,17 @@ It is to be placed under "modules" subdirectory of a trunk checkout. No additional changes to build files are necessary, it'll be picked up automatically. + +To include "rosapps" in your build folder: +1. Copy the rosapps folder into the reactos\modules folder, or +2. Link reactos/modules/rosapps to rosapps + +# For Windows users + + cd %%_ROSSOURCEDIR%%\reactos\modules + mklink /j rosapps %%_ROSSOURCEDIR%%\rosapps + +# For UNIX users + + cd \$$_ROSSOURCEDIR/reactos/modules + ln -s \$$_ROSSOURCEDIR/rosapps rosapps Modified: trunk/rostests/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/readme.txt?rev=66108&r1=6… ============================================================================== --- trunk/rostests/readme.txt [iso-8859-1] (original) +++ trunk/rostests/readme.txt [iso-8859-1] Thu Jan 29 00:15:35 2015 @@ -8,3 +8,17 @@ It is to be placed under "modules" subdirectory of a trunk checkout. No additional changes to build files are necessary, it'll be picked up automatically. + +To include "rostests" in your build folder: +1. Copy the rostests folder into the reactos\modules folder, or +2. Link reactos/modules/rostests to rostests + +# For Windows users + + cd %%_ROSSOURCEDIR%%\reactos\modules + mklink /j rostests %%_ROSSOURCEDIR%%\rostests + +# For UNIX users + + cd \$$_ROSSOURCEDIR/reactos/modules + ln -s \$$_ROSSOURCEDIR/rostests rostests

1 0

[hbelusca] 66107: [REACTOS_SETUP] Show a critical error if txtsetup.sif cannot be found, instead of displaying empty fields in the setup. Patch by Lee Schroeder. CORE-8971 #resolve #comment Fixed, ...
by hbelusca＠svn.reactos.org 29 Jan '15

29 Jan '15

Author: hbelusca Date: Thu Jan 29 00:06:55 2015 New Revision: 66107 URL: http://svn.reactos.org/svn/reactos?rev=66107&view=rev Log: [REACTOS_SETUP] Show a critical error if txtsetup.sif cannot be found, instead of displaying empty fields in the setup. Patch by Lee Schroeder. CORE-8971 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sq-AL.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Ð¡Ð¿Ð¸ÑÑÐº Ð½Ð° Ð²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ÑÐµ Ð·Ð° ÑÐ»Ð°Ð³Ð°Ð½Ðµ Ð·Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ° Ð¿ÑÐµÐ´Ð¸ Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð²ÑÑÑÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ÑÐ¾ Ð·Ð° ÑÐ»Ð°Ð³Ð°Ð½Ðµ" IDS_ABORTSETUP "Ð ÐµÐ°ÐºÑÐÐ¡ Ð½Ðµ Ðµ Ð½Ð°Ð¿ÑÐ»Ð½Ð¾ ÑÐ»Ð¾Ð¶ÐµÐ½ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ° Ð²Ð¸. ÐÐºÐ¾ Ð¸Ð·Ð»ÐµÐ·ÐµÑÐµ Ð¾Ñ Ð½Ð°ÑÑÑÐ¾Ð¹Ð²Ð°Ð½ÐµÑÐ¾ ÑÐµÐ³Ð°, ÑÐµ ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð¿ÑÑÐ½ÐµÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹Ð²Ð°Ð½ÐµÑÐ¾ Ð¾ÑÐ½Ð¾Ð²Ð¾, Ð·Ð° Ð´Ð° ÑÐ»Ð¾Ð¶Ð¸ÑÐµ Ð ÐµÐ°ÐºÑÐ¾Ñ. ÐÐ°Ð¸ÑÑÐ¸Ð½Ð° Ð»Ð¸ Ð¸Ð·Ð»Ð¸Ð·Ð°ÑÐµ?" IDS_ABORTSETUP2 "ÐÑÐµÐºÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ»Ð°Ð³Ð°Ð½ÐµÑÐ¾?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" END Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -150,4 +150,6 @@ IDS_SUMMARYSUBTITLE "VÃ½pis voleb instalace k ovÄÅenÃ pÅed tÃm, neÅ¾ zaÄne instalace" IDS_ABORTSETUP "SystÃ©m ReactOS nenÃ na tomto poÄÃtaÄi kompletnÄ nainstalovanÃ½. Pokud nynÃ ukonÄÃte instalaci, bude ji pro nainstalovÃ¡nÃ systÃ©mu ReactOS nutnÃ© provÃ©st znova. Opravdu ukonÄit?" IDS_ABORTSETUP2 "PÅeruÅ¡it instalaci?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Instalace systÃ©mu ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die GerÃ¤te auf" IDS_ABORTSETUP "ReactOS ist nicht vollstÃ¤ndig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, dann mÃ¼ssen Sie das Setup nochmals ausfÃ¼hren, um ReactOS zu installieren. Wirklich beenden?" IDS_ABORTSETUP2 "Installation abbrechen?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue" + IDS_CAPTION "ReactOS Setup" END Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalaciÃ³n para su verificaciÃ³n antes de aplicarlas al dispositivo instalado" IDS_ABORTSETUP "ReactOS no estÃ¡ completamente instalado en su equipo. Si sale de la instalaciÃ³n ahora, tendrÃ¡ que ejecutar el instalador otra vez para instalar ReactOS. Â¿Realmente quiere salir?" IDS_ABORTSETUP2 "Â¿Abortar instalaciÃ³n?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "InstalaciÃ³n de ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Seadete kontrollimine enne paigaldamise alustamist" IDS_ABORTSETUP "ReactOS ei ole veel tÃ¤ielikult paigaldatud. Kas tÃµesti lahkuda?" IDS_ABORTSETUP2 "Katkestada paigaldamine?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOSi paigaldamine" END Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Installation de ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "××ª×§× ×ª ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Lista delle proprietÃ della installazione da controllare prima che siano eseguite sul dispositivo di installazione" IDS_ABORTSETUP "ReactOS non Ã¨ installato completamente sul computer. Se interropete l'installazione ora sarÃ necessario eseguire l'installazione di nuovo. Volete procedere?" IDS_ABORTSETUP2 "Volete interrompere l'installazione?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Installazione di ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene fÃ¸r du fortsetter installasjon av enhetene" IDS_ABORTSETUP "ReactOS er ikke fullstendig installert pÃ¥ datamaskinen. Hvis du avslutter nÃ¥, trenger du Ã¥ kjÃ¸re installeringen pÃ¥ nytt for Ã¥ installere ReactOS. Vil du virkelig avslutte?" IDS_ABORTSETUP2 "Avbryt installasjonen?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS installering" END Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -154,4 +154,6 @@ IDS_SUMMARYSUBTITLE "SprawdÅº ustawienia instalacji przed dokonaniem zmian na dysku" IDS_ABORTSETUP "Instalacja ReactOS nie zostaÅa ukoÅczona na tym komputerze. JeÅli teraz zakoÅczysz instalacjÄ, bÄdziesz musiaÅ uruchomiÄ Instalator ponownie, aby zainstalowaÄ ReactOS. Na pewno zakoÅczyÄ?" IDS_ABORTSETUP2 "PrzerwaÄ instalacjÄ?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Instalator ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "Listar propriedades da instalaÃ§Ã£o para verificaÃ§Ã£o antes de aplicÃ¡-las na instalaÃ§Ã£o dos despositivos" IDS_ABORTSETUP "ReactOS nÃ£o estÃ¡ totalmente instalado em seu computador. Se vocÃª sair da InstalaÃ§Ã£o agora, vocÃª precisarÃ¡ executar o Instalador novamente para instalar o ReactOS. Tem certeza que deseja sair?" IDS_ABORTSETUP2 "Abortar instalaÃ§Ã£o?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "InstalaÃ§Ã£o do ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -153,4 +153,6 @@ IDS_SUMMARYSUBTITLE "Lista cu opÈiuni de instalare ce necesitÄ verificare Ã®nainte de a continua instalarea." IDS_ABORTSETUP "ReactOS Ã®ncÄ nu este complet instalat Ã®n calculator. Daca Ã®ntrerupeÈi procesul de instalare, pentru a instala va fi necesarÄ repetarea paÈilor parcurÈi pÃ¢nÄ acum. Sigur doriÈi asta?" IDS_ABORTSETUP2 "AbandonaÈi instalarea?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Asistentul de instalare ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "ÐÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¿ÐµÑÐµÐ´ Ð½Ð°ÑÐ°Ð»Ð¾Ð¼ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_ABORTSETUP "ReactOS ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð½Ðµ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ. ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°ÐºÑÐ¾ÐµÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÑÐµÐ¹ÑÐ°Ñ, Ð² Ð´Ð°Ð»ÑÐ½ÐµÐ¹ÑÐµÐ¼ Ð²Ð°Ð¼ Ð¿ÑÐ¸Ð´ÐµÑÑÑ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ ReactOS. ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" IDS_ABORTSETUP2 "ÐÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -149,4 +149,6 @@ IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Naozaj skonÄiÅ¥?" IDS_ABORTSETUP2 "PreruÅ¡iÅ¥ inÅ¡talÃ¡ciu?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Modified: trunk/reactos/base/setup/reactos/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sq… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sq-AL.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "Listo tÃ« dhÃ«nat e instalimit pÃ«r tÃ« kontrolluar para sÃ« tÃ« aplikohen pÃ«r pajisjet e instalimit/kompjuterit" IDS_ABORTSETUP "ReactOS nuk Ã«shtÃ« instaluar plotÃ«sisht nÃ« kompjuterin tuaj. NÃ«se ju dilni nga instalimi tani, do ju duhet tÃ« filloni instalimin pÃ«rsÃ«ri pÃ«r tÃ« instalumar ReactOS. Doni ta mbyllni?" IDS_ABORTSETUP2 "NdÃ«rpritni Instalimin?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Setup" END Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -146,4 +146,6 @@ IDS_SUMMARYSUBTITLE "Kurulumdan aygÄ±tÄ±na uygulanmadan Ã¶nce gÃ¶zden geÃ§irmek iÃ§in dizelgelenen kurulum seÃ§enekleri." IDS_ABORTSETUP "ReactOS bilgisayarÄ±nÄ±za tÃ¼mÃ¼yle kurulmadÄ±. EÄer Åimdi Kur'dan Ã§Ä±karsanÄ±z, ReactOS'u kurmak iÃ§in Kur'u yeniden Ã§alÄ±ÅtÄ±rmayÄ± isteybilirsiniz. GerÃ§ekten Ã§Ä±kÄ±lsÄ±n mÄ±?" IDS_ABORTSETUP2 "Kurulum iptal edilsin mi?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS Kur" END Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -152,4 +152,6 @@ IDS_SUMMARYSUBTITLE "ÐÐµÑÐµÐ²ÑÑÑÐµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÐµÐ¹ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð¿ÐµÑÑ Ð½ÑÐ¶ Ð¿Ð¾ÑÐ°ÑÐ¸ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸" IDS_ABORTSETUP "ReactOS Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð½Ð° ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð½Ðµ Ð¿Ð¾Ð²Ð½ÑÑÑÑ. Ð¯ÐºÑÐ¾ Ð²Ð¸ Ð·Ð°ÐºÑÐ¸ÑÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°ÑÐ°Ð·, Ð² Ð¿Ð¾Ð´Ð°Ð»ÑÑÐ¾Ð¼Ñ Ð²Ð°Ð¼ Ð´Ð¾Ð²ÐµÐ´ÐµÑÑÑÑ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS. ÐÐ¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ, ÑÐ¾ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾ Ð¿ÐµÑÐµÑÐ²Ð°ÑÐ¸ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ?" IDS_ABORTSETUP2 "ÐÐµÑÐµÑÐ²Ð°ÑÐ¸ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ?" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ReactOS" END Modified: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -144,4 +144,6 @@ IDS_SUMMARYSUBTITLE "æ£æ¯å®è£åååºå®è£å±æ§ä»¥ä¾æ£æ¥" IDS_ABORTSETUP "ReactOS æªå¨æ¨ççµèä¸å®è£å®æãå¦ææ¨ç°å¨éåºå®è£ç¨åºï¼æ¨éè¦å¨ä¸æ¬¡è¿è¡å®è£ç¨åºæ¥å®è£ ReactOSã ç¡®å®éåºï¼" IDS_ABORTSETUP2 "ç»æ¢å®è£ï¼" + IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_CAPTION "ReactOS å®è£" END Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -989,7 +989,7 @@ return FALSE; } -void LoadSetupData() +BOOL LoadSetupData(void) { WCHAR szPath[MAX_PATH]; TCHAR tmp[10]; @@ -1007,115 +1007,126 @@ wcscat(szPath, L"\\txtsetup.sif"); hTxtsetupSif = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL); - if (hTxtsetupSif != INVALID_HANDLE_VALUE) - { - // get language list - SetupData.LangCount = SetupGetLineCount(hTxtsetupSif, _T("Language")); - if (SetupData.LangCount > 0) - { - SetupData.pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * SetupData.LangCount); - if (SetupData.pLanguages != NULL) - { - Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), NULL, &InfContext)) + if (hTxtsetupSif == INVALID_HANDLE_VALUE) + { + TCHAR message[512], caption[64]; + + // txtsetup.sif cannot be found + LoadString(hInstance, IDS_NO_TXTSETUP_SIF, message, sizeof(message)/sizeof(TCHAR)); + LoadString(hInstance, IDS_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); + + MessageBox(NULL, message, caption, MB_OK | MB_ICONERROR); + return FALSE; + } + + // get language list + SetupData.LangCount = SetupGetLineCount(hTxtsetupSif, _T("Language")); + if (SetupData.LangCount > 0) + { + SetupData.pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * SetupData.LangCount); + if (SetupData.pLanguages != NULL) + { + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), NULL, &InfContext)) + { + do { - do - { - SetupGetStringField(&InfContext, - 0, - SetupData.pLanguages[Count].LangId, - sizeof(SetupData.pLanguages[Count].LangId) / sizeof(TCHAR), - &LineLength); - - SetupGetStringField(&InfContext, - 1, - SetupData.pLanguages[Count].LangName, - sizeof(SetupData.pLanguages[Count].LangName) / sizeof(TCHAR), - &LineLength); - ++Count; - } - while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount); + SetupGetStringField(&InfContext, + 0, + SetupData.pLanguages[Count].LangId, + sizeof(SetupData.pLanguages[Count].LangId) / sizeof(TCHAR), + &LineLength); + + SetupGetStringField(&InfContext, + 1, + SetupData.pLanguages[Count].LangName, + sizeof(SetupData.pLanguages[Count].LangName) / sizeof(TCHAR), + &LineLength); + ++Count; } - } - } - - // get keyboard layout list - SetupData.KbLayoutCount = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout")); - if (SetupData.KbLayoutCount > 0) - { - SetupData.pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * SetupData.KbLayoutCount); - if (SetupData.pKbLayouts != NULL) - { - Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), NULL, &InfContext)) + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount); + } + } + } + + // get keyboard layout list + SetupData.KbLayoutCount = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout")); + if (SetupData.KbLayoutCount > 0) + { + SetupData.pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * SetupData.KbLayoutCount); + if (SetupData.pKbLayouts != NULL) + { + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), NULL, &InfContext)) + { + do { - do - { - SetupGetStringField(&InfContext, - 0, - SetupData.pKbLayouts[Count].LayoutId, - sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(TCHAR), - &LineLength); - - SetupGetStringField(&InfContext, - 1, - SetupData.pKbLayouts[Count].LayoutName, - sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(TCHAR), - &LineLength); - ++Count; - } - while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.KbLayoutCount); + SetupGetStringField(&InfContext, + 0, + SetupData.pKbLayouts[Count].LayoutId, + sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(TCHAR), + &LineLength); + + SetupGetStringField(&InfContext, + 1, + SetupData.pKbLayouts[Count].LayoutName, + sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(TCHAR), + &LineLength); + ++Count; } - } - } - - // get default for keyboard and language - SetupData.DefaultKBLayout = -1; - SetupData.DefaultLang = -1; - - // TODO: get defaults from underlaying running system - if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLayout"), &InfContext)) - { - SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); - for (Count = 0; Count < SetupData.KbLayoutCount; Count++) - if (_tcscmp(tmp, SetupData.pKbLayouts[Count].LayoutId) == 0) - { - SetupData.DefaultKBLayout = Count; - break; - } - } - - if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLanguage"), &InfContext)) - { - SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); - for (Count = 0; Count < SetupData.LangCount; Count++) - if (_tcscmp(tmp, SetupData.pLanguages[Count].LangId) == 0) - { - SetupData.DefaultLang = Count; - break; - } - } - - // get computers list - SetupData.CompCount = LoadGenentry(hTxtsetupSif,_T("Computer"),&SetupData.pComputers,&InfContext); - - // get display list - SetupData.DispCount = LoadGenentry(hTxtsetupSif,_T("Display"),&SetupData.pDisplays,&InfContext); - - // get keyboard list - SetupData.KeybCount = LoadGenentry(hTxtsetupSif, _T("Keyboard"),&SetupData.pKeyboards,&InfContext); - - // get install directory - if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), _T("DefaultPath"), &InfContext)) - { - SetupGetStringField(&InfContext, - 1, - SetupData.InstallDir, - sizeof(SetupData.InstallDir) / sizeof(TCHAR), - &LineLength); - } - SetupCloseInfFile(hTxtsetupSif); - } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.KbLayoutCount); + } + } + } + + // get default for keyboard and language + SetupData.DefaultKBLayout = -1; + SetupData.DefaultLang = -1; + + // TODO: get defaults from underlaying running system + if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLayout"), &InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); + for (Count = 0; Count < SetupData.KbLayoutCount; Count++) + if (_tcscmp(tmp, SetupData.pKbLayouts[Count].LayoutId) == 0) + { + SetupData.DefaultKBLayout = Count; + break; + } + } + + if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLanguage"), &InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); + for (Count = 0; Count < SetupData.LangCount; Count++) + if (_tcscmp(tmp, SetupData.pLanguages[Count].LangId) == 0) + { + SetupData.DefaultLang = Count; + break; + } + } + + // get computers list + SetupData.CompCount = LoadGenentry(hTxtsetupSif,_T("Computer"),&SetupData.pComputers,&InfContext); + + // get display list + SetupData.DispCount = LoadGenentry(hTxtsetupSif,_T("Display"),&SetupData.pDisplays,&InfContext); + + // get keyboard list + SetupData.KeybCount = LoadGenentry(hTxtsetupSif, _T("Keyboard"),&SetupData.pKeyboards,&InfContext); + + // get install directory + if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), _T("DefaultPath"), &InfContext)) + { + SetupGetStringField(&InfContext, + 1, + SetupData.InstallDir, + sizeof(SetupData.InstallDir) / sizeof(TCHAR), + &LineLength); + } + SetupCloseInfFile(hTxtsetupSif); + + return TRUE; } LONG LoadGenentry(HINF hinf,PCTSTR name,PGENENTRY *gen,PINFCONTEXT context) @@ -1211,8 +1222,8 @@ LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR)); if (!isUnattend) { - - LoadSetupData(); + if (!LoadSetupData()) + return 0; /* Create the Start page, until setup is working */ psp.dwSize = sizeof(PROPSHEETPAGE); Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Thu Jan 29 00:06:55 2015 @@ -59,5 +59,7 @@ #define IDS_SUMMARYTITLE 2050 #define IDS_SUMMARYSUBTITLE 2051 #define IDC_DEVICEDRIVER 2052 +#define IDS_NO_TXTSETUP_SIF 2053 +#define IDS_CAPTION 2054 #define IDI_MAIN 3000

1 0

[hbelusca] 66106: [FREELDR]: Reset FrldrBootDrive before chainloading in some cases (when the boot drive is going to change), because ChainLoadBiosBootSectorCode uses FrldrBootDrive for the boot dr...
by hbelusca＠svn.reactos.org 28 Jan '15

28 Jan '15

Author: hbelusca Date: Wed Jan 28 23:23:48 2015 New Revision: 66106 URL: http://svn.reactos.org/svn/reactos?rev=66106&view=rev Log: [FREELDR]: Reset FrldrBootDrive before chainloading in some cases (when the boot drive is going to change), because ChainLoadBiosBootSectorCode uses FrldrBootDrive for the boot drive. An alternative would be to pass this boot drive as a parameter to ChainLoadBiosBootSectorCode... Fixes FreeLdr booting to another drive. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/miscboot.c [iso-8859-1] Wed Jan 28 23:23:48 2015 @@ -154,6 +154,7 @@ // result in a read error. //DiskStopFloppyMotor(); //DisableA20(); + FrldrBootDrive = DriveNumber; ChainLoadBiosBootSectorCode(); } @@ -211,5 +212,6 @@ // result in a read error. //DiskStopFloppyMotor(); //DisableA20(); + FrldrBootDrive = DriveNumber; ChainLoadBiosBootSectorCode(); }

1 0

[spetreolle] 66105: [LIVECD] Add shortcut to the On Screen Keyboard. Patch by Jared. CORE-9093 #resolve
by spetreolle＠svn.reactos.org 28 Jan '15

28 Jan '15

Author: spetreolle Date: Wed Jan 28 22:32:53 2015 New Revision: 66105 URL: http://svn.reactos.org/svn/reactos?rev=66105&view=rev Log: [LIVECD] Add shortcut to the On Screen Keyboard. Patch by Jared. CORE-9093 #resolve Modified: trunk/reactos/boot/bootdata/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Wed Jan 28 22:32:53 2015 @@ -101,6 +101,7 @@ add_livecd_shortcut("Service Manager" servman.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") add_livecd_shortcut("System Configuration" msconfig.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") add_livecd_shortcut("Magnify" magnify.exe "Profiles/All Users/Start Menu/Programs/Accessibility") +add_livecd_shortcut("On-Screen Keyboard" osk.exe "Profiles/All Users/Start Menu/Programs/Accessibility") add_livecd_shortcut("Calculator" calc.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("Paint" mspaint.exe "Profiles/All Users/Start Menu/Programs/Accessories")

1 0

[spetreolle] 66104: [UNIATA] Update to 0.45e. CORE-8727 #resolve Sorry for the delay !
by spetreolle＠svn.reactos.org 28 Jan '15

28 Jan '15

Author: spetreolle Date: Wed Jan 28 22:20:09 2015 New Revision: 66104 URL: http://svn.reactos.org/svn/reactos?rev=66104&view=rev Log: [UNIATA] Update to 0.45e. CORE-8727 #resolve Sorry for the delay ! Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Wed Jan 28 22:20:09 2015 @@ -1026,8 +1026,9 @@ BOOLEAN CopyDmaBuffer; //BOOLEAN MemIo; BOOLEAN AltRegMap; - - UCHAR Reserved[3]; + BOOLEAN Force80pin; + + UCHAR Reserved[2]; MECHANICAL_STATUS_INFORMATION_HEADER MechStatusData; SENSE_DATA MechStatusSense; @@ -1303,6 +1304,7 @@ //PIDE_AHCI_PORT_REGISTERS BaseIoAHCIPort[AHCI_MAX_PORT]; ULONG AHCI_CAP; ULONG AHCI_PI; + ULONG AHCI_PI_mask; // for port exclusion, usually = AHCI_PI PATA_REQ AhciInternalAtaReq0; PSCSI_REQUEST_BLOCK AhciInternalSrb0; Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Wed Jan 28 22:20:09 2015 @@ -1453,9 +1453,9 @@ } GetPciConfig2(0x48, reg48); - if(!(ChipFlags & ICH4_FIX)) { +// if(!(ChipFlags & ICH4_FIX)) { GetPciConfig2(0x4a, reg4a); - } +// } GetPciConfig2(0x54, reg54); // if(udmamode >= 0) { // enable the write buffer to be used in a split (ping/pong) manner. @@ -1472,7 +1472,7 @@ /* Set UDMA reference clock (33 MHz or more). */ SetPciConfig1(0x48, reg48 | (0x0001 << dev)); - if(!(ChipFlags & ICH4_FIX)) { +// if(!(ChipFlags & ICH4_FIX)) { if(deviceExtension->MaxTransferMode == ATA_UDMA3) { // Special case (undocumented overclock !) for PIIX4e SetPciConfig2(0x4a, (reg4a | (0x03 << (dev<<2)) ) ); @@ -1480,18 +1480,15 @@ SetPciConfig2(0x4a, (reg4a & ~(0x03 << (dev<<2))) | (((USHORT)(intel_utimings[i])) << (dev<<2) ) ); } - } +// } /* Set UDMA reference clock (66 MHz or more). */ + reg54 &= ~(0x1001 << dev); if(i > 2) { reg54 |= (0x1 << dev); - } else { - reg54 &= ~(0x1 << dev); } /* Set UDMA reference clock (133 MHz). */ if(i >= 5) { reg54 |= (0x1000 << dev); - } else { - reg54 &= ~(0x1000 << dev); } SetPciConfig2(0x54, reg54); Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Wed Jan 28 22:20:09 2015 @@ -66,8 +66,11 @@ //ULONG RevID = deviceExtension->RevID; ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ULONG ChipFlags= deviceExtension->HwFlags & CHIPFLAG_MASK; + ULONG i,n; KdPrint2((PRINT_PREFIX "UniataChipDetectChannels:\n" )); + + deviceExtension->AHCI_PI_mask = 0; if(ChipFlags & (UNIATA_SATA | UNIATA_AHCI)) { if(!deviceExtension->NumberChannels) { @@ -88,6 +91,21 @@ KdPrint2((PRINT_PREFIX "MasterDev -> 1 chan\n")); deviceExtension->NumberChannels = 1; } + for(n=0; n<deviceExtension->NumberChannels; n++) { + if(AtapiRegCheckDevValue(deviceExtension, n, DEVNUM_NOT_SPECIFIED, L"Exclude", 0)) { + KdPrint2((PRINT_PREFIX "Channel %d excluded\n", n)); + deviceExtension->AHCI_PI_mask &= ~((ULONG)1 << n); + } else { + deviceExtension->AHCI_PI_mask |= ((ULONG)1 << n); + } + } + KdPrint2((PRINT_PREFIX "PortMask %#x\n", deviceExtension->AHCI_PI_mask)); + deviceExtension->AHCI_PI_mask = + AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortMask", (ULONG)0xffffffff >> (32-deviceExtension->NumberChannels) ); + KdPrint2((PRINT_PREFIX "Force PortMask %#x\n", deviceExtension->AHCI_PI_mask)); + + for(i=deviceExtension->AHCI_PI_mask, n=0; i; n++, i=i>>1); + KdPrint2((PRINT_PREFIX "mask -> %d chans\n", n)); switch(VendorID) { case ATA_ACER_LABS_ID: @@ -271,6 +289,21 @@ } break; } // end switch(VendorID) + + i = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"NumberChannels", n); + if(!i) { + i = n; + } + KdPrint2((PRINT_PREFIX "reg -> %d chans\n", n)); + + deviceExtension->NumberChannels = min(i, deviceExtension->NumberChannels); + if(!deviceExtension->NumberChannels) { + KdPrint2((PRINT_PREFIX "all channels blocked\n", n)); + return FALSE; + } + deviceExtension->AHCI_PI_mask &= (ULONG)0xffffffff >> (32-deviceExtension->NumberChannels); + KdPrint2((PRINT_PREFIX "Final PortMask %#x\n", deviceExtension->AHCI_PI_mask)); + return TRUE; } // end UniataChipDetectChannels() @@ -1542,7 +1575,18 @@ UCHAR reg, val, res; PCI_SLOT_NUMBER slotData; + PHW_CHANNEL chan; + ULONG c; // logical channel (for Compatible Mode controllers) + + c = channel - deviceExtension->Channel; // logical channel (for Compatible Mode controllers) + chan = &deviceExtension->chan[c]; + slotData.u.AsULONG = deviceExtension->slotNumber; + + if(deviceExtension->HwFlags & UNIATA_NO80CHK) { + KdPrint2((PRINT_PREFIX "UNIATA_NO80CHK\n")); + return TRUE; + } if(ChipType == HPT374 && slotData.u.bits.FunctionNumber == 1) { reg = channel ? 0x57 : 0x53; @@ -1557,6 +1601,10 @@ GetPciConfig1(0x5a, res); res = res & (channel ? 0x01 : 0x02); SetPciConfig1(reg, val); + if(chan->Force80pin) { + KdPrint2((PRINT_PREFIX "Force80pin\n")); + res = 0; + } KdPrint2((PRINT_PREFIX "hpt_cable80(%d) = %d\n", channel, !res)); return !res; } // end hpt_cable80() @@ -1637,6 +1685,11 @@ c = channel - deviceExtension->Channel; // logical channel (for Compatible Mode controllers) chan = &deviceExtension->chan[c]; + + if(chan->Force80pin) { + KdPrint2((PRINT_PREFIX "Force80pin\n")); + return TRUE; + } GetPciConfig1(pci_reg, tmp8); if(!(tmp8 & (1 << (channel << bit_offs)))) { @@ -1793,6 +1846,13 @@ KdPrint2((PRINT_PREFIX "MaxTransferMode (overriden): %#x\n", chan->MaxTransferMode)); chan->MaxTransferMode = tmp32; } + tmp32 = AtapiRegCheckDevValue(deviceExtension, c, DEVNUM_NOT_SPECIFIED, L"Force80pin", FALSE); + chan->Force80pin = tmp32 ? TRUE : FALSE; + if(chan->Force80pin) { + KdPrint2((PRINT_PREFIX "Force80pin on chip\n")); + deviceExtension->HwFlags |= UNIATA_NO80CHK; + } + //UniAtaReadLunConfig(deviceExtension, c, 0); //UniAtaReadLunConfig(deviceExtension, c, 1); } @@ -1823,6 +1883,12 @@ } tmp32 = AtapiRegCheckDevValue(deviceExtension, c, DEVNUM_NOT_SPECIFIED, L"ReorderEnable", TRUE); chan->UseReorder = tmp32 ? TRUE : FALSE; + + tmp32 = AtapiRegCheckDevValue(deviceExtension, c, DEVNUM_NOT_SPECIFIED, L"Force80pin", FALSE); + chan->Force80pin = tmp32 ? TRUE : FALSE; + if(chan->Force80pin) { + KdPrint2((PRINT_PREFIX "Force80pin on channel\n")); + } for(i=0; i<deviceExtension->NumberLuns; i++) { UniAtaReadLunConfig(deviceExtension, channel, i); @@ -2145,6 +2211,12 @@ chan = &deviceExtension->chan[c]; GetPciConfig2(0x54, reg54); KdPrint2((PRINT_PREFIX " intel 80-pin check (reg54=%x)\n", reg54)); + if(deviceExtension->HwFlags & UNIATA_NO80CHK) { + KdPrint2((PRINT_PREFIX " No check (administrative)\n")); + if(chan->Force80pin) { + KdPrint2((PRINT_PREFIX "Force80pin\n")); + } + } else if(reg54 == 0x0000 || reg54 == 0xffff) { KdPrint2((PRINT_PREFIX " check failed (not supported)\n")); } else Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Wed Jan 28 22:20:09 2015 @@ -1111,6 +1111,11 @@ if(MasterDev) { KdPrint2((PRINT_PREFIX "MasterDev (1)\n")); deviceExtension->MasterDev = TRUE; + KdPrint2((PRINT_PREFIX "Check exclude\n")); + if(AtapiRegCheckDevValue(deviceExtension, channel, DEVNUM_NOT_SPECIFIED, L"Exclude", 0)) { + KdPrint2((PRINT_PREFIX "Device excluded\n")); + goto exit_notfound; + } } status = UniataChipDetect(HwDeviceExtension, &pciData, i, ConfigInfo, &simplexOnly); Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Wed Jan 28 22:20:09 2015 @@ -760,6 +760,9 @@ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); deviceExtension->AHCI_PI = PI; KdPrint2((PRINT_PREFIX " AHCI PI %#x\n", PI)); + KdPrint2((PRINT_PREFIX " AHCI PI mask %#x\n", deviceExtension->AHCI_PI_mask)); + deviceExtension->AHCI_PI = PI = PI & deviceExtension->AHCI_PI_mask; + KdPrint2((PRINT_PREFIX " masked AHCI PI %#x\n", PI)); CAP2 = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP2); if(CAP2 & AHCI_CAP2_BOH) { @@ -975,8 +978,20 @@ * both CAP.NOP and PI. */ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); - deviceExtension->AHCI_PI = PI; + deviceExtension->AHCI_PI = deviceExtension->AHCI_PI_mask = PI; KdPrint2((PRINT_PREFIX " AHCI PI %#x\n", PI)); + + for(i=PI, n=0; i; n++, i=i>>1) { + if(AtapiRegCheckDevValue(deviceExtension, n, DEVNUM_NOT_SPECIFIED, L"Exclude", 0)) { + KdPrint2((PRINT_PREFIX "Channel %d excluded\n", n)); + deviceExtension->AHCI_PI &= ~((ULONG)1 << n); + deviceExtension->AHCI_PI_mask &= ~((ULONG)1 << n); + } + } + deviceExtension->AHCI_PI_mask = + AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortMask", deviceExtension->AHCI_PI_mask); + KdPrint2((PRINT_PREFIX "Force PortMask %#x\n", deviceExtension->AHCI_PI_mask)); + for(i=PI, n=0; i; n++, i=i>>1); NumberChannels = max((CAP & AHCI_CAP_NOP_MASK)+1, n); Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Wed Jan 28 22:20:09 2015 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "45c1" -#define UNIATA_VER_DOT 0.45.3.1 +#define UNIATA_VER_STR "45e" +#define UNIATA_VER_DOT 0.45.5.0 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 45 -#define UNIATA_VER_SUB_MJ 2 -#define UNIATA_VER_SUB_MN 1 -#define UNIATA_VER_DOT_COMMA 0,45,3,1 -#define UNIATA_VER_DOT_STR "0.45.3.1" +#define UNIATA_VER_SUB_MJ 5 +#define UNIATA_VER_SUB_MN 0 +#define UNIATA_VER_DOT_COMMA 0,45,5,0 +#define UNIATA_VER_DOT_STR "0.45.5.0" #define UNIATA_VER_YEAR 2014 #define UNIATA_VER_YEAR_STR "2014"

1 0

[pschweitzer] 66103: [FREELDR] Revert r66102
by pschweitzer＠svn.reactos.org 28 Jan '15

28 Jan '15

Author: pschweitzer Date: Wed Jan 28 21:03:18 2015 New Revision: 66103 URL: http://svn.reactos.org/svn/reactos?rev=66103&view=rev Log: [FREELDR] Revert r66102 Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Wed Jan 28 21:03:18 2015 @@ -213,7 +213,7 @@ List[Index].MemoryType = MemoryType; DescriptCount++; -#ifdef DBG +#if DBG DbgDumpMemoryMap(List); #endif return DescriptCount;

1 0

[pschweitzer] 66102: [FREELDR] Fix REL build
by pschweitzer＠svn.reactos.org 28 Jan '15

28 Jan '15

Author: pschweitzer Date: Wed Jan 28 20:52:38 2015 New Revision: 66102 URL: http://svn.reactos.org/svn/reactos?rev=66102&view=rev Log: [FREELDR] Fix REL build Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Wed Jan 28 20:52:38 2015 @@ -34,7 +34,7 @@ ULONG BiosMemoryMapEntryCount; SIZE_T FrLdrImageSize; -#if DBG +#ifdef DBG typedef struct { TYPE_OF_MEMORY Type;

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