Vincent Povirk : appwiz.cpl: Search /opt/wine for addons.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2f6896b14d2b1905a25b1ef55bcdc792f9fa02ac
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2f6896b14d2b1905a25b1ef55bcdc792f9fa02ac

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Thu Mar 21 10:14:39 2019 -0500

appwiz.cpl: Search /opt/wine for addons.

Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/appwiz.cpl/addons.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index 225f915..b070307 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -330,6 +330,8 @@ static enum install_res install_from_default_dir(void)
         ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name);
     if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share"))
         ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name);
+    if (ret == INSTALL_NEXT)
+        ret = install_from_unix_file("/opt/wine/", addon->subdir_name, addon->file_name);
     return ret;
 }
 
@@ -794,6 +796,7 @@ BOOL install_addon(addon_t addon_type)
      * - $datadir/$addon_subdir/
      * - $INSTALL_DATADIR/wine/$addon_subdir/
      * - /usr/share/wine/$addon_subdir/
+     * - /opt/wine/$addon_subdir/
      * - download from URL stored in $url_config_key value of HKCU/Software/Wine/$config_key key
      */
     if (install_from_registered_dir() == INSTALL_NEXT