diff options
| author | Tobias Krause <tkr@openoffice.org> | 2009-11-06 13:08:29 +0000 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2009-11-06 13:08:29 +0000 |
| commit | 4215d8c5fda13fe01e6e1e79bf08b8267546e3a0 (patch) | |
| tree | 346c4d0330587ae008e67d0712276f6898d64d84 /setup_native | |
| parent | 92ec80aa1ed7ea3d0bc142bf3944df336733b7bc (diff) | |
#105892# define KEY_WOW64_64KEY for mingw
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/win32/customactions/reg64/reg64.cxx | 9 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/shellextensions.cxx | 10 |
2 files changed, 18 insertions, 1 deletions
diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx index 0dc8cb1f35ee..cecb633167a7 100755 --- a/setup_native/source/win32/customactions/reg64/reg64.cxx +++ b/setup_native/source/win32/customactions/reg64/reg64.cxx @@ -51,6 +51,15 @@ #include <strsafe.h> +// 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY +// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. +// Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and +// extensions\source\activex\main\so_activex.cpp +#ifndef KEY_WOW64_64KEY + #define KEY_WOW64_64KEY (0x0100) +#endif + + #define TABLE_NAME L"Reg64" #define BASISINSTALLLOCATION L"[BASISINSTALLLOCATION]" diff --git a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx index 8c58986328b4..5cc6d5f8df9b 100644 --- a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx @@ -146,6 +146,14 @@ extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE hMSI) HKEY hKey; +// 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY +// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. +// Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and +// extensions\source\activex\main\so_activex.cpp +#ifndef KEY_WOW64_64KEY + #define KEY_WOW64_64KEY (0x0100) +#endif + if (IsVersionNT64(hMSI)) { // Open Windows 64 Bit Registry @@ -161,7 +169,7 @@ extern "C" UINT __stdcall InstallExecSequenceEntry(MSIHANDLE hMSI) // Open Windows 32 Bit Registry on Win64 maschine - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),0, KEY_WRITE | KEY_WOW64_32KEY, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"),0, KEY_WRITE ) == ERROR_SUCCESS) { RegSetValueEx(hKey, ColumnHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(ColumnHandler.Value), _tcslen(ColumnHandler.Value) + 1); RegSetValueEx(hKey, InfotipHandler.Key, 0, REG_SZ, reinterpret_cast<const BYTE*>(InfotipHandler.Value), _tcslen(InfotipHandler.Value) + 1); |