[ros-diffs] [cwittich] 39768: partially revert the mshtml sync as it breaks gecko installation
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Thu Feb 26 12:33:05 CET 2009
Author: cwittich
Date: Thu Feb 26 14:33:04 2009
New Revision: 39768
URL: http://svn.reactos.org/svn/reactos?rev=39768&view=rev
Log:
partially revert the mshtml sync as it breaks gecko installation
Modified:
trunk/reactos/dll/win32/mshtml/install.c
Modified: trunk/reactos/dll/win32/mshtml/install.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c?rev=39768&r1=39767&r2=39768&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mshtml/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/install.c [iso-8859-1] Thu Feb 26 14:33:04 2009
@@ -54,6 +54,11 @@
'\\','W','i','n','e',
'\\','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 LPWSTR tmp_file_name = NULL;
static HANDLE tmp_file = INVALID_HANDLE_VALUE;
@@ -219,23 +224,18 @@
static BOOL install_from_registered_dir(void)
{
char *file_name;
- HKEY hkey;
DWORD res, type, size = MAX_PATH;
BOOL ret;
+ file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME));
/* @@ 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));
- 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);
if(res == ERROR_MORE_DATA) {
file_name = heap_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) {
+ res = RegGetValueA(HKEY_CURRENT_USER, mshtml_keyA, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size);
+ }
+
+ if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) {
heap_free(file_name);
return FALSE;
}
More information about the Ros-diffs
mailing list