Changeset 49610 in vbox

Timestamp:

Nov 21, 2013 4:01:00 PM (11 years ago)

Author:

vboxsync

Message:

Main/GuestCtrl: Don't keep ComObjPtr of parents in internal listeners.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestFileImpl.cpp (modified) (6 diffs)
• GuestProcessImpl.cpp (modified) (4 diffs)
• GuestSessionImpl.cpp (modified) (4 diffs)

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

@@ -57 +57 @@
     HRESULT init(GuestFile *pFile)
     {
+        AssertPtrReturn(pFile, E_POINTER);
         mFile = pFile;
         return S_OK;
@@ -63 +64 @@
     void uninit(void)
     {
-        mFile.setNull();
+        mFile = NULL;
     }
 
@@ -75 +76 @@
             case VBoxEventType_OnGuestFileWrite:
             {
-                Assert(!mFile.isNull());
+                AssertPtrReturn(mFile, E_POINTER);
                 int rc2 = mFile->signalWaitEvent(aType, aEvent);
 #ifdef DEBUG_andy
@@ -94 +95 @@
 private:
 
-    ComObjPtr<GuestFile> mFile;
+    GuestFile *mFile;
 };
 typedef ListenerImpl<GuestFileListener, GuestFile*> GuestFileListenerImpl;
@@ -703 +704 @@
 
 /**
- * Called by IGuestSession right before this file gets removed 
- * from the public file list. 
+ * Called by IGuestSession right before this file gets removed
+ * from the public file list.
  */
 int GuestFile::onRemove(void)
@@ -714 +715 @@
     int vrc = VINF_SUCCESS;
 
-    /* 
+    /*
      * Note: The event source stuff holds references to this object,
      *       so make sure that this is cleaned up *before* calling uninit().

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

@@ -97 +97 @@
     HRESULT init(GuestProcess *pProcess)
     {
+        AssertPtrReturn(pProcess, E_POINTER);
         mProcess = pProcess;
         return S_OK;
@@ -103 +104 @@
     void uninit(void)
     {
-        mProcess.setNull();
+        mProcess = NULL;
     }
 
@@ -114 +115 @@
             case VBoxEventType_OnGuestProcessOutput:
             {
-                Assert(!mProcess.isNull());
+                AssertPtrReturn(mProcess, E_POINTER);
                 int rc2 = mProcess->signalWaitEvent(aType, aEvent);
 #ifdef DEBUG
@@ -133 +134 @@
 private:
 
-    ComObjPtr<GuestProcess> mProcess;
+    GuestProcess *mProcess;
 };
 typedef ListenerImpl<GuestProcessListener, GuestProcess*> GuestProcessListenerImpl;

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

@@ -97 +97 @@
     HRESULT init(GuestSession *pSession)
     {
+        AssertPtrReturn(pSession, E_POINTER);
         mSession = pSession;
         return S_OK;
@@ -103 +104 @@
     void uninit(void)
     {
-        mSession.setNull();
+        mSession = NULL;
     }
 
@@ -112 +113 @@
             case VBoxEventType_OnGuestSessionStateChanged:
             {
-                Assert(!mSession.isNull());
+                AssertPtrReturn(mSession, E_POINTER);
                 int rc2 = mSession->signalWaitEvent(aType, aEvent);
 #ifdef DEBUG_andy
@@ -131 +132 @@
 private:
 
-    ComObjPtr<GuestSession> mSession;
+    GuestSession *mSession;
 };
 typedef ListenerImpl<GuestSessionListener, GuestSession*> GuestSessionListenerImpl;