Changeset 34080 in vbox

Timestamp:

Nov 15, 2010 5:18:03 PM (14 years ago)

Author:

vboxsync

Message:

VBoxTray: Hacking for IPC over named pipes support.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxTray.cpp (modified) (7 diffs)
• VBoxTray.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -36 +36 @@
         VBoxVRDP.cpp \
         VBoxRestore.cpp \
+        VBoxIPC.cpp \
         VBoxHelpers.cpp \
         VBoxTray.rc

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

@@ -20 +20 @@
 *******************************************************************************/
 #include "VBoxTray.h"
+#include "VBoxTrayMsg.h"
 #include "VBoxHelpers.h"
 #include "VBoxSeamless.h"
@@ -28 +29 @@
 #include "VBoxHostVersion.h"
 #include "VBoxSharedFolders.h"
+#include "VBoxIPC.h"
 #include <VBoxHook.h>
 #include "resource.h"
@@ -52 +54 @@
 
 /* Global message handler prototypes. */
-int vboxTrayGlMsgTaskbarCreated(LPARAM lParam, WPARAM wParam);
-int vboxTrayGlMsgShowBalloonMsg(LPARAM lParam, WPARAM wParam);
+int vboxTrayGlMsgTaskbarCreated(WPARAM lParam, LPARAM wParam);
+int vboxTrayGlMsgShowBalloonMsg(WPARAM lParam, LPARAM wParam);
 
 /* Prototypes */
@@ -97 +99 @@
     },
     {
+        "IPC",
+        VBoxIPCInit,
+        VBoxIPCThread,
+        VBoxIPCDestroy
+    },
+    {
         NULL
     }
@@ -111 +119 @@
 
     /* VBoxTray specific stuff. */
-    {
-        "VBoxTrayShowBalloonMsg",
-        vboxTrayGlMsgShowBalloonMsg
-    },
+    /** @todo Add new messages here! */
 
     {
@@ -129 +134 @@
  * @param   lParam
  */
-static int vboxTrayGlMsgTaskbarCreated(LPARAM lParam, WPARAM wParam)
+static int vboxTrayGlMsgTaskbarCreated(WPARAM wParam, LPARAM lParam)
 {
     return vboxTrayCreateTrayIcon();
-}
-
-/**
- * Shows a balloon tooltip message in VBoxTray's
- * message area in the Windows main taskbar.
- *
- * @return  IPRT status code.
- * @param   wParam
- * @param   lParam
- */
-static int vboxTrayGlMsgShowBalloonMsg(LPARAM wParam, WPARAM lParam)
-{
-    int rc = hlpShowBalloonTip(gInstance, gToolWindow, ID_TRAYICON,
-                               (char*)wParam /* Ugly hack! */, "Foo",
-                               5000 /* Time to display in msec */, NIIF_INFO);
-    /*
-     * If something went wrong while displaying, log the message into the
-     * the release log so that the user still is being informed, at least somehow.
-     */
-    if (RT_FAILURE(rc))
-        LogRel(("VBoxTray Information: %s\n", "Foo"));
-    return rc;
 }
 
@@ -245 +228 @@
             {
                 unsigned threadid;
-                pTable->hThread = (HANDLE)_beginthreadex (NULL,  /* security */
-                                                          0,     /* stacksize */
-                                                          pTable->pfnThread,
-                                                          pTable->pInstance,
-                                                          0,     /* initflag */
-                                                          &threadid);
+                pTable->hThread = (HANDLE)_beginthreadex(NULL,  /* security */
+                                                         0,     /* stacksize */
+                                                         pTable->pfnThread,
+                                                         pTable->pInstance,
+                                                         0,     /* initflag */
+                                                         &threadid);
 
                 if (pTable->hThread == (HANDLE)(0))

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

@@ -93 +93 @@
     char    *pszName;
     /** Function pointer for handling the message. */
-    int      (* pfnHandler)          (LPARAM lParam, WPARAM wParam);
+    int      (* pfnHandler)          (WPARAM wParam, LPARAM lParam);
 
     /* Variables. */