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

Timestamp:

Nov 25, 2010 3:49:37 PM (14 years ago)

Author:

vboxsync

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

68147

Message:

VBoxTray: Changed IPC message IDs.

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

@@ -111 +111 @@
 {
     VBOXTRAYIPCHEADER hdr;
-    hdr.ulMsg = VBOXTRAYIPCMSGTYPE_QUIT;
+    hdr.ulMsg = VBOXTRAYIPCMSGTYPE_IPC_QUIT;
     return VBoxIPCWriteMessage(pCtx, (BYTE*)&hdr, sizeof(hdr));
 }
@@ -265 +265 @@
                 switch (hdr.ulMsg)
                 {
-                    case VBOXTRAYIPCMSGTYPE_QUIT:
-                        fTerminate = true;
-                        break;
-
                     case VBOXTRAYIPCMSGTYPE_RESTART:
                         rc = VBoxIPCMsgRestart(pCtx, hdr.wParam, hdr.lParam);
                         if (RT_SUCCESS(rc))
                             fTerminate = true;
+                        break;
+
+                    case VBOXTRAYIPCMSGTYPE_IPC_QUIT:
+                        fTerminate = true;
                         break;
 

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

@@ -24 +24 @@
 enum VBOXTRAYIPCMSGTYPE
 {
+    /** Restarts VBoxTray. */
+    VBOXTRAYIPCMSGTYPE_RESTART        = 10,
+
     /** Asks the IPC thread to quit. */
-    VBOXTRAYIPCMSGTYPE_QUIT           = 10,
-    /** Restarts VBoxTray. */
-    VBOXTRAYIPCMSGTYPE_RESTART        = 11,
+    VBOXTRAYIPCMSGTYPE_IPC_QUIT       = 50,
+
     /** Shows a balloon message in the tray area. */
     VBOXTRAYIPCMSGTYPE_SHOWBALLOONMSG = 100