Commit 6dbe300f authored by Rafaël Carré's avatar Rafaël Carré

windows: use C++ prototype for REFIID / CoCreateInstance

Fix build with mingw-w64
parent 2287e147
...@@ -32,8 +32,13 @@ ...@@ -32,8 +32,13 @@
#define CLSCTX_INPROC_SERVER 1 #define CLSCTX_INPROC_SERVER 1
typedef GUID IID; typedef GUID IID;
#ifndef _REFIID_DEFINED #ifndef _REFIID_DEFINED
# ifdef __cplusplus
# define REFIID const IID&
# else
# define REFIID const IID* const # define REFIID const IID* const
# endif
#endif #endif
const GUID clsid_IApplication2 = { 0x1968106d,0xf3b5,0x44cf,{0x89,0x0e,0x11,0x6f,0xcb,0x9e,0xce,0xf1}}; const GUID clsid_IApplication2 = { 0x1968106d,0xf3b5,0x44cf,{0x89,0x0e,0x11,0x6f,0xcb,0x9e,0xce,0xf1}};
......
...@@ -888,7 +888,7 @@ void SPrefsPanel::assoDialog() ...@@ -888,7 +888,7 @@ void SPrefsPanel::assoDialog()
if( S_OK == CoCreateInstance( &clsid_IApplication2, if( S_OK == CoCreateInstance( &clsid_IApplication2,
NULL, CLSCTX_INPROC_SERVER, NULL, CLSCTX_INPROC_SERVER,
&IID_IApplicationAssociationRegistrationUI, IID_IApplicationAssociationRegistrationUI,
(void **)&p_appassoc) ) (void **)&p_appassoc) )
{ {
if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) ) if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) )
......
...@@ -81,7 +81,7 @@ void MainInterface::createTaskBarButtons() ...@@ -81,7 +81,7 @@ void MainInterface::createTaskBarButtons()
if( S_OK == CoCreateInstance( &clsid_ITaskbarList, if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
NULL, CLSCTX_INPROC_SERVER, NULL, CLSCTX_INPROC_SERVER,
&IID_ITaskbarList3, IID_ITaskbarList3,
(void **)&p_taskbl) ) (void **)&p_taskbl) )
{ {
p_taskbl->vt->HrInit(p_taskbl); p_taskbl->vt->HrInit(p_taskbl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment