diff options
| author | Tobias Krause <tkr@openoffice.org> | 2009-11-10 09:43:56 +0000 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2009-11-10 09:43:56 +0000 |
| commit | 7941b351721d078f623a83fb8bb5a05a886195f2 (patch) | |
| tree | 7cc21b3e55f3c81253103a9141b4c76ab6980589 /setup_native | |
| parent | 7b3f14efe9a84f3d217ae03ef1ff80cc4f816db7 (diff) | |
#105892# define KEY_WOW64_64KEY for mingw
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/win32/customactions/reg64/reg64.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx index a85344af36ae..83150aa1c07c 100755 --- a/setup_native/source/win32/customactions/reg64/reg64.cxx +++ b/setup_native/source/win32/customactions/reg64/reg64.cxx @@ -50,6 +50,8 @@ //#include <map>
#include <strsafe.h> +// 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExW if WINVER < 0x0502. +WINADVAPI LONG WINAPI RegDeleteKeyExW(HKEY,LPCWSTR,REGSAM,DWORD); // 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. @@ -251,15 +253,8 @@ bool QueryReg64Table(MSIHANDLE& rhDatabase, MSIHANDLE& rhView) //--------------------------------------- bool DeleteRegistryKey(HKEY RootKey, const wchar_t* KeyName) { - -// 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyEx if WINVER < 0x0502. -#if (WINVER >= 0x0502) - int rc = RegDeleteKeyEx( + int rc = RegDeleteKeyExW( RootKey, KeyName, KEY_WOW64_64KEY, 0); -#else - int rc = RegDeleteKey( - RootKey, KeyName); -#endif return (ERROR_SUCCESS == rc); } |