mirror of
git://source.winehq.org/git/wine.git
synced 2024-08-31 15:33:37 +00:00
explorer: Create systray for the null graphics driver.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
50ca64fcdf
commit
2027c8ee1f
|
@ -959,6 +959,7 @@ void manage_desktop( WCHAR *arg )
|
|||
const WCHAR *name = NULL;
|
||||
BOOL enable_shell = FALSE;
|
||||
void (WINAPI *pShellDDEInit)( BOOL ) = NULL;
|
||||
HMODULE shell32;
|
||||
|
||||
/* get the rest of the command line (if any) */
|
||||
while (*p && !is_whitespace(*p)) p++;
|
||||
|
@ -1028,20 +1029,15 @@ void manage_desktop( WCHAR *arg )
|
|||
initialize_display_settings();
|
||||
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;
|
||||
|
||||
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 );
|
||||
}
|
||||
pShellDDEInit( TRUE );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -900,7 +900,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab
|
|||
WNDCLASSEXW class;
|
||||
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_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;
|
||||
|
|
Loading…
Reference in a new issue