mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 17:35:07 +00:00
partially revert the mshtml sync as it breaks gecko installation
svn path=/trunk/; revision=39768
This commit is contained in:
parent
9bbe0fef07
commit
9461e682d1
|
@ -54,6 +54,11 @@ static const WCHAR mshtml_keyW[] =
|
||||||
'\\','W','i','n','e',
|
'\\','W','i','n','e',
|
||||||
'\\','M','S','H','T','M','L',0};
|
'\\','M','S','H','T','M','L',0};
|
||||||
|
|
||||||
|
static const CHAR mshtml_keyA[] =
|
||||||
|
{'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 HWND install_dialog = NULL;
|
||||||
static LPWSTR tmp_file_name = NULL;
|
static LPWSTR tmp_file_name = NULL;
|
||||||
static HANDLE tmp_file = INVALID_HANDLE_VALUE;
|
static HANDLE tmp_file = INVALID_HANDLE_VALUE;
|
||||||
|
@ -219,23 +224,18 @@ static BOOL install_from_unix_file(const char *file_name)
|
||||||
static BOOL install_from_registered_dir(void)
|
static BOOL install_from_registered_dir(void)
|
||||||
{
|
{
|
||||||
char *file_name;
|
char *file_name;
|
||||||
HKEY hkey;
|
|
||||||
DWORD res, type, size = MAX_PATH;
|
DWORD res, type, size = MAX_PATH;
|
||||||
BOOL ret;
|
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 = heap_alloc(size+sizeof(GECKO_FILE_NAME));
|
file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME));
|
||||||
res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size);
|
/* @@ Wine registry key: HKCU\Software\Wine\MSHTML */
|
||||||
|
res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size);
|
||||||
if(res == ERROR_MORE_DATA) {
|
if(res == ERROR_MORE_DATA) {
|
||||||
file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME));
|
file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME));
|
||||||
res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size);
|
res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size);
|
||||||
}
|
}
|
||||||
RegCloseKey(hkey);
|
|
||||||
if(res != ERROR_SUCCESS || type != REG_SZ) {
|
if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) {
|
||||||
heap_free(file_name);
|
heap_free(file_name);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue