[Emacs-diffs] Changes to emacs/nt/addpm.c

[Miles Bader]

Index: emacs/nt/addpm.c
diff -c emacs/nt/addpm.c:1.16 emacs/nt/addpm.c:1.17
*** emacs/nt/addpm.c:1.16       Thu Jun 13 14:39:50 2002
--- emacs/nt/addpm.c    Tue Feb  4 09:16:25 2003
***************
*** 32,38 ****
  #include <stdlib.h>
  #include <stdio.h>
  
! HDDEDATA CALLBACK 
  DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
             HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
             DWORD dwData1, DWORD dwData2)
--- 32,38 ----
  #include <stdlib.h>
  #include <stdio.h>
  
! HDDEDATA CALLBACK
  DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
             HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
             DWORD dwData1, DWORD dwData2)
***************
*** 50,57 ****
  {
    char *name;
    char *value;
! } 
! env_vars[] = 
  {
    {"emacs_dir", NULL},
    {"EMACSLOADPATH", 
"%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
--- 50,57 ----
  {
    char *name;
    char *value;
! }
! env_vars[] =
  {
    {"emacs_dir", NULL},
    {"EMACSLOADPATH", 
"%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
***************
*** 65,71 ****
    {"TERM", "cmd"}
  };
  
! BOOL 
  add_registry (path)
       char *path;
  {
--- 65,71 ----
    {"TERM", "cmd"}
  };
  
! BOOL
  add_registry (path)
       char *path;
  {
***************
*** 73,111 ****
    DWORD dwDisp;
    int i;
    BOOL ok = TRUE;
!   
!   /* 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)
      {
        return FALSE;
      }
!   
!   for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++) 
      {
        char * value = env_vars[i].value ? env_vars[i].value : path;
!       
        if (RegSetValueEx (hrootkey, env_vars[i].name,
                         0, REG_EXPAND_SZ,
                         value, lstrlen (value) + 1) != ERROR_SUCCESS)
        ok = FALSE;
!     }                       
!   
    RegCloseKey (hrootkey);
!   
    return (ok);
  }
  
  int
  main (argc, argv)
       int argc;
!      char *argv[];                    
  {
    DWORD idDde = 0;
    HCONV HConversation;
--- 73,111 ----
    DWORD dwDisp;
    int i;
    BOOL ok = TRUE;
! 
!   /* 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)
      {
        return FALSE;
      }
! 
!   for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++)
      {
        char * value = env_vars[i].value ? env_vars[i].value : path;
! 
        if (RegSetValueEx (hrootkey, env_vars[i].name,
                         0, REG_EXPAND_SZ,
                         value, lstrlen (value) + 1) != ERROR_SUCCESS)
        ok = FALSE;
!     }
! 
    RegCloseKey (hrootkey);
! 
    return (ok);
  }
  
  int
  main (argc, argv)
       int argc;
!      char *argv[];
  {
    DWORD idDde = 0;
    HCONV HConversation;