Changeset 44432 in vbox for trunk/src

Timestamp:

Jan 28, 2013 4:11:29 PM (12 years ago)

Author:

vboxsync

Message:

Reverted r83294 - doesn't work with DefaultInstall.Service sections.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp (modified) (4 diffs)

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

@@ -57 +57 @@
 } DIFXAPI_LOG;
 
-typedef void (WINAPI * DIFXLOGCALLBACK_W) (DIFXAPI_LOG Event, DWORD Error, PCWSTR EventDescription, PVOID CallbackContext);
-typedef void ( __cdecl* DIFXAPILOGCALLBACK_W) (DIFXAPI_LOG Event, DWORD Error, PCWSTR EventDescription, PVOID CallbackContext);
+typedef void (WINAPI * DIFXLOGCALLBACK_W)( DIFXAPI_LOG Event, DWORD Error, PCWSTR EventDescription, PVOID CallbackContext);
+typedef void ( __cdecl* DIFXAPILOGCALLBACK_W)( DIFXAPI_LOG Event, DWORD Error, PCWSTR EventDescription, PVOID CallbackContext);
 
 typedef DWORD (WINAPI *fnDriverPackageInstall) (PCTSTR DriverPackageInfPath, DWORD Flags, PCINSTALLERINFO pInstallerInfo, BOOL *pNeedReboot);
@@ -68 +68 @@
 typedef VOID (WINAPI *fnDIFXAPISetLogCallback) (DIFXAPILOGCALLBACK_W LogCallback, PVOID CallbackContext);
 fnDIFXAPISetLogCallback g_pfnDIFXAPISetLogCallback = NULL;
-
-typedef HRESULT (WINAPI *fnLaunchINFSectionEx) (HWND hwnd, HINSTANCE hInst, PSTR pszParams, INT nShow);
-fnLaunchINFSectionEx g_pfnLaunchINFSectionEx = NULL;
 
 /* Defines */
@@ -361 +358 @@
  *
  * @return  Exit code (EXIT_OK, EXIT_FAIL)
- * @param   pszInf              Full qualified path of the .INF file to use.
  * @param   pszSection          Section to execute; usually it's "DefaultInstall".
  * @param   iMode               Execution mode to use (see MSDN).
+ * @param   pszInf              Full qualified path of the .INF file to use.
  */
-int ExecuteInfFile(const _TCHAR *pszInf, const _TCHAR *pszSection, int iMode)
+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. */
-
-    HRESULT hr = S_OK;
-    HMODULE hAdvPack = LoadLibrary(_T("advpack.dll"));
-    if (NULL == hAdvPack)
-    {
-        _tprintf(_T("ERROR: Unable to locate advpack.dll!\n"));
-        hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
-    }
-    else
-    {
-        g_pfnLaunchINFSectionEx = (fnLaunchINFSectionEx)GetProcAddress(hAdvPack, "LaunchINFSectionEx");
-        if (g_pfnLaunchINFSectionEx == NULL)
-        {
-            _tprintf(_T("ERROR: Unable to retrieve entry point for LaunchINFSectionEx!\n"));
-            hr = HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND);
-        }
-    }
+    _TCHAR szCommandLine[_MAX_PATH + 1] = { 0 };
+    swprintf(szCommandLine, sizeof(szCommandLine), TEXT( "%ws %d %ws" ), pszSection, iMode, pszInf);
 
 #ifdef DEBUG
-    _tprintf (_T( "pfnLaunchINFSectionEx=%p\n"), g_pfnLaunchINFSectionEx);
+    _tprintf (_T( "Commandline: %ws\n"), szCommandLine);
 #endif
 
-    if (!g_pfnLaunchINFSectionEx)
-    {
-        _TCHAR szCommandLine[_MAX_PATH + 1] = { 0 };
-
-        swprintf(szCommandLine, sizeof(szCommandLine), TEXT("%ws %d %ws"),
-                 pszSection, iMode, pszInf);
-
-        InstallHinfSection(NULL /* hWnd */, NULL /* hInst */,
-                           szCommandLine, SW_SHOW);
-        /* No return value given! */
-    }
-    else
-    {
-        char szCommandLine[_MAX_PATH + 1] = { 0 };
-
-        /* 4 means silent mode. */
-        _snprintf(szCommandLine, sizeof(szCommandLine), "%ws,%ws,,4",
-                  pszInf, pszSection);
-
-        hr = g_pfnLaunchINFSectionEx(NULL /* hWnd */, NULL /* hInst */,
-                                     szCommandLine, 0 /* Not used */);
-        if (FAILED(hr))
-            _tprintf(_T("ERROR: LaunchINFSectionEx failed: 0x%08lx\n"), hr);
-    }
-
-    if (NULL != hAdvPack)
-       FreeLibrary(hAdvPack);
+    InstallHinfSection(NULL, NULL, szCommandLine, SW_SHOW);
+    /* No return value given! */
 
     return EXIT_OK;
@@ -1110 +1067 @@
             {
                 _sntprintf(szINF, sizeof(szINF) / sizeof(TCHAR), _T("%ws"), argv[3]);
-                rc = ExecuteInfFile(szINF, _T("DefaultInstall"), 132);
+                rc = ExecuteInfFile(_T("DefaultInstall"), 132, szINF);
             }
         }