Changeset 43450 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 27, 2012 11:49:53 AM (13 years ago)

Author:

vboxsync

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

80972

Message:

Device/Parallel: Increased instrumentation for debugging parallel port issue. Will revert it soon..

File:

• trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -335 +335 @@
     LOG_CONF  nextLogConf;
     RES_DES   rdPrevResDes;
-    uint32_t  u32ParportAddr;
+    uint32_t  u32ParportAddr = 0;
 
     wHeaderSize = sizeof(IO_DES);
@@ -355 +355 @@
     {
         u32Size = 0;
-        if ((cmRet = CM_Get_Res_Des_Data_Size((PULONG)(&u32Size), nextLogConf, 0L)) != CR_SUCCESS
-            &&  !(pBuf = (uint8_t *)RTMemAlloc(u32Size + 1))
-            &&   (cmRet = CM_Get_Res_Des_Data(nextLogConf, pBuf, u32Size, 0L)) != CR_SUCCESS
-            )
+        cmRet = CM_Get_Res_Des_Data_Size((PULONG)(&u32Size), nextLogConf, 0L);
+        if (cmRet != CR_SUCCESS)
         {
+            LogFlowFunc("Failed to get Size \n");
+            CM_Free_Res_Des_Handle(nextLogConf);
+            break;
+        }
+
+        pBuf = (uint8_t *)RTMemAlloc(u32Size + 1)
+        if (!pBuf)
+        {
+            LogFlowFunc("Failed to get Buf %d\n", u32Size);
+            CM_Free_Res_Des_Handle(nextLogConf);
+            break;
+        }
+        cmRet = CM_Get_Res_Des_Data(nextLogConf, pBuf, u32Size, 0L);
+        if (cmRet != CR_SUCCESS)
+        {
+            LogFlowFunc("Failed to get Des Data \n");
             CM_Free_Res_Des_Handle(nextLogConf);
             if (pBuf)
                 RTMemFree(pBuf);
             break;
-
         }
+
         LogFlowFunc(("call GetIOResource\n"));
-        u32ParportAddr = ((IO_DES *)pBuf)->IOD_Alloc_Base;
+        if (pBuf)
+            u32ParportAddr = ((IO_DES *)pBuf)->IOD_Alloc_Base;
+        else
+            LogFlowFunc("pBuf Not Available \n");
         LogFlowFunc(("called GetIOResource, ret=%#x\n", u32ParportAddr));
         rdPrevResDes = 0;
@@ -375 +392 @@
                                     0L,
                                     0L);
-        RTMemFree(pBuf);
+        if (pBuf)
+            RTMemFree(pBuf);
         if (cmRet != CR_SUCCESS)
            break;