[Emacs-diffs] emacs/src ChangeLog w32.c

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/12/03 14:13:44

Modified files:
        src            : ChangeLog w32.c 

Log message:
        * w32.c (init_environment): Don't free handle to library shell32.dll.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7161&r2=1.7162
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32.c?cvsroot=emacs&r1=1.155&r2=1.156

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7161
retrieving revision 1.7162
diff -u -b -r1.7161 -r1.7162
--- ChangeLog   3 Dec 2008 05:54:27 -0000       1.7161
+++ ChangeLog   3 Dec 2008 14:13:42 -0000       1.7162
@@ -1,3 +1,7 @@
+2008-12-03  Juanma Barranquero  <address@hidden>
+
+       * w32.c (init_environment): Don't free handle to library shell32.dll.
+
 2008-12-03  Kenichi Handa  <address@hidden>
 
        * font.c (font_at): Set `multibyte' at first.

Index: w32.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- w32.c       30 Aug 2008 16:46:06 -0000      1.155
+++ w32.c       3 Dec 2008 14:13:43 -0000       1.156
@@ -1443,12 +1443,10 @@
       HRESULT profile_result;
       /* Dynamically load ShGetFolderPath, as it won't exist on versions
         of Windows 95 and NT4 that have not been updated to include
-        MSIE 5.  Also we don't link with shell32.dll by default.  */
-      HMODULE shell32_dll;
+        MSIE 5.  */
       ShGetFolderPath_fn get_folder_path;
-      shell32_dll = GetModuleHandle ("shell32.dll");
       get_folder_path = (ShGetFolderPath_fn)
-       GetProcAddress (shell32_dll, "SHGetFolderPathA");
+       GetProcAddress (GetModuleHandle ("shell32.dll"), "SHGetFolderPathA");
 
       if (get_folder_path != NULL)
        {
@@ -1459,9 +1457,6 @@
          if (profile_result == S_OK)
            env_vars[0].def_value = default_home;
        }
-
-      /* Unload shell32.dll, it is not needed anymore.  */
-      FreeLibrary (shell32_dll);
     }
 
   /* Get default locale info and use it for LANG.  */