Changeset 38268 in vbox

Timestamp:

Aug 1, 2011 5:03:03 PM (13 years ago)

Author:

vboxsync

Message:

usb/win: logging fixes

Location:

trunk/src/VBox/HostDrivers

Files:

• VBoxUSB/win/mon/VBoxUsbMon.cpp (modified) (8 diffs)
• win/VBoxDbgLog.h (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp

@@ -216 +216 @@
     for (int i = 0; i < 16; i++)
     {
-        WCHAR           szwHubName[32];
-        char            szHubName[32];
+        WCHAR           szwHubName[32] = {};
+        char            szHubName[32] = {};
         ANSI_STRING     AnsiName;
         UNICODE_STRING  UnicodeName;
@@ -246 +246 @@
                 {
                     LOG(("Associated driver"));
-                    LOG_STRW(pHubDevObj->DriverObject->DriverName.Buffer);
+                    LOG_USTR(&pHubDevObj->DriverObject->DriverName);
                     LOG(("pnp handler %p\n", pHubDevObj->DriverObject->MajorFunction[IRP_MJ_PNP]));
 
@@ -256 +256 @@
             else
             {
-                WARN(("IoGetDeviceObjectPointer returned Status (0x%x) for %S", Status, szwHubName));
+                WARN(("IoGetDeviceObjectPointer returned Status (0x%x) for (%S)", Status, szwHubName));
             }
         }
         else
         {
-            WARN(("RtlAnsiStringToUnicodeString failed, Status (0x%x)", Status));
+            WARN(("RtlAnsiStringToUnicodeString failed, Status (0x%x) for Ansu name (%s)", Status, szHubName));
         }
     }
@@ -841 +841 @@
     Assert(pFileObj->FsContext);
     PVBOXUSBMONCTX pCtx = (PVBOXUSBMONCTX)pFileObj->FsContext;
+
+    LOG(("VBoxUsbMonClose"));
+
     NTSTATUS Status = vboxUsbMonContextClose(pCtx);
     if (Status != STATUS_SUCCESS)
@@ -859 +862 @@
             WARN(("ulPreventUnloadOn already set"));
         }
+        LOG(("success!!"));
         Status = STATUS_SUCCESS;
     }
@@ -875 +879 @@
     NTSTATUS Status;
 
-    LOG(("VBoxUSBMonCreate\n"));
+    LOG(("VBoxUSBMonCreate"));
 
     if (pStack->Parameters.Create.Options & FILE_DIRECTORY_FILE)
     {
-        WARN(("trying to open as a directory\n"));
+        WARN(("trying to open as a directory"));
         pIrp->IoStatus.Status = STATUS_NOT_A_DIRECTORY;
         pIrp->IoStatus.Information = 0;
@@ -896 +900 @@
     else
     {
-        WARN(("vboxUsbMonContextCreate failed Status (0x%x)\n", Status));
+        WARN(("vboxUsbMonContextCreate failed Status (0x%x)", Status));
     }
 
@@ -1244 +1248 @@
 {
 #ifdef DEBUG_misha
-    RTLogGroupSettings(0, "+default.e.l.f.l2.l3");;
+    RTLogGroupSettings(0, "+default.e.l.f.l2.l3");
+    RTLogDestinations(0, "debugger");
 #endif
 

trunk/src/VBox/HostDrivers/win/VBoxDbgLog.h

@@ -61 +61 @@
 #define _LOGMSG_STR(_logger, _a, _f) do {\
         int _i = 0; \
+        _logger(("\"")); \
         for (;(_a)[_i];++_i) { \
             _logger(("%"_f, (_a)[_i])); \
         }\
-        _logger(("\n")); \
+        _logger(("\"\n")); \
+    } while (0)
+
+#define _LOGMSG_USTR(_logger, _a) do {\
+        int _i = 0; \
+        _logger(("\"")); \
+        for (;_i<(_a)->Length/2;++_i) { \
+            _logger(("%c", (_a)->Buffer[_i])); \
+        }\
+        _logger(("\"\n")); \
     } while (0)
 
@@ -102 +112 @@
         _LOGMSG_STR(Log, _a, "c"); \
     } while (0)
+#define LOG_USTR(_a) do {\
+        _LOGMSG_USTR(Log, _a); \
+    } while (0)
 #define LOGREL_STRA(_a) do {\
         _LOGMSG_STR(LogRel, _a, "c"); \
@@ -108 +121 @@
         _LOGMSG_STR(LogRel, _a, "c"); \
     } while (0)
+#define LOGREL_USTR(_a) do {\
+        _LOGMSG_USTR(LogRel, _a); \
+    } while (0)