Changeset 952

Timestamp:

Aug 9, 2011, 11:11:56 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: xsystray: Fixed duplicate mouse click notifications.

This was due to the fact that the pointer to the notification data
passed to the client was not fixed up after making a local copy of
this data. As a result it would still point to the shared data cell
that could get already overwritten with a different notificaiton
message by the time it got processed in the client.

Location:

trunk/src/3rdparty/os2/xsystray

Files:

• apilib/xsystray.c (modified) (1 diff)
• plugin/w_xsystray.h (modified) (2 diffs)

trunk/src/3rdparty/os2/xsystray/apilib/xsystray.c

@@ -223 +223 @@
         PVOID pvMemoryPool = (PVOID)pQmsg->mp2;
 
-        // copy NOTIFYDATA and free it
+        // 1) create a local copy of NOTIFYDATA
         NOTIFYDATA NotifyData = *pNotifyData;
+        // 2) fix the mp2 pointer in it (which is always to one of u's structs)
+        NotifyData.mp2 -= (ULONG)pNotifyData;
+        NotifyData.mp2 += (ULONG)&NotifyData;
+        // 3) free the original to let it be reused by other processes ASAP
         FreeNotifyDataPtr(pvMemoryPool, pQmsg->hwnd, pNotifyData);
 

trunk/src/3rdparty/os2/xsystray/plugin/w_xsystray.h

@@ -173 +173 @@
             // ID of the message that is to be sent to the target window
     MPARAM  mp1;
-            // message parameter (usually: USHORT usIconId, USHORT usNotifyCode)
+            // message parameter (USHORT usIconId, USHORT usNotifyCode)
     MPARAM  mp2;
-            // message parameter (usually, a pointer to a struct from the union)
+            // message parameter (a pointer to a struct from the union)
     union
     {
@@ -210 +210 @@
  *
  *      See AllocNotifyDataPtr() for more details about allocating these
- *      structures.dd
+ *      structures.
  */