Mercurial > emacs
changeset 100192:038d7d21b786
* w32.c (init_environment): Don't free handle to library shell32.dll.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 03 Dec 2008 14:13:42 +0000 |
| parents | 56005ec017c3 |
| children | 319bc0928dee |
| files | src/ChangeLog src/w32.c |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Dec 03 08:21:08 2008 +0000 +++ b/src/ChangeLog Wed Dec 03 14:13:42 2008 +0000 @@ -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.
--- a/src/w32.c Wed Dec 03 08:21:08 2008 +0000 +++ b/src/w32.c Wed Dec 03 14:13:42 2008 +0000 @@ -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. */