Zach Anderson
f407419d0a
This relands https://dart-review.googlesource.com/c/sdk/+/205633 but without renaming TARGET_OS_IPHONE to DART_TARGET_OS_IPHONE. It also changes uses of TARGET_OS_IOS to DART_TARGET_OS_MACOS_IOS to be consistent with the rest of the VM. TargetConditionals.h for XCode 13 defines several TARGET_OS_* preprocessor symbols that confuse the Dart build. There is probably a more targeted fix for this, but renaming the symbols that Dart uses will also prevent this problem if more symbols are added to the platform headers in the future. See: https://github.com/dart-lang/sdk/issues/46499 TEST=It builds. Change-Id: Ie775c19dd23cfdf5f65e5ebc6ee4ec3a561676fa Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/205860 Commit-Queue: Zach Anderson <zra@google.com> Reviewed-by: Alexander Aprelev <aam@google.com>
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "platform/globals.h"
|
|
#if defined(DART_HOST_OS_WINDOWS)
|
|
|
|
#include "bin/extensions.h"
|
|
#include "bin/utils.h"
|
|
#include "bin/utils_win.h"
|
|
#include "platform/assert.h"
|
|
|
|
namespace dart {
|
|
namespace bin {
|
|
|
|
void* Extensions::LoadExtensionLibrary(const char* library_file) {
|
|
SetLastError(0);
|
|
|
|
// Convert to wchar_t string.
|
|
int name_len = MultiByteToWideChar(CP_UTF8, 0, library_file, -1, NULL, 0);
|
|
wchar_t* name;
|
|
name = new wchar_t[name_len];
|
|
MultiByteToWideChar(CP_UTF8, 0, library_file, -1, name, name_len);
|
|
|
|
void* ext = LoadLibraryW(name);
|
|
delete[] name;
|
|
return ext;
|
|
}
|
|
|
|
void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) {
|
|
SetLastError(0);
|
|
return reinterpret_cast<void*>(
|
|
GetProcAddress(reinterpret_cast<HMODULE>(lib_handle), symbol));
|
|
}
|
|
|
|
void Extensions::UnloadLibrary(void* lib_handle) {
|
|
SetLastError(0);
|
|
BOOL result = FreeLibrary(reinterpret_cast<HMODULE>(lib_handle));
|
|
ASSERT(result);
|
|
}
|
|
|
|
Dart_Handle Extensions::GetError() {
|
|
int last_error = GetLastError();
|
|
if (last_error != 0) {
|
|
OSError err;
|
|
return Dart_NewApiError(err.message());
|
|
}
|
|
return Dart_Null();
|
|
}
|
|
|
|
} // namespace bin
|
|
} // namespace dart
|
|
|
|
#endif // defined(DART_HOST_OS_WINDOWS)
|