Minimal change to get win32 build working again.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2011, 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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 1374 matching lines @@
   }
   RETURN_FAILURE("Unable to find field in the class");
 }
 
 
 DART_EXPORT Dart_Result Dart_GetStaticField(Dart_Handle cls,
                                             Dart_Handle name) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   Dart_Result result = LookupStaticField(cls, name, kGetter);
-  if (!Dart_IsValidResult(result)) {
-    RETURN_FAILURE(Dart_GetErrorCString(result));
+  if (!::Dart_IsValidResult(result)) {
+    return result;
   }
   Object& retval = Object::Handle();
   const Object& obj = Object::Handle(Api::UnwrapHandle(Dart_GetResult(result)));
   if (obj.IsField()) {
     Field& fld = Field::Handle();
     fld ^= obj.raw();
     retval = fld.value();
     RETURN_OBJECT(retval);
   } else {
     Function& func = Function::Handle();
     func ^= obj.raw();
     GrowableArray<const Object*> args;
     InvokeStatic(func, args, &result);
-    if (Dart_IsValidResult(result)) {
+    if (::Dart_IsValidResult(result)) {
       Dart_Handle result_obj = Dart_GetResult(result);
       if (Dart_ExceptionOccurred(result_obj)) {
         RETURN_FAILURE("An exception occurred when getting the static field");
       }
     }
     return result;
   }
 }
 
 
 // TODO(iposva): The value parameter should be documented as being an instance.
 DART_EXPORT Dart_Result Dart_SetStaticField(Dart_Handle cls,
                                             Dart_Handle name,
                                             Dart_Handle value) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   Dart_Result result = LookupStaticField(cls, name, kSetter);
-  if (!Dart_IsValidResult(result)) {
-    RETURN_FAILURE(Dart_GetErrorCString(result));
+  if (!::Dart_IsValidResult(result)) {
+    return result;
   }
   Field& fld = Field::Handle();
   fld ^= Api::UnwrapHandle(Dart_GetResult(result));
   if (fld.is_final()) {
     RETURN_FAILURE("Specified field is a static final field in the class");
   }
   const Object& val = Object::Handle(Api::UnwrapHandle(value));
   Instance& instance = Instance::Handle();
   instance ^= val.raw();
   fld.set_value(instance);
   RETURN_OBJECT(val);
 }
 
 
 DART_EXPORT Dart_Result Dart_GetInstanceField(Dart_Handle obj,
                                               Dart_Handle name) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const Object& param = Object::Handle(Api::UnwrapHandle(obj));
   if (param.IsNull() || !param.IsInstance()) {
     RETURN_FAILURE("Invalid object passed in to access instance field");
   }
   Instance& object = Instance::Handle();
   object ^= param.raw();
   Dart_Result result = LookupInstanceField(object, name, kGetter);
-  if (!Dart_IsValidResult(result)) {
-    RETURN_FAILURE(Dart_GetErrorCString(result));
+  if (!::Dart_IsValidResult(result)) {
+    return result;
   }
   Function& func = Function::Handle();
   func ^= Api::UnwrapHandle(Dart_GetResult(result));
   GrowableArray<const Object*> arguments;
   InvokeDynamic(object, func, arguments, &result);
-  if (Dart_IsValidResult(result)) {
+  if (::Dart_IsValidResult(result)) {
     Dart_Handle result_obj = Dart_GetResult(result);
     if (Dart_ExceptionOccurred(result_obj)) {
       RETURN_FAILURE("An exception occurred when accessing the instance field");
     }
   }
   return result;
 }
 
 
 DART_EXPORT Dart_Result Dart_SetInstanceField(Dart_Handle obj,
                                               Dart_Handle name,
                                               Dart_Handle value) {
   Zone zone;  // Setup a VM zone as we are creating some handles.
   HandleScope scope;  // Setup a VM handle scope.
   const Object& param = Object::Handle(Api::UnwrapHandle(obj));
   if (param.IsNull() || !param.IsInstance()) {
     RETURN_FAILURE("Invalid object passed in to access instance field");
   }
   Instance& object = Instance::Handle();
   object ^= param.raw();
   Dart_Result result = LookupInstanceField(object, name, kSetter);
-  if (!Dart_IsValidResult(result)) {
-    RETURN_FAILURE(Dart_GetErrorCString(result));
+  if (!::Dart_IsValidResult(result)) {
+    return result;
   }
   Function& func = Function::Handle();
   func ^= Api::UnwrapHandle(Dart_GetResult(result));
   GrowableArray<const Object*> arguments(1);
   const Object& arg = Object::Handle(Api::UnwrapHandle(value));
   arguments.Add(&arg);
   InvokeDynamic(object, func, arguments, &result);
-  if (Dart_IsValidResult(result)) {
+  if (::Dart_IsValidResult(result)) {
     Dart_Handle result_obj = Dart_GetResult(result);
     if (Dart_ExceptionOccurred(result_obj)) {
       RETURN_FAILURE("An exception occurred when setting the instance field");
     }
   }
   return result;
 }
 
 
 DART_EXPORT Dart_Result Dart_CreateNativeWrapperClass(Dart_Handle library,
@@ skipping 216 matching lines @@
   ASSERT(isolate != NULL);
   ApiState* state = isolate->api_state();
   ASSERT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   ASSERT(scope != NULL);
   return scope->zone().Reallocate(ptr, old_size, new_size);
 }
 
 
 }  // namespace dart