[vlc-devel] [PATCH] directdraw: add prefix to GUID

[Hugo Beauzée-Luyssen]

On Thu, Jul 12, 2018, at 9:05 AM, Steve Lhomme wrote:
> What is the link error ? We define it locally because it's not found in 
> a library. Although it may be in newer versions on mingw64 and you may 
> have this library (uuid.lib) already included from somewhere else.
> 

AFAICS it was added in mingw-w64 in 2007, so I'm surprised it's even needed (and actually surprised that it compiles fine in most cases)
In any case I'd be very interested in the error as well

> I would rather not redefine things if they are available in the build 
> system.
> 
> 
> On 2018-07-04 12:52, Zhao Zhili wrote:
> > Fix static linking.
> > ---
> >   modules/video_output/win32/directdraw.c | 10 +++++-----
> >   1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/modules/video_output/win32/directdraw.c b/modules/video_output/win32/directdraw.c
> > index 0af3ba0..590ee80 100644
> > --- a/modules/video_output/win32/directdraw.c
> > +++ b/modules/video_output/win32/directdraw.c
> > @@ -171,8 +171,8 @@ struct vout_display_sys_t
> >   #include <initguid.h>
> >   #undef GUID_EXT
> >   #define GUID_EXT
> > -DEFINE_GUID(IID_IDirectDraw2, 0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56);
> > -DEFINE_GUID(IID_IDirectDrawSurface2, 0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27);
> > +DEFINE_GUID(VLC_IID_IDirectDraw2, 0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56);
> > +DEFINE_GUID(VLC_IID_IDirectDrawSurface2, 0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27);
> >   
> >   static picture_pool_t *Pool  (vout_display_t *, unsigned);
> >   static void           Display(vout_display_t *, picture_t *, subpicture_t *);
> > @@ -645,7 +645,7 @@ static int DirectXOpenDDraw(vout_display_t *vd)
> >   
> >       /* Get the IDirectDraw2 interface */
> >       void *ptr;
> > -    hr = IDirectDraw_QueryInterface(ddobject, &IID_IDirectDraw2,
> > +    hr = IDirectDraw_QueryInterface(ddobject, &VLC_IID_IDirectDraw2,
> >                                       &ptr);
> >       /* Release the unused interface */
> >       IDirectDraw_Release(ddobject);
> > @@ -828,7 +828,7 @@ static int DirectXOpenDisplay(vout_display_t *vd)
> >       }
> >   
> >       void *ptr;
> > -    hr = IDirectDrawSurface_QueryInterface(display, &IID_IDirectDrawSurface2,
> > +    hr = IDirectDrawSurface_QueryInterface(display, &VLC_IID_IDirectDrawSurface2,
> >                                              &ptr);
> >       /* Release the old interface */
> >       IDirectDrawSurface_Release(display);
> > @@ -928,7 +928,7 @@ static int DirectXCreateSurface(vout_display_t *vd,
> >   
> >       /* Now that the surface is created, try to get a newer DirectX interface */
> >       hr = IDirectDrawSurface_QueryInterface(surface_v1,
> > -                                           &IID_IDirectDrawSurface2,
> > +                                           &VLC_IID_IDirectDrawSurface2,
> >                                              (LPVOID *)surface);
> >       IDirectDrawSurface_Release(surface_v1);
> >       if (hr != DD_OK) {
> > -- 
> > 2.9.5
> >
> >
> >
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr