Changeset 64400 in vbox for trunk/src/VBox

Timestamp:

Oct 24, 2016 3:59:01 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8614: Additions/common/VBoxVideo: make the code more self-contained: remove dependency on -RTErrConvertToErrno() in Linux vboxvideo.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_mode.c (modified) (4 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -696 +696 @@
     rc = VBoxQueryConfHGSMI(&vbox->submit_info,
                             VBOX_VBVA_CONF32_CURSOR_CAPABILITIES, &caps);
-    ret = -RTErrConvertToErrno(rc);
+    ret = rc == VINF_SUCCESS ? 0 : rc == VERR_NO_MEMORY ? -ENOMEM : -EINVAL;
     if (ret)
         return ret;
@@ -740 +740 @@
                                                      width, height, dst,
                                                      data_size);
-                    ret = -RTErrConvertToErrno(rc);
+                    ret =   rc == VINF_SUCCESS ? 0
+                          : rc == VERR_NO_MEMORY ? -ENOMEM
+                          : rc == VERR_NOT_SUPPORTED ? -EBUSY
+                          : -EINVAL;
                 }
                 else
@@ -779 +782 @@
     /* Work around a bug after save and restore in 5.0.20 and earlier. */
     if (RT_FAILURE(rc) || (host_x == 0 && host_y == 0))
-        return -RTErrConvertToErrno(rc);
+        return   rc == VINF_SUCCESS ? 0
+               : rc == VERR_NO_MEMORY ? -ENOMEM
+               : -EINVAL;
     if (x + crtc->x < host_x)
         hot_x = min(host_x - x - crtc->x, vbox->cursor_width);
@@ -792 +797 @@
                                      vbox->cursor_data,
                                      vbox->cursor_data_size);
-    return -RTErrConvertToErrno(rc);
-}
+    return   rc == VINF_SUCCESS ? 0
+           : rc == VERR_NO_MEMORY ? -ENOMEM
+           : rc == VERR_NOT_SUPPORTED ? -EBUSY
+           : -EINVAL;
+}