Ros-dev

ros-dev@reactos.org

5790 discussions

Re: [ros-dev] [ros-diffs] [hbelusca] 57780: [CPORTLIB/FREELDR] GetByte --> Wait for data (with timeout) and get it if available. PollByte --> Check for data, get it if available, and return immediately.
by Timo Kreuzer 30 Nov '12

30 Nov '12

You are aware that this changes the behavior? Polling previously only checked, if data is available, but didn't read it from the port. But afaics it's only relvenat for WinLdrPortPollOnly, which seems to be unused anyway. Am 29.11.2012 00:16, schrieb hbelusca(a)svn.reactos.org: > Author: hbelusca > Date: Wed Nov 28 23:16:01 2012 > New Revision: 57780 > > URL: http://svn.reactos.org/svn/reactos?rev=57780&view=rev > Log: > [CPORTLIB/FREELDR] > GetByte --> Wait for data (with timeout) and get it if available. > PollByte --> Check for data, get it if available, and return immediately. > > Modified: > trunk/reactos/boot/freeldr/freeldr/comm/rs232.c > trunk/reactos/boot/freeldr/freeldr/windows/headless.c > trunk/reactos/include/reactos/libs/cportlib/cportlib.h > trunk/reactos/lib/cportlib/cport.c > > Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -100,7 +100,7 @@ > if (PortInitialized == FALSE) > return FALSE; > > - return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); > + return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE) == CP_GET_SUCCESS); > } > > /* > @@ -109,12 +109,7 @@ > if (PortInitialized == FALSE) > return FALSE; > > - while ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_DR) == 0) > - ; > - > - *ByteReceived = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); > - > - return TRUE; > + return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE) == CP_GET_SUCCESS); > } > */ > > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -143,7 +143,7 @@ > WinLdrPortGetByte(IN ULONG PortId, > OUT PUCHAR Data) > { > - return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; > + return CpGetByte(&Port[PortId], Data, TRUE) == CP_GET_SUCCESS; > } > > BOOLEAN > @@ -151,7 +151,7 @@ > { > UCHAR Dummy; > > - return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; > + return CpGetByte(&Port[PortId], &Dummy, FALSE) == CP_GET_SUCCESS; > } > > VOID > > Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… > ============================================================================== > --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) > +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -69,8 +69,7 @@ > CpGetByte( > IN PCPPORT Port, > OUT PUCHAR Byte, > - IN BOOLEAN Wait, > - IN BOOLEAN Poll > + IN BOOLEAN Wait > ); > > VOID > > Modified: trunk/reactos/lib/cportlib/cport.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… > ============================================================================== > --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) > +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Wed Nov 28 23:16:01 2012 > @@ -255,8 +255,7 @@ > NTAPI > CpGetByte(IN PCPPORT Port, > OUT PUCHAR Byte, > - IN BOOLEAN Wait, > - IN BOOLEAN Poll) > + IN BOOLEAN Wait) > { > UCHAR Lsr; > ULONG LimitCount = Wait ? TIMEOUT_COUNT : 1; > @@ -278,9 +277,6 @@ > return CP_GET_ERROR; > } > > - /* If only polling was requested by caller, return now */ > - if (Poll) return CP_GET_SUCCESS; > - > /* Otherwise read the byte and return it */ > *Byte = READ_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER); > > > >

2 1

November Status Meeting Tomorrow
by Aleksey Bragin 29 Nov '12

29 Nov '12

Hello, Let me invite you to the monthly status meeting taking place last Thursday of this month, 29th of November, 19:00 UTC. The meeting will be at irc://dev.reactos.org (Port 6667, no SSL) in the channel #meeting, or as Pierre/Colin say. Note that the IRC service will only be started shortly before the meeting. Your participation passwords will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. Hopefully it's not much of inconvenience. If someone still is not getting passwords sent before a meeting - please email Colin or Pierre before the meeting started to get one. The agenda will be posted shortly before the meeting, suggestions are welcome (send them to my email as usual). Hot topics would include progress made during this month, contracts updates, release plans (if any), web site progress (if any). With the best regards, Aleksey Bragin

4 4

Re: [ros-dev] [ros-general] Services downtime
by Colin Finck 16 Nov '12

16 Nov '12

Hi all, Pierre Schweitzer <pierre(a)reactos.org> wrote: > due to a hardware migration ongoing on one of our hypervisors, the > following services are currently down: The server upgrade went successfully and everything is back to normal now. Cheers, Colin

1 0

Server upgrade next Friday
by Colin Finck 15 Nov '12

15 Nov '12

Hi all, Several ReactOS services will be moved to a new server next Friday. As this migration highly depends on our hosting provider, the downtime may be up to 24 hours. Affected services include: - ns1.reactos.org - playground.reactos.org - jira.reactos.org The upgrade will improve reliability and adds resources for additional services in the future. Of course, you will be informed once the migration is over. Cheers, Colin

2 3

Re: [ros-dev] [ros-diffs] [hbelusca] 57701: [CSRSRV] - Use a variable ServerDll instead of using each time CsrLoadedServerDll[i], as it is done in some other places. - Clean the code (remove extra-parentheses). - Zero-out t...
by Alex Ionescu 15 Nov '12

15 Nov '12

Would you mind not "cleaning up formatting" by going against our coding style and doing the very thing I even taught you not to do during your initial patches/code reviews? Thanks. Best regards, Alex Ionescu On Tue, Nov 13, 2012 at 1:08 PM, <hbelusca(a)svn.reactos.org> wrote: > - if ((ServerDll) && (ServerDll->HardErrorCallback)) > + if (ServerDll && ServerDll->HardErrorCallback) >

4 5

Re: [ros-dev] [ros-diffs] [pschweitzer] 57674: [DOXYGEN] ReactOS is not C only. Enable support builtin STL.
by Timo Kreuzer 07 Nov '12

07 Nov '12

We have 90 % C. So disabling OPTIMIZE_OUTPUT_FOR_C will probably result in worse readable output for 90% of the code. Am 05.11.2012 12:14, schrieb pschweitzer(a)svn.reactos.org: > Author: pschweitzer > Date: Mon Nov 5 11:13:59 2012 > New Revision: 57674 > > URL: http://svn.reactos.org/svn/reactos?rev=57674&view=rev > Log: > [DOXYGEN] > ReactOS is not C only. > Enable support builtin STL. > > Modified: > trunk/reactos/Doxyfile > > Modified: trunk/reactos/Doxyfile > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=57674&r1=5767… > ============================================================================== > --- trunk/reactos/Doxyfile [iso-8859-1] (original) > +++ trunk/reactos/Doxyfile [iso-8859-1] Mon Nov 5 11:13:59 2012 > @@ -196,7 +196,7 @@ > # For instance, some of the names that are used will be different. The list > # of all members will be omitted, etc. > > -OPTIMIZE_OUTPUT_FOR_C = YES > +OPTIMIZE_OUTPUT_FOR_C = NO > > # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java > # sources only. Doxygen will then generate output that is more tailored for > @@ -236,7 +236,7 @@ > # func(std::string) {}). This also make the inheritance and collaboration > # diagrams that involve STL classes more complete and accurate. > > -BUILTIN_STL_SUPPORT = NO > +BUILTIN_STL_SUPPORT = YES > > # If you use Microsoft's C++/CLI language, you should set this option to YES to > # enable parsing support. > > >

3 3

[ros-diffs] [jgardou] 57679: [USER32] - Avoid more rounding issues and hopefully fix MSC build
by James Tabor 06 Nov '12

06 Nov '12

Hi, BE AWARE this is port synced from wine and please notate changes so it will not get lost on the next sync! James

1 0

Meeting rescheduled!
by Aleksey Bragin 30 Oct '12

30 Oct '12

Hello, the meeting is rescheduled to 1st of November, as I don't see a point to do a meeting if zwabbit, caemyr and other can not attend. 1st of November will also be thursday, just one week late. Sorry for inconvenience. And it's time for agenda proposals already, please send them in to my email address as usual. Thanks. Best regards, Aleksey Bragin.

4 7

Re: [ros-dev] [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests.
by Hermès BÉLUSCA - MAÏTO 10 Oct '12

10 Oct '12

OK, I didn't know that ! I will revert this modification as soon as possible. Regards, Hermès BÉLUSCA - MAÏTO -----Message d'origine----- De : ros-dev-bounces(a)reactos.org [mailto:ros-dev-bounces@reactos.org] De la part de Sylvain Petreolle Envoyé : mercredi 10 octobre 2012 18:10 À : ReactOS Development List Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests. +1. You don't need to add the directory in PATH even if the helper is into bin\data. Kind regards, Sylvain Petreolle ----- Mail original ----- > De : Timo Kreuzer <timo.kreuzer(a)web.de> À : ros-dev(a)reactos.org Cc : > Envoyé le : Mercredi 10 octobre 2012 9h52 Objet : Re: [ros-dev] > [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests. > > > Why is it in the PATH variable? > Why not just put the test data in the bin folder? > > Am 10.10.2012 00:00, schrieb hbelusca(a)svn.reactos.org: >> Author: hbelusca >> Date: Tue Oct 9 22:00:47 2012 >> New Revision: 57526 >> >> URL: http://svn.reactos.org/svn/reactos?rev=57526&view=rev >> Log: >> [BOOTDATA-CMAKE] >> Add a bin\data directory for holding data files which can be used >> for > tests. >> >> Modified: >> trunk/reactos/boot/bootdata/hivesys_amd64.inf >> trunk/reactos/boot/bootdata/hivesys_arm.inf >> trunk/reactos/boot/bootdata/hivesys_i386.inf >> trunk/reactos/boot/bootdata/packages/reactos.dff.in >> trunk/reactos/cmake/CMakeMacros.cmake >> >> Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys > _amd64.inf?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] >> (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf >> [iso-8859-1] Tue Oct 9 > 22:00:47 2012 >> @@ -1200,7 +1200,7 @@ >> ; System environment settings >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" >> -HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system 32;%SystemRoot%;%SystemRoot%\system32\wbem" >> +HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\da ta;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","windir",0x00020000,"%SystemRoot%" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" >> >> Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys > _arm.inf?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] >> (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf >> [iso-8859-1] Tue Oct 9 > 22:00:47 2012 >> @@ -755,7 +755,7 @@ >> ; System environment settings >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" >> -HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system 32;%SystemRoot%;%SystemRoot%\system32\wbem" >> +HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\da ta;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","windir",0x00020000,"%SystemRoot%" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" >> >> Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys > _i386.inf?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] >> (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf >> [iso-8859-1] Tue Oct 9 > 22:00:47 2012 >> @@ -1200,7 +1200,7 @@ >> ; System environment settings >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" >> -HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system 32;%SystemRoot%;%SystemRoot%\system32\wbem" >> +HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\da ta;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","windir",0x00020000,"%SystemRoot%" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" >> HKLM,"SYSTEM\CurrentControlSet\Control\Session > Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" >> >> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/package > s/reactos.dff.in?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] > (original) >> +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] >> Tue > Oct 9 22:00:47 2012 >> @@ -21,12 +21,13 @@ >> 5 = system32\drivers\etc >> 6 = inf >> 7 = bin >> -8 = media >> -9 = Microsoft.NET >> -10 = Microsoft.NET\Framework >> -11 = Microsoft.NET\Framework\v1.0.3705 >> -12 = Microsoft.NET\Framework\v1.1.4322 >> -13 = Microsoft.NET\Framework\v2.0.50727 >> +8 = bin\data >> +9 = media >> +10 = Microsoft.NET >> +11 = Microsoft.NET\Framework >> +12 = Microsoft.NET\Framework\v1.0.3705 >> +13 = Microsoft.NET\Framework\v1.1.4322 >> +14 = Microsoft.NET\Framework\v2.0.50727 >> .InfEnd >> @@ -59,4 +60,4 @@ >> modules\optional\wine_gecko-1.0.0-x86.cab 4 optional >> boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 > optional >> -modules\wallpaper\Angelus_02_ROSWP.bmp > 4 optional >> +modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional >> >> Modified: trunk/reactos/cmake/CMakeMacros.cmake >> URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cma > ke?rev=57526&r1=57525&r2=57526&view=diff >> > ====================================================================== > ======== >> --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) >> +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Oct 9 >> 22:00:47 > 2012 >> @@ -97,18 +97,20 @@ >> set(${var} 6) >> elseif(${dir} STREQUAL reactos/bin) >> set(${var} 7) >> + elseif(${dir} STREQUAL reactos/bin/data) + set(${var} >> 8) >> elseif(${dir} STREQUAL reactos/media) >> - set(${var} 8) >> + set(${var} 9) >> elseif(${dir} STREQUAL reactos/Microsoft.NET) >> - set(${var} 9) >> + set(${var} 10) >> elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) >> - set(${var} 10) >> + set(${var} 11) >> elseif(${dir} STREQUAL >> reactos/Microsoft.NET/Framework/v1.0.3705) >> - set(${var} 11) >> + set(${var} 12) >> elseif(${dir} STREQUAL >> reactos/Microsoft.NET/Framework/v1.1.4322) >> - set(${var} 12) >> + set(${var} 13) >> elseif(${dir} STREQUAL >> reactos/Microsoft.NET/Framework/v2.0.50727) >> - set(${var} 13) >> + set(${var} 14) >> else() >> message(ERROR "Wrong destination: ${dir}") >> endif() >> >> >> > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

1 0

Re: [ros-dev] [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests.
by Timo Kreuzer 10 Oct '12

10 Oct '12

Why is it in the PATH variable? Why not just put the test data in the bin folder? Am 10.10.2012 00:00, schrieb hbelusca(a)svn.reactos.org: > Author: hbelusca > Date: Tue Oct 9 22:00:47 2012 > New Revision: 57526 > > URL: http://svn.reactos.org/svn/reactos?rev=57526&view=rev > Log: > [BOOTDATA-CMAKE] > Add a bin\data directory for holding data files which can be used for tests. > > Modified: > trunk/reactos/boot/bootdata/hivesys_amd64.inf > trunk/reactos/boot/bootdata/hivesys_arm.inf > trunk/reactos/boot/bootdata/hivesys_i386.inf > trunk/reactos/boot/bootdata/packages/reactos.dff.in > trunk/reactos/cmake/CMakeMacros.cmake > > Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -1200,7 +1200,7 @@ > > ; System environment settings > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" > -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" > > Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -755,7 +755,7 @@ > > ; System environment settings > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" > -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" > > Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -1200,7 +1200,7 @@ > > ; System environment settings > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe" > -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" > HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" > > 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] Tue Oct 9 22:00:47 2012 > @@ -21,12 +21,13 @@ > 5 = system32\drivers\etc > 6 = inf > 7 = bin > -8 = media > -9 = Microsoft.NET > -10 = Microsoft.NET\Framework > -11 = Microsoft.NET\Framework\v1.0.3705 > -12 = Microsoft.NET\Framework\v1.1.4322 > -13 = Microsoft.NET\Framework\v2.0.50727 > +8 = bin\data > +9 = media > +10 = Microsoft.NET > +11 = Microsoft.NET\Framework > +12 = Microsoft.NET\Framework\v1.0.3705 > +13 = Microsoft.NET\Framework\v1.1.4322 > +14 = Microsoft.NET\Framework\v2.0.50727 > > .InfEnd > > @@ -59,4 +60,4 @@ > modules\optional\wine_gecko-1.0.0-x86.cab 4 optional > boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional > > -modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional > +modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional > > Modified: trunk/reactos/cmake/CMakeMacros.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… > ============================================================================== > --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Oct 9 22:00:47 2012 > @@ -97,18 +97,20 @@ > set(${var} 6) > elseif(${dir} STREQUAL reactos/bin) > set(${var} 7) > + elseif(${dir} STREQUAL reactos/bin/data) > + set(${var} 8) > elseif(${dir} STREQUAL reactos/media) > - set(${var} 8) > + set(${var} 9) > elseif(${dir} STREQUAL reactos/Microsoft.NET) > - set(${var} 9) > + set(${var} 10) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework) > - set(${var} 10) > + set(${var} 11) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705) > - set(${var} 11) > + set(${var} 12) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322) > - set(${var} 12) > + set(${var} 13) > elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727) > - set(${var} 13) > + set(${var} 14) > else() > message(ERROR "Wrong destination: ${dir}") > endif() > > >

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev