Changeset 64326 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 19, 2016 5:37:25 PM (8 years ago)

Author:

vboxsync

Message:

VBoxTrayMsg.h: Duh. VBOXTRAY_IPC_PIPE_PREFIX need to have the full native path, not just the filename part, now that we use RTLOCALIPC_FLAGS_NATIVE_NAME. Assertions!

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxIPC.cpp (modified) (2 diffs)
• VBoxTrayMsg.h (modified) (1 diff)

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

@@ -201 +201 @@
                                  sizeof(szPipeName) - sizeof(VBOXTRAY_IPC_PIPE_PREFIX) + 1,
                                  NULL /*pcbUser*/);
+        AssertRC(rc);
         if (RT_SUCCESS(rc))
         {
             rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName, RTLOCALIPC_FLAGS_NATIVE_NAME);
+            AssertRC(rc);
             if (RT_SUCCESS(rc))
             {
@@ -230 +232 @@
 DECLCALLBACK(void) VBoxIPCStop(void *pInstance)
 {
+    /* Can be NULL if VBoxIPCInit failed. */
+    if (!pInstance)
+        return;
     AssertPtrReturnVoid(pInstance);
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTrayMsg.h

@@ -19 +19 @@
 #define ___VBOXTRAY_MSG_H
 
-/** The IPC pipe's prefix. Will be followed by the
- *  username VBoxTray runs under. */
-#define VBOXTRAY_IPC_PIPE_PREFIX      "VBoxTrayIPC-"
+/** The IPC pipe's prefix (native).
+ * Will be followed by the username VBoxTray runs under. */
+#define VBOXTRAY_IPC_PIPE_PREFIX      "\\\\.\\pipe\\VBoxTrayIPC-"
 /** The IPC header's magic. */
 #define VBOXTRAY_IPC_HDR_MAGIC        0x19840804