ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Nikolay Sivov 2015-11-11 14:01:37 +03:00 committed by Alexandre Julliard
parent 94667def7b
commit 5cf9539650
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/shell32/shellole.c
View File

@ -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 riid; REFIID clsid;
LPFNCREATEINSTANCE lpfnCI; LPFNCREATEINSTANCE lpfnCI;
} InterfaceTable[] = { } InterfaceTable[] = {
@ -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)
*ppv = NULL; *ppv = NULL;
/* search our internal interface table */ /* search our internal interface table */
for(i=0;InterfaceTable[i].riid;i++) { for(i=0;InterfaceTable[i].clsid;i++) {
if(IsEqualIID(InterfaceTable[i].riid, rclsid)) { if(IsEqualIID(InterfaceTable[i].clsid, 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;
} }
} }