Changeset 35703 in vbox

Timestamp:

Jan 25, 2011 11:16:27 AM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Log driver installation.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxDrvInst.cpp (modified) (6 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

@@ -122 +122 @@
 void LogCallback(DIFXAPI_LOG Event, DWORD dwError, PCWSTR pEventDescription, PVOID pCallbackContext)
 {
-#ifdef DEBUG
     if (dwError == 0)
         _tprintf(_T("(%u) %ws\n"), Event, pEventDescription);
     else
         _tprintf(_T("(%u) ERROR: %u - %ws\n"), Event, dwError, pEventDescription);
-#else
-    if (dwError > 0)
-        _tprintf(_T("ERROR: (%u) %u - %ws\n"), Event, dwError, pEventDescription);
-#endif
 
      if (pCallbackContext)
@@ -144 +139 @@
  * @param   fSilent             Flag indicating a silent installation (TRUE) or not (FALSE).
  */
-int VBoxInstallDriver(const BOOL fInstall, const _TCHAR *pszDriverPath, BOOL fSilent)
+int VBoxInstallDriver(const BOOL fInstall, const _TCHAR *pszDriverPath, BOOL fSilent,
+                      const _TCHAR *pszLogFile)
 {
     HRESULT hr = ERROR_SUCCESS;
@@ -188 +184 @@
     {
         FILE *fh = NULL;
-#ifdef DEBUG
-        char szLogFile[MAX_PATH + 1];
-        sprintf(szLogFile, VBOX_DRVINST_LOGFILE);
-        fh = fopen(szLogFile, "a");
-        if (!fh)
-            _tprintf(_T("ERROR: Unable to create log file!\n"));
-        else
-             _tprintf(_T("Logging enabled ...\n"));
-#endif
-        g_pfnDIFXAPISetLogCallback(LogCallback, fh);
+        if (pszLogFile)
+        {
+            fh = _wfopen(pszLogFile, _T("a"));
+            if (!fh)
+                _tprintf(_T("ERROR: Unable to create log file!\n"));
+            g_pfnDIFXAPISetLogCallback(LogCallback, fh);
+        }
 
         INSTALLERINFO instInfo =
@@ -337 +330 @@
             }
             g_pfnDIFXAPISetLogCallback(NULL, NULL);
-#ifdef DEBUG
             if (fh)
                 fclose(fh);
-#endif
             if (SUCCEEDED(hr))
             {
@@ -1010 +1001 @@
     _tprintf(_T("\n"));
     _tprintf(_T("Drivers:\n"));
-    _tprintf(_T("\tVBoxDrvInst         driver install <inf-file>\n"));
-    _tprintf(_T("\tVBoxDrvInst         driver uninstall <inf-file>\n"));
+    _tprintf(_T("\tVBoxDrvInst         driver install <inf-file> [log file]\n"));
+    _tprintf(_T("\tVBoxDrvInst         driver uninstall <inf-file> [log file]\n"));
     _tprintf(_T("\tVBoxDrvInst         driver executeinf <inf-file>\n"));
     _tprintf(_T("\n"));
@@ -1056 +1047 @@
                 {
                     _stprintf(szINF, _T("%ws"), argv[3]);
-                    rc = VBoxInstallDriver(!_tcsicmp(argv[2], _T("install")) ? TRUE : FALSE, szINF, FALSE);
+
+                    _TCHAR szLogFile[_MAX_PATH] = { 0 };
+                    if (argc > 4)
+                        _stprintf(szLogFile, _T("%ws"), argv[4]);
+                    rc = VBoxInstallDriver(!_tcsicmp(argv[2], _T("install")) ? TRUE : FALSE, szINF,
+                                           FALSE /* Not silent */, szLogFile[0] != NULL ? szLogFile : NULL);
                 }
             }

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -345 +345 @@
   ${If} $g_bNoGuestDrv == "false"
     DetailPrint "Installing guest driver ..."
-    nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxGuest.inf"'
+    nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxGuest.inf" "$INSTDIR\install_drivers.log"'
     Pop $0 ; Ret value
     LogText "Guest driver returned: $0"
@@ -356 +356 @@
     ${If} $g_bWithWDDM == "true"
       DetailPrint "Installing WDDM video driver ..."
-      nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoWddm.inf"'
+      nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoWddm.inf" "$INSTDIR\install_drivers.log"'
     ${Else}
       DetailPrint "Installing video driver ..."
-      nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideo.inf"'
+      nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideo.inf" "$INSTDIR\install_drivers.log"'
     ${EndIf}
     Pop $0 ; Ret value