Changeset 73624 in vbox

Timestamp:

Aug 10, 2018 5:46:50 PM (6 years ago)

Author:

vboxsync

Message:

Main,SharedOpenGL: VRDP cleanup. bugref:9225

Location:

trunk/src/VBox

Files:

• HostServices/SharedOpenGL/crserverlib/presenter/display_base.cpp (modified) (1 diff)
• Main/src-client/ConsoleVRDPServer.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_base.cpp

@@ -327 +327 @@
             break;
         }
-
-        CrFbVisitCreatedEntries(mpFb, entriesDestroyCb, this);
-    }
+    }
+
+    CrFbVisitCreatedEntries(mpFb, entriesDestroyCb, this);
 
     return rc;

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

@@ -1861 +1861 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     /** @todo find out what to do if size changes to 0x0 from non zero */
@@ -1984 +1984 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     if (cRects == 0)
@@ -2015 +2015 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     /* Currently only a topdown BGR0 bitmap format is supported. */
@@ -2048 +2048 @@
 
     H3DORInstance *p = (H3DORInstance *)pvInstance;
-    Assert(p);
-    Assert(p->pThis);
+    AssertPtrReturnVoid(p);
+    AssertPtrReturnVoid(p->pThis);
 
     p->pThis->m_interfaceImage.VRDEImageHandleClose(p->hImageBitmap);
 
+    RT_ZERO(*p);
     RTMemFree(p);