Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8b8be8eb
Commit
8b8be8eb
authored
Dec 03, 2008
by
Juanma Barranquero
Browse files
* w32.c (init_environment): Don't free handle to library shell32.dll.
parent
61cf9fad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
src/ChangeLog
src/ChangeLog
+4
-0
src/w32.c
src/w32.c
+2
-7
No files found.
src/ChangeLog
View file @
8b8be8eb
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.
...
...
src/w32.c
View file @
8b8be8eb
...
...
@@ -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. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment