[Bug 43175] New:=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

Bug ID: 43175
           Summary: redefinition of typedef ‘ID2D1Image’ (gcc-4.2)
           Product: Wine
           Version: 2.10
          Hardware: x86-64
                OS: Mac OS X
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: windowscodecs
          Assignee: [e-mail]
          Reporter: [e-mail]
                CC: [e-mail]
   Regression SHA1: 28ea560b7a935e9652906d2dbf3460aa0cb927b7

In file included from bitmap.c:23:
../../include/wincodec.h:437: error: redefinition of typedef ‘ID2D1Image’
../../include/d2d1.h:126: error: previous declaration of ‘ID2D1Image’ was here
make[1]: *** [bitmap.o] Error 1
make: *** [dlls/d2d1] Error 2
make: *** Waiting for unfinished jobs....

Regression test revealed:

author    Alistair Leslie-Hughes     
Tue, 6 Jun 2017 01:51:05 +0000 (01:51 +0000)
commit    28ea560b7a935e9652906d2dbf3460aa0cb927b7

include/windocdec.idl: Add interface IWICImagingFactory2.

As the first bad commit.

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

Gijs Vermeulen  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]
           Keywords|                            |regression

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

--- Comment #1 from Gijs Vermeulen  ---
Forgot to specify this, but reverting 28ea560b7a935e9652906d2dbf3460aa0cb927b7
made the problem go away.

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

--- Comment #2 from Alistair Leslie-Hughes  ---
Created attachment 58438
  --> https://bugs.winehq.org/attachment.cgi?id=58438
Patch

Does this fix the issue?

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

--- Comment #3 from Gijs Vermeulen  ---
(In reply to Alistair Leslie-Hughes from comment #2)
> Created attachment 58438 [details]
> Patch
>
> Does this fix the issue?

Yes it does, thank you.

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

Sebastian Lackner  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

Alistair Leslie-Hughes  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #58438|0                           |1
        is obsolete|                            |

--- Comment #4 from Alistair Leslie-Hughes  ---
Created attachment 58450
  --> https://bugs.winehq.org/attachment.cgi?id=58450
try 2

Can you please try this patch instead?

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

--- Comment #5 from Gijs Vermeulen  ---
(In reply to Alistair Leslie-Hughes from comment #4)
> Created attachment 58450 [details]
> try 2
>
> Can you please try this patch instead?

This one works too, thank you.

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

Bruno Jesus  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
     Ever confirmed|0                           |1
           Keywords|                            |patch
             Status|UNCONFIRMED                 |NEW

--- Comment #6 from Bruno Jesus  ---
Confirming on PC-BSD. Same error and the patch fixes it.

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

Gijs Vermeulen  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED
      Fixed by SHA1|                            |92847874b273ec488e6eaa882ca
                   |                            |c8772005ff9ea

--- Comment #7 from Gijs Vermeulen  ---
Fixed by 92847874b273ec488e6eaa882cac8772005ff9ea

[Bug 43175]=?UTF-8?Q?=20redefinition=20of=20type?= def ‘ID2D1Image’ (gcc-4.2)

https://bugs.winehq.org/show_bug.cgi?id=43175

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #8 from Alexandre Julliard  ---
Closing bugs fixed in 2.11.