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

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

appwiz.cpl: Search /opt/wine for addons.
2f6896b1 · Vincent Povirk · Alexandre Julliard · 46400814 · 2f6896b1
Commit 2f6896b1 authored Mar 21, 2019 by Vincent Povirk Committed by Alexandre Julliard Mar 25, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

addons.c dlls/appwiz.cpl/addons.c +3 -0

No files found.
--- 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