[PATCH v2 8/8] explorer: Remove now unnecessary wine_notify_icon support.

[Rémi Bernon]

From: Rémi Bernon

---
 programs/explorer/desktop.c          |  9 +++------
 programs/explorer/explorer_private.h |  2 +-
 programs/explorer/systray.c          | 11 ++---------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 0af8d4c8e3c..9a58f13d887 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -841,7 +841,7 @@ static BOOL get_default_enable_shell( const WCHAR *name )
     return result;
 }

-static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
+static void load_graphics_driver( const WCHAR *driver, GUID *guid )
 {
     static const WCHAR device_keyW[] = L"System\CurrentControlSet\Control\Video\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\0000";

@@ -914,8 +914,6 @@ static HMODULE load_graphics_driver( const WCHAR *driver, GUID *guid )
             RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 );
         RegCloseKey( hkey );
     }
-
-    return module;
 }

static const char *debugstr_devmodew( const DEVMODEW *devmode )
@@ -1018,7 +1016,6 @@ void manage_desktop( WCHAR *arg )
     GUID guid;
     MSG msg;
     HWND hwnd;
-    HMODULE graphics_driver;
     unsigned int width, height;
     WCHAR *cmdline = NULL, *driver = NULL;
     WCHAR *p = arg;
@@ -1062,7 +1059,7 @@ void manage_desktop( WCHAR *arg )

UuidCreate( &guid );
     TRACE( "display guid %s\n", debugstr_guid(&guid) );
-    graphics_driver = load_graphics_driver( driver, &guid );
+    load_graphics_driver( driver, &guid );

if (name && width && height)
     {
@@ -1104,7 +1101,7 @@ void manage_desktop( WCHAR *arg )

if (using_root) enable_shell = FALSE;

-        initialize_systray( graphics_driver, using_root, enable_shell );
+        initialize_systray( using_root, enable_shell );
         if (!using_root) initialize_launchers( hwnd );

if ((shell32 = LoadLibraryW( L"shell32.dll" )) &&
diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h
index df598187fc1..34aa1cf046b 100644
--- a/programs/explorer/explorer_private.h
+++ b/programs/explorer/explorer_private.h
@@ -22,7 +22,7 @@
 #define __WINE_EXPLORER_PRIVATE_H

extern void manage_desktop( WCHAR *arg );
-extern void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL enable_shell );
+extern void initialize_systray( BOOL using_root, BOOL enable_shell );
 extern void initialize_appbar(void);
 extern void handle_parent_notify( HWND hwnd, WPARAM wp );
 extern void do_startmenu( HWND owner );
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 670493be086..1af8a72de46 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -57,8 +57,6 @@ struct notify_data  /* platform-independent format for NOTIFYICONDATA */
     UINT bpp;
 };

-static int (CDECL *wine_notify_icon)(DWORD,NOTIFYICONDATAW *);
-
 #define ICON_DISPLAY_HIDDEN -1
 #define ICON_DISPLAY_DOCKED -2

@@ -743,7 +741,6 @@ static void cleanup_systray_window( HWND hwnd )
         if (icon->owner == hwnd) delete_icon( icon );

NtUserMessageCall( hwnd, WINE_SYSTRAY_CLEANUP_ICONS, 0, 0, NULL, NtUserSystemTrayCall, FALSE );
-    if (wine_notify_icon) wine_notify_icon( 0xdead, &nid );
 }

/* update the taskbar buttons when something changed */
@@ -842,8 +839,6 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds)
         if ((ret = NtUserMessageCall( hwndSource, WINE_SYSTRAY_NOTIFY_ICON, cds->dwData, 0,
                                       &nid, NtUserSystemTrayCall, FALSE )) != -1)
             goto done;
-        if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1))
-            goto done;
         ret = FALSE;
     }

@@ -1110,12 +1105,10 @@ void handle_parent_notify( HWND hwnd, WPARAM wp )
 }

/* this function creates the listener window */
-void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enable_shell )
+void initialize_systray( BOOL using_root, BOOL arg_enable_shell )
 {
     RECT work_rect, primary_rect, taskbar_rect;

-    if (using_root && graphics_driver) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" );
-
     shell_traywnd_class.hIcon = LoadIconW( 0, (const WCHAR *)IDI_WINLOGO );
     shell_traywnd_class.hCursor = LoadCursorW( 0, (const WCHAR *)IDC_ARROW );
     tray_icon_class.hIcon = shell_traywnd_class.hIcon;
@@ -1132,7 +1125,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab
         ERR( "Could not register SysTray window class\n" );
         return;
     }
-    if (!wine_notify_icon && !RegisterClassExW( &tray_icon_class ))
+    if (!RegisterClassExW( &tray_icon_class ))
     {
         ERR( "Could not register Wine SysTray window classes\n" );
         return;