Changeset 48818 in vbox for trunk

Timestamp:

Oct 2, 2013 1:50:27 PM (11 years ago)

Author:

vboxsync

Message:

Main/GuestCtrl: Fire IGuestFile events in every case; there might we waiters depending on it. seekAt() is now accepting relative offsets.

File:

• trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -594 +594 @@
                                                        &dataCb.u.read.cbData);
                 uint32_t cbRead = dataCb.u.read.cbData;
-                if (cbRead)
-                {
-                    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-                    mData.mOffCurrent += cbRead;
-
-                    alock.release();
-
-                    com::SafeArray<BYTE> data((size_t)cbRead);
-                    data.initFrom((BYTE*)dataCb.u.read.pvData, cbRead);
-
-                    fireGuestFileReadEvent(mEventSource, mSession, this, mData.mOffCurrent,
-                                           cbRead, ComSafeArrayAsInParam(data));
-                }
+
+                AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+                mData.mOffCurrent += cbRead;
+
+                alock.release();
+
+                com::SafeArray<BYTE> data((size_t)cbRead);
+                data.initFrom((BYTE*)dataCb.u.read.pvData, cbRead);
+
+                fireGuestFileReadEvent(mEventSource, mSession, this, mData.mOffCurrent,
+                                       cbRead, ComSafeArrayAsInParam(data));
             }
             else
@@ -627 +625 @@
                 alock.release();
 
-                if (dataCb.u.write.cbWritten)
-                    fireGuestFileWriteEvent(mEventSource, mSession, this, uOffCurrent,
-                                            dataCb.u.write.cbWritten);
+                fireGuestFileWriteEvent(mEventSource, mSession, this, uOffCurrent,
+                                        dataCb.u.write.cbWritten);
             }
             else
@@ -645 +642 @@
 
                 mData.mOffCurrent = dataCb.u.seek.uOffActual;
-                uint64_t uOffCurrent = mData.mOffCurrent;
 
                 alock.release();
 
-                if (dataCb.u.seek.uOffActual)
-                    fireGuestFileOffsetChangedEvent(mEventSource, mSession, this,
-                                                    uOffCurrent, 0 /* Processed */);
+                fireGuestFileOffsetChangedEvent(mEventSource, mSession, this,
+                                                dataCb.u.seek.uOffActual, 0 /* Processed */);
             }
             else
@@ -666 +661 @@
                 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-                if (mData.mOffCurrent != dataCb.u.tell.uOffActual)
-                {
-                    mData.mOffCurrent = dataCb.u.tell.uOffActual;
-                    uint64_t uOffCurrent = mData.mOffCurrent;
-
-                    alock.release();
-
-                    fireGuestFileOffsetChangedEvent(mEventSource, mSession, this,
-                                                    uOffCurrent, 0 /* Processed */);
-                }
+                mData.mOffCurrent = dataCb.u.tell.uOffActual;
+
+                alock.release();
+
+                fireGuestFileOffsetChangedEvent(mEventSource, mSession, this,
+                                                dataCb.u.tell.uOffActual, 0 /* Processed */);
             }
             else
@@ -864 +855 @@
 }
 
-int GuestFile::seekAt(uint64_t uOffset, GUEST_FILE_SEEKTYPE eSeekType,
+int GuestFile::seekAt(int64_t iOffset, GUEST_FILE_SEEKTYPE eSeekType,
                       uint32_t uTimeoutMS, uint64_t *puOffset)
 {
-    LogFlowThisFunc(("uOffset=%RU64, uTimeoutMS=%RU32\n",
-                     uOffset, uTimeoutMS));
+    LogFlowThisFunc(("iOffset=%RI64, uTimeoutMS=%RU32\n",
+                     iOffset, uTimeoutMS));
     int vrc;
 
@@ -894 +885 @@
     paParms[i++].setUInt32(mData.mID /* File handle */);
     paParms[i++].setUInt32(eSeekType /* Seek method */);
-    paParms[i++].setUInt64(uOffset /* Offset (in bytes) to start reading */);
+    /** @todo uint64_t vs. int64_t! */
+    paParms[i++].setUInt64((uint64_t)iOffset /* Offset (in bytes) to start reading */);
 
     vrc = sendCommand(HOST_FILE_SEEK, i, paParms);
@@ -1374 +1366 @@
         default:
             return setError(E_INVALIDARG, tr("Invalid seek type specified"));
-            break;
+            break; /* Never reached. */
     }
 
@@ -1385 +1377 @@
             default:
                 hr = setError(VBOX_E_IPRT_ERROR,
-                              tr("Seeking file \"%s\" (to offset %RU64) failed: %Rrc"),
+                              tr("Seeking file \"%s\" (to offset %RI64) failed: %Rrc"),
                               mData.mOpenInfo.mFileName.c_str(), aOffset, vrc);
                 break;