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

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

Issue 1403683007: Fix for issue 23908 - error message reports the exact error when a native extension fails to load. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: code-review Created 5 years, 2 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
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/assert.h"
5 #include "platform/globals.h" 6 #include "platform/globals.h"
6 #if defined(TARGET_OS_WINDOWS) 7 #if defined(TARGET_OS_WINDOWS)
7 8
8 #include "bin/extensions.h" 9 #include "bin/extensions.h"
9 #include "bin/utils.h" 10 #include "bin/utils.h"
10 #include "bin/utils_win.h" 11 #include "bin/utils_win.h"
11 12
12 13
13 namespace dart { 14 namespace dart {
14 namespace bin { 15 namespace bin {
15 16
16 const char* kPrecompiledLibraryName = "precompiled.dll"; 17 const char* kPrecompiledLibraryName = "precompiled.dll";
17 const char* kPrecompiledSymbolName = "_kInstructionsSnapshot"; 18 const char* kPrecompiledSymbolName = "_kInstructionsSnapshot";
18 19
19 void* Extensions::LoadExtensionLibrary(const char* library_file) { 20 Dart_Handle Extensions::LoadExtensionLibrary(const char* library_file,
20 return LoadLibraryW(StringUtilsWin::Utf8ToWide(library_file)); 21 void** library_handle) {
22 ASSERT(library_handle != NULL);
23 *library_handle = LoadLibraryW(StringUtilsWin::Utf8ToWide(library_file));
24 if (*library_handle == NULL) {
25 OSError err;
26 return Dart_NewApiError(err.message());
27 }
28 return Dart_Null();
21 } 29 }
22 30
23 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) { 31 Dart_Handle Extensions::ResolveSymbol(void* lib_handle,
24 return GetProcAddress(reinterpret_cast<HMODULE>(lib_handle), symbol); 32 const char* symbol,
33 void** init_function) {
34 ASSERT(init_function != NULL);
35 *init_function = GetProcAddress(
36 reinterpret_cast<HMODULE>(lib_handle), symbol);
37 if (*init_function == NULL) {
38 OSError err;
39 return Dart_NewApiError(err.message());
40 }
41 return Dart_Null();
25 } 42 }
26 43
27 } // namespace bin 44 } // namespace bin
28 } // namespace dart 45 } // namespace dart
29 46
30 #endif // defined(TARGET_OS_WINDOWS) 47 #endif // defined(TARGET_OS_WINDOWS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698