Changeset 281 for trunk/src/3rdparty/os2/xsystray/xsystray_api.c

Timestamp:

Nov 2, 2009, 11:32:16 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Implemented array of HMQ to track HK_INPUT hook installation/removal.

File:

• trunk/src/3rdparty/os2/xsystray/xsystray_api.c (modified) (14 diffs)

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

@@ -26 +26 @@
 #define INCL_WINPOINTERS
 #define INCL_WINHOOKS
+
 #include <os2.h>
 
@@ -33 +34 @@
 #include <string.h>
 #include <sys/builtin.h>        // atomics
+
+
 
 static ULONG WM_XST_CREATED = 0;
@@ -56 +59 @@
         // sounds sane
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // @todo to be on the safe side with casting in __atomic_cmpxchg32() we need
 // compile-time assertions like this:
@@ -78 +100 @@
 }
 
-static BOOL SendSysTrayCtlMsg(PSYSTRAYCTLDATA pData)
+static  SendSysTrayCtlMsg(PSYSTRAYCTLDATA pData)
 {
     APIRET arc;
@@ -112 +134 @@
 
         mrc = WinSendMsg(G_hwndSysTray, WM_XST_CONTROL, pData, NULL);
-        if (mrc == (MRESULT)TRUE && pData->bAcknowledged)
-            return TRUE;
+        if (pData->bAcknowledged)
+            return ;
 
         // if we failed to send the message, it may mean that XCenter was restarted
@@ -126 +148 @@
         break;
     }
-    while (TRUE);
-
-    return FALSE;
+    while ();
+
+    return ;
 }
 
@@ -183 +205 @@
 /*
  *@@ InputHook:
- *      This is used to intercept posted XST_NOTIFY messages and apply special
- *      processing to them (compose a client window-specific notification
- *      message, free the NOTIFYDATA structure and post the composed message to
- *      the target window).
+ *      This is used to intercept posted 
+ *      
+ *      
+ *      the target window).
  */
 
@@ -243 +265 @@
     pData->hwndSender = NULLHANDLE;
 
-    brc = SendSysTrayCtlMsg(pData);
+    brc = SendSysTrayCtlMsg(pData);
     if (brc)
     {
@@ -302 +324 @@
                        ULONG ulFlags)   // in: flags (not currently used, must be 0)
 {
-    BOOL brc;
-    PPIB ppib;
+    BOOL    brc;
+    ULONG   xrc;
+    PPIB    ppib;
+    HAB     hab;
+    HMQ     hmq;
+    size_t  i;
+
     PSYSTRAYCTLDATA pData = AllocSysTrayCtlDataPtr();
     if (!pData)
         return FALSE;
 
-    // install the message hook if not already done so
-    // @todo the code is temporary and incorrect, it's just for testing
-    // (we should use an array of HMQ to check if we already installed the filter)
     if (WM_XST_NOTIFY == 0)
-    {
         WM_XST_NOTIFY = WinAddAtom(WinQuerySystemAtomTable(),
                                    WM_XST_NOTIFY_ATOM);
 
-        brc = WinSetHook(WinQueryAnchorBlock(hwnd),
-                         HMQ_CURRENT, HK_INPUT, (PFN)InputHook, NULLHANDLE);
-        if (!brc)
+    hab = WinQueryAnchorBlock(hwnd);
+    hmq = WinQueryWindowULong(hwnd, QWL_HMQ);
+    if (hmq == NULLHANDLE)
+        return FALSE;
+
+    // initialize the HMQ refs array
+    // @todo remove _smutex usage when we get into the DLL and initialize
+    // _fmutex + array in the DLL init routine
+    _smutex_request(&G_smtx);
+    if (!G_pHmqRefs)
+    {
+        if (_fmutex_create(&G_fmtx, 0))
             return FALSE;
-    }
+        G_pHmqRefs = malloc(sizeof(*G_pHmqRefs) * HMQREFS_GROW);
+        if (!G_pHmqRefs)
+            return FALSE;
+        G_cHmqRefs = 0;
+        G_cHmqRefsMax = HMQREFS_GROW;
+    }
+    _smutex_release(&G_smtx);
 
     // give all processes temporary access to hIcon
@@ -332 +370 @@
         pData->u.icon.ulMsgId = ulMsgId;
 
-        brc = SendSysTrayCtlMsg(pData);
+        xrc = SendSysTrayCtlMsg(pData);
+        brc = xrc == XST_OK || xrc == XST_REPLACED;
 
         // revoke temporary access to hIcon
@@ -341 +380 @@
     FreeSysTrayCtlDataPtr(pData);
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     return brc;
 }
@@ -355 +435 @@
 BOOL xstRemoveSysTrayIcon(HWND hwnd,    // in: window handle associated with the icon
                           USHORT usId)  // in: icon ID to remove
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 {
     BOOL brc;
@@ -361 +507 @@
         return FALSE;
 
-    pData->ulCommand = SYSTRAYCMD_REMOVEICON;
-    pData->hwndSender = hwnd;
-    pData->u.icon.usId = usId;
-
-    brc = SendSysTrayCtlMsg(pData);
-
-    FreeSysTrayCtlDataPtr(pData);
-
-    return brc;
-}
-
-/*
- *@@ xstSetSysTrayIconToolTip:
- *
- *      Sets the tooltip text for the given icon in the system tray. This text
- *      is shown when the mouse pointer is held still over the icon area for
- *      some time.
- *
- *      If pszText is NULL, the tooltip text is reset and will not be shown next
- *      time. The old tooltip is hidden if it is being currently shown.
- *
- *      Returns TRUE on success and FALSE otherwise.
- *
- *      NOTE: The maximum tooltip text length (including terminating null) is
- *      limited to a value returned by xstGetSysTrayMaxTextLen(). If the
- *      supplied string is longer, it will be truncated.
- */
-
-BOOL xstSetSysTrayIconToolTip(HWND hwnd,    // in: window handle associated with the icon
-                              USHORT usId,  // in: icon ID to set the tooltip for
-                              PSZ pszText)  // in: tooltip text
-{
-    BOOL brc;
-    PSYSTRAYCTLDATA pData = AllocSysTrayCtlDataPtr();
-    if (!pData)
-        return FALSE;
-
     pData->ulCommand = SYSTRAYCMD_SETTOOLTIP;
     pData->hwndSender = hwnd;
@@ -412 +521 @@
     }
 
-    brc = SendSysTrayCtlMsg(pData);
+    brc = SendSysTrayCtlMsg(pData);
 
     FreeSysTrayCtlDataPtr(pData);