Changeset 55963 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 20, 2015 11:18:14 AM (10 years ago)

Author:

vboxsync

Message:

DnD: Fixed hang when reporting host errors such as inaccessible (locked) files.

Location:

trunk/src/VBox/Main/include

Files:

• GuestDnDPrivate.h (modified) (3 diffs)
• GuestDnDSourceImpl.h (modified) (1 diff)
• GuestDnDTargetImpl.h (modified) (1 diff)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -50 +50 @@
     int Reset(void);
 
-    int Notify(int rc);
+    int Notify(int rc = VINF_SUCCESS);
 
     int Result(void) const { return mRc; }
@@ -367 +367 @@
     bool isProgressCanceled(void) const;
     int setCallback(uint32_t uMsg, PFNGUESTDNDCALLBACK pfnCallback, void *pvUser = NULL);
-    int setProgress(unsigned uPercentage, uint32_t uState, int rcOp = VINF_SUCCESS);
+    int setProgress(unsigned uPercentage, uint32_t uState, int rcOp = VINF_SUCCESS, const Utf8Str &strMsg = "");
     HRESULT resetProgress(const ComObjPtr<Guest>& pParent);
     HRESULT queryProgressTo(IProgress **ppProgress);
@@ -377 +377 @@
     int onDispatch(uint32_t u32Function, void *pvParms, uint32_t cbParms);
     /** @}  */
-
-public:
-
-    Utf8Str errorToString(const ComObjPtr<Guest>& pGuest, int guestRc);
 
 protected:

trunk/src/VBox/Main/include/GuestDnDSourceImpl.h

@@ -74 +74 @@
 protected:
 
+    static Utf8Str i_guestErrorToString(int guestRc);
+    static Utf8Str i_hostErrorToString(int hostRc);
+
+    /** @name Thread callbacks.
+     * @{ */
     static DECLCALLBACK(int) i_receiveDataThread(RTTHREAD Thread, void *pvUser);
+    /** @}  */
 
     /** @name Callbacks for dispatch handler.

trunk/src/VBox/Main/include/GuestDnDTargetImpl.h

@@ -68 +68 @@
 protected:
 
+    static Utf8Str i_guestErrorToString(int guestRc);
+    static Utf8Str i_hostErrorToString(int hostRc);
+
+    /** @name Thread callbacks.
+     * @{ */
     static DECLCALLBACK(int) i_sendDataThread(RTTHREAD Thread, void *pvUser);
+    /** @}  */
+
+    /** @name Callbacks for dispatch handler.
+     * @{ */
     static DECLCALLBACK(int) i_sendURIDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
+    /** @}  */
 
 protected: