/* Add entries to the GNU Emacs Program Manager folder.
- Copyright (C) 1995 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/****************************************************************************
*
#include <ddeml.h>
#include <stdlib.h>
#include <stdio.h>
+#include <malloc.h>
HDDEDATA CALLBACK
DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
CF_TEXT, XTYP_EXECUTE, 30000, NULL)
#define REG_ROOT "SOFTWARE\\GNU\\Emacs"
+#define REG_GTK "SOFTWARE\\GTK\\2.0"
+#define REG_APP_PATH \
+ "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\emacs.exe"
static struct entry
{
char *path;
{
HKEY hrootkey = NULL;
- DWORD dwDisp;
int i;
BOOL ok = TRUE;
+ DWORD size;
+
+ /* Record the location of Emacs to the App Paths key if we have
+ sufficient permissions to do so. This helps Windows find emacs quickly
+ if the user types emacs.exe in the "Run Program" dialog without having
+ emacs on their path. Some applications also use the same registry key
+ to discover the installation directory for programs they are looking for.
+ Multiple installations cannot be handled by this method, but it does not
+ affect the general operation of other installations of Emacs, and we
+ are blindly overwriting the Start Menu entries already.
+ */
+ if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, REG_APP_PATH, 0, "",
+ REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL,
+ &hrootkey, NULL) == ERROR_SUCCESS)
+ {
+ int len;
+ char *emacs_path;
+ HKEY gtk_key = NULL;
+
+ len = strlen (path) + 15; /* \bin\emacs.exe + terminator. */
+ emacs_path = (char *) alloca (len);
+ sprintf (emacs_path, "%s\\bin\\emacs.exe", path);
+
+ RegSetValueEx (hrootkey, NULL, 0, REG_SZ, emacs_path, len);
+
+ /* Look for a GTK installation. If found, add it to the library search
+ path for Emacs so that the image libraries it provides are available
+ to Emacs regardless of whether it is in the path or not. */
+ if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_GTK, REG_OPTION_NON_VOLATILE,
+ KEY_READ, >k_key) == ERROR_SUCCESS)
+ {
+ if (RegQueryValueEx (gtk_key, "DllPath", NULL, NULL,
+ NULL, &size) == ERROR_SUCCESS)
+ {
+ char *gtk_path = (char *) alloca (size);
+ if (RegQueryValueEx (gtk_key, "DllPath", NULL, NULL,
+ gtk_path, &size) == ERROR_SUCCESS)
+ {
+ /* Make sure the emacs bin directory continues to be searched
+ first by including it as well. */
+ char *dll_paths;
+ len = strlen (path) + 5 + size;
+ dll_paths = (char *) alloca (size + strlen (path) + 1);
+ sprintf (dll_paths, "%s\\bin;%s", path, gtk_path);
+ RegSetValueEx (hrootkey, "Path", 0, REG_SZ, dll_paths, len);
+ }
+ }
+ RegCloseKey (gtk_key);
+ }
+ RegCloseKey (hrootkey);
+ }
+
+ /* Previous versions relied on registry settings, but we do not need
+ them any more. If registry settings are installed from a previous
+ version, replace them to ensure they are the current settings.
+ Otherwise, do nothing. */
/* Check both the current user and the local machine to see if we
have any resources. */
- if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT,
- 0, "", REG_OPTION_NON_VOLATILE,
- KEY_WRITE, NULL, &hrootkey, &dwDisp) != ERROR_SUCCESS
- && RegCreateKeyEx (HKEY_CURRENT_USER, REG_ROOT,
- 0, "", REG_OPTION_NON_VOLATILE,
- KEY_WRITE, NULL, &hrootkey, &dwDisp) != ERROR_SUCCESS)
+ if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT,
+ REG_OPTION_NON_VOLATILE,
+ KEY_WRITE, &hrootkey) != ERROR_SUCCESS
+ && RegOpenKeyEx (HKEY_CURRENT_USER, REG_ROOT,
+ REG_OPTION_NON_VOLATILE,
+ KEY_WRITE, &hrootkey) != ERROR_SUCCESS)
{
return FALSE;
}
#if 0
if (argc < 2 || argc > 3)
{
- fprintf (stderr, "usage: addpm [/q] [emacs_path [icon_path]]\n");
+ fprintf (stderr, "usage: addpm [-q] [emacs_path [icon_path]]\n");
exit (1);
}
#endif
- if (argc > 1 && argv[1][0] == '/' && argv[1][1] == 'q')
+ if (argc > 1
+ && (argv[1][0] == '/' || argv[1][0] == '-')
+ && argv[1][1] == 'q')
{
quiet = 1;
--argc;