mirror of
https://github.com/reactos/wine.git
synced 2024-11-25 20:59:54 +00:00
mshtml: Added support for installing Gecko from the local file.
This commit is contained in:
Jacek Caban
Alexandre Julliard
parent
352d29b194
commit
f4e1ff6e1f
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2006 Jacek Caban for CodeWeavers
|
||||
* Copyright 2006-2007 Jacek Caban for CodeWeavers
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@ -19,6 +19,8 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define COBJMACROS
|
||||
#define NONAMELESSUNION
|
||||
@ -36,12 +38,20 @@
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/library.h"
|
||||
|
||||
#include "mshtml_private.h"
|
||||
#include "resource.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
|
||||
|
||||
#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION ".cab"
|
||||
|
||||
static const WCHAR mshtml_keyW[] =
|
||||
{'S','o','f','t','w','a','r','e',
|
||||
'\\','W','i','n','e',
|
||||
'\\','M','S','H','T','M','L',0};
|
||||
|
||||
static HWND install_dialog = NULL;
|
||||
static LPWSTR tmp_file_name = NULL;
|
||||
static HANDLE tmp_file = INVALID_HANDLE_VALUE;
|
||||
@ -83,16 +93,14 @@ static void set_registry(LPCSTR install_dir)
|
||||
HKEY hkey;
|
||||
DWORD res, len, size;
|
||||
|
||||
static const WCHAR wszMshtmlKey[] = {
|
||||
'S','o','f','t','w','a','r','e','\\','W','i','n','e',
|
||||
'\\','M','S','H','T','M','L','\\'};
|
||||
static const WCHAR wszGeckoPath[] = {'G','e','c','k','o','P','a','t','h',0};
|
||||
static const WCHAR wszWineGecko[] = {'w','i','n','e','_','g','e','c','k','o',0};
|
||||
|
||||
memcpy(mshtml_key, wszMshtmlKey, sizeof(wszMshtmlKey));
|
||||
memcpy(mshtml_key, mshtml_keyW, sizeof(mshtml_keyW));
|
||||
mshtml_key[sizeof(mshtml_keyW)/sizeof(WCHAR)-1] = '\\';
|
||||
MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, sizeof(GECKO_VERSION),
|
||||
mshtml_key+sizeof(wszMshtmlKey)/sizeof(WCHAR),
|
||||
(sizeof(mshtml_key)-sizeof(wszMshtmlKey))/sizeof(WCHAR));
|
||||
mshtml_key+sizeof(mshtml_keyW)/sizeof(WCHAR),
|
||||
(sizeof(mshtml_key)-sizeof(mshtml_keyW))/sizeof(WCHAR));
|
||||
|
||||
/* @@ Wine registry key: HKCU\Software\Wine\MSHTML\<version> */
|
||||
res = RegCreateKeyW(HKEY_CURRENT_USER, mshtml_key, &hkey);
|
||||
@ -119,6 +127,151 @@ static void set_registry(LPCSTR install_dir)
|
||||
ERR("Failed to set GeckoPath value: %08x\n", res);
|
||||
}
|
||||
|
||||
static BOOL install_cab(LPCWSTR file_name)
|
||||
{
|
||||
HMODULE advpack;
|
||||
char install_dir[MAX_PATH];
|
||||
typeof(ExtractFilesA) *pExtractFilesA;
|
||||
LPSTR file_name_a;
|
||||
DWORD res, len;
|
||||
HRESULT hres;
|
||||
|
||||
static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
|
||||
|
||||
TRACE("(%s)\n", debugstr_w(file_name));
|
||||
|
||||
GetWindowsDirectoryA(install_dir, sizeof(install_dir));
|
||||
strcat(install_dir, "\\gecko\\");
|
||||
res = CreateDirectoryA(install_dir, NULL);
|
||||
if(!res && GetLastError() != ERROR_ALREADY_EXISTS) {
|
||||
ERR("Could not create directory: %08u\n", GetLastError());
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
strcat(install_dir, GECKO_VERSION);
|
||||
res = CreateDirectoryA(install_dir, NULL);
|
||||
if(!res && GetLastError() != ERROR_ALREADY_EXISTS) {
|
||||
ERR("Could not create directory: %08u\n", GetLastError());
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
advpack = LoadLibraryW(wszAdvpack);
|
||||
pExtractFilesA = (typeof(ExtractFilesA)*)GetProcAddress(advpack, "ExtractFiles");
|
||||
|
||||
len = WideCharToMultiByte(CP_ACP, 0, file_name, -1, NULL, 0, NULL, NULL);
|
||||
file_name_a = mshtml_alloc(len);
|
||||
WideCharToMultiByte(CP_ACP, 0, file_name, -1, file_name_a, -1, NULL, NULL);
|
||||
|
||||
/* FIXME: Use unicode version (not yet implemented) */
|
||||
hres = pExtractFilesA(file_name_a, install_dir, 0, NULL, NULL, 0);
|
||||
FreeLibrary(advpack);
|
||||
mshtml_free(file_name_a);
|
||||
if(FAILED(hres)) {
|
||||
ERR("Could not extract package: %08x\n", hres);
|
||||
clean_up();
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
set_registry(install_dir);
|
||||
clean_up();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static BOOL install_from_unix_file(const char *file_name)
|
||||
{
|
||||
LPWSTR dos_file_name;
|
||||
int fd;
|
||||
BOOL ret;
|
||||
|
||||
static WCHAR *(*wine_get_dos_file_name)(const char*);
|
||||
static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
|
||||
|
||||
fd = open(file_name, O_RDONLY);
|
||||
if(fd == -1) {
|
||||
TRACE("%s not found\n", debugstr_a(file_name));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
close(fd);
|
||||
|
||||
if(!wine_get_dos_file_name) {
|
||||
wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name");
|
||||
if(!wine_get_dos_file_name) {
|
||||
ERR("Could not get wine_get_dos_file_name function.\n");
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
dos_file_name = wine_get_dos_file_name(file_name);
|
||||
if(!file_name) {
|
||||
ERR("Could not get dos file name of %s\n", debugstr_a(file_name));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
ret = install_cab(dos_file_name);
|
||||
|
||||
mshtml_free(dos_file_name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static BOOL install_from_registered_dir(void)
|
||||
{
|
||||
char *file_name;
|
||||
HKEY hkey;
|
||||
DWORD res, type, size = MAX_PATH;
|
||||
BOOL ret;
|
||||
|
||||
/* @@ Wine registry key: HKCU\Software\Wine\MSHTML */
|
||||
res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey);
|
||||
if(res != ERROR_SUCCESS)
|
||||
return FALSE;
|
||||
|
||||
file_name = mshtml_alloc(size+sizeof(GECKO_FILE_NAME));
|
||||
res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size);
|
||||
if(res == ERROR_MORE_DATA) {
|
||||
file_name = mshtml_realloc(file_name, size+sizeof(GECKO_FILE_NAME));
|
||||
res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size);
|
||||
}
|
||||
RegCloseKey(hkey);
|
||||
if(res != ERROR_SUCCESS || type != REG_SZ)
|
||||
return FALSE;
|
||||
|
||||
strcat(file_name, GECKO_FILE_NAME);
|
||||
|
||||
TRACE("Trying %s\n", debugstr_a(file_name));
|
||||
|
||||
ret = install_from_unix_file(file_name);
|
||||
|
||||
mshtml_free(file_name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static BOOL install_from_default_dir(void)
|
||||
{
|
||||
const char *data_dir;
|
||||
char *file_name;
|
||||
int len;
|
||||
BOOL ret;
|
||||
|
||||
static const char gecko_dir[] = "/gecko/";
|
||||
|
||||
data_dir = wine_get_data_dir();
|
||||
if(!data_dir) return FALSE;
|
||||
|
||||
len = strlen(data_dir);
|
||||
|
||||
file_name = mshtml_alloc(len+sizeof(gecko_dir)+sizeof(GECKO_FILE_NAME));
|
||||
memcpy(file_name, data_dir, len);
|
||||
memcpy(file_name+len, gecko_dir, sizeof(gecko_dir));
|
||||
memcpy(file_name+len+sizeof(gecko_dir)-1, GECKO_FILE_NAME, sizeof(GECKO_FILE_NAME));
|
||||
|
||||
ret = install_from_unix_file(file_name);
|
||||
|
||||
mshtml_free(file_name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,
|
||||
REFIID riid, void **ppv)
|
||||
{
|
||||
@ -194,16 +347,6 @@ static HRESULT WINAPI InstallCallback_OnProgress(IBindStatusCallback *iface, ULO
|
||||
static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
|
||||
HRESULT hresult, LPCWSTR szError)
|
||||
{
|
||||
LPSTR file_name;
|
||||
DWORD len;
|
||||
HMODULE advpack;
|
||||
char install_dir[MAX_PATH];
|
||||
typeof(ExtractFilesA) *pExtractFilesA;
|
||||
BOOL res;
|
||||
HRESULT hres;
|
||||
|
||||
static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
|
||||
|
||||
if(FAILED(hresult)) {
|
||||
ERR("Binding failed %08x\n", hresult);
|
||||
clean_up();
|
||||
@ -215,39 +358,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
|
||||
|
||||
set_status(IDS_INSTALLING);
|
||||
|
||||
GetWindowsDirectoryA(install_dir, sizeof(install_dir));
|
||||
strcat(install_dir, "\\gecko\\");
|
||||
res = CreateDirectoryA(install_dir, NULL);
|
||||
if(!res && GetLastError() != ERROR_ALREADY_EXISTS) {
|
||||
ERR("Could not create directory: %08u\n", GetLastError());
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
strcat(install_dir, GECKO_VERSION);
|
||||
res = CreateDirectoryA(install_dir, NULL);
|
||||
if(!res && GetLastError() != ERROR_ALREADY_EXISTS) {
|
||||
ERR("Could not create directory: %08u\n", GetLastError());
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
advpack = LoadLibraryW(wszAdvpack);
|
||||
pExtractFilesA = (typeof(ExtractFilesA)*)GetProcAddress(advpack, "ExtractFiles");
|
||||
|
||||
len = WideCharToMultiByte(CP_ACP, 0, tmp_file_name, -1, NULL, 0, NULL, NULL);
|
||||
file_name = mshtml_alloc(len);
|
||||
WideCharToMultiByte(CP_ACP, 0, tmp_file_name, -1, file_name, -1, NULL, NULL);
|
||||
|
||||
/* FIXME: Use unicode version (not yet implemented) */
|
||||
hres = pExtractFilesA(file_name, install_dir, 0, NULL, NULL, 0);
|
||||
FreeLibrary(advpack);
|
||||
mshtml_free(file_name);
|
||||
if(FAILED(hres)) {
|
||||
ERR("Could not extract package: %08x\n", hres);
|
||||
clean_up();
|
||||
}
|
||||
|
||||
set_registry(install_dir);
|
||||
clean_up();
|
||||
install_cab(tmp_file_name);
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
@ -308,15 +419,12 @@ static LPWSTR get_url(void)
|
||||
DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR);
|
||||
LPWSTR url;
|
||||
|
||||
static const WCHAR wszMshtmlKey[] = {
|
||||
'S','o','f','t','w','a','r','e','\\','W','i','n','e',
|
||||
'\\','M','S','H','T','M','L',0};
|
||||
static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0};
|
||||
static const WCHAR httpW[] = {'h','t','t','p'};
|
||||
static const WCHAR v_formatW[] = {'?','v','=',0};
|
||||
|
||||
/* @@ Wine registry key: HKCU\Software\Wine\MSHTML */
|
||||
res = RegOpenKeyW(HKEY_CURRENT_USER, wszMshtmlKey, &hkey);
|
||||
res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey);
|
||||
if(res != ERROR_SUCCESS)
|
||||
return NULL;
|
||||
|
||||
@ -400,7 +508,15 @@ BOOL install_wine_gecko(void)
|
||||
if(GetLastError() == ERROR_ALREADY_EXISTS) {
|
||||
WaitForSingleObject(hsem, INFINITE);
|
||||
}else {
|
||||
if((url = get_url()))
|
||||
/*
|
||||
* Try to find Gecko .cab file in following order:
|
||||
* - directory stored in GeckoCabDir value of HKCU/Software/MSHTML key
|
||||
* - $datadir/gecko
|
||||
* - download from URL stored in GeckoUrl value of HKCU/Software/MSHTML key
|
||||
*/
|
||||
if(!install_from_registered_dir()
|
||||
&& !install_from_default_dir()
|
||||
&& (url = get_url()))
|
||||
DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user