system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

explorer: Create systray for the null graphics driver.

Browse source 
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-05-14 13:40:08 +02:00 committed by Alexandre Julliard
parent 50ca64fcdf
commit 2027c8ee1f
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
programs/explorer/desktop.c
View file

@ -959,6 +959,7 @@ void manage_desktop( WCHAR *arg )
const WCHAR *name = NULL; const WCHAR *name = NULL;
BOOL enable_shell = FALSE; BOOL enable_shell = FALSE;
void (WINAPI *pShellDDEInit)( BOOL ) = NULL; void (WINAPI *pShellDDEInit)( BOOL ) = NULL;
HMODULE shell32;
/* get the rest of the command line (if any) */ /* get the rest of the command line (if any) */
while (*p && !is_whitespace(*p)) p++; while (*p && !is_whitespace(*p)) p++;
@ -1028,20 +1029,15 @@ void manage_desktop( WCHAR *arg )
initialize_display_settings(); initialize_display_settings();
initialize_appbar(); initialize_appbar();
if (graphics_driver) if (using_root) enable_shell = FALSE;
initialize_systray( graphics_driver, using_root, enable_shell );
if (!using_root) initialize_launchers( hwnd );
if ((shell32 = LoadLibraryW( L"shell32.dll" )) &&
(pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188)))
{ {
HMODULE shell32; pShellDDEInit( TRUE );
if (using_root) enable_shell = FALSE;
initialize_systray( graphics_driver, using_root, enable_shell );
if (!using_root) initialize_launchers( hwnd );
if ((shell32 = LoadLibraryW( L"shell32.dll" )) &&
(pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188)))
{
pShellDDEInit( TRUE );
}
} }
} }

2
programs/explorer/systray.c
View file

@ -900,7 +900,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab
WNDCLASSEXW class; WNDCLASSEXW class;
static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0};
if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); if (using_root && graphics_driver) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" );
icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER;
icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;