Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
42e50e44
Commit
42e50e44
authored
Jun 24, 2020
by
Huw Davies
Committed by
Alexandre Julliard
Jun 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Don't call CreateDesktop() with an empty desktop name.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
01ac2e48
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
user_main.c
dlls/user32/user_main.c
+3
-2
desktop.c
programs/explorer/desktop.c
+2
-2
No files found.
dlls/user32/user_main.c
View file @
42e50e44
...
...
@@ -196,7 +196,8 @@ static const WCHAR *get_default_desktop(void)
len
=
sizeof
(
buffer
);
if
(
!
RegQueryValueExW
(
appkey
,
desktopW
,
0
,
NULL
,
(
LPBYTE
)
buffer
,
&
len
))
ret
=
buffer
;
RegCloseKey
(
appkey
);
if
(
ret
)
return
ret
;
if
(
ret
&&
*
ret
)
return
ret
;
ret
=
NULL
;
}
}
...
...
@@ -209,7 +210,7 @@ static const WCHAR *get_default_desktop(void)
len
=
sizeof
(
buffer
);
if
(
!
RegQueryValueExW
(
appkey
,
desktopW
,
0
,
NULL
,
(
LPBYTE
)
buffer
,
&
len
))
ret
=
buffer
;
RegCloseKey
(
appkey
);
if
(
ret
)
return
ret
;
if
(
ret
&&
*
ret
)
return
ret
;
}
return
defaultW
;
}
...
...
programs/explorer/desktop.c
View file @
42e50e44
...
...
@@ -732,7 +732,7 @@ static const WCHAR *get_default_desktop_name(void)
/* @@ Wine registry key: HKCU\Software\Wine\Explorer */
if
(
!
RegOpenKeyW
(
HKEY_CURRENT_USER
,
explorer_keyW
,
&
hkey
))
{
if
(
!
RegQueryValueExW
(
hkey
,
desktopW
,
0
,
NULL
,
(
LPBYTE
)
buffer
,
&
size
))
ret
=
buffer
;
if
(
!
RegQueryValueExW
(
hkey
,
desktopW
,
0
,
NULL
,
(
LPBYTE
)
buffer
,
&
size
)
&&
*
buffer
)
ret
=
buffer
;
RegCloseKey
(
hkey
);
}
return
ret
;
...
...
@@ -974,7 +974,7 @@ void manage_desktop( WCHAR *arg )
/* parse the desktop option */
/* the option is of the form /desktop=name[,widthxheight[,driver]] */
if
(
*
arg
==
'='
||
*
arg
=
=
','
)
if
(
(
arg
[
0
]
==
'='
||
arg
[
0
]
==
','
)
&&
arg
[
1
]
&&
arg
[
1
]
!
=
','
)
{
arg
++
;
name
=
arg
;
...
...
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