Changeset 46428 in vbox

Timestamp:

Jun 7, 2013 8:26:18 AM (12 years ago)

Author:

vboxsync

Message:

VBoxTray/VBoxGuest: better caps tracking logging

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxTray.cpp (modified) (12 diffs)
• common/VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -1437 +1437 @@
     DWORD cbReturned = 0;
     VBoxGuestCapsAquire Info;
+    Log(("VBoxTray: VBoxAcquireGuestCaps or(0x%x), not(0x%x), cfx(%d)\n", fOr, fNot, fCfg));
     Info.enmFlags = fCfg ? VBOXGUESTCAPSACQUIRE_FLAGS_CONFIG_ACQUIRE_MODE : VBOXGUESTCAPSACQUIRE_FLAGS_NONE;
     Info.rc = VERR_NOT_IMPLEMENTED;
@@ -1444 +1445 @@
     {
         DWORD LastErr = GetLastError();
-        WARN(("DeviceIoControl VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed LastErr %d\n", LastErr));
+        WARN(("VBoxTray: DeviceIoControl VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed LastErr %d\n", LastErr));
         return RTErrConvertFromWin32(LastErr);
     }
@@ -1451 +1452 @@
     if (!RT_SUCCESS(rc))
     {
-        WARN(("VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed rc %d\n", rc));
+        WARN(("VBoxTray: VBOXGUEST_IOCTL_GUEST_CAPS_ACQUIRE failed rc %d\n", rc));
         return rc;
     }
@@ -1496 +1497 @@
     if (fEnabled)
     {
+        Log(("VBoxTray: vboxCapsOnEnableSeamles: ENABLED\n"));
         Assert(pCap->enmAcState == VBOXCAPS_ENTRY_ACSTATE_ACQUIRED);
         Assert(pCap->enmFuncState == VBOXCAPS_ENTRY_FUNCSTATE_STARTED);
@@ -1502 +1504 @@
     else
     {
+        Log(("VBoxTray: vboxCapsOnEnableSeamles: DISABLED\n"));
         Assert(pCap->enmAcState != VBOXCAPS_ENTRY_ACSTATE_ACQUIRED || pCap->enmFuncState != VBOXCAPS_ENTRY_FUNCSTATE_STARTED);
         VBoxSeamlessRemoveHook();
@@ -1510 +1513 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
+
+    Log(("VBoxTray: vboxCapsEntryAcStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
+            enmAcState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
+
     if (pCap->enmAcState == enmAcState)
         return;
@@ -1534 +1541 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
+
+    Log(("VBoxTray: vboxCapsEntryFuncStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
+            enmFuncState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
+
     if (pCap->enmFuncState == enmFuncState)
         return;
@@ -1579 +1590 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
+    Log(("VBoxTray: VBoxCapsReleaseAll\n"));
     int rc = VBoxAcquireGuestCaps(0, VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, false);
     if (!RT_SUCCESS(rc))
@@ -1588 +1600 @@
     if (pConsole->idTimer)
     {
+        Log(("VBoxTray: killing console timer\n"));
         KillTimer(ghwndToolWindow, pConsole->idTimer);
         pConsole->idTimer = 0;
@@ -1664 +1677 @@
     if (pCap->enmAcState == VBOXCAPS_ENTRY_ACSTATE_RELEASED)
     {
-        WARN(("invalid cap[%d] state[%d] on release\n", iCap, pCap->enmAcState));
+        WARN(("VBoxTray: invalid cap[%d] state[%d] on release\n", iCap, pCap->enmAcState));
         return VERR_INVALID_STATE;
     }
@@ -1684 +1697 @@
     Assert(VBoxConsoleIsAllowed());
     VBOXCAPS_ENTRY *pCap = &pConsole->aCaps[iCap];
+    Log(("VBoxTray: VBoxCapsEntryAcquire %d\n", iCap));
     if (pCap->enmAcState != VBOXCAPS_ENTRY_ACSTATE_RELEASED)
     {
-        WARN(("invalid cap[%d] state[%d] on acquire\n", iCap, pCap->enmAcState));
+        WARN(("VBoxTray: invalid cap[%d] state[%d] on acquire\n", iCap, pCap->enmAcState));
         return VERR_INVALID_STATE;
     }
@@ -1725 +1739 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
+    Log(("VBoxTray: VBoxCapsAcquireAllSupported\n"));
     for (int i = 0; i < RT_ELEMENTS(pConsole->aCaps); ++i)
     {
         if (pConsole->aCaps[i].enmFuncState >= VBOXCAPS_ENTRY_FUNCSTATE_SUPPORTED)
+        {
+            Log(("VBoxTray: VBoxCapsAcquireAllSupported acquiring cap %d, state %d\n", i, pConsole->aCaps[i].enmFuncState));
             VBoxCapsEntryAcquire(i);
+        }
+        else
+        {
+            WARN(("VBoxTray: VBoxCapsAcquireAllSupported: WARN: cap %d not supported, state %d\n", i, pConsole->aCaps[i].enmFuncState));
+        }
     }
     return VINF_SUCCESS;

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -2544 +2544 @@
     uint32_t fSetCaps = 0;
 
+    LogRel(("VBoxGuest: VBoxGuestCommonGuestCapsAcquire: pSession(0x%p), OR(0x%x), NOT(0x%x), flags(0x%x)\n", pSession, fOrMask, fNotMask, enmFlags));
+
     if (!VBoxGuestCommonGuestCapsValidateValues(fOrMask))
     {
@@ -2618 +2620 @@
     if (!RT_SUCCESS(rc))
     {
+        LogRel(("VBoxGuest: VBoxGuestCommonGuestCapsAcquire: VBoxGuestSetGuestCapabilities failed, rc %d\n", rc));
+
         /* Failure branch
          * this is generally bad since e.g. failure to release the caps may result in other sessions not being able to use it