Changeset 275

Timestamp:

Nov 2, 2009, 12:58:41 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Few more typos.

Location:

trunk/src/3rdparty/os2/xsystray

Files:

• xsystray.c (modified) (7 diffs)
• xsystray.h (modified) (1 diff)

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

@@ -394 +394 @@
     PNOTIFYDATA pData;
 
-    LOGF(("pvMemoryPool %p\n", pvMemoryPool));
-    LOGF(("hwnd         %p\n", pIconData->hwnd));
+    LOGF(("pvMemoryPool %p\n", pvMemoryPool));
+    LOGF(("hwnd         \n", pIconData->hwnd));
 
     if (!pIconData->bMemoryPoolGiven)
@@ -450 +450 @@
     LOGF(("ulCurr        %p\n", ulCurr));
 
+
+
+
     // advance to the next possibly free block
     ulCurr += sizeof(MEMPOOLBLK);
@@ -459 +462 @@
     __atomic_cmpxchg32((uint32_t *)&pHdr->ulNext, ulCurr, ulNext);
 
-    pData = &((PMEMPOOLBLK)ulCurr)->NotifyData;
-    memset(pData, sizeof(*pData), 0);
+    
+    memset(pData, );
 
     pData->msg = pIconData->ulMsgId;
@@ -778 +781 @@
     }
 
-    PostNotifyMsg(pSysTrayData, hwnd, pNotifyData);
+    PostNotifyMsg(pSysTrayData, hwnd, pNotifyData);
 
     return TRUE;
@@ -868 +871 @@
 
             // initialize the SYSTRAYDATA structure
-            memset(pSysTrayData, sizeof(*pSysTrayData), 0);
+            memset(pSysTrayData, );
             pSysTrayData->lIconWidth = WinQuerySysValue(HWND_DESKTOP, SV_CXICON) / 2;
             pSysTrayData->lIconHeight = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) / 2;
@@ -1154 +1157 @@
 
                 pData = &pSysTrayData->pIcons[i];
-                memset(pData, sizeof(*pData), 0);
+                memset(pData, );
 
                 pData->hwnd = pCtlData->hwndSender;
@@ -1257 +1260 @@
                     {
                         LOGF((" freeing memory block %p\n", pMemPoolBlk));
-                        __atomic_cmpxchg32((uint32_t *)&pMemPoolBlk->hwnd,
-                                           NULLHANDLE, hwnd);
+                        FreeNotifyDataPtr(pSysTrayData->pvMemoryPool,
+                                          pData->hwnd,
+                                          &pMemPoolBlk->NotifyData);
                     }
                     ++pMemPoolBlk;

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

@@ -118 +118 @@
  *                                          FreeNotifyDataPtr() call)
  *
+
+
+
  *      NOTE: When you change the size of this structure, you may also need to
  *      change SERVER_MEMORYPOOL_SIZE value in xsystray.c (see the comments