Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
9f804910
Commit
9f804910
authored
6 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
explorer: Move the check for the magic root desktop to the X11 driver.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5a58080a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/winex11.drv/desktop.c
+10
-1
10 additions, 1 deletion
dlls/winex11.drv/desktop.c
programs/explorer/desktop.c
+1
-3
1 addition, 3 deletions
programs/explorer/desktop.c
with
11 additions
and
4 deletions
dlls/winex11.drv/desktop.c
+
10
−
1
View file @
9f804910
...
...
@@ -173,12 +173,21 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height )
*/
BOOL
CDECL
X11DRV_create_desktop
(
UINT
width
,
UINT
height
)
{
static
const
WCHAR
rootW
[]
=
{
'r'
,
'o'
,
'o'
,
't'
,
0
};
XSetWindowAttributes
win_attr
;
Window
win
;
Display
*
display
=
thread_init_display
();
RECT
rect
;
WCHAR
name
[
MAX_PATH
];
TRACE
(
"%u x %u
\n
"
,
width
,
height
);
if
(
!
GetUserObjectInformationW
(
GetThreadDesktop
(
GetCurrentThreadId
()
),
UOI_NAME
,
name
,
sizeof
(
name
),
NULL
))
name
[
0
]
=
0
;
TRACE
(
"%s %ux%u
\n
"
,
debugstr_w
(
name
),
width
,
height
);
/* magic: desktop "root" means use the root window */
if
(
!
lstrcmpiW
(
name
,
rootW
))
return
FALSE
;
/* Create window */
win_attr
.
event_mask
=
ExposureMask
|
KeyPressMask
|
KeyReleaseMask
|
EnterWindowMask
|
...
...
This diff is collapsed.
Click to expand it.
programs/explorer/desktop.c
+
1
−
3
View file @
9f804910
...
...
@@ -670,12 +670,10 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR
/* create the desktop and the associated driver window, and make it the current desktop */
static
BOOL
create_desktop
(
HMODULE
driver
,
const
WCHAR
*
name
,
unsigned
int
width
,
unsigned
int
height
)
{
static
const
WCHAR
rootW
[]
=
{
'r'
,
'o'
,
'o'
,
't'
,
0
};
BOOL
ret
=
FALSE
;
BOOL
(
CDECL
*
create_desktop_func
)(
unsigned
int
,
unsigned
int
);
/* magic: desktop "root" means use the root window */
if
(
driver
&&
strcmpiW
(
name
,
rootW
))
if
(
driver
)
{
create_desktop_func
=
(
void
*
)
GetProcAddress
(
driver
,
"wine_create_desktop"
);
if
(
create_desktop_func
)
ret
=
create_desktop_func
(
width
,
height
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment