/* Add entries to the GNU Emacs Program Manager folder.
- Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include <stdio.h>
#include <malloc.h>
-/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
- below 0x500. */
-#ifndef _W64
+/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x500. */
+#ifndef MINGW_W64
#define _WIN32_IE 0x400
#endif
/* Request C Object macros for COM interfaces. */
{
#ifdef OLD_PATHS
{"emacs_dir", NULL},
- {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
+ {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp"},
{"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
{"EMACSDATA", "%emacs_dir%/etc"},
{"EMACSPATH", "%emacs_dir%/bin"},
/* 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,
+ if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_GTK, 0,
KEY_READ, >k_key) == ERROR_SUCCESS)
{
if (RegQueryValueEx (gtk_key, "DllPath", NULL, NULL,
/* Check both the current user and the local machine to see if we
have any resources. */
- if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT,
- REG_OPTION_NON_VOLATILE,
+ if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT, 0,
KEY_WRITE, &hrootkey) != ERROR_SUCCESS
- && RegOpenKeyEx (HKEY_CURRENT_USER, REG_ROOT,
- REG_OPTION_NON_VOLATILE,
+ && RegOpenKeyEx (HKEY_CURRENT_USER, REG_ROOT, 0,
KEY_WRITE, &hrootkey) != ERROR_SUCCESS)
{
return FALSE;