IApplicationAssociationRegistrationUI: move to single user
authorRafaël Carré <funman@videolan.org>
Tue, 17 Sep 2013 22:43:04 +0000 (00:43 +0200)
committerRafaël Carré <funman@videolan.org>
Tue, 17 Sep 2013 22:43:37 +0000 (00:43 +0200)
This interface is only defined for Vista+ in mingw-w64 3.0
If we define an extern symbol for the GUID it will clash at
linking with libuuid which always contains it.

include/vlc_windows_interfaces.h
modules/gui/qt4/components/simple_preferences.cpp

index c7a6c0e..e4c41f2 100644 (file)
@@ -228,18 +228,4 @@ struct ITaskbarList3Vtbl
 # define THBN_CLICKED        0x1800
 #endif
 
-#ifndef __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__
-#define __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__
-const GUID IID_IApplicationAssociationRegistrationUI = {0x1f76a169,0xf994,0x40ac, {0x8f,0xc8,0x09,0x59,0xe8,0x87,0x47,0x10}};
-const GUID CLSID_ApplicationAssociationRegistrationUI = { 0x1968106d,0xf3b5,0x44cf,{0x89,0x0e,0x11,0x6f,0xcb,0x9e,0xce,0xf1}};
-#ifdef __cplusplus
-
-interface IApplicationAssociationRegistrationUI : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE LaunchAdvancedAssociationUI(
-        LPCWSTR pszAppRegName) = 0;
-};
-#endif /* __cplusplus */
-#endif /* __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__ */
-
 #endif //MINGW_WORKAROUNDS_H
index 499f362..99a3dfa 100644 (file)
@@ -1206,6 +1206,19 @@ bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current,
 
 void SPrefsPanel::assoDialog()
 {
+#if !defined(__IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__)
+#define __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__
+    const GUID IID_IApplicationAssociationRegistrationUI = {0x1f76a169,0xf994,0x40ac, {0x8f,0xc8,0x09,0x59,0xe8,0x87,0x47,0x10}};
+    const GUID CLSID_ApplicationAssociationRegistrationUI = { 0x1968106d,0xf3b5,0x44cf,{0x89,0x0e,0x11,0x6f,0xcb,0x9e,0xce,0xf1}};
+#ifdef __cplusplus
+    interface IApplicationAssociationRegistrationUI : public IUnknown
+    {
+        virtual HRESULT STDMETHODCALLTYPE LaunchAdvancedAssociationUI(
+                LPCWSTR pszAppRegName) = 0;
+    };
+#endif /* __cplusplus */
+#endif /* __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__ */
+
     IApplicationAssociationRegistrationUI *p_appassoc;
     CoInitializeEx( NULL, COINIT_MULTITHREADED );