--- trunk/reactos/bootdata/hivesft.inf 2005-12-09 21:25:39 UTC (rev 20019)
+++ trunk/reactos/bootdata/hivesft.inf 2005-12-09 21:39:50 UTC (rev 20020)
@@ -739,4 +739,7 @@
HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000
HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"
+; Where to download the Mozilla ActiveX control
+HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://source.winehq.org/mozactivex"
+
; EOF
--- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-12-09 21:25:39 UTC (rev 20019)
+++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-12-09 21:39:50 UTC (rev 20020)
@@ -50,7 +50,7 @@
LONG SHDOCVW_refCount = 0;
static const WCHAR szMozDlPath[] = {
- 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\',
+ 'S','o','f','t','w','a','r','e','\\','R','e','a','c','t','O','S','\\',
's','h','d','o','c','v','w',0
};
@@ -321,7 +321,7 @@
/* find the name of the thing to download */
szUrl[0] = 0;
/* @@ Wine registry key: HKCU\Software\Wine\shdocvw */
- r = RegOpenKeyW( HKEY_CURRENT_USER, szMozDlPath, &hkey );
+ r = RegOpenKeyW( HKEY_LOCAL_MACHINE, szMozDlPath, &hkey );
if( r == ERROR_SUCCESS )
{
sz = MAX_PATH;
@@ -404,7 +404,7 @@
{
DWORD r;
WCHAR buf[0x100];
- static const WCHAR szWine[] = { 'W','i','n','e',0 };
+ static const WCHAR szTitle[] = { 'R','e','a','c','t','O','S',0 };
HANDLE hsem;
SetLastError( ERROR_SUCCESS );
@@ -412,7 +412,7 @@
if( GetLastError() != ERROR_ALREADY_EXISTS )
{
LoadStringW( shdocvw_hinstance, 1001, buf, sizeof buf/sizeof(WCHAR) );
- r = MessageBoxW(NULL, buf, szWine, MB_YESNO | MB_ICONQUESTION);
+ r = MessageBoxW(NULL, buf, szTitle, MB_YESNO | MB_ICONQUESTION);
if( r != IDYES )
return FALSE;
@@ -445,7 +445,7 @@
if( bTried )
{
MESSAGE("You need to install the Mozilla ActiveX control to\n");
- MESSAGE("use Wine's builtin CLSID_WebBrowser from SHDOCVW.DLL\n");
+ MESSAGE("use ReactOS's builtin CLSID_WebBrowser from SHDOCVW.DLL\n");
return FALSE;
}
SHDOCVW_TryDownloadMozillaControl();