Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

Side by Side Diff: runtime/bin/extensions_win.cc

Issue 186473003: Refactor native extension shared library lookup. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add check for loading from http(s): Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« runtime/bin/builtin.dart ('K') | « runtime/bin/extensions_macos.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "platform/globals.h" 5 #include "platform/globals.h"
6 #if defined(TARGET_OS_WINDOWS) 6 #if defined(TARGET_OS_WINDOWS)
7 7
8 #include "bin/extensions.h" 8 #include "bin/extensions.h"
9 #include "bin/utils.h" 9 #include "bin/utils.h"
10 10
11 11
12 namespace dart { 12 namespace dart {
13 namespace bin { 13 namespace bin {
14 14
15 void* Extensions::LoadExtensionLibrary(const char* library_path, 15 void* Extensions::LoadExtensionLibrary(const char* library_file) {
16 const char* extension_name) { 16 return LoadLibraryW(StringUtils::Utf8ToWide(library_file));
17 const char* strings[] = { library_path, "/", extension_name, ".dll", NULL };
18 char* library_file = Concatenate(strings);
19 wchar_t* unicode_library_file = StringUtils::Utf8ToWide(library_file);
20 void* lib_handle = LoadLibraryW(unicode_library_file);
21 free(unicode_library_file);
22 free(library_file);
23 return lib_handle;
24 } 17 }
25 18
26 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) { 19 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) {
27 return GetProcAddress(reinterpret_cast<HMODULE>(lib_handle), symbol); 20 return GetProcAddress(reinterpret_cast<HMODULE>(lib_handle), symbol);
28 } 21 }
29 22
30 } // namespace bin 23 } // namespace bin
31 } // namespace dart 24 } // namespace dart
32 25
33 #endif // defined(TARGET_OS_WINDOWS) 26 #endif // defined(TARGET_OS_WINDOWS)
OLDNEW
« runtime/bin/builtin.dart ('K') | « runtime/bin/extensions_macos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698