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
Zsolt Vadász
wine
Commits
c6ba4eed
Commit
c6ba4eed
authored
16 years ago
by
Aric Stewart
Committed by
Alexandre Julliard
16 years ago
Browse files
Options
Downloads
Patches
Plain Diff
shell32: In ParseDisplayName make use of shdocvw if the display name is not a drive but has a :.
parent
7392162e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/shell32/Makefile.in
+1
-1
1 addition, 1 deletion
dlls/shell32/Makefile.in
dlls/shell32/shfldr_desktop.c
+8
-0
8 additions, 0 deletions
dlls/shell32/shfldr_desktop.c
dlls/shell32/tests/shlfolder.c
+26
-0
26 additions, 0 deletions
dlls/shell32/tests/shlfolder.c
with
35 additions
and
1 deletion
dlls/shell32/Makefile.in
+
1
−
1
View file @
c6ba4eed
...
...
@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE
=
shell32.dll
IMPORTLIB
=
shell32
IMPORTS
=
uuid shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS
=
ole32 oleaut32
DELAYIMPORTS
=
ole32 oleaut32
shdocvw
C_SRCS
=
\
appbar.c
\
...
...
This diff is collapsed.
Click to expand it.
dlls/shell32/shfldr_desktop.c
+
8
−
0
View file @
c6ba4eed
...
...
@@ -55,6 +55,10 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
shell
);
/* Undocumented functions from shdocvw */
extern
HRESULT
WINAPI
IEParseDisplayNameWithBCW
(
DWORD
codepage
,
LPCWSTR
lpszDisplayName
,
LPBC
pbc
,
LPITEMIDLIST
*
ppidl
);
/***********************************************************************
* Desktopfolder implementation
*/
...
...
@@ -181,6 +185,10 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
*
ppidl
=
pidlTemp
;
return
S_OK
;
}
else
if
(
strchrW
(
lpszDisplayName
,
':'
))
{
return
IEParseDisplayNameWithBCW
(
CP_ACP
,
lpszDisplayName
,
pbc
,
ppidl
);
}
else
{
/* it's a filesystem path on the desktop. Let a FSFolder parse it */
...
...
This diff is collapsed.
Click to expand it.
dlls/shell32/tests/shlfolder.c
+
26
−
0
View file @
c6ba4eed
...
...
@@ -82,6 +82,8 @@ static void test_ParseDisplayName(void)
IShellFolder
*
IDesktopFolder
;
static
const
char
*
cNonExistDir1A
=
"c:
\\
nonexist_subdir"
;
static
const
char
*
cNonExistDir2A
=
"c:
\\\\
nonexist_subdir"
;
static
const
char
*
cInetTestA
=
"http:
\\
yyy"
;
static
const
char
*
cInetTest2A
=
"xx:yyy"
;
DWORD
res
;
WCHAR
cTestDirW
[
MAX_PATH
]
=
{
0
};
ITEMIDLIST
*
newPIDL
;
...
...
@@ -90,6 +92,30 @@ static void test_ParseDisplayName(void)
hr
=
SHGetDesktopFolder
(
&
IDesktopFolder
);
if
(
hr
!=
S_OK
)
return
;
MultiByteToWideChar
(
CP_ACP
,
0
,
cInetTestA
,
-
1
,
cTestDirW
,
MAX_PATH
);
hr
=
IShellFolder_ParseDisplayName
(
IDesktopFolder
,
NULL
,
NULL
,
cTestDirW
,
NULL
,
&
newPIDL
,
0
);
todo_wine
ok
((
SUCCEEDED
(
hr
)
||
broken
(
hr
==
E_FAIL
)
/* NT4 */
),
"ParseDisplayName returned %08x, expected SUCCESS or E_FAIL
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
pILFindLastID
(
newPIDL
)
->
mkid
.
abID
[
0
]
==
0x61
,
"Last pidl should be of type "
"PT_IESPECIAL1, but is: %02x
\n
"
,
pILFindLastID
(
newPIDL
)
->
mkid
.
abID
[
0
]);
IMalloc_Free
(
ppM
,
newPIDL
);
}
MultiByteToWideChar
(
CP_ACP
,
0
,
cInetTest2A
,
-
1
,
cTestDirW
,
MAX_PATH
);
hr
=
IShellFolder_ParseDisplayName
(
IDesktopFolder
,
NULL
,
NULL
,
cTestDirW
,
NULL
,
&
newPIDL
,
0
);
todo_wine
ok
((
SUCCEEDED
(
hr
)
||
broken
(
hr
==
E_FAIL
)
/* NT4 */
),
"ParseDisplayName returned %08x, expected SUCCESS or E_FAIL
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
{
ok
(
pILFindLastID
(
newPIDL
)
->
mkid
.
abID
[
0
]
==
0x61
,
"Last pidl should be of type "
"PT_IESPECIAL1, but is: %02x
\n
"
,
pILFindLastID
(
newPIDL
)
->
mkid
.
abID
[
0
]);
IMalloc_Free
(
ppM
,
newPIDL
);
}
res
=
GetFileAttributesA
(
cNonExistDir1A
);
if
(
res
!=
INVALID_FILE_ATTRIBUTES
)
return
;
...
...
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