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:
parent
94667def7b
commit
5cf9539650
|
@ -59,7 +59,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc
|
|||
|
||||
/* this table contains all CLSIDs of shell32 objects */
|
||||
static const struct {
|
||||
REFIID riid;
|
||||
REFIID clsid;
|
||||
LPFNCREATEINSTANCE lpfnCI;
|
||||
} InterfaceTable[] = {
|
||||
|
||||
|
@ -204,8 +204,8 @@ end:
|
|||
*/
|
||||
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
|
||||
{
|
||||
HRESULT hres = E_OUTOFMEMORY;
|
||||
IClassFactory * pcf = NULL;
|
||||
HRESULT hres;
|
||||
int i;
|
||||
|
||||
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;
|
||||
|
||||
/* search our internal interface table */
|
||||
for(i=0;InterfaceTable[i].riid;i++) {
|
||||
if(IsEqualIID(InterfaceTable[i].riid, rclsid)) {
|
||||
for(i=0;InterfaceTable[i].clsid;i++) {
|
||||
if(IsEqualIID(InterfaceTable[i].clsid, rclsid)) {
|
||||
TRACE("index[%u]\n", i);
|
||||
pcf = IDefClF_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue