Changeset 10859 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 24, 2008 4:43:29 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33675

Message:

VBoxControl: Fixed incorrect RTMemFree.

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (27 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -54 +54 @@
  * Displays the program usage message.
  *
- * @param u64Which 
- * 
+ * @param u64Which
+ *
  * @{
- */ 
+ */
 
 /** Helper function */
@@ -190 +190 @@
     paNewRects[iResized].right += NewWidth - (paNewRects[iResized].right - paNewRects[iResized].left);
     paNewRects[iResized].bottom += NewHeight - (paNewRects[iResized].bottom - paNewRects[iResized].top);
-    
-    /* Verify all pairs of originally adjacent rectangles for all 4 directions. 
+
+    /* Verify all pairs of originally adjacent rectangles for all 4 directions.
      * If the pair has a "good" delta (that is the first rectangle intersects the second)
      * at a direction and the second rectangle is not primary one (which can not be moved),
      * move the second rectangle to make it adjacent to the first one.
      */
-    
+
     /* X positive. */
     unsigned iRect;
@@ -204 +204 @@
         unsigned iNextRect = nextAdjacentRectXP (paRects, nRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
-        
+
         if (iNextRect == ~0 || iNextRect == iPrimary)
         {
             continue;
         }
-        
+
         /* Check whether there is an X intesection between these adjacent rects in the new rectangles
          * and fix the intersection if delta is "good".
          */
         int delta = paNewRects[iRect].right - paNewRects[iNextRect].left;
-        
+
         if (delta > 0)
         {
@@ -220 +220 @@
                      paNewRects[iRect].right, paNewRects[iNextRect].left,
                      delta));
-            
+
             paNewRects[iNextRect].left += delta;
             paNewRects[iNextRect].right += delta;
         }
     }
-    
+
     /* X negative. */
     for (iRect = 0; iRect < nRects; iRect++)
@@ -232 +232 @@
         unsigned iNextRect = nextAdjacentRectXN (paRects, nRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
-        
+
         if (iNextRect == ~0 || iNextRect == iPrimary)
         {
             continue;
         }
-        
+
         /* Check whether there is an X intesection between these adjacent rects in the new rectangles
          * and fix the intersection if delta is "good".
          */
         int delta = paNewRects[iRect].left - paNewRects[iNextRect].right;
-        
+
         if (delta < 0)
         {
@@ -248 +248 @@
                      paNewRects[iRect].left, paNewRects[iNextRect].right,
                      delta));
-            
+
             paNewRects[iNextRect].left += delta;
             paNewRects[iNextRect].right += delta;
         }
     }
-    
+
     /* Y positive (in the computer sence, top->down). */
     for (iRect = 0; iRect < nRects; iRect++)
@@ -260 +260 @@
         unsigned iNextRect = nextAdjacentRectYP (paRects, nRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
-        
+
         if (iNextRect == ~0 || iNextRect == iPrimary)
         {
             continue;
         }
-        
+
         /* Check whether there is an Y intesection between these adjacent rects in the new rectangles
          * and fix the intersection if delta is "good".
          */
         int delta = paNewRects[iRect].bottom - paNewRects[iNextRect].top;
-        
+
         if (delta > 0)
         {
@@ -276 +276 @@
                      paNewRects[iRect].bottom, paNewRects[iNextRect].top,
                      delta));
-            
+
             paNewRects[iNextRect].top += delta;
             paNewRects[iNextRect].bottom += delta;
         }
     }
-    
+
     /* Y negative (in the computer sence, down->top). */
     for (iRect = 0; iRect < nRects; iRect++)
@@ -288 +288 @@
         unsigned iNextRect = nextAdjacentRectYN (paRects, nRects, iRect);
         Log(("next %d -> %d\n", iRect, iNextRect));
-        
+
         if (iNextRect == ~0 || iNextRect == iPrimary)
         {
             continue;
         }
-        
+
         /* Check whether there is an Y intesection between these adjacent rects in the new rectangles
          * and fix the intersection if delta is "good".
          */
         int delta = paNewRects[iRect].top - paNewRects[iNextRect].bottom;
-        
+
         if (delta < 0)
         {
@@ -304 +304 @@
                      paNewRects[iRect].top, paNewRects[iNextRect].bottom,
                      delta));
-            
+
             paNewRects[iNextRect].top += delta;
             paNewRects[iNextRect].bottom += delta;
         }
     }
-    
+
     memcpy (paRects, paNewRects, sizeof (RECTL) * nRects);
     return;
@@ -318 +318 @@
 {
     BOOL fModeReset = (Width == 0 && Height == 0 && BitsPerPixel == 0);
-    
+
     DISPLAY_DEVICE DisplayDevice;
 
     ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
     DisplayDevice.cb = sizeof(DisplayDevice);
-    
+
     /* Find out how many display devices the system has */
     DWORD NumDevices = 0;
     DWORD i = 0;
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
-    { 
+    {
         Log(("[%d] %s\n", i, DisplayDevice.DeviceName));
 
@@ -338 +338 @@
         else if (!(DisplayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER))
         {
-            
+
             Log(("Found secondary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
-        
+
         ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
         DisplayDevice.cb = sizeof(DisplayDevice);
         i++;
     }
-    
+
     Log(("Found total %d devices. err %d\n", NumDevices, GetLastError ()));
-    
+
     if (NumDevices == 0 || Id >= NumDevices)
     {
@@ -355 +355 @@
         return FALSE;
     }
-    
+
     DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NumDevices);
     DEVMODE *paDeviceModes = (DEVMODE *)alloca (sizeof (DEVMODE) * NumDevices);
     RECTL *paRects = (RECTL *)alloca (sizeof (RECTL) * NumDevices);
-    
+
     /* Fetch information about current devices and modes. */
     DWORD DevNum = 0;
     DWORD DevPrimaryNum = 0;
-    
+
     ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE));
     DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
-    
+
     i = 0;
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
-    { 
+    {
         Log(("[%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
-        
+
         BOOL bFetchDevice = FALSE;
 
@@ -382 +382 @@
         else if (!(DisplayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER))
         {
-            
+
             Log(("Found secondary device. err %d\n", GetLastError ()));
             bFetchDevice = TRUE;
         }
-        
+
         if (bFetchDevice)
         {
@@ -394 +394 @@
                 return FALSE;
             }
-        
+
             paDisplayDevices[DevNum] = DisplayDevice;
-            
+
             ZeroMemory(&paDeviceModes[DevNum], sizeof(DEVMODE));
             paDeviceModes[DevNum].dmSize = sizeof(DEVMODE);
@@ -405 +405 @@
                 return FALSE;
             }
-            
+
             Log(("%dx%d at %d,%d\n",
                     paDeviceModes[DevNum].dmPelsWidth,
@@ -411 +411 @@
                     paDeviceModes[DevNum].dmPosition.x,
                     paDeviceModes[DevNum].dmPosition.y));
-                    
+
             paRects[DevNum].left   = paDeviceModes[DevNum].dmPosition.x;
             paRects[DevNum].top    = paDeviceModes[DevNum].dmPosition.y;
@@ -418 +418 @@
             DevNum++;
         }
-        
+
         ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE));
         DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
         i++;
     }
-    
+
     if (Width == 0)
     {
@@ -454 +454 @@
     }
 #endif /* Log */
-    
+
     /* Without this, Windows will not ask the miniport for its
      * mode table but uses an internal cache instead.
@@ -470 +470 @@
         paDeviceModes[i].dmPelsWidth  = paRects[i].right - paRects[i].left;
         paDeviceModes[i].dmPelsHeight = paRects[i].bottom - paRects[i].top;
-        
+
         paDeviceModes[i].dmFields = DM_POSITION | DM_PELSHEIGHT | DM_PELSWIDTH;
-        
+
         if (   i == Id
             && BitsPerPixel != 0)
@@ -479 +479 @@
             paDeviceModes[i].dmBitsPerPel = BitsPerPixel;
         }
-        Log(("calling pfnChangeDisplaySettingsEx %x\n", gpfnChangeDisplaySettingsEx));     
-        gpfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName, 
-                 &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL); 
+        Log(("calling pfnChangeDisplaySettingsEx %x\n", gpfnChangeDisplaySettingsEx));
+        gpfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName,
+                 &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL);
         Log(("ChangeDisplaySettings position err %d\n", GetLastError ()));
     }
-    
+
     /* A second call to ChangeDisplaySettings updates the monitor. */
-    LONG status = ChangeDisplaySettings(NULL, 0); 
+    LONG status = ChangeDisplaySettings(NULL, 0);
     Log(("ChangeDisplaySettings update status %d\n", status));
     if (status == DISP_CHANGE_SUCCESSFUL || status == DISP_CHANGE_BADMODE)
@@ -522 +522 @@
         *(uintptr_t *)&gpfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
         Log(("VBoxService: pChangeDisplaySettingsEx = %p\n", gpfnChangeDisplaySettingsEx));
-        
+
         if (gpfnChangeDisplaySettingsEx)
         {
             /* The screen index is 0 based in the ResizeDisplayDevice call. */
             scr = scr > 0? scr - 1: 0;
-            
+
             /* Horizontal resolution must be a multiple of 8, round down. */
             xres &= ~0x7;
@@ -891 +891 @@
  * Here we actually retrieve the value from the host.
  */
+    void *pvBuf = NULL;
     const char *pszName = argv[0];
     char *pszValue = NULL;
@@ -903 +904 @@
         bool finish = false;
         /* We leave a bit of space here in case the maximum values are raised. */
-        void *pvBuf = NULL;
         uint32_t cbBuf = MAX_VALUE_LEN + MAX_FLAGS_LEN + 1024;
         for (unsigned i = 0; (i < 10) && !finish; ++i)
@@ -910 +910 @@
             if (NULL == pvTmpBuf)
             {
-                RTMemFree(pvBuf);
                 rc = VERR_NO_MEMORY;
                 VBoxControlError("Out of memory\n");
@@ -937 +936 @@
     if (VERR_NOT_FOUND == rc)
         RTPrintf("No value set!\n");
-    if (RT_SUCCESS(rc))
+    else if (RT_SUCCESS(rc))
+    {
         RTPrintf("Value: %S\n", pszValue);
-    if (RT_SUCCESS(rc) && verbose)
-    {
-        RTPrintf("Timestamp: %lld ns\n", u64Timestamp);
-        RTPrintf("Flags: %S\n", pszFlags);
+        if (verbose)
+        {
+            RTPrintf("Timestamp: %lld ns\n", u64Timestamp);
+            RTPrintf("Flags: %S\n", pszFlags);
+        }
     }
 
     if (u32ClientId != 0)
         VbglR3GuestPropDisconnect(u32ClientId);
+    RTMemFree(pvBuf);
     return RT_SUCCESS(rc) ? 0 : 1;
 }
@@ -1112 +1114 @@
             onlyinfo = true;
             dohelp = true;
-            done = true;           
+            done = true;
         }
         else