diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-31 22:03:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-31 22:03:44 +0200 |
| commit | 760d14a55cb2b60bd048246690d17348b4cd0fdf (patch) | |
| tree | 4c2b8516ccc5631e3ce9ff578269683c4cfbcded /src/dosinst.c | |
| parent | 7805004319691ee026342525e0bf9df146358dc0 (diff) | |
| download | vim-git-760d14a55cb2b60bd048246690d17348b4cd0fdf.tar.gz | |
Fix that uninstaller isn't found on 64-bit Windows.
Diffstat (limited to 'src/dosinst.c')
| -rw-r--r-- | src/dosinst.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/dosinst.c b/src/dosinst.c index 6dcb5e30d..979d6fe87 100644 --- a/src/dosinst.c +++ b/src/dosinst.c @@ -462,8 +462,8 @@ uninstall_check(int skip_question) DWORD new_num_keys; int foundone = 0; - code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, uninstall_key, 0, KEY_READ, - &key_handle); + code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, uninstall_key, 0, + KEY_WOW64_64KEY | KEY_READ, &key_handle); CHECK_REG_ERROR(code); for (key_index = 0; @@ -475,8 +475,8 @@ uninstall_check(int skip_question) if (strncmp("Vim", subkey_name_buff, 3) == 0) { /* Open the key named Vim* */ - code = RegOpenKeyEx(key_handle, subkey_name_buff, 0, KEY_READ, - &uninstall_key_handle); + code = RegOpenKeyEx(key_handle, subkey_name_buff, 0, + KEY_WOW64_64KEY | KEY_READ, &uninstall_key_handle); CHECK_REG_ERROR(code); /* get the DisplayName out of it to show the user */ @@ -1352,14 +1352,6 @@ init_vimrc_choices(void) } #if defined(WIN3264) -/* - * Modern way of creating registry entries, also works on 64 bit windows when - * compiled as a 32 bit program. - */ -# ifndef KEY_WOW64_64KEY -# define KEY_WOW64_64KEY 0x0100 -# endif - static LONG reg_create_key( HKEY root, |