[PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type

[Adeniyi Mayokun]

> From 275d93c9ab0f533fa70d698726afc8adaaefb664 Mon Sep 17 00:00:00 2001

From: Adeniyi Mayokun 
Date: Wed, 14 Mar 2018 06:55:15 +0100
Subject: [PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type

Signed-off-by: Adeniyi Mayokun 
---
 dlls/oleaut32/typelib.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 1c00d715f4..247d383ff7 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -4725,10 +4725,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2
*iface)
     if (!ref)
     {
       TLBImpLib *pImpLib, *pImpLibNext;
-      TLBRefType *ref_type;
+      TLBRefType *ref_type, *ref_type_next;
       TLBString *tlbstr, *tlbstr_next;
       TLBGuid *tlbguid, *tlbguid_next;
-      void *cursor2;
       int i;

/* remove cache entry */
@@ -4778,7 +4777,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2
*iface)
           heap_free(pImpLib);
       }

-      LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list,
TLBRefType, entry)
+      LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list,
TLBRefType, entry)
       {
           list_remove(&ref_type->entry);
           heap_free(ref_type);

[André Hentschel]

Am 14.03.2018 um 07:00 schrieb Adeniyi Mayokun:
> From 275d93c9ab0f533fa70d698726afc8adaaefb664 Mon Sep 17 00:00:00 2001
> From: Adeniyi Mayokun <[e-mail] >
> Date: Wed, 14 Mar 2018 06:55:15 +0100
> Subject: [PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type
> Signed-off-by: Adeniyi Mayokun
>
> dlls/oleaut32/typelib.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
> index 1c00d715f4..247d383ff7 100644
> --- a/dlls/oleaut32/typelib.c
> +++ b/dlls/oleaut32/typelib.c
> @@ -4725,10 +4725,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
>      if (!ref)
>      {
>        TLBImpLib *pImpLib, *pImpLibNext;
> -      TLBRefType *ref_type;
> +      TLBRefType *ref_type, *ref_type_next;
>        TLBString *tlbstr, *tlbstr_next;
>        TLBGuid *tlbguid, *tlbguid_next;
> -      void *cursor2;
>        int i;
>  
>        /* remove cache entry */
> @@ -4778,7 +4777,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
>            heap_free(pImpLib);
>        }
>  
> -      LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry)
> +      LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry)
>        {
>            list_remove(&ref_type->entry);
>            heap_free(ref_type);
> -- 
> 2.14.1

This is an existing patch, if you picked it from wine-staging or somewhere you should have mentioned the original author...

commit 0dde88202a97578ffd346ae24d904a4f89cfb9b9
Author: Nils Kuhnhenn 
Date:   Fri Jun 16 16:05:07 2017 +0200

oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.

[Nikolay Sivov]

On 3/31/2018 7:02 PM, André Hentschel wrote:
> Am 14.03.2018 um 07:00 schrieb Adeniyi Mayokun:
> > From 275d93c9ab0f533fa70d698726afc8adaaefb664 Mon Sep 17 00:00:00 2001
> > From: Adeniyi Mayokun <[e-mail] >
> > Date: Wed, 14 Mar 2018 06:55:15 +0100
> > Subject: [PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type
> > Signed-off-by: Adeniyi Mayokun
> >
> > dlls/oleaut32/typelib.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
> > index 1c00d715f4..247d383ff7 100644
> > --- a/dlls/oleaut32/typelib.c
> > +++ b/dlls/oleaut32/typelib.c
> > @@ -4725,10 +4725,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
> >      if (!ref)
> >      {
> >        TLBImpLib *pImpLib, *pImpLibNext;
> > -      TLBRefType *ref_type;
> > +      TLBRefType *ref_type, *ref_type_next;
> >        TLBString *tlbstr, *tlbstr_next;
> >        TLBGuid *tlbguid, *tlbguid_next;
> > -      void *cursor2;
> >        int i;
> >  
> >        /* remove cache entry */
> > @@ -4778,7 +4777,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
> >            heap_free(pImpLib);
> >        }
> >  
> > -      LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry)
> > +      LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry)
> >        {
> >            list_remove(&ref_type->entry);
> >            heap_free(ref_type);
> > -- 
> > 2.14.1
>
> This is an existing patch, if you picked it from wine-staging or somewhere you should have mentioned the original author...
>
> commit 0dde88202a97578ffd346ae24d904a4f89cfb9b9
> Author: Nils Kuhnhenn 
> Date:   Fri Jun 16 16:05:07 2017 +0200
> oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.

To clarify, it was committed last summer, so obviously it does not apply
any more.