wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 47b02e8c1ea4ad82cd572dc3dcf60af753222f39.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-03-19 15:02:16 +11:00
parent 62db3313d5
commit e3a9010df6
6 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch
View File

@@ -1,4 +1,4 @@
From 1b6c8682eeabea769020928a1f0fadb6f4a66930 Mon Sep 17 00:00:00 2001
From d83180d032eee8c3ec72c22fc2706d8b7231090e Mon Sep 17 00:00:00 2001
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Sun, 1 Mar 2020 17:58:12 -0700
Subject: [PATCH] winemenubuilder: Blacklist desktop integration for certain
@@ -65,12 +65,12 @@ index 4a650b444fc..548739f4326 100644
;; PS
HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps"
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 4ff5e874cf8..892e0a04167 100644
index 131fd34ed7a..48c867cd216 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -512,6 +512,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1
HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8
HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9
@@ -329,6 +329,16 @@ HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
HKCR,mailto\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
+HKCU,Software\Wine\FileOpenBlacklist\.htm,"winebrowser",,"""%11%\winebrowser.exe"" -nohome"
+HKCU,Software\Wine\FileOpenBlacklist\.html,"winebrowser",,"""%11%\winebrowser.exe"" -nohome"
@@ -86,10 +86,10 @@ index 4ff5e874cf8..892e0a04167 100644
HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}"
HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,""
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 6d157305135..ed400d2052e 100644
index 31c97107802..0226d0d7ad9 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -2092,7 +2092,7 @@ static BOOL write_freedesktop_mime_type_entry(const WCHAR *packages_dir, const W
@@ -1954,7 +1954,7 @@ static BOOL write_freedesktop_mime_type_entry(const WCHAR *packages_dir, const W
return ret;
}
@@ -98,7 +98,7 @@ index 6d157305135..ed400d2052e 100644
{
/* These are managed through external tools like wine.desktop, to evade malware created file type associations */
if (!wcsicmp(extension, L".com") ||
@@ -2102,6 +2102,42 @@ static BOOL is_extension_banned(LPCWSTR extension)
@@ -1964,6 +1964,42 @@ static BOOL is_extension_banned(LPCWSTR extension)
return FALSE;
}
@@ -141,7 +141,7 @@ index 6d157305135..ed400d2052e 100644
static WCHAR *get_special_mime_type(LPCWSTR extension)
{
if (!wcsicmp(extension, L".lnk"))
@@ -2189,6 +2225,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
@@ -2044,6 +2080,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
WCHAR *mimeProgId = NULL;
struct rb_string_entry *entry;
@@ -157,7 +157,7 @@ index 6d157305135..ed400d2052e 100644
wcslwr(extensionW);
friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL);
@@ -2229,11 +2274,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
@@ -2083,11 +2128,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
hasChanged = TRUE;
}
@@ -170,5 +170,5 @@ index 6d157305135..ed400d2052e 100644
if (executableW)
openWithIcon = compute_native_identifier(0, executableW, NULL);
--
2.33.0
2.35.1