Problem: MS-Windows: missing 32 and 64 bit files in installer.
Solution: Include both 32 and 64 bit GvimExt and related dll files. Remove
old Windows code from the installer. (Ken Takata, closes #2144)
#
# MS-Windows:
# - Run make on Unix to update the ".mo" files.
-# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
+# - Get 32 bit libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
# https://mlocati.github.io/gettext-iconv-windows/ .
# Use the "shared-32.zip file and extract the archive to get the files.
-# Put them in the top directory, "make dosrt" uses them.
+# Put them in the gettext32 directory, "make dosrt" uses them.
+# - Get 64 bit libintl-8.dll and libiconv-2.dll. E.g. from
+# https://mlocati.github.io/gettext-iconv-windows/ .
+# Use the "shared-64.zip file and extract the archive to get the files.
+# Put them in the gettext64 directory, "make dosrt" uses them.
# - > make dossrc
# > make dosrt
# Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
fi \
done
- cp libintl-8.dll dist/vim/$(VIMRTDIR)/
- cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
- cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
+ mkdir dist/vim/$(VIMRTDIR)/gettext32
+ cp gettext32/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext32/
+ cp gettext32/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext32/
+ cp gettext32/libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/gettext32/
+ mkdir dist/vim/$(VIMRTDIR)/gettext64
+ cp gettext64/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext64/
+ cp gettext64/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext64/
# Used before uploading. Don't delete the AAPDIR/sign files!
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
- cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
+ mkdir dist/vim/$(VIMRTDIR)/GvimExt32
+ cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll
+ mkdir dist/vim/$(VIMRTDIR)/GvimExt64
+ cp gvimext64.dll dist/vim/$(VIMRTDIR)/GvimExt64/gvimext.dll
cd dist && zip -9 -rD -z gvim$(VERSION).zip vim <$(COMMENT_GVIM)
cp gvim.pdb dist/gvim$(VERSION).pdb
This builds a one-click install for Vim for Win32 using the Nullsoft
-Installation System (NSIS), available at http://www.nullsoft.com/free/nsis/
+Installation System (NSIS), available at http://nsis.sourceforge.net/
To build the installable .exe:
uninstal.exe,
xxd/xxd.exe,
+ Then execute tools/rename.bat to rename the executables. (mv command is
+ required.)
+
3. Go to the GvimExt directory and build gvimext.dll (or get it from a binary
- archive).
+ archive). Both 64- and 32-bit versions are needed and should be placed
+ as follows:
+ 64-bit: src/GvimExt/gvimext64.dll
+ 32-bit: src/GvimExt/gvimext.dll
4. Go to the VisVim directory and build VisVim.dll (or get it from a binary
archive).
get them from a binary archive).
6. Get a "diff.exe" program and put it in the "../.." directory (above the
- "vim61" directory, it's the same for all Vim versions).
+ "vim80" directory, it's the same for all Vim versions).
You can find one in previous Vim versions or in this archive:
http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz
+ Also put winpty32.dll and winpty-agent.exe there.
7. Do "make uganda.nsis.txt" in runtime/doc. This requires sed, you may have
to do this on Unix. Make sure the file is in DOS file format!
+8. Get gettext and iconv DLLs from the following site:
+ https://github.com/mlocati/gettext-iconv-windows/releases
+ Both 64- and 32-bit versions are needed.
+ Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
+ DLLs and place them as follows:
+
+ <GETTEXT directory>
+ |
+ + gettext32/
+ | libintl-8.dll
+ | libiconv-2.dll
+ | libgcc_s_sjlj-1.dll
+ |
+ ` gettext64/
+ libintl-8.dll
+ libiconv-2.dll
+
+ The default <GETTEXT directory> is "..", however, you can change it by
+ passing /DGETTEXT=... option to the makensis command.
+
+
Install NSIS if you didn't do that already.
Also install UPX, if you want a compressed file.
!define VIMTOOLS ..\..
!endif
+# Location of gettext.
+# It must contain two directories: gettext32 and gettext64.
+# See README.txt for detail.
+!ifndef GETTEXT
+ !define GETTEXT ${VIMRT}
+!endif
+
# Comment the next line if you don't have UPX.
-# Get it at http://upx.sourceforge.net
+# Get it at https://upx.github.io/
!define HAVE_UPX
# comment the next line if you do not want to add Native Language Support
SetOutPath $0
ClearErrors
SetOverwrite try
+
${If} ${RunningX64}
+ # Install 64-bit gvimext.dll into the GvimExt64 directory.
+ SetOutPath $0\GvimExt64
+ ClearErrors
File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext64.dll
- ${Else}
- File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll
+!ifdef HAVE_NLS
+ File ${GETTEXT}\gettext64\libintl-8.dll
+ File ${GETTEXT}\gettext64\libiconv-2.dll
+!endif
+
+ IfErrors 0 GvimExt64Done
+
+ # Can't copy gvimext.dll, create it under another name and rename it
+ # on next reboot.
+ GetTempFileName $3 $0\GvimExt64
+ File /oname=$3 ${VIMSRC}\GvimExt64\gvimext.dll
+ Rename /REBOOTOK $3 $0\GvimExt64\gvimext.dll
+!ifdef HAVE_NLS
+ GetTempFileName $3 $0\GvimExt64
+ File /oname=$3 ${GETTEXT}\gettext64\libintl-8.dll
+ Rename /REBOOTOK $3 $0\GvimExt64\libintl-8.dll
+ GetTempFileName $3 $0\GvimExt64
+ File /oname=$3 ${GETTEXT}\gettext64\libiconv-2.dll
+ Rename /REBOOTOK $3 $0\GvimExt64\libiconv-2.dll
+!endif
${EndIf}
- IfErrors 0 GvimExtDone
+
+ GvimExt64Done:
+
+ # Install 32-bit gvimext.dll into the GvimExt32 directory.
+ SetOutPath $0\GvimExt32
+ ClearErrors
+
+ File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll
+!ifdef HAVE_NLS
+ File ${GETTEXT}\gettext32\libintl-8.dll
+ File ${GETTEXT}\gettext32\libiconv-2.dll
+ File ${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll
+!endif
+
+ IfErrors 0 GvimExt32Done
# Can't copy gvimext.dll, create it under another name and rename it on
# next reboot.
- GetTempFileName $3 $0
- ${If} ${RunningX64}
- File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll
- ${Else}
- File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll
- ${EndIf}
- Rename /REBOOTOK $3 $0\gvimext.dll
+ GetTempFileName $3 $0\GvimExt32
+ File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll
+ Rename /REBOOTOK $3 $0\GvimExt32\gvimext.dll
+!ifdef HAVE_NLS
+ GetTempFileName $3 $0\GvimExt32
+ File /oname=$3 ${GETTEXT}\gettext32\libintl-8.dll
+ Rename /REBOOTOK $3 $0\GvimExt32\libintl-8.dll
+ GetTempFileName $3 $0\GvimExt32
+ File /oname=$3 ${GETTEXT}\gettext32\libiconv-2.dll
+ Rename /REBOOTOK $3 $0\GvimExt32\libiconv-2.dll
+ GetTempFileName $3 $0\GvimExt32
+ File /oname=$3 ${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll
+ Rename /REBOOTOK $3 $0\GvimExt32\libgcc_s_sjlj-1.dll
+!endif
- GvimExtDone:
+ GvimExt32Done:
SetOverwrite lastused
# We don't have a separate entry for the "Open With..." menu, assume
File ${VIMRT}\keymap\README.txt
File ${VIMRT}\keymap\*.vim
SetOutPath $0
- File ${VIMRT}\libintl-8.dll
- File ${VIMRT}\libiconv-2.dll
- File /nonfatal ${VIMRT}\libwinpthread-1.dll
- File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
+ File ${GETTEXT}\gettext32\libintl-8.dll
+ File ${GETTEXT}\gettext32\libiconv-2.dll
+ #File /nonfatal ${VIMRT}\libwinpthread-1.dll
+ File /nonfatal ${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll
SectionEnd
!endif
$\nIt contains the Vim executables and runtime files." IDNO NoRemoveExes
Delete /REBOOTOK $0\*.dll
+ Delete /REBOOTOK $0\GvimExt32\*.dll
+ ${If} ${RunningX64}
+ Delete /REBOOTOK $0\GvimExt64\*.dll
+ ${EndIf}
+
ClearErrors
# Remove everything but *.dll files. Avoids that
# a lot remains when gvimext.dll cannot be deleted.
HRESULT hres = 0;
UINT cbFiles = 0;
-/* The buffers size used to be MAX_PATH (256 bytes), but that's not always
+/* The buffers size used to be MAX_PATH (260 bytes), but that's not always
* enough */
#define BUFSIZE 1100
if (hLibintlDLL)
return 1;
- // Load gettext library from the Vim runtime directory.
+ // Load gettext library from $VIMRUNTIME\GvimExt{64,32} directory.
// Add the directory to $PATH temporarily.
len = GetEnvironmentVariableW(L"PATH", NULL, 0);
len2 = MAX_PATH + 1 + len;
if (buf != NULL && buf2 != NULL)
{
GetEnvironmentVariableW(L"PATH", buf, len);
- _snwprintf(buf2, len2, L"%S;%s", dir, buf);
+#ifdef _WIN64
+ _snwprintf(buf2, len2, L"%S\\GvimExt64;%s", dir, buf);
+#else
+ _snwprintf(buf2, len2, L"%S\\GvimExt32;%s", dir, buf);
+#endif
SetEnvironmentVariableW(L"PATH", buf2);
hLibintlDLL = LoadLibrary(GETTEXT_DLL);
#ifdef GETTEXT_DLL_ALT
return TRUE;
}
-#ifdef WIN32
-// This symbol is not defined in older versions of the SDK or Visual C++.
-
-#ifndef VER_PLATFORM_WIN32_WINDOWS
-# define VER_PLATFORM_WIN32_WINDOWS 1
-#endif
-
-static DWORD g_PlatformId;
-
-//
-// Set g_PlatformId to VER_PLATFORM_WIN32_NT (NT) or
-// VER_PLATFORM_WIN32_WINDOWS (Win95).
-//
- static void
-PlatformId(void)
-{
- static int done = FALSE;
-
- if (!done)
- {
- OSVERSIONINFO ovi;
-
- ovi.dwOSVersionInfoSize = sizeof(ovi);
- GetVersionEx(&ovi);
-
- g_PlatformId = ovi.dwPlatformId;
- done = TRUE;
- }
-}
-
-# ifndef __BORLANDC__
+#ifndef __BORLANDC__
static char *
searchpath(char *name)
{
// There appears to be a bug in FindExecutableA() on Windows NT.
// Use FindExecutableW() instead...
- PlatformId();
- if (g_PlatformId == VER_PLATFORM_WIN32_NT)
+ MultiByteToWideChar(CP_ACP, 0, (LPCSTR)name, -1,
+ (LPWSTR)widename, BUFSIZE);
+ if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"",
+ (LPWSTR)location) > (HINSTANCE)32)
{
- MultiByteToWideChar(CP_ACP, 0, (LPCTSTR)name, -1,
- (LPWSTR)widename, BUFSIZE);
- if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"",
- (LPWSTR)location) > (HINSTANCE)32)
- {
- WideCharToMultiByte(CP_ACP, 0, (LPWSTR)location, -1,
- (LPSTR)widename, 2 * BUFSIZE, NULL, NULL);
- return widename;
- }
- }
- else
- {
- if (FindExecutableA((LPCTSTR)name, (LPCTSTR)"",
- (LPTSTR)location) > (HINSTANCE)32)
- return location;
+ WideCharToMultiByte(CP_ACP, 0, (LPWSTR)location, -1,
+ (LPSTR)widename, 2 * BUFSIZE, NULL, NULL);
+ return widename;
}
return (char *)"";
}
-# endif
#endif
STDMETHODIMP CShellExt::InvokeGvim(HWND hParent,
#define DOSINST
#include "dosinst.h"
+#define GVIMEXT64_PATH "GvimExt64\\gvimext.dll"
+#define GVIMEXT32_PATH "GvimExt32\\gvimext.dll"
+
/* Macro to do an error check I was typing over and over */
#define CHECK_REG_ERROR(code) if (code != ERROR_SUCCESS) { printf("%ld error number: %ld\n", (long)__LINE__, (long)code); return 1; }
{
"\nChoose:",
"Do not remap keys for Windows behavior",
- "Remap a few keys for Windows behavior (<C-V>, <C-C>, etc)",
+ "Remap a few keys for Windows behavior (CTRL-V, CTRL-C, CTRL-F, etc)",
};
int remap_choice = (int)remap_win;
char *remap_text = "- %s";
mch_chdir(installdir);
}
-#ifdef WIN3264
/*
* Get the value of $VIMRUNTIME or $VIM and write it in $TEMP/vimini.ini, so
* that NSIS can read it.
return foundone;
}
-#endif
/*
* Find out information about the system.
++choice_count;
}
-#if defined(WIN3264)
static LONG
reg_create_key(
HKEY root,
const char *subkey,
- PHKEY phKey)
+ PHKEY phKey,
+ DWORD flag)
{
DWORD disp;
return RegCreateKeyEx(
root, subkey,
0, NULL, REG_OPTION_NON_VOLATILE,
- KEY_WOW64_64KEY | KEY_WRITE,
+ flag | KEY_WRITE,
NULL, phKey, &disp);
}
HKEY hRootKey,
const char *subkey,
const char *value_name,
- const char *data)
+ const char *data,
+ DWORD flag)
{
HKEY hKey;
- LONG lRet = reg_create_key(hRootKey, subkey, &hKey);
+ LONG lRet = reg_create_key(hRootKey, subkey, &hKey, flag);
if (ERROR_SUCCESS == lRet)
{
const char *clsid,
const char *extname,
const char *module,
- const char *threading_model)
+ const char *threading_model,
+ DWORD flag)
{
CHAR subkey[BUFSIZE];
LONG lRet;
sprintf(subkey, "CLSID\\%s", clsid);
- lRet = reg_create_key_and_value(hRootKey, subkey, NULL, extname);
+ lRet = reg_create_key_and_value(hRootKey, subkey, NULL, extname, flag);
if (ERROR_SUCCESS == lRet)
{
sprintf(subkey, "CLSID\\%s\\InProcServer32", clsid);
- lRet = reg_create_key_and_value(hRootKey, subkey, NULL, module);
+ lRet = reg_create_key_and_value(hRootKey, subkey, NULL, module, flag);
if (ERROR_SUCCESS == lRet)
{
lRet = reg_create_key_and_value(hRootKey, subkey,
- "ThreadingModel", threading_model);
+ "ThreadingModel", threading_model, flag);
}
}
return lRet;
HKEY hRootKey,
const char *clsid,
const char *name,
- const char *exe_path)
+ const char *exe_path,
+ DWORD flag)
{
LONG lRet = reg_create_key_and_value(
hRootKey,
"*\\shellex\\ContextMenuHandlers\\gvim",
NULL,
- clsid);
+ clsid,
+ flag);
if (ERROR_SUCCESS == lRet)
{
HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved",
clsid,
- name);
+ name,
+ flag);
if (ERROR_SUCCESS == lRet)
{
HKEY_LOCAL_MACHINE,
"Software\\Vim\\Gvim",
"path",
- exe_path);
+ exe_path,
+ flag);
}
}
return lRet;
static LONG
register_openwith(
HKEY hRootKey,
- const char *exe_path)
+ const char *exe_path,
+ DWORD flag)
{
char exe_cmd[BUFSIZE];
LONG lRet;
hRootKey,
"Applications\\gvim.exe\\shell\\edit\\command",
NULL,
- exe_cmd);
+ exe_cmd,
+ flag);
if (ERROR_SUCCESS == lRet)
{
for (i = 0; ERROR_SUCCESS == lRet
&& i < sizeof(openwith) / sizeof(openwith[0]); i++)
{
- lRet = reg_create_key_and_value(hRootKey, openwith[i], NULL, "");
+ lRet = reg_create_key_and_value(hRootKey, openwith[i], NULL, "", flag);
}
}
const char *uninstall_string)
{
LONG lRet = reg_create_key_and_value(hRootKey, appname,
- "DisplayName", display_name);
+ "DisplayName", display_name, KEY_WOW64_64KEY);
if (ERROR_SUCCESS == lRet)
lRet = reg_create_key_and_value(hRootKey, appname,
- "UninstallString", uninstall_string);
+ "UninstallString", uninstall_string, KEY_WOW64_64KEY);
return lRet;
}
-#endif /* WIN3264 */
/*
* Add some entries to the registry:
static int
install_registry(void)
{
-#ifdef WIN3264
LONG lRet = ERROR_SUCCESS;
const char *vim_ext_ThreadingModel = "Apartment";
const char *vim_ext_name = "Vim Shell Extension";
char vim_exe_path[BUFSIZE];
char display_name[BUFSIZE];
char uninstall_string[BUFSIZE];
+ int i;
+ int loop_count = is_64bit_os() ? 2 : 1;
+ DWORD flag;
sprintf(vim_exe_path, "%s\\gvim.exe", installdir);
if (install_popup)
{
char bufg[BUFSIZE];
- struct stat st;
-
- if (stat("gvimext.dll", &st) >= 0)
- sprintf(bufg, "%s\\gvimext.dll", installdir);
- else
- /* gvimext.dll is in gvimext subdir */
- sprintf(bufg, "%s\\gvimext\\gvimext.dll", installdir);
printf("Creating \"Edit with Vim\" popup menu entry\n");
- lRet = register_inproc_server(
- HKEY_CLASSES_ROOT, vim_ext_clsid, vim_ext_name,
- bufg, vim_ext_ThreadingModel);
- if (ERROR_SUCCESS != lRet)
- return FAIL;
- lRet = register_shellex(
- HKEY_CLASSES_ROOT, vim_ext_clsid, vim_ext_name, vim_exe_path);
- if (ERROR_SUCCESS != lRet)
- return FAIL;
+ for (i = 0; i < loop_count; i++)
+ {
+ if (i == 0)
+ {
+ sprintf(bufg, "%s\\" GVIMEXT32_PATH, installdir);
+ flag = KEY_WOW64_32KEY;
+ }
+ else
+ {
+ sprintf(bufg, "%s\\" GVIMEXT64_PATH, installdir);
+ flag = KEY_WOW64_64KEY;
+ }
+
+ lRet = register_inproc_server(
+ HKEY_CLASSES_ROOT, vim_ext_clsid, vim_ext_name,
+ bufg, vim_ext_ThreadingModel, flag);
+ if (ERROR_SUCCESS != lRet)
+ return FAIL;
+ lRet = register_shellex(
+ HKEY_CLASSES_ROOT, vim_ext_clsid, vim_ext_name,
+ vim_exe_path, flag);
+ if (ERROR_SUCCESS != lRet)
+ return FAIL;
+ }
}
if (install_openwith)
{
printf("Creating \"Open with ...\" list entry\n");
- lRet = register_openwith(HKEY_CLASSES_ROOT, vim_exe_path);
- if (ERROR_SUCCESS != lRet)
- return FAIL;
+ for (i = 0; i < loop_count; i++)
+ {
+ if (i == 0)
+ flag = KEY_WOW64_32KEY;
+ else
+ flag = KEY_WOW64_64KEY;
+
+ lRet = register_openwith(HKEY_CLASSES_ROOT, vim_exe_path, flag);
+ if (ERROR_SUCCESS != lRet)
+ return FAIL;
+ }
}
printf("Creating an uninstall entry\n");
uninstall_string);
if (ERROR_SUCCESS != lRet)
return FAIL;
-#endif /* WIN3264 */
return OK;
}
struct stat st;
if (has_gvim
- && (stat("gvimext.dll", &st) >= 0
- || stat("gvimext/gvimext.dll", &st) >= 0)
-#ifndef WIN3264
- && searchpath("regedit.exe") != NULL
-#endif
- )
+ && (stat(GVIMEXT32_PATH, &st) >= 0
+ || stat(GVIMEXT64_PATH, &st) >= 0))
{
choices[choice_count].changefunc = change_popup_choice;
choices[choice_count].installfunc = NULL;
static void
init_openwith_choice(void)
{
- if (has_gvim
-#ifndef WIN3264
- && searchpath("regedit.exe") != NULL
-#endif
- )
+ if (has_gvim)
{
choices[choice_count].changefunc = change_openwith_choice;
choices[choice_count].installfunc = NULL;
add_dummy_choice();
}
-#ifdef WIN3264
/* create_shortcut
*
* Create a shell link.
alloc_text(idx, "Create a desktop icon for %s", arg);
}
}
-#endif /* WIN3264 */
static void
init_startmenu_choice(void)
{
-#ifdef WIN3264
/* Start menu */
choices[choice_count].changefunc = toggle_startmenu_choice;
choices[choice_count].installfunc = NULL;
choices[choice_count].active = 1;
toggle_startmenu_choice(choice_count); /* set the text */
++choice_count;
-#else
- add_dummy_choice();
-#endif
}
/*
static void
init_shortcut_choices(void)
{
-#ifdef WIN3264
/* Shortcut to gvim */
choices[choice_count].text = NULL;
choices[choice_count].arg = 0;
choices[choice_count].installfunc = install_shortcut_gview;
toggle_shortcut_choice(choice_count);
++choice_count;
-#else
- add_dummy_choice();
- add_dummy_choice();
- add_dummy_choice();
-#endif
}
-#ifdef WIN3264
/*
* Attempt to register OLE for Vim.
*/
printf("\n--- Attempting to register Vim with OLE ---\n");
printf("(There is no message whether this works or not.)\n");
-#ifndef __CYGWIN__
sprintf(register_command_string, "\"%s\\gvim.exe\" -silent -register", installdir);
-#else
- /* handle this differently for Cygwin which sometimes has trouble with
- * Windows-style pathnames here. */
- sprintf(register_command_string, "./gvim.exe -silent -register");
-#endif
system(register_command_string);
}
-#endif /* WIN3264 */
/*
* Remove the last part of directory "path[]" to get its parent, and put the
printf(" Install the Edit-with-Vim context menu entry\n");
printf("-install-openwith\n");
printf(" Add Vim to the \"Open With...\" context menu list\n");
-#ifdef WIN3264
printf("-add-start-menu");
printf(" Add Vim to the start menu\n");
printf("-install-icons");
printf(" Create icons for gVim executables on the desktop\n");
-#endif
printf("-create-directories [vim|home]\n");
printf(" Create runtime directories to drop plugins into; in the $VIM\n");
printf(" or $HOME directory\n");
-#ifdef WIN3264
printf("-register-OLE");
printf(" Ignored\n");
-#endif
printf("\n");
}
else /* No choice specified, default to vim directory */
vimfiles_dir_choice = (int)vimfiles_dir_vim;
}
-#ifdef WIN3264
else if (strcmp(argv[i], "-register-OLE") == 0)
{
/* This is always done when gvim is found */
}
-#endif
else /* Unknown switch */
{
printf("Got unknown argument argv[%d] = %s\n", i, argv[i]);
|| !interactive)
install_registry();
-#ifdef WIN3264
/* Register gvim with OLE. */
if (has_gvim)
install_OLE_register();
-#endif
}
/*
/* Initialize this program. */
do_inits(argv);
-#ifdef WIN3264
if (argc > 1 && strcmp(argv[1], "-uninstall-check") == 0)
{
/* Only check for already installed Vims. Used by NSIS installer. */
sleep(3);
exit(0);
}
-#endif
printf("This program sets up the installation of Vim "
VIM_VERSION_MEDIUM "\n\n");
/* Check if the user unpacked the archives properly. */
check_unpack();
-#ifdef WIN3264
/* Check for already installed Vims. */
if (interactive)
uninstall_check(0);
-#endif
/* Find out information about the system. */
inspect_system();
# include "vimio.h"
# include <ctype.h>
-# ifndef __CYGWIN__
-# include <direct.h>
-# endif
+# include <direct.h>
-# if defined(_WIN64) || defined(WIN32)
-# define WIN3264
-# include <windows.h>
-# include <shlobj.h>
-# else
-# include <dir.h>
-# include <bios.h>
-# include <dos.h>
-# endif
+# include <windows.h>
+# include <shlobj.h>
#endif
#ifdef UNIX_LINT
#if defined(UNIX_LINT)
# define vim_mkdir(x, y) mkdir((char *)(x), y)
#else
-# if defined(WIN3264) && !defined(__BORLANDC__)
+# ifndef __BORLANDC__
# define vim_mkdir(x, y) _mkdir((char *)(x))
# else
# define vim_mkdir(x, y) mkdir((char *)(x))
# ifndef KEY_WOW64_64KEY
# define KEY_WOW64_64KEY 0x0100
# endif
+# ifndef KEY_WOW64_32KEY
+# define KEY_WOW64_32KEY 0x0200
+# endif
#define VIM_STARTMENU "Programs\\Vim " VIM_VERSION_SHORT
exit(n);
}
-#ifdef WIN3264
-/* This symbol is not defined in older versions of the SDK or Visual C++ */
-
-#ifndef VER_PLATFORM_WIN32_WINDOWS
-# define VER_PLATFORM_WIN32_WINDOWS 1
-#endif
-
-static DWORD g_PlatformId;
+typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS)(HANDLE, PBOOL);
/*
- * Set g_PlatformId to VER_PLATFORM_WIN32_NT (NT) or
- * VER_PLATFORM_WIN32_WINDOWS (Win95).
+ * Check if this is a 64-bit OS.
*/
- static void
-PlatformId(void)
+ static BOOL
+is_64bit_os(void)
{
- static int done = FALSE;
-
- if (!done)
- {
- OSVERSIONINFO ovi;
-
- ovi.dwOSVersionInfoSize = sizeof(ovi);
- GetVersionEx(&ovi);
-
- g_PlatformId = ovi.dwPlatformId;
- done = TRUE;
- }
+#ifdef _WIN64
+ return TRUE;
+#else
+ BOOL bIsWow64 = FALSE;
+ LPFN_ISWOW64PROCESS pIsWow64Process;
+
+ pIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress(
+ GetModuleHandle("kernel32"), "IsWow64Process");
+ if (pIsWow64Process != NULL)
+ pIsWow64Process(GetCurrentProcess(), &bIsWow64);
+ return bIsWow64;
+#endif
}
-# ifdef __BORLANDC__
+#ifdef __BORLANDC__
/* Borland defines its own searchpath() in dir.h */
-# include <dir.h>
-# else
+# include <dir.h>
+#else
static char *
searchpath(char *name)
{
/* There appears to be a bug in FindExecutableA() on Windows NT.
* Use FindExecutableW() instead... */
- PlatformId();
- if (g_PlatformId == VER_PLATFORM_WIN32_NT)
+ MultiByteToWideChar(CP_ACP, 0, (LPCTSTR)name, -1,
+ (LPWSTR)widename, BUFSIZE);
+ if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"",
+ (LPWSTR)location) > (HINSTANCE)32)
{
- MultiByteToWideChar(CP_ACP, 0, (LPCTSTR)name, -1,
- (LPWSTR)widename, BUFSIZE);
- if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"",
- (LPWSTR)location) > (HINSTANCE)32)
- {
- WideCharToMultiByte(CP_ACP, 0, (LPWSTR)location, -1,
- (LPSTR)widename, 2 * BUFSIZE, NULL, NULL);
- return widename;
- }
- }
- else
- {
- if (FindExecutableA((LPCTSTR)name, (LPCTSTR)"",
- (LPTSTR)location) > (HINSTANCE)32)
- return location;
+ WideCharToMultiByte(CP_ACP, 0, (LPWSTR)location, -1,
+ (LPSTR)widename, 2 * BUFSIZE, NULL, NULL);
+ return widename;
}
return NULL;
}
-# endif
#endif
/*
return s;
}
-#ifdef WIN3264
#ifndef CSIDL_COMMON_PROGRAMS
# define CSIDL_COMMON_PROGRAMS 0x0017
return OK;
}
-#endif
/*
* List of targets. The first one (index zero) is used for the default path
"gVim Easy " VIM_VERSION_SHORT ".lnk",
"gVim Read only " VIM_VERSION_SHORT ".lnk"};
-/* This is only used for dosinst.c when WIN3264 is defined and for uninstal.c
- * when not being able to directly access registry entries. */
-#if (defined(DOSINST) && defined(WIN3264)) \
- || (!defined(DOSINST) && !defined(WIN3264))
+/* This is only used for dosinst.c. */
+#if defined(DOSINST)
/*
* Run an external command and wait for it to finish.
*/
int
change_drive(int drive)
{
-#ifdef WIN3264
char temp[3] = "-:";
temp[0] = (char)(drive + 'A' - 1);
return !SetCurrentDirectory(temp);
-#else
-# ifndef UNIX_LINT
- union REGS regs;
-
- regs.h.ah = 0x0e;
- regs.h.dl = drive - 1;
- intdos(®s, ®s); /* set default drive */
- regs.h.ah = 0x19;
- intdos(®s, ®s); /* get default drive */
- if (regs.h.al == drive - 1)
- return 0;
-# endif
- return -1;
-#endif
}
/*
/*
* Expand the executable name into a full path name.
*/
-#if defined(__BORLANDC__) && !defined(WIN3264)
+#if defined(__BORLANDC__)
/* Only Borland C++ has this. */
# define my_fullpath(b, n, l) _fullpath(b, n, l)
static char *
my_fullpath(char *buf, char *fname, int len)
{
-# ifdef WIN3264
/* Only GetModuleFileName() will get the long file name path.
* GetFullPathName() may still use the short (FAT) name. */
DWORD len_read = GetModuleFileName(NULL, buf, (size_t)len);
return (len_read > 0 && len_read < (DWORD)len) ? buf : NULL;
-# else
- char olddir[BUFSIZE];
- char *p, *q;
- int c;
- char *retval = buf;
-
- if (strchr(fname, ':') != NULL) /* already expanded */
- {
- strncpy(buf, fname, len);
- }
- else
- {
- *buf = NUL;
- /*
- * change to the directory for a moment,
- * and then do the getwd() (and get back to where we were).
- * This will get the correct path name with "../" things.
- */
- p = strrchr(fname, '/');
- q = strrchr(fname, '\\');
- if (q != NULL && (p == NULL || q > p))
- p = q;
- q = strrchr(fname, ':');
- if (q != NULL && (p == NULL || q > p))
- p = q;
- if (p != NULL)
- {
- if (getcwd(olddir, BUFSIZE) == NULL)
- {
- p = NULL; /* can't get current dir: don't chdir */
- retval = NULL;
- }
- else
- {
- if (p == fname) /* /fname */
- q = p + 1; /* -> / */
- else if (q + 1 == p) /* ... c:\foo */
- q = p + 1; /* -> c:\ */
- else /* but c:\foo\bar */
- q = p; /* -> c:\foo */
-
- c = *q; /* truncate at start of fname */
- *q = NUL;
- if (mch_chdir(fname)) /* change to the directory */
- retval = NULL;
- else
- {
- fname = q;
- if (c == '\\') /* if we cut the name at a */
- fname++; /* '\', don't add it again */
- }
- *q = c;
- }
- }
- if (getcwd(buf, len) == NULL)
- {
- retval = NULL;
- *buf = NUL;
- }
- /*
- * Concatenate the file name to the path.
- */
- if (strlen(buf) + strlen(fname) >= len - 1)
- {
- printf("ERROR: File name too long!\n");
- myexit(1);
- }
- add_pathsep(buf);
- strcat(buf, fname);
- if (p)
- mch_chdir(olddir);
- }
-
- /* Replace forward slashes with backslashes, required for the path to a
- * command. */
- while ((p = strchr(buf, '/')) != NULL)
- *p = '\\';
-
- return retval;
-# endif
}
#endif
return (scanf(" %c", answer) == 1 && toupper(answer[0]) == 'Y');
}
-#ifdef WIN3264
-
static int
-reg_delete_key(HKEY hRootKey, const char *key)
+reg_delete_key(HKEY hRootKey, const char *key, DWORD flag)
{
static int did_load = FALSE;
static HANDLE advapi_lib = NULL;
delete_key_ex = (LONG (WINAPI *)(HKEY, LPCTSTR, REGSAM, DWORD))GetProcAddress(advapi_lib, "RegDeleteKeyExA");
}
if (delete_key_ex != NULL) {
- return (*delete_key_ex)(hRootKey, key, KEY_WOW64_64KEY, 0);
+ return (*delete_key_ex)(hRootKey, key, flag, 0);
}
return RegDeleteKey(hRootKey, key);
}
/* Open the key where the path to gvim.exe is stored. */
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", 0,
KEY_WOW64_64KEY | KEY_READ, &key_handle) != ERROR_SUCCESS)
- return 0;
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", 0,
+ KEY_WOW64_32KEY | KEY_READ, &key_handle) != ERROR_SUCCESS)
+ return 0;
/* get the DisplayName out of it to show the user */
r = RegQueryValueEx(key_handle, "path", 0,
remove_popup(void)
{
int fail = 0;
+ int i;
+ int loop = is_64bit_os() ? 2 : 1;
+ int maxfail = loop * 6;
+ DWORD flag;
HKEY kh;
- if (reg_delete_key(HKEY_CLASSES_ROOT, "CLSID\\{51EEE242-AD87-11d3-9C1E-0090278BBD99}\\InProcServer32") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, "CLSID\\{51EEE242-AD87-11d3-9C1E-0090278BBD99}") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, "*\\shellex\\ContextMenuHandlers\\gvim") != ERROR_SUCCESS)
- ++fail;
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", 0,
- KEY_WOW64_64KEY | KEY_ALL_ACCESS, &kh) != ERROR_SUCCESS)
- ++fail;
- else
+ for (i = 0; i < loop; i++)
{
- if (RegDeleteValue(kh, "{51EEE242-AD87-11d3-9C1E-0090278BBD99}") != ERROR_SUCCESS)
+ if (i == 0)
+ flag = KEY_WOW64_32KEY;
+ else
+ flag = KEY_WOW64_64KEY;
+
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "CLSID\\{51EEE242-AD87-11d3-9C1E-0090278BBD99}\\InProcServer32", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "CLSID\\{51EEE242-AD87-11d3-9C1E-0090278BBD99}", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "*\\shellex\\ContextMenuHandlers\\gvim", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", 0,
+ flag | KEY_ALL_ACCESS, &kh) != ERROR_SUCCESS)
+ ++fail;
+ else
+ {
+ if (RegDeleteValue(kh, "{51EEE242-AD87-11d3-9C1E-0090278BBD99}") != ERROR_SUCCESS)
+ ++fail;
+ RegCloseKey(kh);
+ }
+ if (reg_delete_key(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_LOCAL_MACHINE, "Software\\Vim", flag) != ERROR_SUCCESS)
++fail;
- RegCloseKey(kh);
}
- if (reg_delete_key(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_LOCAL_MACHINE, "Software\\Vim") != ERROR_SUCCESS)
- ++fail;
- if (fail == 6)
+ if (fail == maxfail)
printf("No Vim popup registry entries could be removed\n");
else if (fail > 0)
printf("Some Vim popup registry entries could not be removed\n");
remove_openwith(void)
{
int fail = 0;
+ int i;
+ int loop = is_64bit_os() ? 2 : 1;
+ int maxfail = loop * 7;
+ DWORD flag;
+
+ for (i = 0; i < loop; i++)
+ {
+ if (i == 0)
+ flag = KEY_WOW64_32KEY;
+ else
+ flag = KEY_WOW64_64KEY;
+
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe\\shell\\edit\\command", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe\\shell\\edit", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe\\shell", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, ".htm\\OpenWithList\\gvim.exe", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, ".vim\\OpenWithList\\gvim.exe", flag) != ERROR_SUCCESS)
+ ++fail;
+ if (reg_delete_key(HKEY_CLASSES_ROOT, "*\\OpenWithList\\gvim.exe", flag) != ERROR_SUCCESS)
+ ++fail;
+ }
- if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe\\shell\\edit\\command") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe\\shell\\edit") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe\\shell") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, "Applications\\gvim.exe") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, ".htm\\OpenWithList\\gvim.exe") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, ".vim\\OpenWithList\\gvim.exe") != ERROR_SUCCESS)
- ++fail;
- if (reg_delete_key(HKEY_CLASSES_ROOT, "*\\OpenWithList\\gvim.exe") != ERROR_SUCCESS)
- ++fail;
-
- if (fail == 7)
+ if (fail == maxfail)
printf("No Vim open-with registry entries could be removed\n");
else if (fail > 0)
printf("Some Vim open-with registry entries could not be removed\n");
else
printf("The Vim open-with registry entries have been removed\n");
}
-#endif
/*
* Check if a batch file is really for the current version. Don't delete a
return found;
}
-#ifdef WIN3264
static void
remove_if_exists(char *path, char *filename)
{
}
}
}
-#endif
static void
delete_uninstall_key(void)
{
- reg_delete_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Vim " VIM_VERSION_SHORT);
+ reg_delete_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Vim " VIM_VERSION_SHORT, KEY_WOW64_64KEY);
}
int
{
int found = 0;
FILE *fd;
-#ifdef WIN3264
int i;
struct stat st;
char icon[BUFSIZE];
if (argc == 2 && stricmp(argv[1], "-nsis") == 0)
interactive = FALSE;
else
-#endif
interactive = TRUE;
/* Initialize this program. */
printf("This program will remove the following items:\n");
-#ifdef WIN3264
if (popup_gvim_path(popup_path))
{
printf(" - the \"Edit with Vim\" entry in the popup menu\n");
if (!interactive || confirm())
remove_start_menu();
}
-#endif
printf("\n");
found = remove_batfiles(0);
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1191,
/**/
1190,
/**/
projects / vim / commitdiff