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
Yoann Laissus
wine
Commits
da70148a
Commit
da70148a
authored
23 years ago
by
Huw D. M. Davies
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
IShellFolder_BindToObject should respect riid.
parent
a8322d0b
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/shell32/shlfolder.c
+28
-12
28 additions, 12 deletions
dlls/shell32/shlfolder.c
with
28 additions
and
12 deletions
dlls/shell32/shlfolder.c
+
28
−
12
View file @
da70148a
...
...
@@ -736,6 +736,7 @@ static HRESULT WINAPI IShellFolder_fnBindToObject( IShellFolder2 * iface, LPCITE
IShellFolder
*
pShellFolder
,
*
pSubFolder
;
IPersistFolder
*
pPersistFolder
;
LPITEMIDLIST
absPidl
;
HRESULT
hr
;
TRACE
(
"(%p)->(pidl=%p,%p,
\n\t
IID:
\t
%s,%p)
\n
"
,
This
,
pidl
,
pbcReserved
,
debugstr_guid
(
riid
),
ppvOut
);
...
...
@@ -773,18 +774,28 @@ static HRESULT WINAPI IShellFolder_fnBindToObject( IShellFolder2 * iface, LPCITE
if
(
_ILIsPidlSimple
(
pidl
))
{
*
ppvOut
=
pShellFolder
;
if
(
IsEqualIID
(
riid
,
&
IID_IShellFolder
))
{
*
ppvOut
=
pShellFolder
;
hr
=
S_OK
;
}
else
{
hr
=
IShellFolder_QueryInterface
(
pShellFolder
,
riid
,
ppvOut
);
IShellFolder_Release
(
pShellFolder
);
}
}
else
{
IShellFolder_BindToObject
(
pShellFolder
,
ILGetNext
(
pidl
),
NULL
,
&
IID_IShellFolder
,
(
LPVOID
)
&
pSubFolder
);
hr
=
IShellFolder_BindToObject
(
pShellFolder
,
ILGetNext
(
pidl
),
NULL
,
riid
,
(
LPVOID
)
&
pSubFolder
);
IShellFolder_Release
(
pShellFolder
);
*
ppvOut
=
pSubFolder
;
}
TRACE
(
"-- (%p) returning (%p)
\n
"
,
This
,
*
ppvOut
);
TRACE
(
"-- (%p) returning (%p)
%08lx
\n
"
,
This
,
*
ppvOut
,
hr
);
return
S_OK
;
return
hr
;
}
/**************************************************************************
...
...
@@ -1764,7 +1775,8 @@ static HRESULT WINAPI ISF_Desktop_fnBindToObject( IShellFolder2 * iface, LPCITEM
_ICOM_THIS_From_IShellFolder2
(
IGenericSFImpl
,
iface
)
GUID
const
*
clsid
;
IShellFolder
*
pShellFolder
,
*
pSubFolder
;
HRESULT
hr
;
TRACE
(
"(%p)->(pidl=%p,%p,
\n\t
IID:
\t
%s,%p)
\n
"
,
This
,
pidl
,
pbcReserved
,
debugstr_guid
(
riid
),
ppvOut
);
...
...
@@ -1810,17 +1822,18 @@ static HRESULT WINAPI ISF_Desktop_fnBindToObject( IShellFolder2 * iface, LPCITEM
if
(
_ILIsPidlSimple
(
pidl
))
/* no sub folders */
{
*
ppvOut
=
pShellFolder
;
hr
=
S_OK
;
}
else
/* go deeper */
{
IShellFolder_BindToObject
(
pShellFolder
,
ILGetNext
(
pidl
),
NULL
,
riid
,
(
LPVOID
)
&
pSubFolder
);
hr
=
IShellFolder_BindToObject
(
pShellFolder
,
ILGetNext
(
pidl
),
NULL
,
riid
,
(
LPVOID
)
&
pSubFolder
);
IShellFolder_Release
(
pShellFolder
);
*
ppvOut
=
pSubFolder
;
}
TRACE
(
"-- (%p) returning (%p)
\n
"
,
This
,
*
ppvOut
);
TRACE
(
"-- (%p) returning (%p)
%08lx
\n
"
,
This
,
*
ppvOut
,
hr
);
return
S_OK
;
return
hr
;
}
/**************************************************************************
...
...
@@ -2206,7 +2219,8 @@ static HRESULT WINAPI ISF_MyComputer_fnBindToObject( IShellFolder2 * iface, LPCI
GUID
const
*
clsid
;
IShellFolder
*
pShellFolder
,
*
pSubFolder
;
LPITEMIDLIST
pidltemp
;
HRESULT
hr
;
TRACE
(
"(%p)->(pidl=%p,%p,
\n\t
IID:
\t
%s,%p)
\n
"
,
This
,
pidl
,
pbcReserved
,
debugstr_guid
(
riid
),
ppvOut
);
...
...
@@ -2233,17 +2247,19 @@ static HRESULT WINAPI ISF_MyComputer_fnBindToObject( IShellFolder2 * iface, LPCI
if
(
_ILIsPidlSimple
(
pidl
))
/* no sub folders */
{
*
ppvOut
=
pShellFolder
;
hr
=
S_OK
;
}
else
/* go deeper */
{
IShellFolder_BindToObject
(
pShellFolder
,
ILGetNext
(
pidl
),
NULL
,
&
IID_IShellFolder
,
(
LPVOID
)
&
pSubFolder
);
hr
=
IShellFolder_BindToObject
(
pShellFolder
,
ILGetNext
(
pidl
),
NULL
,
riid
,
(
LPVOID
)
&
pSubFolder
);
IShellFolder_Release
(
pShellFolder
);
*
ppvOut
=
pSubFolder
;
}
TRACE
(
"-- (%p) returning (%p)
\n
"
,
This
,
*
ppvOut
);
TRACE
(
"-- (%p) returning (%p)
%08lx
\n
"
,
This
,
*
ppvOut
,
hr
);
return
S_OK
;
return
hr
;
}
/**************************************************************************
...
...
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