Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[navaraf] 19202: Fix the clipping checks in TuiFillArea.
by navaraf＠svn.reactos.com 13 Nov '05

13 Nov '05

Fix the clipping checks in TuiFillArea. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 08:21:41 UTC (rev 19201) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 08:24:15 UTC (rev 19202) @@ -190,19 +190,18 @@ ULONG i, j; // Clip the area to the screen - // FIXME: This code seems to have problems... Uncomment and view ;-) - /*if ((Left >= UiScreenWidth) || (Top >= UiScreenHeight)) + if ((Left >= UiScreenWidth) || (Top >= UiScreenHeight)) { return; } - if ((Left + Right) >= UiScreenWidth) + if (Right >= UiScreenWidth) { - Right = UiScreenWidth - Left; + Right = UiScreenWidth - 1; } - if ((Top + Bottom) >= UiScreenHeight) + if (Bottom >= UiScreenHeight) { - Bottom = UiScreenHeight - Top; - }*/ + Bottom = UiScreenHeight - 1; + } // Loop through each line and fill it in for (i=Top; i<=Bottom; i++)

1 0

[navaraf] 19201: Revert r19199.
by navaraf＠svn.reactos.com 13 Nov '05

13 Nov '05

Revert r19199. Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 08:19:54 UTC (rev 19200) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 08:21:41 UTC (rev 19201) @@ -142,18 +142,19 @@ ULONG i, j; // Clip the area to the screen - if ((Left >= UiScreenWidth) || (Top >= UiScreenHeight)) + // FIXME: This code seems to have problems... Uncomment and view ;-) + /*if ((Left >= UiScreenWidth) || (Top >= UiScreenHeight)) { return; } - if (Right >= UiScreenWidth) + if ((Left + Right) >= UiScreenWidth) { - Right = UiScreenWidth - 1; + Right = UiScreenWidth - Left; } - if (Bottom >= UiScreenHeight) + if ((Top + Bottom) >= UiScreenHeight) { - Bottom = UiScreenHeight - 1; - } + Bottom = UiScreenHeight - Top; + }*/ // Loop through each line and fill it in for (i=Top; i<=Bottom; i++)

1 0

[gvg] 19200: Spelling fixes. Thanks to Royce for pointing them out.
by gvg＠svn.reactos.com 13 Nov '05

13 Nov '05

Spelling fixes. Thanks to Royce for pointing them out. Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-11-13 08:19:13 UTC (rev 19199) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-11-13 08:19:54 UTC (rev 19200) @@ -97,7 +97,7 @@ "That's the way the cookie crumbles ;-)\n", "ReactOS is ready to be booted again ;-)\n", "NOO!! DONT HIT THE BUTTON! I wouldnt do it to you.\n", - "Don't abandon your computer, he wouldnt to it to you.\n", + "Don't abandon your computer, he wouldn't do it to you.\n", "Oh, come on. I got a headache. Leave me alone, will ya!\n", "Finally, I thought you'd never get over me.\n", "Yes i didn't like you either.\n", @@ -125,8 +125,8 @@ "An odd game, the only way to win is not to play. - WOPR (Wargames)\n", "Quoth the raven, nevermore.\n", "Come blade, my breast imbrue. - William Shakespeare, A Midsummer Nights Dream\n", - "Buy this place for advertisment purposes.\n", - "Remember to turn of your computer. (That was a public service message!)\n", + "Buy this place for advertisement purposes.\n", + "Remember to turn off your computer. (That was a public service message!)\n", "You may be a king or poor street sweeper, Sooner or later you'll dance with the\n" "reaper! -Death in Bill and Ted's Bougs Journey\n", "Final Surrender\n",

1 0

[navaraf] 19199: Fix the clipping checks in TuiFillArea.
by navaraf＠svn.reactos.com 13 Nov '05

13 Nov '05

Fix the clipping checks in TuiFillArea. Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 07:41:32 UTC (rev 19198) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 08:19:13 UTC (rev 19199) @@ -142,19 +142,18 @@ ULONG i, j; // Clip the area to the screen - // FIXME: This code seems to have problems... Uncomment and view ;-) - /*if ((Left >= UiScreenWidth) || (Top >= UiScreenHeight)) + if ((Left >= UiScreenWidth) || (Top >= UiScreenHeight)) { return; } - if ((Left + Right) >= UiScreenWidth) + if (Right >= UiScreenWidth) { - Right = UiScreenWidth - Left; + Right = UiScreenWidth - 1; } - if ((Top + Bottom) >= UiScreenHeight) + if (Bottom >= UiScreenHeight) { - Bottom = UiScreenHeight - Top; - }*/ + Bottom = UiScreenHeight - 1; + } // Loop through each line and fill it in for (i=Top; i<=Bottom; i++)

1 0

[sedwards] 19198: add information for the Windows Installer Service. This allows Office2000 and OfficeXP setup to get slightly further
by sedwards＠svn.reactos.com 13 Nov '05

13 Nov '05

add information for the Windows Installer Service. This allows Office2000 and OfficeXP setup to get slightly further Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-13 06:57:29 UTC (rev 19197) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-13 07:41:32 UTC (rev 19198) @@ -761,6 +761,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x0000000 1 HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDr ivers",0x00010000,"vgaddi" +; Windows Installer Service + +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x0000 0000,"Adds, modifies, and removes applications provided as a Windows Installer (*.msi) package. If this service is disabled, any services that explicitly depend on it will fail to start." +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000," Windows Installer" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x000 10001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x000200 00,"system32\msiexec.exe /V" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Start",0x00010001,0 x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Type",0x00010001,0x 00000020 + ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001

1 0

[jimtabor] 19197: Fix unix paths.
by jimtabor＠svn.reactos.com 13 Nov '05

13 Nov '05

Fix unix paths. Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 06:34:51 UTC (rev 19196) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 06:57:29 UTC (rev 19197) @@ -43,18 +43,18 @@ #include <registry.h> #include <fsrec.h> /* file system headers */ -#include <fs\ext2.h> -#include <fs\fat.h> -#include <fs\ntfs.h> -#include <fs\iso.h> +#include <fs/ext2.h> +#include <fs/fat.h> +#include <fs/ntfs.h> +#include <fs/iso.h> /* ui support */ -#include <ui\tui.h> -#include <ui\gui.h> +#include <ui/tui.h> +#include <ui/gui.h> /* arch files */ -#include <arch\i386\hardware.h> -#include <arch\i386\i386.h> -#include <arch\i386\machpc.h> -#include <arch\i386\machxbox.h> +#include <arch/i386/hardware.h> +#include <arch/i386/i386.h> +#include <arch/i386/machpc.h> +#include <arch/i386/machxbox.h> #include <internal/i386/ke.h> /* misc files */ #include <keycodes.h>

1 0

[ion] 19196: - Add new configuration option "SARCH" to define the sub-architecture. Examples include i386-xbox, ppc-be/le (little/bigendian), or any other sub-types of the specified ARCH.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Add new configuration option "SARCH" to define the sub-architecture. Examples include i386-xbox, ppc-be/le (little/bigendian), or any other sub-types of the specified ARCH. - Use SARCH option to isolate XBOX architecture code in freeldr. - Only build rs232.c if DEBUG is on, because the code is only used in DEBUG mode. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: trunk/reactos/config.template.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 06:34:51 UTC (rev 19196) @@ -32,7 +32,9 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { +#ifdef XBOX XboxMachInit(CmdLine); +#endif } else { _____ Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c 2005-11-13 06:34:51 UTC (rev 19196) @@ -23,6 +23,8 @@ /* MACROS *******************************************************************/ +#ifndef DEBUG + #define DEFAULT_BAUD_RATE 19200 #define SER_RBR(x) ((x)+0) @@ -272,3 +274,5 @@ WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend); } + +#endif _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 06:34:51 UTC (rev 19196) @@ -22,20 +22,22 @@ <file>i386rtl.c</file> <file>i386vid.c</file> <file>machpc.c</file> - <file>machxbox.c</file> <file>pccons.c</file> <file>pcdisk.c</file> <file>pcmem.c</file> <file>pcrtc.c</file> <file>pcvideo.c</file> <file>portio.c</file> - <file>xboxcons.c</file> - <file>xboxdisk.c</file> - <file>xboxfont.c</file> - <file>xboxhw.c</file> - <file>xboxmem.c</file> - <file>xboxrtc.c</file> - <file>xboxvideo.c</file> + <if property="SARCH" value="xbox"> + <file>machxbox.c</file> + <file>xboxcons.c</file> + <file>xboxdisk.c</file> + <file>xboxfont.c</file> + <file>xboxhw.c</file> + <file>xboxmem.c</file> + <file>xboxrtc.c</file> + <file>xboxvideo.c</file> + </if> </directory> </if> </directory> _____ Modified: trunk/reactos/config.template.xml --- trunk/reactos/config.template.xml 2005-11-13 06:13:20 UTC (rev 19195) +++ trunk/reactos/config.template.xml 2005-11-13 06:34:51 UTC (rev 19196) @@ -15,7 +15,13 @@ --> <property name="ARCH" value="i386" /> + +<property name="SARCH" value="" /> + <!-- Which CPU ReactOS should be optimized for. Specify one of: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,

1 0

[ion] 19195: - Remove duplicate PCH entry, it'll inherit freeldr's.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Remove duplicate PCH entry, it'll inherit freeldr's. Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:11:38 UTC (rev 19194) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:13:20 UTC (rev 19195) @@ -14,5 +14,4 @@ <directory name="reactos"> <file>setupldr.c</file> </directory> - <pch>include/freeldr.h</pch> </module>

1 0

[ion] 19194: - Fix a bug in printf.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Fix a bug in printf. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 06:09:37 UTC (rev 19193) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-11-13 06:11:38 UTC (rev 19194) @@ -42,7 +42,10 @@ switch (c = *(format++)) { case 'd': case 'u': case 'x': - *_itoa(va_arg(ap, unsigned long), str, 10) = 0; + if (c == 'x') + *_itoa(va_arg(ap, unsigned long), str, 16) = 0; + else + *_itoa(va_arg(ap, unsigned long), str, 10) = 0; ptr = str;

1 0

[ion] 19193: - Fix setupldr. Thanks to Steven.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Fix setupldr. Thanks to Steven. Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.xml Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 06:05:06 UTC (rev 19192) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-11-13 06:09:37 UTC (rev 19193) @@ -36,6 +36,7 @@ #include <cache.h> #include <machine.h> #include <inifile.h> +#include <inffile.h> #include <video.h> #include <portio.h> #include <reactos.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.xml --- trunk/reactos/boot/freeldr/freeldr/setupldr.xml 2005-11-13 06:05:06 UTC (rev 19192) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.xml 2005-11-13 06:09:37 UTC (rev 19193) @@ -5,4 +5,6 @@ <library>freeldr_base</library> <library>setupldr_main</library> <library>rossym</library> + <library>string</library> + <library>rtl</library> </module> _____ Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:05:06 UTC (rev 19192) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml 2005-11-13 06:09:37 UTC (rev 19193) @@ -14,4 +14,5 @@ <directory name="reactos"> <file>setupldr.c</file> </directory> + <pch>include/freeldr.h</pch> </module>

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005