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
1f5b3b9e
Commit
1f5b3b9e
authored
Jan 26, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Ignore KF_FLAG_NOT_PARENT_RELATIVE in SHGetKnownFolderPath().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2e88169d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
shellpath.c
dlls/shell32/shellpath.c
+14
-1
shellpath.c
dlls/shell32/tests/shellpath.c
+13
-0
No files found.
dlls/shell32/shellpath.c
View file @
1f5b3b9e
...
...
@@ -3529,11 +3529,24 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t
return
HRESULT_FROM_WIN32
(
ERROR_FILE_NOT_FOUND
);
if
(
flags
&
~
(
KF_FLAG_CREATE
|
KF_FLAG_SIMPLE_IDLIST
|
KF_FLAG_DONT_UNEXPAND
|
KF_FLAG_DONT_VERIFY
|
KF_FLAG_NO_ALIAS
|
KF_FLAG_INIT
|
KF_FLAG_DEFAULT_PATH
))
KF_FLAG_DONT_VERIFY
|
KF_FLAG_NO_ALIAS
|
KF_FLAG_INIT
|
KF_FLAG_DEFAULT_PATH
|
KF_FLAG_NOT_PARENT_RELATIVE
))
{
FIXME
(
"flags 0x%08x not supported
\n
"
,
flags
);
return
E_INVALIDARG
;
}
if
((
flags
&
(
KF_FLAG_DEFAULT_PATH
|
KF_FLAG_NOT_PARENT_RELATIVE
))
==
KF_FLAG_NOT_PARENT_RELATIVE
)
{
WARN
(
"Invalid flags mask %#x.
\n
"
,
flags
);
return
E_INVALIDARG
;
}
if
(
flags
&
KF_FLAG_NOT_PARENT_RELATIVE
)
{
FIXME
(
"Ignoring KF_FLAG_NOT_PARENT_RELATIVE.
\n
"
);
flags
&=
~
KF_FLAG_NOT_PARENT_RELATIVE
;
}
folder
|=
flags
&
CSIDL_FLAG_MASK
;
shgfp_flags
=
flags
&
KF_FLAG_DEFAULT_PATH
?
SHGFP_TYPE_DEFAULT
:
SHGFP_TYPE_CURRENT
;
...
...
dlls/shell32/tests/shellpath.c
View file @
1f5b3b9e
...
...
@@ -1910,6 +1910,19 @@ if (0) { /* crashes */
ok
(
!
lstrcmpiW
(
path
,
path2
),
"expected equal paths: %s, %s
\n
"
,
wine_dbgstr_w
(
path
),
wine_dbgstr_w
(
path2
));
CoTaskMemFree
(
path2
);
hr
=
pSHGetKnownFolderPath
(
folder_id
,
KF_FLAG_DEFAULT_PATH
,
NULL
,
&
path2
);
ok
(
hr
==
S_OK
,
"expected S_OK, got 0x%08x
\n
"
,
hr
);
ok
(
path2
!=
NULL
,
"expected path != NULL
\n
"
);
CoTaskMemFree
(
path2
);
hr
=
pSHGetKnownFolderPath
(
folder_id
,
KF_FLAG_NOT_PARENT_RELATIVE
,
NULL
,
&
path2
);
ok
(
hr
==
E_INVALIDARG
,
"expected S_OK, got 0x%08x
\n
"
,
hr
);
hr
=
pSHGetKnownFolderPath
(
folder_id
,
KF_FLAG_DEFAULT_PATH
|
KF_FLAG_NOT_PARENT_RELATIVE
,
NULL
,
&
path2
);
ok
(
hr
==
S_OK
,
"expected S_OK, got 0x%08x
\n
"
,
hr
);
ok
(
path2
!=
NULL
,
"expected path != NULL
\n
"
);
CoTaskMemFree
(
path2
);
CoTaskMemFree
(
path
);
}
...
...
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