Author: gedmurphy
Date: Fri Sep 7 18:05:55 2007
New Revision: 28923
URL: http://svn.reactos.org/svn/reactos?rev=28923&view=rev
Log:
- We shouldn't use the same text as Windows does for descriptions
- Add display names for each service
Modified:
trunk/reactos/boot/bootdata/hivesys.inf
Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys.inf (original)
+++ trunk/reactos/boot/bootdata/hivesys.inf Fri Sep 7 18:05:55 2007
@@ -545,9 +545,19 @@
HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001
+; DHCP client service
+HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP Client"
+HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Attempts to obtain network settings automatically from an available DHCP server"
+HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"Network"
+HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%SystemRoot%\system32\dhcp.exe"
+HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x00000002
+HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000010
+
; Event logging service
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog",,0x00000010
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000000,"Enables event log messages issued by Windows-based programs and components to be viewed in Event Viewer. This service cannot be stopped"
+HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","DisplayName",0x00000000,"Event Logger"
+HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000000,"Logs events or messages sent by the operating system in a database accessible via the event log viewer"
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event log"
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000,"%SystemRoot%\system32\eventlog.exe"
@@ -560,14 +570,6 @@
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security","File",0x00020000,"%SystemRoot%\system32\config\SecEvent.Evt"
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System",,0x00000010
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","File",0x00020000,"%SystemRoot%\system32\config\SysEvent.Evt"
-
-; DHCP client service
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Manages network configuration by registering and updating IP addresses and DNS names"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"Network"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%SystemRoot%\system32\dhcp.exe"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x00000002
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000010
; Floppy driver
HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000
@@ -653,7 +655,8 @@
HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001
; NetLogon
-HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,"Supports pass-through authentication of account logon events for computers in a domain."
+HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","DisplayName",0x00000000,"Net Logon"
+HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,"Sets up a secure channel to a domain controller for domain authentication"
HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe"
HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003
@@ -688,7 +691,8 @@
HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001
; Plug and Play manager
-HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Description",0x00000000,"Enables a computer to recognize and adapt to hardware changes with little or no user input. Stopping or disabling this service will result in system instability."
+HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","DisplayName",0x00000000,"Plug and Play"
+HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Description",0x00000000,"Detects hardware changes and installs needed software if possible"
HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"PlugPlay"
HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000,"%SystemRoot%\system32\umpnpmgr.exe"
@@ -696,7 +700,8 @@
HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00000010
; RPC service
-HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000,"Provides the endpoint mapper and other miscellaneous RPC services."
+HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","DisplayName",0x00000000,"Remote Procedure Call"
+HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000,"RPC subsystem which is responsible for Remote procedure Calls on the local machine"
HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Group",0x00000000," RPC Service"
HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"%SystemRoot%\system32\rpcss.exe"
@@ -760,7 +765,8 @@
;HKLM,"SYSTEM\CurrentControlSet\Services\usbdriver","Type",0x00010001,0x00000001
; Windows Installer Service
-HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"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","DisplayName",0x00000000,"ReactOS Installer"
+HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)"
HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer"
HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x00020000,"system32\msiexec.exe /V"
Author: gedmurphy
Date: Fri Sep 7 17:19:37 2007
New Revision: 28922
URL: http://svn.reactos.org/svn/reactos?rev=28922&view=rev
Log:
fix 1 description and add a new one
See issue #2639 for more details.
Modified:
trunk/reactos/boot/bootdata/hivesys.inf
Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys.inf (original)
+++ trunk/reactos/boot/bootdata/hivesys.inf Fri Sep 7 17:19:37 2007
@@ -653,6 +653,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001
; NetLogon
+HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,"Supports pass-through authentication of account logon events for computers in a domain."
HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe"
HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003
@@ -695,7 +696,7 @@
HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00000010
; RPC service
-HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000,"Enables a computer to recognize and adapt to hardware changes with little or no user input"
+HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000,"Provides the endpoint mapper and other miscellaneous RPC services."
HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Group",0x00000000," RPC Service"
HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"%SystemRoot%\system32\rpcss.exe"
Author: cfinck
Date: Fri Sep 7 16:24:18 2007
New Revision: 28919
URL: http://svn.reactos.org/svn/reactos?rev=28919&view=rev
Log:
- Revert fireball's change in r28912
- HACK: Create the "Mozilla Firefox\chrome" directory by syssetup now, so Firefox 2.0 can be installed.
The installation still shows an error message about the Talkback component at the end, but when you click "Cancel" then, Firefox 2.0 is installed and works.
- Update Firefox 1.5 to 1.5.0.12 and Thunderbird 1.5 to 1.5.0.13
- Change the links to the Mozilla apps. They are downloaded from ftp.mozilla.org now instead of ftp-mozilla.netscape.com.
The ftp-mozilla.netscape.com URLs for the 1.5 apps are broken, but the old versions are still available at ftp.mozilla.org.
Modified:
branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c
branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml
Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c (original)
+++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Fri Sep 7 16:24:18 2007
@@ -765,6 +765,19 @@
CreateDirectory(szBuffer, NULL);
}
+ // Temporary hack for ROS 0.3.3 to get Firefox 2.0 to install
+ // Because of a permission problem, the Firefox installer cannot create the "chrome" subdirectory. Therefore it has to exist, before Firefox is installed
+ ZeroMemory(&szBuffer, sizeof(szBuffer));
+
+ if (SHGetSpecialFolderPath(0, szBuffer, CSIDL_PROGRAM_FILES, FALSE))
+ {
+ PathAddBackslash(szBuffer);
+ _tcscat(szBuffer, _T("Mozilla Firefox"));
+ CreateDirectory(szBuffer, NULL);
+ _tcscat(szBuffer, _T("\\chrome"));
+ CreateDirectory(szBuffer, NULL);
+ }
+
if (!CommonInstall())
return 0;
Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/do…
==============================================================================
--- branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml (original)
+++ branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Fri Sep 7 16:24:18 2007
@@ -3,23 +3,30 @@
<application name="Firefox 1.5">
<regname>Mozilla Firefox (1.5)</regname>
<licence>MPL/GPL/LGPL</licence>
- <version>1.5.0.9</version>
+ <version>1.5.0.12</version>
<description>The most popular and one of the best free Web Browsers out there.</description>
- <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location>
+ <location>http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.12/win32/en-U…</location>
+ </application>
+ <application name="Firefox 2.0">
+ <regname>Mozilla Firefox (2.0.0.6)</regname>
+ <licence>MPL/GPL/LGPL</licence>
+ <version>2.0.0.6</version>
+ <description>The most popular and one of the best free Web Browsers out there.</description>
+ <location>http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.6/win32/en-US…</location>
</application>
<application name="Thunderbird 1.5">
<regname>Mozilla Thunderbird (1.5)</regname>
<licence>MPL/GPL/LGPL</licence>
- <version>1.5.0.9</version>
+ <version>1.5.0.13</version>
<description>The most popular and one of the best free Mail Clients out there.</description>
- <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location>
+ <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.13/win32/…</location>
</application>
<application name="Thunderbird 2.0">
<regname>Mozilla Thunderbird (2.0.0.6)</regname>
<licence>MPL/GPL/LGPL</licence>
<version>2.0.0.6</version>
<description>The most popular and one of the best free Mail Clients out there.</description>
- <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location>
+ <location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/latest/win32/en…</location>
</application>
<application name="Mozilla ActiveX Control">
<regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname>