[PATCH] ieframe: Check FAILED in get_typeinfo().

[Andrey Gusev]

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
---
 dlls/ieframe/ieframe_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c
index e207ce0575..ff7c1de306 100644
--- a/dlls/ieframe/ieframe_main.c
+++ b/dlls/ieframe/ieframe_main.c
@@ -62,9 +62,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
 {
     HRESULT hres;
 
-    if(!typelib)
-        hres = load_typelib();
-    if(!typelib)
+    if(FAILED(hres = load_typelib()))
         return hres;
 
     if(!typeinfos[tid]) {
-- 
2.20.1

[Jacek Caban]

Hi Andrey,

On 2/11/19 6:15 PM, Andrey Gusev wrote:
> Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
> ---
>   dlls/ieframe/ieframe_main.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c
> index e207ce0575..ff7c1de306 100644
> --- a/dlls/ieframe/ieframe_main.c
> +++ b/dlls/ieframe/ieframe_main.c
> @@ -62,9 +62,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
>   {
>       HRESULT hres;
>
> -    if(!typelib)
> -        hres = load_typelib();
> -    if(!typelib)
> +    if(FAILED(hres = load_typelib()))
>           return hres;
>
> if(!typeinfos[tid]) {

Skipping the first if means that you'd load typelib even if it's already 
loaded.


Jacek