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
81b7509f
Commit
81b7509f
authored
Jun 14, 2005
by
Michael Jung
Committed by
Alexandre Julliard
Jun 14, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use SHGetPathFromIDList instead of SHELL32_GetPathFromIDList.
parent
0901b232
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
clipboard.c
dlls/shell32/clipboard.c
+6
-6
shelllink.c
dlls/shell32/shelllink.c
+3
-2
shlexec.c
dlls/shell32/shlexec.c
+1
-1
No files found.
dlls/shell32/clipboard.c
View file @
81b7509f
...
@@ -176,7 +176,7 @@ HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
...
@@ -176,7 +176,7 @@ HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
char
szTemp
[
MAX_PATH
],
*
szFileName
;
char
szTemp
[
MAX_PATH
],
*
szFileName
;
LPITEMIDLIST
pidl
;
LPITEMIDLIST
pidl
;
HGLOBAL
hGlobal
;
HGLOBAL
hGlobal
;
HRESULT
hr
;
BOOL
bSuccess
;
TRACE
(
"(%p,%p,%u)
\n
"
,
pidlRoot
,
apidl
,
cidl
);
TRACE
(
"(%p,%p,%u)
\n
"
,
pidlRoot
,
apidl
,
cidl
);
...
@@ -185,9 +185,9 @@ HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
...
@@ -185,9 +185,9 @@ HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
if
(
!
pidl
)
if
(
!
pidl
)
return
0
;
return
0
;
hr
=
SHELL_GetPathFromIDListA
(
pidl
,
szTemp
,
MAX_PATH
);
bSuccess
=
SHGetPathFromIDListA
(
pidl
,
szTemp
);
SHFree
(
pidl
);
SHFree
(
pidl
);
if
(
FAILED
(
hr
)
)
if
(
!
bSuccess
)
return
0
;
return
0
;
size
=
strlen
(
szTemp
)
+
1
;
size
=
strlen
(
szTemp
)
+
1
;
...
@@ -208,7 +208,7 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
...
@@ -208,7 +208,7 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
WCHAR
szTemp
[
MAX_PATH
],
*
szFileName
;
WCHAR
szTemp
[
MAX_PATH
],
*
szFileName
;
LPITEMIDLIST
pidl
;
LPITEMIDLIST
pidl
;
HGLOBAL
hGlobal
;
HGLOBAL
hGlobal
;
HRESULT
hr
;
BOOL
bSuccess
;
TRACE
(
"(%p,%p,%u)
\n
"
,
pidlRoot
,
apidl
,
cidl
);
TRACE
(
"(%p,%p,%u)
\n
"
,
pidlRoot
,
apidl
,
cidl
);
...
@@ -217,9 +217,9 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
...
@@ -217,9 +217,9 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl)
if
(
!
pidl
)
if
(
!
pidl
)
return
0
;
return
0
;
hr
=
SHELL_GetPathFromIDListW
(
pidl
,
szTemp
,
MAX_PATH
);
bSuccess
=
SHGetPathFromIDListW
(
pidl
,
szTemp
);
SHFree
(
pidl
);
SHFree
(
pidl
);
if
(
FAILED
(
hr
)
)
if
(
!
bSuccess
)
return
0
;
return
0
;
size
=
(
strlenW
(
szTemp
)
+
1
)
*
sizeof
(
WCHAR
);
size
=
(
strlenW
(
szTemp
)
+
1
)
*
sizeof
(
WCHAR
);
...
...
dlls/shell32/shelllink.c
View file @
81b7509f
...
@@ -1973,6 +1973,7 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR
...
@@ -1973,6 +1973,7 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR
static
HRESULT
WINAPI
IShellLinkW_fnResolve
(
IShellLinkW
*
iface
,
HWND
hwnd
,
DWORD
fFlags
)
static
HRESULT
WINAPI
IShellLinkW_fnResolve
(
IShellLinkW
*
iface
,
HWND
hwnd
,
DWORD
fFlags
)
{
{
HRESULT
hr
=
S_OK
;
HRESULT
hr
=
S_OK
;
BOOL
bSuccess
;
_ICOM_THIS_From_IShellLinkW
(
IShellLinkImpl
,
iface
);
_ICOM_THIS_From_IShellLinkW
(
IShellLinkImpl
,
iface
);
...
@@ -1983,9 +1984,9 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR
...
@@ -1983,9 +1984,9 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR
if
(
!
This
->
sPath
&&
This
->
pPidl
)
{
if
(
!
This
->
sPath
&&
This
->
pPidl
)
{
WCHAR
buffer
[
MAX_PATH
];
WCHAR
buffer
[
MAX_PATH
];
hr
=
SHELL_GetPathFromIDListW
(
This
->
pPidl
,
buffer
,
MAX_PATH
);
bSuccess
=
SHGetPathFromIDListW
(
This
->
pPidl
,
buffer
);
if
(
SUCCEEDED
(
hr
)
&&
*
buffer
)
{
if
(
bSuccess
&&
*
buffer
)
{
This
->
sPath
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
lstrlenW
(
buffer
)
+
1
)
*
sizeof
(
WCHAR
));
This
->
sPath
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
lstrlenW
(
buffer
)
+
1
)
*
sizeof
(
WCHAR
));
if
(
!
This
->
sPath
)
if
(
!
This
->
sPath
)
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
...
...
dlls/shell32/shlexec.c
View file @
81b7509f
...
@@ -296,7 +296,7 @@ static HRESULT SHELL_ResolveShortCutW(LPWSTR wcmd, LPWSTR wargs, LPWSTR wdir, HW
...
@@ -296,7 +296,7 @@ static HRESULT SHELL_ResolveShortCutW(LPWSTR wcmd, LPWSTR wargs, LPWSTR wdir, HW
if
(
SUCCEEDED
(
hr
)
&&
*
ppidl
)
{
if
(
SUCCEEDED
(
hr
)
&&
*
ppidl
)
{
/* We got a PIDL instead of a file system path - try to translate it. */
/* We got a PIDL instead of a file system path - try to translate it. */
if
(
S
UCCEEDED
(
SHELL_GetPathFromIDListW
(
*
ppidl
,
wcmd
,
MAX_PATH
)
))
{
if
(
S
HGetPathFromIDListW
(
*
ppidl
,
wcmd
))
{
SHFree
(
*
ppidl
);
SHFree
(
*
ppidl
);
*
ppidl
=
NULL
;
*
ppidl
=
NULL
;
}
}
...
...
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