Changeset 54780 in vbox for trunk/src/VBox

Timestamp:

Mar 16, 2015 12:34:11 PM (10 years ago)

Author:

vboxsync

Message:

RDP/client: fixed several regressions after r93776 due to changed return types of the proxy functions

File:

• trunk/src/VBox/RDP/client/vrdp/rdpusb.c (modified) (17 diffs)

trunk/src/VBox/RDP/client/vrdp/rdpusb.c

@@ -98 +98 @@
 #pragma pack ()
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_open(PUSBPROXYDEV p, const char *pszAddress)
 {
@@ -108 +111 @@
 }
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_reset(PUSBPROXYDEV pDev)
 {
@@ -113 +119 @@
 }
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_set_config(PUSBPROXYDEV pDev, int cfg)
 {
@@ -118 +127 @@
 }
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_claim_interface(PUSBPROXYDEV pDev, int ifnum)
 {
@@ -123 +135 @@
 }
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_release_interface(PUSBPROXYDEV pDev, int ifnum)
 {
@@ -128 +143 @@
 }
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_interface_setting(PUSBPROXYDEV pDev, int ifnum, int setting)
 {
@@ -133 +151 @@
 }
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_queue_urb(PUSBPROXYDEV pDev, PVUSBURB pUrb)
 {
@@ -143 +164 @@
 }
 
-static inline bool op_usbproxy_back_clear_halted_ep(PUSBPROXYDEV pDev, unsigned EndPoint)
+/**
+ * @returns VBox status code.
+ */
+static inline int op_usbproxy_back_clear_halted_ep(PUSBPROXYDEV pDev, unsigned EndPoint)
 {
     return g_USBProxyDeviceHost.pfnClearHaltedEndpoint (pDev, EndPoint);
 }
 
+/**
+ * @returns VBox status code.
+ */
 static inline int op_usbproxy_back_cancel_urb(PUSBPROXYDEV pDev, PVUSBURB pUrb)
 {
@@ -471 +498 @@
                         }
 
+                        memset (proxy, 0, sizeof (USBPROXYDEV));
+
                         proxy->pvInstanceDataR3 = xmalloc(g_USBProxyDeviceHost.cbBackend);
                         if (!proxy->pvInstanceDataR3)
@@ -477 +506 @@
                                 return;
                         }
-
-                        memset (proxy, 0, sizeof (USBPROXYDEV));
 
                         proxy->Dev.pszName = "Remote device";
@@ -551 +578 @@
 
                         rc = op_usbproxy_back_reset(proxy);
-
                         if (rc != VINF_SUCCESS)
                         {
@@ -574 +600 @@
 
                         rc = op_usbproxy_back_set_config(proxy, cfg);
-
-                        if (!rc)
+                        if (RT_FAILURE(rc))
                         {
                                 rdpusb_send_reply (code, vrdp_usb_status (rc, &proxy->Dev), devid);
@@ -595 +620 @@
 
                         in_uint8(s, ifnum);
+                                in_uint8(s, ifnum);
 
                         rc = op_usbproxy_back_claim_interface(proxy, ifnum);
-
-                        if (!rc)
+                        if (RT_FAILURE(rc))
                         {
                                 rdpusb_send_reply (code, vrdp_usb_status (rc, &proxy->Dev), devid);
@@ -620 +645 @@
 
                         rc = op_usbproxy_back_release_interface(proxy, ifnum);
-
-                        if (!rc)
+                        if (RT_FAILURE(rc))
                         {
                                 rdpusb_send_reply (code, vrdp_usb_status (rc, &proxy->Dev), devid);
@@ -645 +669 @@
 
                         rc = op_usbproxy_back_interface_setting(proxy, ifnum, setting);
-
-                        if (!rc)
+                        if (RT_FAILURE(rc))
                         {
                                 rdpusb_send_reply (code, vrdp_usb_status (rc, &proxy->Dev), devid);
@@ -703 +726 @@
                         /* No reply required. */
 
-                        if (rc)
+                        if (RT_SUCCESS(rc))
                         {
                                 if (proxy->pUrbs)
@@ -740 +763 @@
 
                         rc = op_usbproxy_back_clear_halted_ep(proxy, ep);
-
-                        if (!rc)
+                        if (RT_FAILURE(rc))
                         {
                                 rdpusb_send_reply (code, vrdp_usb_status (rc, &proxy->Dev), devid);