OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "bin/extensions.h" | 5 #include "bin/extensions.h" |
| 6 #include "bin/utils.h" |
6 | 7 |
7 void* Extensions::LoadExtensionLibrary(const char* library_path, | 8 void* Extensions::LoadExtensionLibrary(const char* library_path, |
8 const char* extension_name) { | 9 const char* extension_name) { |
9 const char* strings[] = { library_path, "/", extension_name, ".dll", NULL }; | 10 const char* strings[] = { library_path, "/", extension_name, ".dll", NULL }; |
10 char* library_file = Concatenate(strings); | 11 char* library_file = Concatenate(strings); |
11 void* lib_handle = LoadLibrary(library_file); | 12 wchar_t* unicode_library_file = StringUtils::Utf8ToWide(library_file); |
| 13 void* lib_handle = LoadLibraryW(unicode_library_file); |
| 14 free(unicode_library_file); |
12 free(library_file); | 15 free(library_file); |
13 return lib_handle; | 16 return lib_handle; |
14 } | 17 } |
15 | 18 |
16 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) { | 19 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) { |
17 return GetProcAddress(reinterpret_cast<HMODULE>(lib_handle), symbol); | 20 return GetProcAddress(reinterpret_cast<HMODULE>(lib_handle), symbol); |
18 } | 21 } |
OLD | NEW |