| Index: base/native_library_win.cc
|
| diff --git a/base/native_library_win.cc b/base/native_library_win.cc
|
| index bcea485a1d10582016622738f1081fde471cd567..6ac9e324456bf451abeb0ed12d2c2ccabb05cf6f 100644
|
| --- a/base/native_library_win.cc
|
| +++ b/base/native_library_win.cc
|
| @@ -15,9 +15,11 @@ namespace base {
|
|
|
| typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name);
|
|
|
| +namespace {
|
| +
|
| NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
|
| LoadLibraryFunction load_library_api,
|
| - std::string* error) {
|
| + NativeLibraryLoadError* error) {
|
| // LoadLibrary() opens the file off disk.
|
| ThreadRestrictions::AssertIOAllowed();
|
|
|
| @@ -36,8 +38,7 @@ NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
|
| HMODULE module = (*load_library_api)(library_path.value().c_str());
|
| if (!module && error) {
|
| // GetLastError() needs to be called immediately after |load_library_api|.
|
| - DWORD last_error = GetLastError();
|
| - *error = StringPrintf("%u", last_error);
|
| + *error = GetLastError();
|
| }
|
|
|
| if (restore_directory)
|
| @@ -46,9 +47,11 @@ NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
|
| return module;
|
| }
|
|
|
| +} // namespace
|
| +
|
| // static
|
| NativeLibrary LoadNativeLibrary(const FilePath& library_path,
|
| - std::string* error) {
|
| + NativeLibraryLoadError* error) {
|
| return LoadNativeLibraryHelper(library_path, LoadLibraryW, error);
|
| }
|
|
|
| @@ -59,7 +62,7 @@ NativeLibrary LoadNativeLibraryDynamically(const FilePath& library_path) {
|
| load_library = reinterpret_cast<LoadLibraryFunction>(
|
| GetProcAddress(GetModuleHandle(L"kernel32.dll"), "LoadLibraryW"));
|
|
|
| - return LoadNativeLibraryHelper(library_path, load_library, NULL);
|
| + return LoadNativeLibraryHelper(library_path, load_library, NULL, NULL);
|
| }
|
|
|
| // static
|
|
|