Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5cf95396
Commit
5cf95396
authored
Nov 11, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 11, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Return as soon as requested CLSID is located (Coverity).
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
94667def
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
shellole.c
dlls/shell32/shellole.c
+5
-4
No files found.
dlls/shell32/shellole.c
View file @
5cf95396
...
@@ -59,7 +59,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc
...
@@ -59,7 +59,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc
/* this table contains all CLSIDs of shell32 objects */
/* this table contains all CLSIDs of shell32 objects */
static
const
struct
{
static
const
struct
{
REFIID
ri
id
;
REFIID
cls
id
;
LPFNCREATEINSTANCE
lpfnCI
;
LPFNCREATEINSTANCE
lpfnCI
;
}
InterfaceTable
[]
=
{
}
InterfaceTable
[]
=
{
...
@@ -204,8 +204,8 @@ end:
...
@@ -204,8 +204,8 @@ end:
*/
*/
HRESULT
WINAPI
DllGetClassObject
(
REFCLSID
rclsid
,
REFIID
iid
,
LPVOID
*
ppv
)
HRESULT
WINAPI
DllGetClassObject
(
REFCLSID
rclsid
,
REFIID
iid
,
LPVOID
*
ppv
)
{
{
HRESULT
hres
=
E_OUTOFMEMORY
;
IClassFactory
*
pcf
=
NULL
;
IClassFactory
*
pcf
=
NULL
;
HRESULT
hres
;
int
i
;
int
i
;
TRACE
(
"CLSID:%s,IID:%s
\n
"
,
shdebugstr_guid
(
rclsid
),
shdebugstr_guid
(
iid
));
TRACE
(
"CLSID:%s,IID:%s
\n
"
,
shdebugstr_guid
(
rclsid
),
shdebugstr_guid
(
iid
));
...
@@ -214,10 +214,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
...
@@ -214,10 +214,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
*
ppv
=
NULL
;
*
ppv
=
NULL
;
/* search our internal interface table */
/* search our internal interface table */
for
(
i
=
0
;
InterfaceTable
[
i
].
ri
id
;
i
++
)
{
for
(
i
=
0
;
InterfaceTable
[
i
].
cls
id
;
i
++
)
{
if
(
IsEqualIID
(
InterfaceTable
[
i
].
ri
id
,
rclsid
))
{
if
(
IsEqualIID
(
InterfaceTable
[
i
].
cls
id
,
rclsid
))
{
TRACE
(
"index[%u]
\n
"
,
i
);
TRACE
(
"index[%u]
\n
"
,
i
);
pcf
=
IDefClF_fnConstructor
(
InterfaceTable
[
i
].
lpfnCI
,
NULL
,
NULL
);
pcf
=
IDefClF_fnConstructor
(
InterfaceTable
[
i
].
lpfnCI
,
NULL
,
NULL
);
break
;
}
}
}
}
...
...
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