Changeset 34097 in vbox

Timestamp:

Nov 16, 2010 10:39:51 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67796

Message:

VBoxTray: Update on IPC handling.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxIPC.cpp (modified) (7 diffs)
• VBoxTrayMsg.h (modified) (3 diffs)

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

@@ -23 +23 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/mem.h>
 #include <VBoxGuestInternal.h>
 
@@ -32 +33 @@
 } VBOXIPCCONTEXT, *PVBOXIPCCONTEXT;
 
-#define VBOXTRAY_PIPE_BUFSIZE 512
-
 static VBOXIPCCONTEXT gCtx = {0};
 
@@ -39 +38 @@
 {
     int rc = VINF_SUCCESS;
-    while (RT_SUCCESS(rc))
+    do
     {
         DWORD dwRead;
         if (!ReadFile(pCtx->hPipe, pMessage, cbMessage, &dwRead, 0))
+        {
             rc = RTErrConvertFromWin32(GetLastError());
-        if (rc == VERR_MORE_DATA)
-        {
-            rc = VINF_SUCCESS;
+        }
+        else
+        {
+            if (rc == VERR_MORE_DATA)
+                rc = VINF_SUCCESS;
             pMessage += dwRead;
-        }
-    }
+            cbMessage -= dwRead;
+        }
+    }
+    while (cbMessage && RT_SUCCESS(rc));
     return rc;
 }
@@ -69 +73 @@
 {
     VBOXTRAYIPCHEADER hdr;
-    hdr.uMsg = VBOXTRAYIPCMSGTYPE_QUIT;
-    hdr.uVer = 0;
+    hdr.ulMsg = VBOXTRAYIPCMSGTYPE_QUIT;
+    hdr.ulVer = 0;
     return VBoxIPCWriteMessage(pCtx, (BYTE*)&hdr, sizeof(hdr));
 }
@@ -91 +95 @@
         hlpShowBalloonTip(gInstance, gToolWindow, ID_TRAYICON,
                           msg.szBody, msg.szTitle,
-                          msg.uShowMS, msg.uType);
+                          msg.ulShowMS, msg.ulType);
     }
     return rc;
@@ -103 +107 @@
     gCtx.pEnv = pEnv;
 
+    int rc = VINF_SUCCESS;
     SECURITY_ATTRIBUTES sa;
-    sa.lpSecurityDescriptor = (PSECURITY_DESCRIPTOR)malloc(SECURITY_DESCRIPTOR_MIN_LENGTH);
-    if (!InitializeSecurityDescriptor(sa.lpSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION))
-    {
-        DWORD er = ::GetLastError();
-    }
-    if (!SetSecurityDescriptorDacl(sa.lpSecurityDescriptor, TRUE, (PACL)0, FALSE))
-    {
-        DWORD er = ::GetLastError();
-    }
-    sa.nLength = sizeof sa;
-    sa.bInheritHandle = TRUE;
-
-    int rc = VINF_SUCCESS;
-    gCtx.hPipe = ::CreateNamedPipe((LPSTR)VBOXTRAY_PIPE_IPC,
-                                   PIPE_ACCESS_DUPLEX,
-                                   PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
-                                   PIPE_UNLIMITED_INSTANCES,
-                                   VBOXTRAY_PIPE_BUFSIZE, // output buffer size
-                                   VBOXTRAY_PIPE_BUFSIZE, // input buffer size
-                                   NMPWAIT_USE_DEFAULT_WAIT,
-                                   &sa);
-    if (gCtx.hPipe == INVALID_HANDLE_VALUE)
-    {
-        DWORD dwError = ::GetLastError();
-    }
+    sa.lpSecurityDescriptor = (PSECURITY_DESCRIPTOR)RTMemAlloc(SECURITY_DESCRIPTOR_MIN_LENGTH);
+    if (!sa.lpSecurityDescriptor)
+        rc = VERR_NO_MEMORY;
     else
     {
-        *pfStartThread = true;
-        *ppInstance = &gCtx;
+        if (!InitializeSecurityDescriptor(sa.lpSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION))
+            rc = RTErrConvertFromWin32(GetLastError());
+        else
+        {
+            if (!SetSecurityDescriptorDacl(sa.lpSecurityDescriptor, TRUE, (PACL)0, FALSE))
+                rc = RTErrConvertFromWin32(GetLastError());
+            else
+            {
+                sa.nLength = sizeof(sa);
+                sa.bInheritHandle = TRUE;
+            }
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            gCtx.hPipe = CreateNamedPipe((LPSTR)VBOXTRAY_PIPE_IPC,
+                                         PIPE_ACCESS_DUPLEX,
+                                         PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+                                         PIPE_UNLIMITED_INSTANCES,
+                                         VBOXTRAY_PIPE_IPC_BUFSIZE, /* Output buffer size. */
+                                         VBOXTRAY_PIPE_IPC_BUFSIZE, /* Input buffer size. */
+                                         NMPWAIT_USE_DEFAULT_WAIT,
+                                         &sa);
+            if (gCtx.hPipe == INVALID_HANDLE_VALUE)
+                rc = RTErrConvertFromWin32(GetLastError());
+            else
+            {
+                *pfStartThread = true;
+                *ppInstance = &gCtx;
+            }
+        }
+        RTMemFree(sa.lpSecurityDescriptor);
     }
     return rc;
@@ -191 +204 @@
             if (SUCCEEDED(dwErr))
             {
-                switch (hdr.uMsg)
+                switch (hdr.ulMsg)
                 {
                     case VBOXTRAYIPCMSGTYPE_SHOWBALLOONMSG:
-                        rc = VBoxIPCMsgShowBalloonMsg(pCtx, hdr.uVer);
+                        rc = VBoxIPCMsgShowBalloonMsg(pCtx, hdr.ulVer);
                         break;
 

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

@@ -19 +19 @@
 #define ___VBOXTRAY_MSG_H
 
-#define VBOXTRAY_PIPE_IPC "\\\\.\\pipe\\VBoxTrayIPC"
+#define VBOXTRAY_PIPE_IPC               "\\\\.\\pipe\\VBoxTrayIPC"
+#define VBOXTRAY_PIPE_IPC_BUFSIZE       64 * 1024
 
 enum VBOXTRAYIPCMSGTYPE
@@ -33 +34 @@
 {
     /** Message type. */
-    UINT uMsg;
+    ULONG ulMsg;
     /** Version of message type. */
-    UINT uVer;
+    ULONG ulVer;
 } VBOXTRAYIPCHEADER, *PVBOXTRAYIPCHEADER;
 
@@ -45 +46 @@
     TCHAR    szTitle[64];
     /** Message type. */
-    UINT     uType;
+    ULONG    ulType;
     /** Flags; not used yet. */
-    UINT     uFlags;
+    ULONG    ulFlags;
     /** Time to show the message (in msec). */
-    UINT     uShowMS;
+    ULONG    ulShowMS;
 } VBOXTRAYIPCMSG_SHOWBALLOONMSG, *PVBOXTRAYIPCMSG_SHOWBALLOONMSG;