vbox的更動 67493 路徑 trunk/src/VBox/HostDrivers

時間撮記:

2017-6-20 上午10:23:42 (7 年 以前)

作者:

vboxsync

訊息:

HostDrivers/Support/win: translate the error when the VBoxDrv module cannot be unloaded to VERR_RESOURCE_BUSY

檔案:

• trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp (修改) (1 筆差異)

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -390 +390 @@
             {
                 dwErr = GetLastError();
-                AssertMsgFailed(("ControlService failed with dwErr=%Rwa. status=%d\n", dwErr, Status.dwCurrentState));
-                rc = RTErrConvertFromWin32(dwErr);
+                if (   Status.dwCurrentState == SERVICE_STOP_PENDING
+                    && dwErr == ERROR_SERVICE_CANNOT_ACCEPT_CTRL)
+                    rc = VERR_RESOURCE_BUSY;    /* better than VERR_GENERAL_FAILURE */
+                else
+                {
+                    AssertMsgFailed(("ControlService failed with dwErr=%Rwa. status=%d\n", dwErr, Status.dwCurrentState));
+                    rc = RTErrConvertFromWin32(dwErr);
+                }
             }
             CloseServiceHandle(hService);