Changeset 44735 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

Timestamp:

Feb 18, 2013 2:01:33 PM (12 years ago)

Author:

vboxsync

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

83838

Message:

WINNT/VBoxTray.cpp: memory leak fix, code fixes as per VBox standard.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

@@ -1323 +1323 @@
           */
         if (OSinfo.dwMajorVersion >= 6 && OSinfo.dwMinorVersion >= 1)
-            winEr = vboxDispIfWddmResizeDisplay(pIf,iChangedMode, paDisplayDevices, paDeviceModes, cDevModes);
+            winEr = vboxDispIfWddmResizeDisplay(pIf, iChangedMode, paDisplayDevices, paDeviceModes, cDevModes);
         else
             winEr = vboxDispIfWddmValidateFixResize(pIf, paDisplayDevices, paDeviceModes, cDevModes);
@@ -1358 +1358 @@
     DISPLAYCONFIG_PATH_INFO *pPathInfoArray;
     DISPLAYCONFIG_MODE_INFO *pModeInfoArray;
-    UINT NumPathArrayElements = 0;
-    UINT NumModeInfoArrayElements = 0;
+    UINT numPathArrayElements = 0;
+    UINT numModeInfoArrayElements = 0;
     ULONG dwStatus;
 
-    dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements,&NumModeInfoArrayElements);
+    dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS, &numPathArrayElements, &numModeInfoArrayElements);
     if (dwStatus != ERROR_SUCCESS)
     {
@@ -1368 +1368 @@
         return dwStatus;
     }
-    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(NumPathArrayElements * sizeof(DISPLAYCONFIG_PATH_INFO));
-    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(NumModeInfoArrayElements * sizeof(DISPLAYCONFIG_MODE_INFO));
-    if (!pPathInfoArray || !pModeInfoArray )
-    {
+    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(numPathArrayElements * sizeof(DISPLAYCONFIG_PATH_INFO));
+     if (!pPathInfoArray)
         return ERROR_OUTOFMEMORY;
-    }
-    dwStatus = gCtx.pfnQueryDisplayConfig(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements, pPathInfoArray,&NumModeInfoArrayElements, pModeInfoArray,NULL);
+    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(numModeInfoArrayElements * sizeof(DISPLAYCONFIG_MODE_INFO));
+    if (!pModeInfoArray )
+    {
+        if (pPathInfoArray)
+        {
+            free(pPathInfoArray);
+        }
+        return ERROR_OUTOFMEMORY;
+    }
+    dwStatus = gCtx.pfnQueryDisplayConfig(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS, &numPathArrayElements, pPathInfoArray,&numModeInfoArrayElements, pModeInfoArray, NULL);
     if (dwStatus != ERROR_SUCCESS)
     {
@@ -1384 +1390 @@
         return dwStatus;
     }
-    for (unsigned int i=0; i < NumPathArrayElements; ++i)
+    for (unsigned int i=0; i < numPathArrayElements; ++i)
     {
         LogRel(("Sourceid= %d and targetid = %d\n", pPathInfoArray[i].sourceInfo.id, pPathInfoArray[i].targetInfo.id));
@@ -1403 +1409 @@
         }
     }
-    dwStatus = gCtx.pfnSetDisplayConfig(NumPathArrayElements, pPathInfoArray, NumModeInfoArrayElements, pModeInfoArray, (SDC_APPLY | SDC_SAVE_TO_DATABASE| SDC_ALLOW_CHANGES | SDC_USE_SUPPLIED_DISPLAY_CONFIG));
+    dwStatus = gCtx.pfnSetDisplayConfig(numPathArrayElements, pPathInfoArray, numModeInfoArrayElements, pModeInfoArray, (SDC_APPLY | SDC_SAVE_TO_DATABASE| SDC_ALLOW_CHANGES | SDC_USE_SUPPLIED_DISPLAY_CONFIG));
     if (dwStatus != ERROR_SUCCESS)
     {
@@ -1424 +1430 @@
     DISPLAYCONFIG_PATH_INFO *pPathInfoArray;
     DISPLAYCONFIG_MODE_INFO *pModeInfoArray;
-    UINT NumPathArrayElements = 0;
-    UINT NumModeInfoArrayElements = 0;
+    UINT numPathArrayElements = 0;
+    UINT numModeInfoArrayElements = 0;
     ULONG dwStatus;
 
-    dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements,&NumModeInfoArrayElements);
+    dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &numPathArrayElements, &numModeInfoArrayElements);
     if (dwStatus != ERROR_SUCCESS)
     {
@@ -1434 +1440 @@
         return dwStatus;
     }
-    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(NumPathArrayElements * sizeof(DISPLAYCONFIG_PATH_INFO));
-    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(NumModeInfoArrayElements * sizeof(DISPLAYCONFIG_MODE_INFO));
-    if (!pPathInfoArray || !pModeInfoArray )
-    {
+    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(numPathArrayElements * sizeof(DISPLAYCONFIG_PATH_INFO));
+    if (!pPathInfoArray)
         return ERROR_OUTOFMEMORY;
-    }
-    dwStatus = gCtx.pfnQueryDisplayConfig( QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements, pPathInfoArray,&NumModeInfoArrayElements, pModeInfoArray,NULL);
+    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(numModeInfoArrayElements * sizeof(DISPLAYCONFIG_MODE_INFO));
+    if (!pModeInfoArray )
+    {
+        if (pPathInfoArray)
+        {
+            free(pPathInfoArray);
+        }
+        return ERROR_OUTOFMEMORY;
+    }
+    dwStatus = gCtx.pfnQueryDisplayConfig( QDC_ONLY_ACTIVE_PATHS, &numPathArrayElements, pPathInfoArray,&numModeInfoArrayElements, pModeInfoArray, NULL);
     if (dwStatus != ERROR_SUCCESS)
     {
@@ -1450 +1462 @@
         return dwStatus;
      }
-    for (unsigned int i=0; i < NumPathArrayElements; ++i)
+    for (unsigned int i=0; i < numPathArrayElements; ++i)
     {
         LogRel(("Sourceid= %d and targetid = %d\n", pPathInfoArray[i].sourceInfo.id, pPathInfoArray[i].targetInfo.id));
@@ -1464 +1476 @@
         }
     }
-    dwStatus = gCtx.pfnSetDisplayConfig(NumPathArrayElements, pPathInfoArray, NumModeInfoArrayElements, pModeInfoArray,(SDC_APPLY | SDC_SAVE_TO_DATABASE| SDC_ALLOW_CHANGES | SDC_USE_SUPPLIED_DISPLAY_CONFIG));
-    if (dwStatus != ERROR_SUCCESS) {
+    dwStatus = gCtx.pfnSetDisplayConfig(numPathArrayElements, pPathInfoArray, numModeInfoArrayElements, pModeInfoArray,(SDC_APPLY | SDC_SAVE_TO_DATABASE| SDC_ALLOW_CHANGES | SDC_USE_SUPPLIED_DISPLAY_CONFIG));
+    if (dwStatus != ERROR_SUCCESS)
+    {
         if (pPathInfoArray)
             free(pPathInfoArray);