Changeset 44732 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Feb 18, 2013 1:20:55 PM (12 years ago)

Author:

vboxsync

Message:

WINNT/VBoxTray: Fixed code error in rev 83832 .

File:

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

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

@@ -1362 +1362 @@
     ULONG dwStatus;
 
-    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(NumPathArrayElements);
-    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(NumModeInfoArrayElements);
-    if (!pPathInfoArray || !pModeInfoArray ) {
-        return ERROR_OUTOFMEMORY;
-    }
     dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements,&NumModeInfoArrayElements);
     if (dwStatus != ERROR_SUCCESS)
     {
         LogFlow(("VBoxTray: (WDDM) Failed GetDisplayConfigBufferSizes \n"));
-        if (pPathInfoArray)
-            free(pPathInfoArray);
-        if (pModeInfoArray)
-            free(pModeInfoArray);
         return dwStatus;
     }
-    dwStatus = gCtx.pfnQueryDisplayConfig(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements, &pPathInfoArray[0],&NumModeInfoArrayElements, &pModeInfoArray[0],NULL);
+    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(NumPathArrayElements * sizeof(DISPLAYCONFIG_PATH_INFO));
+    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(NumModeInfoArrayElements * sizeof(DISPLAYCONFIG_MODE_INFO));
+    if (!pPathInfoArray || !pModeInfoArray )
+    {
+        return ERROR_OUTOFMEMORY;
+    }
+    dwStatus = gCtx.pfnQueryDisplayConfig(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements, pPathInfoArray,&NumModeInfoArrayElements, pModeInfoArray,NULL);
     if (dwStatus != ERROR_SUCCESS)
     {
@@ -1406 +1403 @@
         }
     }
-    dwStatus = gCtx.pfnSetDisplayConfig(NumPathArrayElements, &pPathInfoArray[0],NumModeInfoArrayElements, &pModeInfoArray[0],(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)
     {
@@ -1416 +1413 @@
         return dwStatus;
     }
+    if (pPathInfoArray)
+        free(pPathInfoArray);
+    if (pModeInfoArray)
+        free(pModeInfoArray);
     return ERROR_SUCCESS;
 }
@@ -1427 +1428 @@
     ULONG dwStatus;
 
-    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(NumPathArrayElements);
-    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(NumModeInfoArrayElements);
-    if (!pPathInfoArray || !pModeInfoArray ) {
-        return ERROR_OUTOFMEMORY;
-    }
     dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements,&NumModeInfoArrayElements);
     if (dwStatus != ERROR_SUCCESS)
     {
         LogFlow(("VBoxTray: (WDDM) Failed GetDisplayConfigBufferSizes \n"));
-        if (pPathInfoArray)
-            free(pPathInfoArray);
-        if (pModeInfoArray)
-            free(pModeInfoArray);
         return dwStatus;
     }
-    dwStatus = gCtx.pfnQueryDisplayConfig( QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements, &pPathInfoArray[0],&NumModeInfoArrayElements, &pModeInfoArray[0],NULL);
+    pPathInfoArray = (DISPLAYCONFIG_PATH_INFO *)malloc(NumPathArrayElements * sizeof(DISPLAYCONFIG_PATH_INFO));
+    pModeInfoArray = (DISPLAYCONFIG_MODE_INFO *)malloc(NumModeInfoArrayElements * sizeof(DISPLAYCONFIG_MODE_INFO));
+    if (!pPathInfoArray || !pModeInfoArray )
+    {
+        return ERROR_OUTOFMEMORY;
+    }
+    dwStatus = gCtx.pfnQueryDisplayConfig( QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements, pPathInfoArray,&NumModeInfoArrayElements, pModeInfoArray,NULL);
     if (dwStatus != ERROR_SUCCESS)
     {
@@ -1466 +1464 @@
         }
     }
-    dwStatus = gCtx.pfnSetDisplayConfig(NumPathArrayElements, &pPathInfoArray[0],NumModeInfoArrayElements, &pModeInfoArray[0],(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) {
         if (pPathInfoArray)