[vlc-commits] IApplicationAssociationRegistrationUI: move to single user

[Rafaël Carré]

vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Sep 18 00:43:04 2013 +0200| [f2f2c2519f81cea813e4fa3e8a72c0d384b46fa0] | committer: Jean-Baptiste Kempf

IApplicationAssociationRegistrationUI: move to single user

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.

(cherry picked from commit f033c000b2617d7acb3d1e8bfd98de81b9238949)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=f2f2c2519f81cea813e4fa3e8a72c0d384b46fa0
---

 include/vlc_windows_interfaces.h                  |   14 --------------
 modules/gui/qt4/components/simple_preferences.cpp |   13 +++++++++++++
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/vlc_windows_interfaces.h b/include/vlc_windows_interfaces.h
index c7a6c0e..e4c41f2 100644
--- a/include/vlc_windows_interfaces.h
+++ b/include/vlc_windows_interfaces.h
@@ -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
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index ab415a3..785ec60 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1208,6 +1208,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 );