windows: use C++ prototype for REFIID / CoCreateInstance

Fix build with mingw-w64

diff --git a/include/vlc_windows_interfaces.h b/include/vlc_windows_interfaces.h
index 9e0dd35acc91a593b469e3217cf773ad8836d7fd..ac066e6fac4a8eeaebe7c7e07c640efe833e0281 100644 (file)
--- a/include/vlc_windows_interfaces.h
+++ b/include/vlc_windows_interfaces.h
@@ -32,8 +32,13 @@
 
 #define CLSCTX_INPROC_SERVER 1
 typedef GUID IID;
+
 #ifndef _REFIID_DEFINED
-# define REFIID const IID* const
+# ifdef __cplusplus
+#  define REFIID const IID&
+# else
+#  define REFIID const IID* const
+# endif
 #endif
 
 const GUID clsid_IApplication2 = { 0x1968106d,0xf3b5,0x44cf,{0x89,0x0e,0x11,0x6f,0xcb,0x9e,0xce,0xf1}};

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index faee5e24ec2ca6b8da327d0399f2b92495260568..57e5839d270e98d86f9a02b982f7947ce601b8a0 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -888,7 +888,7 @@ void SPrefsPanel::assoDialog()
 
     if( S_OK == CoCreateInstance( &clsid_IApplication2,
                 NULL, CLSCTX_INPROC_SERVER,
-                &IID_IApplicationAssociationRegistrationUI,
+                IID_IApplicationAssociationRegistrationUI,
                 (void **)&p_appassoc) )
     {
         if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) )

diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp
index 2b819072332a257b8cfd9dce8c439bc98c80889a..bbbfe44c0d69f85a01dcb890fd553928555edf33 100644 (file)
--- a/modules/gui/qt4/main_interface_win32.cpp
+++ b/modules/gui/qt4/main_interface_win32.cpp
@@ -81,7 +81,7 @@ void MainInterface::createTaskBarButtons()
 
     if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
                 NULL, CLSCTX_INPROC_SERVER,
-                &IID_ITaskbarList3,
+                IID_ITaskbarList3,
                 (void **)&p_taskbl) )
     {
         p_taskbl->vt->HrInit(p_taskbl);