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

Timestamp:

Nov 2, 2009, 3:10:29 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Use custom shared memory pool for structures posted by the server to the client windows. Process mouse/wheel and context menu messages in the icon area and post them to the respective client windows. Use smaller spacing between icons (one pad unit instead of two).

File:

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

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

@@ -28 +28 @@
 #include <sys/builtin.h>        // atomics
 
-static HWND G_hwndSysTray = NULLHANDLE;
-            // window handle of the system tray server
-
-static PVOID G_pvMemoryPool = NULL;
-             // memory pool for SYSTRAYCTLDATA structs used by WM_XST_CONTROL
-             // messages. Note that once allocated, this memory is never freed:
-             // it is intentional since the memory is assumed to be always in
-             // need and that the system will free it when the application
-             // terminates
-
-#define MEMORYPOOL_SIZE 65536
-        // taking SYSTRAYCTLDATA size into account, this is enough for at least
-        // 64 threads sending WM_XST_CONTROL simultaneously, which sounds sane
+static
+volatile HWND G_hwndSysTray = NULLHANDLE;
+              // window handle of the system tray server
+
+static
+volatile PVOID G_pvMemoryPool = NULL;
+               // shared memory pool for SYSTRAYCTLDATA structs used by
+               // WM_XST_CONTROL messages. Note that once allocated, this memory
+               // is never freed: it is intentional since the memory is assumed
+               // to be always in need and that the system will free it when the
+               // application terminates
+
+#define CLIENT_MEMORYPOOL_SIZE 65536
+        // taking SYSTRAYCTLDATA size into account (<=1024 B), this is enough
+        // for at least 64 threads sending WM_XST_CONTROL simultaneously, which
+        // sounds sane
 
 // @todo to be on the safe side with casting in __atomic_cmpxchg32() we need
@@ -116 +119 @@
 }
 
-// This function allocates a SYSTRAYCTLDATA struct in the pool of shared memory.
-// If there is no free space in the pool, it returns NULL. The allocated memory
-// must be freed by FreeSysTrayCtlDataPtr() when not needed.
+/*
+ *@@ AllocSysTrayCtlDataPtr:
+ *      Allocates a SYSTRAYCTLDATA struct in the pool of shared memory.
+ *
+ *      If there is no free space in the pool, it returns NULL. The allocated
+ *      memory must be freed by FreeSysTrayCtlDataPtr() when not needed.
+ */
+
 static PSYSTRAYCTLDATA AllocSysTrayCtlDataPtr()
 {
@@ -128 +136 @@
     {
         // Note: we don't PAG_COMMIT, DosSubAllocMem will do so when needed
-        arc = DosAllocSharedMem((PVOID)&pvPool, NULL, MEMORYPOOL_SIZE,
+        arc = DosAllocSharedMem((PVOID)&pvPool, NULL, MEMORYPOOL_SIZE,
                                 PAG_READ | PAG_WRITE | OBJ_GIVEABLE);
         if (arc == NO_ERROR)
             arc = DosSubSetMem(pvPool,
                                DOSSUB_INIT | DOSSUB_SPARSE_OBJ,
-                               MEMORYPOOL_SIZE);
+                               MEMORYPOOL_SIZE);
         if (!__atomic_cmpxchg32((uint32_t *)&G_pvMemoryPool,
                                 (uint32_t)pvPool, (uint32_t)NULL))
@@ -149 +157 @@
     }
 
-    arc = DosSubAllocMem(G_pvMemoryPool, (PVOID)&pData, sizeof(SYSTRAYCTLDATA));
+    arc = DosSubAllocMem(G_pvMemoryPool, (PVOID)&pData, sizeof());
     if (arc != NO_ERROR)
         return NULL;
@@ -158 +166 @@
 static VOID FreeSysTrayCtlDataPtr(PSYSTRAYCTLDATA pData)
 {
-    DosSubFreeMem(G_pvMemoryPool, pData, sizeof(SYSTRAYCTLDATA));
+    DosSubFreeMem(G_pvMemoryPool, pData, sizeof());
 }
 
@@ -220 +228 @@
  *
  *          param1
- *              USHORT  usID        icon ID
- *              USHORT  usCode      notify code, one of XST_IN_ constants
+ *              USHORT  usID        icon ID
+ *              USHORT  us    notify code, one of XST_IN_ constants
  *
  *          param2
- *              PVOID   pData       notify code specific data (see below)
+ *              PVOID   pData       notify code specific data (see below)
  *
  *      The following notify codes are currently recognized:
@@ -232 +240 @@
  *              messages are recognized. param2 is a pointer to the XSTMOUSEMSG
  *              structure containing full mouse message details.
+
+
+
+
+
+
+
+
  */
 
 BOOL xstAddSysTrayIcon(HWND hwnd,       // in: window handle associated with the icon
-                       ULONG ulId,      // in: icon ID to add
+                       U     // in: icon ID to add
                        HPOINTER hIcon,  // in: icon handle
                        ULONG ulMsgId,   // in: message ID for notifications
@@ -252 +268 @@
         pData->ulCommand = SYSTRAYCMD_ADDICON;
         pData->hwndSender = hwnd;
-        pData->u.icon.ulId = ulId;
+        pData->u.icon.uId;
         pData->u.icon.hIcon = hIcon;
         pData->u.icon.ulMsgId = ulMsgId;
@@ -278 +294 @@
 
 BOOL xstRemoveSysTrayIcon(HWND hwnd,    // in: window handle associated with the icon
-                          ULONG ulId)   // in: icon ID to remove
+                          U  // in: icon ID to remove
 {
     BOOL brc;
@@ -287 +303 @@
     pData->ulCommand = SYSTRAYCMD_REMOVEICON;
     pData->hwndSender = hwnd;
-    pData->u.icon.ulId = ulId;
+    pData->u.icon.uId;
 
     brc = SendSysTrayCtlMsg(pData);
@@ -314 +330 @@
 
 BOOL xstSetSysTrayIconToolTip(HWND hwnd,    // in: window handle associated with the icon
-                              ULONG ulId,   // in: icon ID to set the tooltip for
+                              U  // in: icon ID to set the tooltip for
                               PSZ pszText)  // in: tooltip text
 {
@@ -324 +340 @@
     pData->ulCommand = SYSTRAYCMD_SETTOOLTIP;
     pData->hwndSender = hwnd;
-    pData->u.tooltip.ulId = ulId;
+    pData->u.tooltip.uId;
 
     if (pszText == NULL)
@@ -343 +359 @@
 }
 
-BOOL xstShowSysTrayIconBalloon(HWND hwnd, ULONG ulId, PSZ pszTitle, PSZ pszText,
+BOOL xstShowSysTrayIconBalloon(HWND hwnd, UId, PSZ pszTitle, PSZ pszText,
                                ULONG ulFlags, ULONG ulTimeout)
 {
@@ -350 +366 @@
 }
 
-BOOL xstHideSysTrayIconBalloon(HWND hwnd, ULONG ulId)
+BOOL xstHideSysTrayIconBalloon(HWND hwnd, UId)
 {
     // @todo implement
@@ -364 +380 @@
  *      Returns TRUE on success and FALSE otherwise.
  */
-BOOL xstQuerySysTrayIconRect(HWND hwnd, ULONG ulId, PRECTL prclRect)
+BOOL xstQuerySysTrayIconRect(HWND hwnd, UId, PRECTL prclRect)
 {
     // @todo implement
@@ -384 +400 @@
 ULONG xstGetSysTrayCreatedMsgId()
 {
-    // NOTE: keep in sync with fnwpXSysTray()::WM_CREATED
-
     static ULONG WM_XST_CREATED = 0;
     if (WM_XST_CREATED == 0)
         WM_XST_CREATED = WinAddAtom(WinQuerySystemAtomTable(),
-                                    "ExtendedSysTray.WM_XST_CREATED");
+                                    );
     return WM_XST_CREATED;
 }