Changeset 40198 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Feb 21, 2012 2:02:26 PM (13 years ago)

Author:

vboxsync

Message:

VBoxGuest: Implemented (optional) ability to print debug guest output to the release log (Windows guest only atm).

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-win.cpp (modified) (3 diffs)
• VBoxGuest.cpp (modified) (3 diffs)
• VBoxGuestInternal.h (modified) (1 diff)

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

@@ -45 +45 @@
 static NTSTATUS vboxguestwinIOCtl(PDEVICE_OBJECT pDevObj, PIRP pIrp);
 static NTSTATUS vboxguestwinInternalIOCtl(PDEVICE_OBJECT pDevObj, PIRP pIrp);
+static NTSTATUS vboxguestwinRegistryReadDWORD(ULONG ulRoot, PCWSTR pwszPath, PWSTR pwszName, PULONG puValue);
 static NTSTATUS vboxguestwinSystemControl(PDEVICE_OBJECT pDevObj, PIRP pIrp);
 static NTSTATUS vboxguestwinShutdown(PDEVICE_OBJECT pDevObj, PIRP pIrp);
@@ -491 +492 @@
     if (RT_SUCCESS(rc))
     {
+        ULONG ulValue = 0;
+        NTSTATUS s = vboxguestwinRegistryReadDWORD(RTL_REGISTRY_SERVICES, L"VBoxGuest", L"LoggingEnabled",
+                                                   &ulValue);
+        if (NT_SUCCESS(s))
+        {
+            pDevExt->fLoggingEnabled = ulValue >= 0xFF;
+            if (pDevExt->fLoggingEnabled)
+                Log(("Logging to release log enabled (0x%x)", ulValue));
+        }
+
         /* Ready to rumble! */
         Log(("VBoxGuest::vboxguestwinInit: Device is ready!\n"));
@@ -1023 +1034 @@
      * we rely on the pDevExt->u32MousePosChangedSeq to be set to a non-zero value on a mouse event
      * and queue the DPC in our ISR routine in that case doing KeSetEvent from the DPC routine */
+}
+
+
+/**
+ * Queries (gets) a DWORD value from the registry.
+ *
+ * @return  NTSTATUS
+ * @param   ulRoot      Relative path root. See RTL_REGISTRY_SERVICES or RTL_REGISTRY_ABSOLUTE.
+ * @param   pwszPath    Path inside path root.
+ * @param   pwszName    Actual value name to look up.
+ * @param   puValue     On input this can specify the default value (if RTL_REGISTRY_OPTIONAL is
+ *                      not specified in ulRoot), on output this will retrieve the looked up
+ *                      registry value if found.
+ */
+NTSTATUS vboxguestwinRegistryReadDWORD(ULONG ulRoot, PCWSTR pwszPath, PWSTR pwszName,
+                                       PULONG puValue)
+{
+    if (!pwszPath || !pwszName || !puValue)
+        return STATUS_INVALID_PARAMETER;
+
+    ULONG ulDefault = *puValue;
+
+    RTL_QUERY_REGISTRY_TABLE  tblQuery[2];
+    RtlZeroMemory(tblQuery, sizeof(tblQuery));
+    /** @todo Add RTL_QUERY_REGISTRY_TYPECHECK! */
+    tblQuery[0].Flags         = RTL_QUERY_REGISTRY_DIRECT;
+    tblQuery[0].Name          = pwszName;
+    tblQuery[0].EntryContext  = puValue;
+    tblQuery[0].DefaultType   = REG_DWORD;
+    tblQuery[0].DefaultData   = &ulDefault;
+    tblQuery[0].DefaultLength = sizeof(ULONG);
+
+    return RtlQueryRegistryValues(ulRoot,
+                                  pwszPath,
+                                  &tblQuery[0],
+                                  NULL /* Context */,
+                                  NULL /* Environment */);
 }
 

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

@@ -713 +713 @@
     pDevExt->fVRDPEnabled = false;
 #endif
+    pDevExt->fLoggingEnabled = false;
     pDevExt->f32PendingEvents = 0;
     pDevExt->u32MousePosChangedSeq = 0;
@@ -2341 +2342 @@
  * @returns VBox status code.
  *
+ * @param   pDevExt             The device extension.
  * @param   pch                 The log message (need not be NULL terminated).
  * @param   cbData              Size of the buffer.
  * @param   pcbDataReturned     Where to store the amount of returned data. Can be NULL.
  */
-static int VBoxGuestCommonIOCtl_Log(const char *pch, size_t cbData, size_t *pcbDataReturned)
+static int VBoxGuestCommonIOCtl_Log(PVBOXGUESTDEVEXT pDevExt, const char *pch, size_t cbData, size_t *pcbDataReturned)
 {
     NOREF(pch);
     NOREF(cbData);
-    Log(("%.*s", cbData, pch));
+    if (pDevExt->fLoggingEnabled)
+        RTLogBackdoorPrintf("%.*s", cbData, pch);
+    else
+        Log(("%.*s", cbData, pch));
     if (pcbDataReturned)
         *pcbDataReturned = 0;
@@ -2479 +2484 @@
     {
         CHECKRET_MIN_SIZE("LOG", 1);
-        rc = VBoxGuestCommonIOCtl_Log((char *)pvData, cbData, pcbDataReturned);
+        rc = VBoxGuestCommonIOCtl_Log(pDevExt, (char *)pvData, cbData, pcbDataReturned);
     }
     else

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -153 +153 @@
     bool                        fVRDPEnabled;
 #endif
+    /** Flag indicating whether logging to the release log
+     *  is enabled. */
+    bool                        fLoggingEnabled;
     /** Memory balloon information for RTR0MemObjAllocPhysNC(). */
     VBOXGUESTMEMBALLOON         MemBalloon;