vim: src/dosinst.c comparison

comparison src/dosinst.c @ 2287:573da4dac306 vim73

Make the dos installer work with more compilers.

author	Bram Moolenaar <bram@vim.org>
date	Wed, 07 Jul 2010 15:14:03 +0200
parents	144aa6167799
children	ccda151dde4e

comparison

equal deleted inserted replaced

-:144aa6167799
+:573da4dac306
 "plugin",
 "syntax",
 };
 /*
-* Copy a directory name from "dir" to "buf", doubling backslashes.
-* Also make sure it ends in a double backslash.
-*/
-static void
-double_bs(char *dir, char *buf)
-{
-char *d = buf;
-char *s;
-for (s = dir; *s; ++s)
-{
-	if (*s == '\\')
-	    *d++ = '\\';
-	*d++ = *s;
-}
-/* when dir is not empty, it must end in a double backslash */
-if (d > buf && d[-1] != '\\')
-{
-	*d++ = '\\';
-	*d++ = '\\';
-}
-*d = NUL;
-}
-/*
 * Obtain a choice from a table.
 * First entry is a question, others are choices.
 */
 static int
 get_choice(char **table, int entries)
 	fclose(fd);
 }
 else
 {
 	printf("Failed to open %s\n", fname);
-	Sleep(2000);
+	sleep(2);
 }
 }
 static int num_windows;
 			/* Count the number of windows with a title that match
 			 * the installer, so that we can check when it's done.
 			 * The uninstaller copies itself, executes the copy
 			 * and exits, thus we can't wait for the process to
 			 * finish. */
-			Sleep(1000);  /* wait for uninstaller to start up */
+			sleep(1);  /* wait for uninstaller to start up */
 			num_windows = 0;
 			EnumWindows(window_cb, 0);
-			Sleep(1000);  /* wait for windows to be counted */
+			sleep(1);  /* wait for windows to be counted */
 			if (num_windows == 0)
 			{
 			    /* Did not find the uninstaller, ask user to press
 			     * Enter when done. Just in case. */
 			    printf("Press Enter when the uninstaller is finished\n");
 			    {
 				printf(".");
 				fflush(stdout);
 				num_windows = 0;
 				EnumWindows(window_cb, 0);
-				Sleep(1000);  /* wait for windows to be counted */
+				sleep(1);  /* wait for windows to be counted */
 			    } while (num_windows > 0);
 			}
 			printf("\nDone!\n");
 			/* Check if an uninstall reg key was deleted.
 choices[choice_count].installfunc = NULL;;
 choices[choice_count].active = (*oldvimrc == NUL);
 ++choice_count;
 }
-#if defined(DJGPP) || defined(WIN3264) || defined(UNIX_LINT)
+#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,
 const char *subkey,
 PHKEY phKey)
 if (ERROR_SUCCESS == lRet)
 lRet = reg_create_key_and_value(hRootKey, appname,
 					 "UninstallString", uninstall_string);
 return lRet;
 }
-#endif /* if defined(DJGPP) || defined(WIN3264) || defined(UNIX_LINT) */
+#endif /* WIN3264 */
 /*
 * Add some entries to the registry:
 * - to add "Edit with Vim" to the context * menu
 * - to add Vim to the "Open with..." list
 * - to uninstall Vim
 */
 /*ARGSUSED*/
-static LONG
+static int
 install_registry(void)
 {
+#ifdef WIN3264
 LONG        lRet = ERROR_SUCCESS;
-#if defined(DJGPP) || defined(WIN3264) || defined(UNIX_LINT)
 const char	*vim_ext_ThreadingModel = "Apartment";
 const char	*vim_ext_name = "Vim Shell Extension";
 const char	*vim_ext_clsid = "{51EEE242-AD87-11d3-9C1E-0090278BBD99}";
 char	buf[BUFSIZE];
 char	vim_exe_path[BUFSIZE];
 lRet = register_inproc_server(
 HKEY_CLASSES_ROOT, vim_ext_clsid, vim_ext_name,
 						bufg, vim_ext_ThreadingModel);
 if (ERROR_SUCCESS != lRet)
-	    return lRet;
+	    return FAIL;
 lRet = register_shellex(
 HKEY_CLASSES_ROOT, vim_ext_clsid, vim_ext_name, vim_exe_path);
 if (ERROR_SUCCESS != lRet)
-	    return 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 lRet;
+	    return FAIL;
 }
 printf("Creating an uninstall entry\n");
 /* For the NSIS installer use the generated uninstaller. */
 lRet = register_uninstall(
 HKEY_LOCAL_MACHINE,
 "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Vim " VIM_VERSION_SHORT,
 display_name,
 uninstall_string);
+if (ERROR_SUCCESS != lRet)
-#endif /* if defined(DJGPP) || defined(WIN3264) || defined(UNIX_LINT) */
+	return FAIL;
-return lRet;
+#endif /* WIN3264 */
+return OK;
 }
 static void
 change_popup_choice(int idx)
 {
 	get_vim_env();
 	/* When nothing found exit quietly.  If something found wait for
 	 * a little while, so that the user can read the messages. */
 	if (i)
-	    Sleep(3000);
+	    sleep(3);
 	exit(0);
 }
 #endif
 printf("This program sets up the installation of Vim "
 	command_line_setup_choices(argc, argv);
 	install();
 	/* Avoid that the user has to hit Enter, just wait a little bit to
 	 * allow reading the messages. */
-	Sleep(2000);
+	sleep(2);
 }
 return 0;
 }

Mercurial > vim

comparison src/dosinst.c @ 2287:573da4dac306 vim73