Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 19206: fixed unrecognized escape character sequence warning
by weiden＠svn.reactos.com 13 Nov '05

13 Nov '05

fixed unrecognized escape character sequence warning Modified: trunk/reactos/subsys/system/cmd/Es.rc _____ Modified: trunk/reactos/subsys/system/cmd/Es.rc --- trunk/reactos/subsys/system/cmd/Es.rc 2005-11-13 09:39:51 UTC (rev 19205) +++ trunk/reactos/subsys/system/cmd/Es.rc 2005-11-13 11:29:17 UTC (rev 19206) @@ -330,7 +330,8 @@ STRING_PATH_HELP1, "Muestra o cambia la ruta de b·squeda de archivos ejecutables.\n\n\ PATH [[unidad:]ruta[;...]]\nRuta ;\n\n\ -Escribe PATH ; para limpiar todas las configuraciones de b·squeda y usar solo el\n\ directorio actual del interprete de comandos.\n\ +Escribe PATH ; para limpiar todas las configuraciones de b·squeda y usar solo el\n\ +directorio actual del interprete de comandos.\n\ Escribe PATH sin parßmetros para mostrar la ruta actual.\n" STRING_PROMPT_HELP1, "Cambia el sÝmbolo de comandos.\n\n\

1 0

[hpoussin] 19205: Fix typo: Install pci.sys for PCI buses, and isapnp.sys for ISA bus
by hpoussin＠svn.reactos.com 13 Nov '05

13 Nov '05

Fix typo: Install pci.sys for PCI buses, and isapnp.sys for ISA bus Modified: trunk/reactos/media/inf/machine.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-11-13 09:05:28 UTC (rev 19204) +++ trunk/reactos/media/inf/machine.inf 2005-11-13 09:39:51 UTC (rev 19205) @@ -38,8 +38,8 @@ %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 -%PCI\CC_0601.DeviceDesc% = PCI_Inst,PCI\CC_0601 -%PCI\CC_0604.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0604 +%PCI\CC_0601.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0601 +%PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 [IntelMfg] %PCI\VEN_8086&DEV_7110.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_8086&DEV_7110

1 0

[mf] 19204: some little german translation fixes
by mf＠svn.reactos.com 13 Nov '05

13 Nov '05

some little german translation fixes Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc --- trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-11-13 08:34:24 UTC (rev 19203) +++ trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-11-13 09:05:28 UTC (rev 19204) @@ -96,7 +96,7 @@ BEGIN MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ MENUITEM "&?ber Explorer...", ID_ABOUT_EXPLORER - MENUITEM "About &OS...", ID_ABOUT_WINDOWS + MENUITEM "?ber &OS...", ID_ABOUT_WINDOWS END END @@ -207,7 +207,7 @@ IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 204 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Startmenu-Einstellungen" +CAPTION "Startmen³-Einstellungen" FONT 8, "MS Sans Serif" BEGIN END @@ -284,7 +284,7 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Programmsuche im Startmenu" +CAPTION "Programmsuche im Startmen³" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Filter:",IDC_STATIC,7,9,18,8

1 0

[ion] 19203: - Unconditionally support XBOX in Freeldr.
by ion＠svn.reactos.com 13 Nov '05

13 Nov '05

- Unconditionally support XBOX in Freeldr. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 08:24:15 UTC (rev 19202) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 08:34:24 UTC (rev 19203) @@ -32,9 +32,7 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { -#ifdef XBOX XboxMachInit(CmdLine); -#endif } else { _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 08:24:15 UTC (rev 19202) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 08:34:24 UTC (rev 19203) @@ -28,16 +28,14 @@ <file>pcrtc.c</file> <file>pcvideo.c</file> <file>portio.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> + <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> </directory> </if> </directory>

1 0

[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

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