Changeset 3505 for trunk/src/shell32/systray.cpp

Timestamp:

May 9, 2000, 9:01:51 PM (25 years ago)

Author:

sandervl

Message:

systray heap corruption fix

File:

• trunk/src/shell32/systray.cpp (modified) (3 diffs)

trunk/src/shell32/systray.cpp

@@ -1 @@
-/* $Id: systray.cpp,v 1.1 2000-03-26 16:34:57 cbratschi Exp $ */
+/* $Id: systray.cpp,v 1.2 2000-05-09 19:01:51 sandervl Exp $ */
 /*
  *      Systray
@@ -265 +265 @@
 
   if (unicode)
-    lstrcpynW(ptrayItem->notifyIcon.szTip, szTip, sizeof(ptrayItem->notifyIcon.szTip));
+    lstrcpynW(ptrayItem->notifyIcon.szTip, szTip, sizeof(ptrayItem->notifyIcon.szTip)/sizeof(WCHAR));
   else
-   lstrcpynAtoW(ptrayItem->notifyIcon.szTip,(LPSTR)szTip,sizeof(ptrayItem->notifyIcon.szTip));
-  ptrayItem->notifyIcon.szTip[sizeof(ptrayItem->notifyIcon.szTip)-1]=0;
-
-  ti.cbSize = sizeof(TTTOOLINFOA);
+   lstrcpynAtoW(ptrayItem->notifyIcon.szTip,(LPSTR)szTip,sizeof(ptrayItem->notifyIcon.szTip)/sizeof(WCHAR));
+  ptrayItem->notifyIcon.szTip[sizeof(ptrayItem->notifyIcon.szTip)/sizeof(WCHAR)-1]=0;
+
+  ti.cbSize = sizeof(TTTOOLINFOW);
   ti.uFlags = 0;
   ti.hwnd = ptrayItem->hWnd;
@@ -289 +289 @@
 
   if (unicode)
-    lstrcpynW(ptrayItem->notifyIcon.szTip, szTip, sizeof(ptrayItem->notifyIcon.szTip));
+    lstrcpynW(ptrayItem->notifyIcon.szTip, szTip, sizeof(ptrayItem->notifyIcon.szTip)/sizeof(WCHAR));
   else
-    lstrcpynAtoW(ptrayItem->notifyIcon.szTip,(LPSTR)szTip,sizeof(ptrayItem->notifyIcon.szTip));
-  ptrayItem->notifyIcon.szTip[sizeof(ptrayItem->notifyIcon.szTip)-1]=0;
-
-  ti.cbSize = sizeof(TTTOOLINFOA);
+    lstrcpynAtoW(ptrayItem->notifyIcon.szTip,(LPSTR)szTip,sizeof(ptrayItem->notifyIcon.szTip)/sizeof(WCHAR));
+  ptrayItem->notifyIcon.szTip[sizeof(ptrayItem->notifyIcon.szTip)/sizeof(WCHAR)-1]=0;
+
+  ti.cbSize = sizeof(TTTOOLINFOW);
   ti.uFlags = 0;
   ti.hwnd = ptrayItem->hWnd;