[PATCH 2/5] winemenubuilder: Get content type from registry only when needed

Alex Henrie alexhenrie24 at gmail.com
Mon Oct 4 00:51:23 CDT 2021


When Freedesktop recognizes the content type, the value from the
registry is ignored.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 programs/winemenubuilder/winemenubuilder.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 51d83aed971..278480d3a9c 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -2183,16 +2183,13 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic
 
             iconW = assoc_query(ASSOCSTR_DEFAULTICON, extensionW, NULL);
 
-            contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL);
-            if (contentTypeW)
-                wcslwr(contentTypeW);
-
             mimeType = freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW);
 
             if (mimeType == NULL)
             {
+                contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL);
                 if (contentTypeW != NULL && wcschr(contentTypeW, '/'))
-                    mimeType = xwcsdup(contentTypeW);
+                    mimeType = xwcsdup(wcslwr(contentTypeW));
                 else if (!(mimeType = get_special_mime_type(extensionW)))
                     mimeType = heap_wprintf(L"application/x-wine-extension-%s", &extensionW[1]);
 
-- 
2.33.0




More information about the wine-devel mailing list