Changeset 5618 for trunk/src/shell32/systray.c

Timestamp:

Apr 28, 2001, 3:33:49 PM (24 years ago)

Author:

sandervl

Message:

resync with latest wine

File:

• trunk/src/shell32/systray.c (modified) (11 diffs)

trunk/src/shell32/systray.c

@@ -1 @@
-/* $Id: systray.c,v 1.1 2000-08-30 13:53:01 sandervl Exp $ */
 /*
  *      Systray
@@ -10 +9 @@
  *
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#else
+
+#ifndef __WIN32OS2__
 #include <unistd.h>
 #endif
@@ -19 +16 @@
 #include <string.h>
 
-#ifndef __WIN32OS2__
-#include "heap.h"
-#endif
+#include "winnls.h"
+#include "shlobj.h"
 #include "shellapi.h"
 #include "shell32_main.h"
-#include "windows.h"
 #include "commctrl.h"
 #include "debugtools.h"
+#include "heap.h"
 #include "config.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct SystrayItem {
@@ -186 +182 @@
   return FALSE;
 #else
+
   /* Initialize the window size. */
   rect.left   = 0;
@@ -215 +212 @@
   }
   return TRUE;
-#endif  //__WIN32OS2__
+#endif
 }
 
@@ -221 +218 @@
 static void SYSTRAY_ItemTerm(SystrayItem *ptrayItem)
 {
+  if(ptrayItem->notifyIcon.hIcon)
+     DestroyIcon(ptrayItem->notifyIcon.hIcon);   
   if(ptrayItem->hWndToolTip)
       DestroyWindow(ptrayItem->hWndToolTip);
@@ -237 +236 @@
 void SYSTRAY_ItemSetIcon(SystrayItem *ptrayItem, HICON hIcon)
 {
-  ptrayItem->notifyIcon.hIcon = hIcon; /* do we need a copy? */
+  ptrayItem->notifyIcon.hIcon = CopyIcon(hIcon);
   InvalidateRect(ptrayItem->hWnd, NULL, TRUE);
 }
@@ -346 +345 @@
 
 /*************************************************************************
- * Shell_NotifyIconA                    [SHELL32.297]
+ * Shell_NotifyIconA                    [SHELL32.297][SHELL32.296]
  */
 BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
@@ -368 +367 @@
 
 /*************************************************************************
- * Shell_NotifyIconW                    [SHELL32.297]
+ * Shell_NotifyIconW                    [SHELL32.298]
  */
 BOOL WINAPI Shell_NotifyIconW (DWORD dwMessage, PNOTIFYICONDATAW pnid )
@@ -376 +375 @@
         PNOTIFYICONDATAA p = HeapAlloc(GetProcessHeap(),0,sizeof(NOTIFYICONDATAA));
         memcpy(p, pnid, sizeof(NOTIFYICONDATAA));
-        if (*(pnid->szTip))
-          lstrcpynWtoA (p->szTip, pnid->szTip, 64 );
+        WideCharToMultiByte( CP_ACP, 0, pnid->szTip, -1, p->szTip, sizeof(p->szTip), NULL, NULL );
+        p->szTip[sizeof(p->szTip)-1] = 0;
 
         ret = Shell_NotifyIconA(dwMessage, p );
@@ -384 +383 @@
         return ret;
 }
-
-/*************************************************************************
- * Shell_NotifyIcon                     [SHELL32.296]
- */
-BOOL WINAPI Shell_NotifyIcon(DWORD dwMessage, PNOTIFYICONDATAA pnid)
-{
-  return Shell_NotifyIconA(dwMessage, pnid);
-}