mirror of
https://github.com/reactos/reactos.git
synced 2024-10-31 03:48:17 +00:00
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
--- C:/Users/CHRIST~1/AppData/Local/Temp/install.-rev47414.svn001.tmp.c Sa Mai 29 16:46:40 2010
|
|
+++ C:/Users/Christoph/Desktop/Projekte/ReactOS/dll/win32/mshtml/install.c Sa Mai 29 16:43:49 2010
|
|
@@ -60,6 +60,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;
|
|
@@ -225,23 +230,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);
|
|
+ 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);
|
|
return FALSE;
|
|
}
|