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

diff --git a/src/ChangeLog b/src/ChangeLog
index 48448c3b95c31fc43798205de560c6c32d6c940b..9a8f6384ae588cbc0b00c2b2e9d27b532801ba3e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-03  Juanma Barranquero  <lekktu@gmail.com>
+
+       * w32.c (init_environment): Don't free handle to library shell32.dll.
+
 2008-12-03  Kenichi Handa  <handa@m17n.org>
 
        * font.c (font_at): Set `multibyte' at first.

diff --git a/src/w32.c b/src/w32.c
index 1032ac57af6a52406af892b6c1b395a15ab4ac2d..c6660c0d3d650555baaf49641cf41afad7b763a2 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -1443,12 +1443,10 @@ init_environment (char ** argv)
       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 @@ init_environment (char ** argv)
          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.  */