Changeset 281 for trunk/src/3rdparty/os2/xsystray/xsystray.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.c (modified) (7 diffs)

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

@@ -1071 +1071 @@
 
 static
-BOOL WgtXSysTrayControl(HWND hwnd, PXCENTERWIDGET pWidget,
-                        PSYSTRAYCTLDATA pCtlData)
-{
-    BOOL brc = FALSE;
+ULONG WgtXSysTrayControl(HWND hwnd, PXCENTERWIDGET pWidget,
+                         PSYSTRAYCTLDATA pCtlData)
+{
+    BOOL    brc = FALSE;
+    ULONG   xrc = XST_FAIL;
+
     PSYSTRAYDATA pSysTrayData = (PSYSTRAYDATA)pWidget->pUser;
 
@@ -1087 +1089 @@
             pCtlData->u.version.ulMajor = XSYSTRAY_VERSION_MINOR;
             pCtlData->u.version.ulRevision = XSYSTRAY_VERSION_REVISION;
-            brc = TRUE;
+            xrc = XST_OK;
         }
         break;
@@ -1112 +1114 @@
             hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &Info);
             if (hIcon == NULLHANDLE)
-            {
-                brc = FALSE;
                 break;
-            }
 
             pData = FindIconData(pSysTrayData, pCtlData->hwndSender,
@@ -1129 +1128 @@
                 // we didn't change the number of icons so simply invalidate
                 WinInvalidateRect(pWidget->hwndWidget, NULL, FALSE);
+
+                xrc = XST_REPLACED;
             }
             else
@@ -1166 +1167 @@
 
                 WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
+
+                xrc = XST_OK;
             }
-
-            brc = TRUE;
         }
         break;
@@ -1201 +1202 @@
                 WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
 
-                brc = TRUE;
+                xrc = XST_OK;
             }
             else
@@ -1213 +1214 @@
 
     LOGF(("return %d (WinGetLastError is %x)\n",
-          brc, WinGetLastError(pWidget->habWidget)));
-
-    return brc;
+          xrc, WinGetLastError(pWidget->habWidget)));
+
+    return xrc;
 }