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

Timestamp:

Oct 27, 2009, 2:36:55 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: xsystray: Further coding (established communication channel between the clients and the server, some bug fixes).

File:

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

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

@@ -27 +27 @@
 
 static HWND G_hwndSysTray = NULLHANDLE;
-static int G_itlsSysTrayMsgData = -1;
+static int G_itlsSysTrayData = -1;
 
 static HWND FindSysTrayWindow()
@@ -46 +46 @@
 }
 
-static BOOL SendSysTrayCtlMsg(PSYSTRAYMSGDATA pData)
+static BOOL SendSysTrayCtlMsg(PSYSTRAYDATA pData)
 {
     APIRET arc;
@@ -70 +70 @@
             arc = ERROR_INVALID_HANDLE;
             if (WinQueryWindowProcess(G_hwndSysTray, &pid, &tid))
-                arc = DosGiveSharedMem(__libc_TLSGet(G_itlsSysTrayMsgData),
+                arc = DosGiveSharedMem(__libc_TLSGet(G_itlsSysTrayData),
                                        pid, PAG_READ | PAG_WRITE);
             if (arc != NO_ERROR)
@@ -80 +80 @@
         mrc = WinSendMsg(G_hwndSysTray, WM_XST_CONTROL, pData, NULL);
         if (mrc == (MRESULT)TRUE && pData->bAcknowledged)
-            break;
+            ;
 
         // if we failed to send the message, it may mean that XCenter was restarted
@@ -98 +98 @@
 }
 
-static PSYSTRAYMSGDATA GetSysTrayMsgDataPtr()
+static PSYSTRAYDataPtr()
 {
     APIRET arc;
 
     // allocate a thread local storage entry if not done so
-    if (G_itlsSysTrayMsgData == -1)
+    if (G_itlsSysTrayData == -1)
     {
         // @todo does XWorkplace have its own TLS? Not? Use
@@ -109 +109 @@
         // to the lack of space in that area)
         int itls = __libc_TLSAlloc();
-        if (!__atomic_cmpxchg32(&G_itlsSysTrayMsgData, itls, -1))
+        if (!__atomic_cmpxchg32(&G_itlsSysTrayData, itls, -1))
         {
             // another thread has already got an entry, discard our try
@@ -116 +116 @@
         }
 
-        if (G_itlsSysTrayMsgData == -1)
+        if (G_itlsSysTrayData == -1)
             return NULL;
     }
 
-    // allocate a SYSTRAYMSGDATA struct for this thread if not done so
-    PSYSTRAYMSGDATA pData = __libc_TLSGet(G_itlsSysTrayMsgData);
-    if (!pData)
-    {
-        arc = DosAllocSharedMem((PVOID)&pData, NULL, sizeof(SYSTRAYMSGDATA),
+    // allocate a SYSTRAYDATA struct for this thread if not done so
+    PSYSTRAYData);
+    if (!pData)
+    {
+        arc = DosAllocSharedMem((PVOID)&pData, NULL, sizeof(SYSTRAYDATA),
                                 PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GIVEABLE);
         if (arc != NO_ERROR)
             return NULL;
 
-        __libc_TLSSet(G_itlsSysTrayMsgData, pData);
+        __libc_TLSSet(G_itlsSysTrayData, pData);
 
         // note that we don't ever free the allocated block since our API doesn't
@@ -159 +159 @@
                             PULONG pulRevision) // out: revision number
 {
-    PSYSTRAYMSGDATA pData = GetSysTrayMsgDataPtr();
+    PSYSTRAYDataPtr();
     if (!pData)
         return FALSE;
@@ -166 +166 @@
     pData->hwndSender = NULLHANDLE;
 
-    BOOL rc = SendSysTrayCtlMsg(pData);
-    if (rc)
+    BOOL rc = SendSysTrayCtlMsg(pData);
+    if (rc)
     {
         if (pulMajor)
@@ -177 +177 @@
     }
 
-    return rc;
+    return rc;
 }
 
@@ -215 +215 @@
                        ULONG ulFlags)   // in: flags (not currently used, must be 0)
 {
-    PSYSTRAYMSGDATA pData = GetSysTrayMsgDataPtr();
+    PSYSTRAYDataPtr();
     if (!pData)
         return FALSE;
@@ -240 +240 @@
                           ULONG ulId)   // in: icon ID to remove
 {
-    PSYSTRAYMSGDATA pData = GetSysTrayMsgDataPtr();
+    PSYSTRAYDataPtr();
     if (!pData)
         return FALSE;
@@ -272 +272 @@
                               PSZ pszText)  // in: tooltip text
 {
-    PSYSTRAYMSGDATA pData = GetSysTrayMsgDataPtr();
+    PSYSTRAYDataPtr();
     if (!pData)
         return FALSE;
@@ -361 +361 @@
 ULONG xstGetSysTrayMaxTextLen()
 {
-    return sizeof(((PSYSTRAYMSGDATA)0)->u.tooltip.szText);
-}
-
+    return sizeof(((PSYSTRAYDATA)0)->u.tooltip.szText);
+}
+