儲存庫 vbox 的更動 38731

時間撮記:

2011-9-13 下午01:05:12 (13 年 以前)

作者:

vboxsync

訊息:

VBoxDrvCfg.cpp: Mark non-standard logging and assertions as such instead of wasting time figuring out why '%S' looks all wrong in this file.

檔案:

• trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp (修改) (37 筆差異)

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

@@ -101 +101 @@
 /* we do not use IPRT Logging because the lib is used in host installer and needs to
  * post its msgs to MSI logger */
-#define Log(_m)     do { vboxDrvCfgLogRegular _m ; } while (0)
-#define LogFlow(_m) do { vboxDrvCfgLogFlow _m ; } while (0)
-#define LogRel(_m)  do { vboxDrvCfgLogRel _m ; } while (0)
-#define AssertFailed() vboxDrvCfgPanic()
-#define Assert(_m) do { \
+#define NonStandardLogCrap(_m)     do { vboxDrvCfgLogRegular _m ; } while (0)
+#define NonStandardLogFlowCrap(_m) do { vboxDrvCfgLogFlow _m ; } while (0)
+#define NonStandardLogRelCrap(_m)  do { vboxDrvCfgLogRel _m ; } while (0)
+#define NonStandardAssertFailed() vboxDrvCfgPanic()
+#define NonStandardAssert(_m) do { \
         if (RT_UNLIKELY(!(_m))) {  vboxDrvCfgPanic(); } \
     } while (0)
@@ -168 +168 @@
 HRESULT VBoxDrvCfgStringList::resize(int newSize)
 {
-    Assert(newSize >= mSize);
+    NonStandardAssert(newSize >= mSize);
     if (newSize < mSize)
         return E_FAIL;
@@ -202 +202 @@
     {
         DWORD winEr = GetLastError();
-        LogRel((__FUNCTION__ ": SetupFindFirstLine failed WinEr (%d) for Section(%S), Key(%S)\n", winEr, lpszSection, lpszKey));
+        NonStandardLogRelCrap((__FUNCTION__ ": SetupFindFirstLine failed WinEr (%d) for Section(%S), Key(%S)\n", winEr, lpszSection, lpszKey));
         return HRESULT_FROM_WIN32(winEr);
     }
@@ -216 +216 @@
     {
         winEr = GetLastError();
-//        Assert(winEr == ERROR_INSUFFICIENT_BUFFER);
+//        NonStandardAssert(winEr == ERROR_INSUFFICIENT_BUFFER);
         if (winEr != ERROR_INSUFFICIENT_BUFFER)
         {
-            LogFlow((__FUNCTION__ ": SetupGetStringField failed WinEr (%d) for iValue(%d)\n", winEr, iValue));
+            NonStandardLogFlowCrap((__FUNCTION__ ": SetupGetStringField failed WinEr (%d) for iValue(%d)\n", winEr, iValue));
             return HRESULT_FROM_WIN32(winEr);
         }
@@ -225 +225 @@
 
     LPWSTR lpszValue = (LPWSTR)malloc(cValue * sizeof (lpszValue[0]));
-    Assert(lpszValue);
+    NonStandardAssert(lpszValue);
     if (!lpszValue)
     {
-        LogRel((__FUNCTION__ ": SetCoTaskMemAlloc failed to alloc mem of size (%d), for iValue(%d)\n", cValue * sizeof (lpszValue[0]), winEr, iValue));
+        NonStandardLogRelCrap((__FUNCTION__ ": SetCoTaskMemAlloc failed to alloc mem of size (%d), for iValue(%d)\n", cValue * sizeof (lpszValue[0]), winEr, iValue));
         return E_FAIL;
     }
@@ -235 +235 @@
     {
         winEr = GetLastError();
-        LogRel((__FUNCTION__ ": SetupGetStringField failed WinEr (%d) for iValue(%d)\n", winEr, iValue));
-        Assert(0);
+        NonStandardLogRelCrap((__FUNCTION__ ": SetupGetStringField failed WinEr (%d) for iValue(%d)\n", winEr, iValue));
+        NonStandardAssert(0);
         free(lpszValue);
         return HRESULT_FROM_WIN32(winEr);
@@ -263 +263 @@
     if (hr != S_OK)
     {
-        Log((__FUNCTION__ ": vboxDrvCfgInfQueryContext for Manufacturer failed, hr = (0x%x)\n", hr));
+        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgInfQueryContext for Manufacturer failed, hr = (0x%x)\n", hr));
         return hr;
     }
@@ -270 +270 @@
     if (hr != S_OK)
     {
-        LogRel((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue 1 for Manufacturer failed, hr = (0x%x)\n", hr));
+        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue 1 for Manufacturer failed, hr = (0x%x)\n", hr));
         return hr;
     }
@@ -352 +352 @@
     if (hr != S_OK)
     {
-        Log((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for Manufacturer failed, hr = (0x%x)\n", hr));
+        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for Manufacturer failed, hr = (0x%x)\n", hr));
         return hr;
     }
@@ -360 +360 @@
     if (hr != S_OK)
     {
-        LogRel((__FUNCTION__ ": vboxDrvCfgInfQueryContext for models (%S) failed, hr = (0x%x)\n", lpszModels, hr));
+        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryContext for models (%S) failed, hr = (0x%x)\n", lpszModels, hr));
     }
     else
@@ -367 +367 @@
         if (hr != S_OK)
         {
-            LogRel((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%S) failed, hr = (0x%x)\n", lpszModels, hr));
+            NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%S) failed, hr = (0x%x)\n", lpszModels, hr));
         }
     }
@@ -401 +401 @@
         if (fCopyStyle != SP_COPY_REPLACEONLY || hr != VBOXDRVCFG_S_INFEXISTS)
         {
-            LogRel((__FUNCTION__ ": SetupCopyOEMInf fail winEr (%d)\n", winEr));
+            NonStandardLogRelCrap((__FUNCTION__ ": SetupCopyOEMInf fail winEr (%d)\n", winEr));
         }
         return hr;
@@ -429 +429 @@
         {
             DWORD winEr = GetLastError();
-            LogRel((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%S), oem(%S), winEr (%d)\n", lpszInfPath, DstInfName, winEr));
-            Assert(0);
+            NonStandardLogRelCrap((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%S), oem(%S), winEr (%d)\n", lpszInfPath, DstInfName, winEr));
+            NonStandardAssert(0);
             return HRESULT_FROM_WIN32(winEr);
         }
@@ -482 +482 @@
                             if (!wcsicmp(pHwId, pPnPId))
                             {
-                                Assert(pDrvDetail->InfFileName[0]);
+                                NonStandardAssert(pDrvDetail->InfFileName[0]);
                                 if (pDrvDetail->InfFileName)
                                 {
@@ -493 +493 @@
                     {
                         DWORD winEr = GetLastError();
-                        LogRel((__FUNCTION__": SetupDiGetDriverInfoDetail fail winEr (%d), size(%d)", winEr, dwReq));
-//                        Assert(0);
+                        NonStandardLogRelCrap((__FUNCTION__": SetupDiGetDriverInfoDetail fail winEr (%d), size(%d)", winEr, dwReq));
+//                        NonStandardAssert(0);
                     }
 
@@ -506 +506 @@
                     }
 
-                    Assert(0);
+                    NonStandardAssert(0);
                 }
             }
@@ -518 +518 @@
         {
             winEr = GetLastError();
-            Assert(0);
+            NonStandardAssert(0);
         }
 
@@ -526 +526 @@
     {
         winEr = GetLastError();
-        Assert(0);
+        NonStandardAssert(0);
     }
 
@@ -538 +538 @@
     if (rc != VINF_SUCCESS)
     {
-        LogRel(("Could not init IPRT!, rc (%d)\n", rc));
+        NonStandardLogRelCrap(("Could not init IPRT!, rc (%d)\n", rc));
         return E_FAIL;
     }
@@ -573 +573 @@
 
             vboxDrvCfgInfEnumerationCallback(pRel, &Context);
-//            LogRel(("inf : %S\n", list.get(i)));
+//            NonStandardLogRelCrap(("inf : %S\n", list.get(i)));
         }
     }
@@ -604 +604 @@
                 if (winEr != ERROR_NO_MORE_FILES)
                 {
-                    LogRel((__FUNCTION__": FindNextFile fail winEr (%d)\n", winEr));
-                    Assert(0);
+                    NonStandardLogRelCrap((__FUNCTION__": FindNextFile fail winEr (%d)\n", winEr));
+                    NonStandardAssert(0);
                     hr = HRESULT_FROM_WIN32(winEr);
                 }
@@ -618 +618 @@
         if (winEr != ERROR_NO_MORE_FILES)
         {
-            LogRel((__FUNCTION__": FindFirstFile fail winEr (%d)\n", winEr));
-            Assert(0);
+            NonStandardLogRelCrap((__FUNCTION__": FindFirstFile fail winEr (%d)\n", winEr));
+            NonStandardAssert(0);
             hr = HRESULT_FROM_WIN32(winEr);
         }
@@ -631 +631 @@
     PINFENUM_CONTEXT pContext = (PINFENUM_CONTEXT)pCtxt;
     DWORD winEr;
-//    LogRel(("vboxDrvCfgInfEnumerationCallback: pFileName (%S)\n", pFileName));
+//    NonStandardLogRelCrap(("vboxDrvCfgInfEnumerationCallback: pFileName (%S)\n", pFileName));
 
     HINF hInf = SetupOpenInfFileW(lpszFileName, pContext->InfInfo.lpszClassName, INF_STYLE_WIN4, NULL /*__in PUINT ErrorLine */);
@@ -637 +637 @@
     {
         winEr = GetLastError();
-//        Assert(winEr == ERROR_CLASS_MISMATCH);
+//        NonStandardAssert(winEr == ERROR_CLASS_MISMATCH);
         if (winEr != ERROR_CLASS_MISMATCH)
         {
-            Log((__FUNCTION__ ": SetupOpenInfFileW err winEr (%d)\n", winEr));
+            NonStandardLogCrap((__FUNCTION__ ": SetupOpenInfFileW err winEr (%d)\n", winEr));
         }
 
@@ -658 +658 @@
             {
                 winEr = GetLastError();
-                LogRel((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%S), winEr (%d)\n", lpszFileName, winEr));
-                Assert(0);
+                NonStandardLogRelCrap((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%S), winEr (%d)\n", lpszFileName, winEr));
+                NonStandardAssert(0);
                 hr = HRESULT_FROM_WIN32( winEr );
             }
@@ -668 +668 @@
     else
     {
-        Log((__FUNCTION__ ": vboxDrvCfgInfQueryFirstPnPId failed, hr = (0x%x)\n", hr));
+        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgInfQueryFirstPnPId failed, hr = (0x%x)\n", hr));
     }
 
@@ -684 +684 @@
             SHGFP_TYPE_CURRENT, /*DWORD dwFlags*/
             InfDirPath);
-    Assert(hr == S_OK);
+    NonStandardAssert(hr == S_OK);
     if (hr == S_OK)
     {
@@ -695 +695 @@
         Context.hr = S_OK;
         hr = vboxDrvCfgEnumFiles(InfDirPath, vboxDrvCfgInfEnumerationCallback, &Context);
-        Assert(hr == S_OK);
+        NonStandardAssert(hr == S_OK);
         if (hr == S_OK)
         {
@@ -702 +702 @@
         else
         {
-            LogRel((__FUNCTION__": vboxDrvCfgEnumFiles failed, hr = (0x%x)\n", hr));
+            NonStandardLogRelCrap((__FUNCTION__": vboxDrvCfgEnumFiles failed, hr = (0x%x)\n", hr));
         }
     }
     else
     {
-        LogRel((__FUNCTION__": SHGetFolderPathW failed, hr = (0x%x)\n", hr));
+        NonStandardLogRelCrap((__FUNCTION__": SHGetFolderPathW failed, hr = (0x%x)\n", hr));
     }
 
@@ -728 +728 @@
     {
         DWORD winEr = GetLastError();
-        LogRel((__FUNCTION__": OpenSCManager failed, winEr (%d)\n", winEr));
+        NonStandardLogRelCrap((__FUNCTION__": OpenSCManager failed, winEr (%d)\n", winEr));
         return HRESULT_FROM_WIN32(winEr);
     }
@@ -743 +743 @@
             {
                 DWORD winEr = GetLastError();
-                LogRel((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
+                NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
                 hr = HRESULT_FROM_WIN32(winEr);
                 break;
@@ -750 +750 @@
             if (Status.dwCurrentState != SERVICE_RUNNING && Status.dwCurrentState != SERVICE_START_PENDING)
             {
-                LogRel(("Starting service (%S)\n", lpszSvcName));
+                NonStandardLogRelCrap(("Starting service (%S)\n", lpszSvcName));
 
                 fRc = StartService(hSvc, 0, NULL);
@@ -756 +756 @@
                 {
                     DWORD winEr = GetLastError();
-                    LogRel((__FUNCTION__": StartService failed winEr (%d)\n", winEr));
+                    NonStandardLogRelCrap((__FUNCTION__": StartService failed winEr (%d)\n", winEr));
                     hr = HRESULT_FROM_WIN32(winEr);
                     break;
@@ -766 +766 @@
             {
                 DWORD winEr = GetLastError();
-                LogRel((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
+                NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
                 hr = HRESULT_FROM_WIN32(winEr);
                 break;
@@ -780 +780 @@
                     {
                         DWORD winEr = GetLastError();
-                        LogRel((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
+                        NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed winEr (%d)\n", winEr));
                         hr = HRESULT_FROM_WIN32(winEr);
                         break;
@@ -791 +791 @@
             if (hr != S_OK || Status.dwCurrentState != SERVICE_RUNNING)
             {
-                LogRel((__FUNCTION__": Failed to start the service\n"));
+                NonStandardLogRelCrap((__FUNCTION__": Failed to start the service\n"));
                 hr = E_FAIL;
                 break;
@@ -803 +803 @@
     {
         DWORD winEr = GetLastError();
-        LogRel((__FUNCTION__": OpenServiceW failed, winEr (%d)\n", winEr));
+        NonStandardLogRelCrap((__FUNCTION__": OpenServiceW failed, winEr (%d)\n", winEr));
         hr = HRESULT_FROM_WIN32(winEr);
     }