Changeset 45938 in vbox for trunk/src/VBox/Additions

Timestamp:

May 7, 2013 3:52:46 PM (12 years ago)

Author:

vboxsync

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

85578

Message:

Windows Guest Additions installer: New try for installing the services section of supplied filter drivers in silent mode.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Installer/VBoxDrvInst.cpp (modified) (2 diffs)
• Mouse/NT5/VBoxMouse.inf (modified) (2 diffs)

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

@@ -354 +354 @@
 }
 
+static UINT WINAPI vboxDrvInstExecuteInfFileCallback(PVOID Context,
+                                                     UINT Notification,
+                                                     UINT_PTR Param1,
+                                                     UINT_PTR Param2)
+{
+#ifdef DEBUG
+    _tprintf (_T( "Got installation notification %u\n"), Notification);
+#endif
+
+    switch (Notification)
+    {
+        case SPFILENOTIFY_NEEDMEDIA:
+            _tprintf (_T( "Requesting installation media ...\n"));
+            break;
+
+        case SPFILENOTIFY_STARTCOPY:
+            _tprintf (_T( "Copying driver files to destination ...\n"));
+            break;
+
+        case SPFILENOTIFY_TARGETNEWER:
+        case SPFILENOTIFY_TARGETEXISTS:
+            return TRUE;
+    }
+
+    return SetupDefaultQueueCallback(Context, Notification, Param1, Param2);
+}
+
 /**
  * Executes a sepcified .INF section to install/uninstall drivers and/or services.
@@ -364 +391 @@
 int ExecuteInfFile(const _TCHAR *pszSection, int iMode, const _TCHAR *pszInf)
 {
-    _tprintf(_T("Executing INF-File: %ws (Section: %ws) ...\n"), pszInf, pszSection);
-
-    /* Executed by the installer that already has proper privileges. */
-    _TCHAR szCommandLine[_MAX_PATH + 1] = { 0 };
-    swprintf(szCommandLine, sizeof(szCommandLine), TEXT( "%ws %d %ws" ), pszSection, iMode, pszInf);
-
-#ifdef DEBUG
-    _tprintf (_T( "Commandline: %ws\n"), szCommandLine);
-#endif
-
-    InstallHinfSection(NULL, NULL, szCommandLine, SW_SHOW);
-    /* No return value given! */
+    _tprintf(_T("Installing from INF-File: %ws (Section: %ws) ...\n"),
+             pszInf, pszSection);
+
+    UINT uErrorLine = 0;
+    HINF hINF = SetupOpenInfFile(pszInf, NULL, INF_STYLE_WIN4, &uErrorLine);
+    if (hINF != INVALID_HANDLE_VALUE)
+    {
+        PVOID pvQueue = SetupInitDefaultQueueCallback(NULL);
+
+        BOOL fSuccess = SetupInstallFromInfSection(NULL,
+                                                    hINF,
+                                                    pszSection,
+                                                    SPINST_ALL,
+                                                    HKEY_LOCAL_MACHINE,
+                                                    NULL,
+                                                    SP_COPY_NEWER_OR_SAME | SP_COPY_NOSKIP,
+                                                    vboxDrvInstExecuteInfFileCallback,
+                                                    pvQueue,
+                                                    NULL,
+                                                    NULL
+                                                    );
+        if (fSuccess)
+        {
+            _tprintf (_T( "File installation stage successful\n"));
+
+            fSuccess = SetupInstallServicesFromInfSection(hINF,
+                                                          L"DefaultInstall.Services",
+                                                          0 /* Flags */);
+            if (fSuccess)
+            {
+                _tprintf (_T( "Service installation stage successful. Installation completed\n"));
+            }
+            else
+            {
+                DWORD dwErr = GetLastError();
+                switch (dwErr)
+                {
+                    case ERROR_SUCCESS_REBOOT_REQUIRED:
+                        _tprintf (_T( "A reboot is required to complete the installation\n"));
+                        break;
+
+                    case ERROR_SECTION_NOT_FOUND:
+                        break;
+
+                    default:
+                        _tprintf (_T( "Error %ld while installing service\n"), dwErr);
+                        break;
+                }
+            }
+        }
+        else
+            _tprintf (_T( "Error %ld while installing files\n"), GetLastError());
+
+        if (pvQueue)
+            SetupTermDefaultQueueCallback(pvQueue);
+
+        SetupCloseInfFile(hINF);
+    }
+    else
+        _tprintf (_T( "Unable to open %ws: %ld (error line %u)\n"),
+                  pszInf, GetLastError(), uErrorLine);
 
     return EXIT_OK;

trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf

@@ -35 +35 @@
 ;amd64 %ORACLE%=VBoxMouse, NTamd64
 
+[VBoxMouse_Install]
+CopyFiles = @VBoxMouse.sys
+
+[VBoxMouse_Install.Services]
+AddService = VBoxMouse,,VBoxMouse.Service
+
 [DefaultInstall]
-;
-; DefaultInstall section is used to install the class filter driver.
-;
 CopyFiles = @VBoxMouse.sys
-AddReg = VBoxMouse_AddReg
 
-[VBoxMouse_AddReg]
+[DefaultInstall.Services]
+AddService = VBoxMouse,,VBoxMouse.Service
+
+[VBoxMouse.AddRegistry]
 HKLM, System\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}, UpperFilters, 0x00010000, "VBoxMouse", "mouclass"
 
-[DefaultInstall.Services]
-AddService = VBoxMouse, , VBoxMouse_Service_Inst
-
-
-[VBoxMouse_Service_Inst]
+[VBoxMouse.Service]
 DisplayName    = %VBoxMouse.SvcDesc%
 ServiceType    = %SERVICE_KERNEL_DRIVER%
@@ -55 +56 @@
 ErrorControl   = %SERVICE_ERROR_IGNORE%
 ServiceBinary  = %12%\VBoxMouse.sys
-
+AddReg         = VBoxMouse.AddRegistry
 
 [Strings]