Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
b088d311
Commit
b088d311
authored
Jun 22, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Dec 01, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explorer: Remove now unnecessary wine_notify_icon support.
parent
48e6bf3c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
16 deletions
+6
-16
desktop.c
programs/explorer/desktop.c
+3
-6
explorer_private.h
programs/explorer/explorer_private.h
+1
-1
systray.c
programs/explorer/systray.c
+2
-9
No files found.
programs/explorer/desktop.c
View file @
b088d311
...
...
@@ -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"
))
&&
...
...
programs/explorer/explorer_private.h
View file @
b088d311
...
...
@@ -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
);
...
...
programs/explorer/systray.c
View file @
b088d311
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment