From patchwork Sat Feb 19 09:56:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692131nkx; Sat, 19 Feb 2022 01:56:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxG6iNzghGZuY5aLLljre2g1DChlq3vvDxnbfvnH9GzSWChofLRJSIlQMEQ1I6wZDN6Dez8 X-Received: by 2002:a50:ba8e:0:b0:410:a99c:4c3b with SMTP id x14-20020a50ba8e000000b00410a99c4c3bmr12442230ede.427.1645264614969; Sat, 19 Feb 2022 01:56:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264614; cv=none; d=google.com; s=arc-20160816; b=in5KfK2EQzvM15tRus6l5NjT6h5Ild4ItlX68PI32RG2WDseYr7WQCcVyyQUOzTk/K GGM4GiOMJK2XgOJ0tJEhVdTIq5+kgFqkOD9GMCfWNz1ALQEjV2rHrbBWIsiZumxdMhHl m+vy4VbOBOTUQdXOD5wNMoE90/iqYgRPNr26UmgVmwB10D/sOzvMHV9kif3Iw4MtM9lp L3vlkgTJ3MDRxig6q37RcYUPBEKdLsbfDjkL2h+J/U03FNKihNtg1imXX1zbLPKeVr0W Au2XYC78Iqf5VxdLKCJblNT10YSpn37NzC5385LjgJLhU4OmgDAs/Rds1Ac5+TXxzNPs LlHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=1KcIWr7vXotbkYbg0td7z4JAj73xsqvOMvue1ynC3o0=; b=PsDxgOByzmJbM2hKGY4CYtlONsbnAfxBX+9VdkB86yD+ADs+xq6s4HAf1hQ8tvKYWm NN6oJQRJFV0ykTVnjHs+8fsh+X7PfjZX6OSiq02OSp8kp5yfv5UQcc+j0dXhdz0ZI6iA cYJM80wfso29y/Yy+MIcwUXMQ9KwmOygmao2DYQpt5fKR+HbGvrEiHPP3Vk8bmxBpSfU HH9xob9i/9J3Y5yM3y8/QybSVKnxxAlbf0WhzykaYUSwT8E57f0ligIgtUeVakHs7KD0 svi7wBrm2aItzeqGy0zx2rCEoj7+beJ3fhB4rl83oiclxHYQ56Gh8KxaSjTERs5o8lml DJzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="HeL/Iq4Q"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bg9si5442518ejb.460.2022.02.19.01.56.53; Sat, 19 Feb 2022 01:56:54 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="HeL/Iq4Q"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59C9268B11A; Sat, 19 Feb 2022 11:56:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A79068AFDC for ; Sat, 19 Feb 2022 11:56:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264595; bh=UaTF/ZFNf+TaWxTnXLeNinfxMIrGgRvkXoYlUt+N8Kg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=HeL/Iq4QPbHRrNEyqKPb2YxwdAb2n/Kc6Yc2wl/QGjp0WSxg6wKSghsKwPXjZyb3T FqUYycv31bKKKabvWZL9qH/3RpAm4XYUwkiSJOlsbzP5U/K/kJ3hhtwFcnjDKHf10F MfkvIDUspXHUy/S+qYZKywS/Wef5CsfgDtaXY2eg= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:56:35 +0100 (CET) X-EA-Auth: WZqTcCopBqSCZuhkcwe1UMzAc625T7x6vS9L88/5njpa1+QtOC/QgE1oz5EBuSFJFQaR9a43Omc+quR1YMNU/ODeIeEHIPLOl8slb8qOhDM= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:18 +0300 Message-Id: <20220219095623.9417-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 1/6] libavutil/wchar_filename.h: Add whcartoutf8, wchartoansi and utf8toansi X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IYbAdJ3PEnlE These functions are going to be used in libavformat/avisynth.c and fftools/cmdutils.c when replacing MAX_PATH-sized buffers with dynamically sized ones. --- libavutil/wchar_filename.h | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f0824..70cd5a4 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,57 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, *filename_w, num_chars); return 0; } + +av_warn_unused_result +static inline int wchartocp(const unsigned int code_page, const wchar_t *filename_w, + char **filename) +{ + const int flags = code_page == CP_UTF8 ? MB_ERR_INVALID_CHARS : 0; + const int num_chars = WideCharToMultiByte(code_page, flags, filename_w, -1, + NULL, 0, NULL, NULL); + if (num_chars <= 0) { + *filename = NULL; + return 0; + } + *filename = av_calloc(num_chars, sizeof(char)); + if (!*filename) { + errno = ENOMEM; + return -1; + } + WideCharToMultiByte(code_page, flags, filename_w, -1, + *filename, num_chars, NULL, NULL); + return 0; +} + +av_warn_unused_result +static inline int wchartoutf8(const wchar_t *filename_w, char **filename) +{ + return wchartocp(CP_UTF8, filename_w, filename); +} + +av_warn_unused_result +static inline int wchartoansi(const wchar_t *filename_w, char **filename) +{ + return wchartocp(CP_THREAD_ACP, filename_w, filename); +} + +av_warn_unused_result +static inline int utf8toansi(const char *filename_utf8, char **filename) +{ + wchar_t *filename_w = NULL; + int ret = -1; + if (utf8towchar(filename_utf8, &filename_w)) + return -1; + + if (!filename_w) { + *filename = NULL; + return 0; + } + + ret = wchartoansi(filename_w, filename); + av_free(filename_w); + return ret; +} #endif #endif /* AVUTIL_WCHAR_FILENAME_H */ From patchwork Sat Feb 19 09:56:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692466nkx; Sat, 19 Feb 2022 01:57:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCzE2UmXfpMck2mLUGDhoBOiNmPj/mimlRXarpzdCzbthYwzQJXCBFqp704Q2ZpB6+Gj3k X-Received: by 2002:a17:906:a85:b0:6d0:827a:89d0 with SMTP id y5-20020a1709060a8500b006d0827a89d0mr8235139ejf.230.1645264655487; Sat, 19 Feb 2022 01:57:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264655; cv=none; d=google.com; s=arc-20160816; b=b7ZF/hGoRM3+YBP2/8YuE1wR40lLKiNXwSTOlGTIUACqntlsyZyXKl2oqcDokOdtmm OlIE9DWQfABZrHPWgErkUKbdF2XK1QkGxjUM732pI0FkTNDLMHjoKY3/rqw86VF2UhRy PiCggaF15bgYVuGnoKA21G5wRgTfpLKsoyGrgs0PRheCNH4/TRuEmlUYLxpJJM/gTwGG wMK6ivOvOfiTkiMI+YWThey+cnBqYWCyoC407Zmm/gvNXChuv7V3JvszVa4qRxGdiNI+ fCICfcEUDYayr1kWjijJYpxy/q+UbOTFo2bcCcdXMet1U+iYdLybbOqDNN5bea5nPTeI i26Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xw7Cj+UJEsLYW5gd2dGTMvW/uUkVNCpFVmnOsAn9kU4=; b=MFVIHab+e/3lqfGk7Zrxi6LDQQbVkEEDJ5PJGGAHNJbcnLErWeho5+rItLq3mwu7iW pjP43LU314dj+Ht0sDJ8UxJrWt0CLxoARKyDtTNtLfdWCVsTINn+1ii1fEsH48mZAOS+ KbDuBPQlamACHSxvKM9ipDIKa5IqgYnHsCX3hT4nqV7ODjODJ3fQL/lP7Vj4/5ztKFwU kOOAtnsRlIjsBdQtFckfvzdZ/qX0rUjmp2Y2g2QfelG+ECvfVN2sUwpfglDvDAkTZBek 6pJUG4V05Ph1Lme/anrK0JA8Kvfbi5ip/bwYynJkTQ3DiU7BJhGc29KY1btAcqZ+WEbQ 02lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=DJOcmMXh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w25si7740712edt.600.2022.02.19.01.57.35; Sat, 19 Feb 2022 01:57:35 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=DJOcmMXh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B034568B19F; Sat, 19 Feb 2022 11:56:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32B7068B0CD for ; Sat, 19 Feb 2022 11:56:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264596; bh=v0NXlsvOi2QMYMh51jQD1B6JipWxNNrVG0rV2ZtjWAQ=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=DJOcmMXh1eFHhlVG3AOrYe9kuG5eIE23/AauSoXP32uPbAApJ66L775yds5TdVCxz Sryc/Ic+6gDVxGB0NyYiOFu8ZXXQMaLtVKlRbhfFoD2mL1YLPLOlPoE3yGhwbgg0qw wiwnMUeKMMNkS65xJgXEHi1ZtgBob/zGezd5MMG4= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:56:36 +0100 (CET) X-EA-Auth: OtCLGuJF4c+Vq+Ldx7mWEhJQq5V+oVqDfxeJ8cUz2gEvlFuO7KlCE3CWkyweQbba0iYk1USsb+wHFnRz4hznqiHqqmd0mhR9608osOMUzbI= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:19 +0300 Message-Id: <20220219095623.9417-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219095623.9417-1-nil-admirari@mailo.com> References: <20220219095623.9417-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 2/6] libavformat/avisynth.c: Replace MAX_PATH-sized buffers with dynamically sized ones X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +o41+XjDlEHh --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 2bd0c69..e28d832 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -34,6 +34,7 @@ /* Platform-specific directives. */ #ifdef _WIN32 #include "compat/w32dlfcn.h" + #include "libavutil/wchar_filename.h" #undef EXTERN_C #define AVISYNTH_LIB "avisynth" #else @@ -793,8 +794,7 @@ static int avisynth_open_file(AVFormatContext *s) AVS_Value arg, val; int ret; #ifdef _WIN32 - char filename_ansi[MAX_PATH * 4]; - wchar_t filename_wc[MAX_PATH * 4]; + char *filename_ansi = NULL; #endif if (ret = avisynth_context_create(s)) @@ -802,10 +802,12 @@ static int avisynth_open_file(AVFormatContext *s) #ifdef _WIN32 /* Convert UTF-8 to ANSI code page */ - MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4); - WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi, - MAX_PATH * 4, NULL, NULL); + if (utf8toansi(s->url, &filename_ansi)) { + ret = AVERROR_UNKNOWN; + goto fail; + } arg = avs_new_value_string(filename_ansi); + av_free(filename_ansi); #else arg = avs_new_value_string(s->url); #endif From patchwork Sat Feb 19 09:56:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692222nkx; Sat, 19 Feb 2022 01:57:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwE6seRRWD6Kw4TVD1n1+UPHV1jjS3s5T3t3zESXvgLzQfppHqtMwl9/nR/MW52eeFC0tWc X-Received: by 2002:a17:906:18b2:b0:6d0:ee54:1add with SMTP id c18-20020a17090618b200b006d0ee541addmr2096260ejf.499.1645264626227; Sat, 19 Feb 2022 01:57:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264626; cv=none; d=google.com; s=arc-20160816; b=tVZTSEQ5aEJq5o+w6ITdfCUBHoC+yIt5pRVa9qmVNgnR8DGeF371XB+eF5vf28eWjL a4CrtNDe0zlumvLx67WBlAe0Ja/vhRQyDZRbyH/zls6bWocaVD94/c7W8DUrSlBHivjk nqSZBcfPLj7W4aHA3G/pemVB9UtB0lFO/6XqXU5+POavLhsezD10K1xpNnhskoI3d2Wq VnoPrbeJeJBeaS2YXxpeWv1xcr/7uyoFMwnNDYuL2BOrCjAPUnuWXy3WNzKNToUgOORY VWGSzmEHSS+cqimVuBjuBSzZ9WvDWC1x3zD1YSOfbsRJjJvJZLI/euKa/IRzhOY5TbeO 1/cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=bPHl+A3f3NrnVF3zAK4GFJjqfzDO0FUm+bQDlfgmPwo=; b=AvLW+W5YTj45vQSWNlHLiFQnC5Cid8CocPKTiKaK7yE4QXSA0p080T2PfEYe+JHw2q +Jm2EGffjnFpSuUt7Zh92TxjEEqM/nJGmhj0c8Iao+D+FSiY/sIrQA0wZCbXfReQDs5D kNI6udDu4QHgVxymYSU1mweW2tV4EQNqnDXbwKaDGCY/V1gRaJz5RzEw4K06w/CcOuqo mjukSFktA8bfX4feSpI4SNeFQhOuBTMajLtSDCu6MjNHkJDz+YGrceTBOlGzuNXN6yD2 mKuv/k2UpeJ8+wXBAPBzqWMmWxCo0NXYbxsFQZC8uGk6+IA7DEyKDW3V2dLG2gdD7umC zAhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=FZeXBDu3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f20si1685843edc.256.2022.02.19.01.57.04; Sat, 19 Feb 2022 01:57:06 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=FZeXBDu3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83A3268B14F; Sat, 19 Feb 2022 11:56:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 282EA68AEFA for ; Sat, 19 Feb 2022 11:56:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264597; bh=Yjx7eV17kp5L23zKB69r5J1UQAazjkTgmtV3lBgZbYg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=FZeXBDu3yDQz5Ce56RXq1CCCwKFR71Vw2LVAVTxY7ilJAkVZmS8TDmYoVlG3r54/5 9mzHziGZlsdaoS/F9Mi9zDccOYMI8geNf4ta8huHw2YoQDgcYKuGgrAe+zO6dbWZMF JFtJ9jTGkm4kKLNPgn/32T+sk1r4X54gPi2jPfeQ= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:56:37 +0100 (CET) X-EA-Auth: 0vOLPfRCv471UaSLfW8ILdcQBzCLh//mxIMWk4hb3mRPsZfX/VUPzTa0I3myGFXGZJMx4ZVlxig+KTVp/aUA+/81EjscC2OyPc+tiszVglY= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:20 +0300 Message-Id: <20220219095623.9417-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219095623.9417-1-nil-admirari@mailo.com> References: <20220219095623.9417-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 3/6] compat/w32dlfcn.h: Replace MAX_PATH-sized buffers with dynamically sized ones X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZZfcWjXyvaN4 Also replaces a call to LoadLibraryExA with LoadLibraryExW since ANSI functions do not support long paths. --- compat/w32dlfcn.h | 74 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 13 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94ef..a8ac780 100644 --- a/compat/w32dlfcn.h +++ b/compat/w32dlfcn.h @@ -25,6 +25,30 @@ #if (_WIN32_WINNT < 0x0602) || HAVE_WINRT #include "libavutil/wchar_filename.h" #endif + +static inline wchar_t *get_module_filename(const HMODULE module) +{ + wchar_t *path = NULL; + int path_size = 0, path_len = 0; + + do { + path_size = path_size ? 1.5 * path_size : MAX_PATH; + wchar_t *new_path = av_realloc_array(path, path_size, sizeof *path); + if (!new_path) { + av_free(path); + return NULL; + } + path = new_path; + path_len = GetModuleFileNameW(module, path, path_size); + } while (path_len && path_size <= 32768 && path_size <= path_len); + + if (!path_len) { + av_free(path); + return NULL; + } + return path; +} + /** * Safe function used to open dynamic libs. This attempts to improve program security * by removing the current directory from the dll search path. Only dll's found in the @@ -34,28 +58,50 @@ */ static inline HMODULE win32_dlopen(const char *name) { + wchar_t *name_w = NULL; + if (utf8towchar(name, &name_w)) + name_w = NULL; #if _WIN32_WINNT < 0x0602 // Need to check if KB2533623 is available if (!GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDefaultDllDirectories")) { HMODULE module = NULL; - wchar_t *path = NULL, *name_w = NULL; - DWORD pathlen; - if (utf8towchar(name, &name_w)) + wchar_t *path = NULL, *new_path = NULL; + DWORD pathlen, pathsize, namelen; + if (!name_w) goto exit; - path = (wchar_t *)av_calloc(MAX_PATH, sizeof(wchar_t)); + namelen = wcslen(name_w); // Try local directory first - pathlen = GetModuleFileNameW(NULL, path, MAX_PATH); - pathlen = wcsrchr(path, '\\') - path; - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + path = get_module_filename(NULL); + if (!path) goto exit; - path[pathlen] = '\\'; + new_path = wcsrchr(path, '\\'); + if (!new_path) + goto exit; + pathlen = new_path - path; + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) + goto exit; + path = new_path; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (module == NULL) { // Next try System32 directory - pathlen = GetSystemDirectoryW(path, MAX_PATH); - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) goto exit; + if (pathlen + namelen + 2 > pathsize) { + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) + goto exit; + path = new_path; + // The buffer might have been not enough for system directory + // in the first place. + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) + goto exit; + } path[pathlen] = '\\'; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); @@ -73,15 +119,17 @@ exit: # define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 #endif #if HAVE_WINRT - wchar_t *name_w = NULL; int ret; - if (utf8towchar(name, &name_w)) + if (!name_w) return NULL; ret = LoadPackagedLibrary(name_w, 0); av_free(name_w); return ret; #else - return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + /* filename may be be in CP_ACP */ + if (!name_w) + return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + return LoadLibraryExW(name_w, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); #endif } #define dlopen(name, flags) win32_dlopen(name) From patchwork Sat Feb 19 09:56:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34406 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692410nkx; Sat, 19 Feb 2022 01:57:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwp+lan9PetZ6rk1LHBkYcWCmQco0dkluskv6Hen0f78HanpePzR0oNa6IngvG3+AK/BEIA X-Received: by 2002:a50:ee90:0:b0:40f:349f:7368 with SMTP id f16-20020a50ee90000000b0040f349f7368mr12053681edr.236.1645264645268; Sat, 19 Feb 2022 01:57:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264645; cv=none; d=google.com; s=arc-20160816; b=m5l79spTsCvZ6c28ePwuz4RwRKYZ1aQzUXLsvOy2+XdL4y81A696MdeniFPjtjBr2w 2WHG8rMKXXPO3ujn+R0Erosz3HtaLcwmTYkVTEU7TCgQSJpoPpmnnvMzWuA0RLRSsRD2 OcTfENODe2LQsOgMugJOA8rCmkrhyBpBRVCTarFLobsnwuRUs7NJwbvhoyEe4BJZmemz JbQprQwCR85rUF3vUy2Z25I3TCOTrRAHr3Ifml4TvIJGQjRIREl/VlwaFG7cg8/5TWXR Qn7QYZMmJcPcleuTJ2bUQoJYrTO0BPEg2Q9F63+SmdCv2cCMBSJcmmqF2SOVvzzvL5mL 1+8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=TRmDstopPVvrKuH49EakUzr2gJiWNGXlmjBEfDTf3Bo=; b=jHPefu9/ZkjYRIS3IryzwjakY5d1lamuT+niJK1WFeYbku2vNgeDMO1JuYiO6IV262 AOcYo8Tp85I1j1fnSuHxJ9awU+L4Qq6lJyKZS5xxoV1Ona1QkRu1JoCQon1QjyPRnryw ncFLvp/E4qFhJKffuyAQPqJIAkDX3ZiepSJ/dkLwmvpClrGWT5br/regirgxXttXGwOv tBlmTZtQvagdcDWjKTrvl7etchD3OCY87A0npg4oMdCS6LboE/19EarNwWg1FCOLMSet EWJ+CqhqJLJsC3gd38b2eoxqxVs93LVk7ZdT/zpEIkTr4IqQ1LVAybMkmOaCihaiYy6S 9FBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=Lgy9RwCN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n26si1008634ejr.817.2022.02.19.01.57.24; Sat, 19 Feb 2022 01:57:25 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=Lgy9RwCN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A33B668B164; Sat, 19 Feb 2022 11:56:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D53368B058 for ; Sat, 19 Feb 2022 11:56:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264598; bh=H8HJIYiw1HvIFkXRKR1L0BymRute8G9cxtVjIwJwhE8=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=Lgy9RwCNsevAEbiDxldtuYMEyHKPPOiNr905nyt4V1YWcdLC5Tddljx30e3jbuhzt tXpdJIeIerlku4Mfaet798Vg6jkmK+v688Te//xujdcSd9wWTWOhsP/QGhnEn/YwRg Zznvdk9UnCF8agbzHWTIPXtwO6sfrAkC6058fkyU= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:56:38 +0100 (CET) X-EA-Auth: XM0Lrp0mFq7tKwazQC9RnLAKGwtVHTprgfkrQj8bWNgnCFgc3JO73Rbg722S7jckT1L2Addag9/HMJcV02s/NKaoGZjqBBnk4gzdI9QpNqA= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:21 +0300 Message-Id: <20220219095623.9417-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219095623.9417-1-nil-admirari@mailo.com> References: <20220219095623.9417-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 4/6] fftools/cmdutils.c: Replace MAX_PATH-sized buffers with dynamically sized ones, and fopen with av_fopen_utf8 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: a+wpD0ZurklR --- fftools/cmdutils.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15..e87601e 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -40,6 +40,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" @@ -62,6 +63,7 @@ #endif #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif static int init_report(const char *env); @@ -1032,7 +1034,7 @@ static int init_report(const char *env) if (!envlevel) report_file_level = FFMAX(report_file_level, prog_loglevel); - report_file = fopen(filename.str, "w"); + report_file = av_fopen_utf8(filename.str, "w"); if (!report_file) { int ret = AVERROR(errno); av_log(NULL, AV_LOG_ERROR, "Failed to open report \"%s\": %s\n", @@ -2065,28 +2067,43 @@ FILE *get_preset_file(char *filename, size_t filename_size, { FILE *f = NULL; int i; +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + char *datadir = NULL; +#endif const char *base[3] = { getenv("FFMPEG_DATADIR"), getenv("HOME"), FFMPEG_DATADIR, }; if (is_path) { av_strlcpy(filename, preset_name, filename_size); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); } else { #if HAVE_GETMODULEHANDLE && defined(_WIN32) - char datadir[MAX_PATH], *ls; + wchar_t *datadir_w = get_module_filename(NULL); base[2] = NULL; - if (GetModuleFileNameA(GetModuleHandleA(NULL), datadir, sizeof(datadir) - 1)) + if (wchartoutf8(datadir_w, &datadir)) + datadir = NULL; + av_free(datadir_w); + + if (datadir) { - for (ls = datadir; ls < datadir + strlen(datadir); ls++) + char *ls; + for (ls = datadir; *ls; ls++) if (*ls == '\\') *ls = '/'; if (ls = strrchr(datadir, '/')) { - *ls = 0; - strncat(datadir, "/ffpresets", sizeof(datadir) - 1 - strlen(datadir)); - base[2] = datadir; + const int datadir_len = ls - datadir; + const int desired_size = datadir_len + strlen("/ffpresets") + 1; + char *new_datadir = av_realloc_array( + datadir, desired_size, sizeof *datadir); + if (new_datadir) { + datadir = new_datadir; + datadir[datadir_len] = 0; + strncat(datadir, "/ffpresets", desired_size - 1 - datadir_len); + base[2] = datadir; + } } } #endif @@ -2095,17 +2112,20 @@ FILE *get_preset_file(char *filename, size_t filename_size, continue; snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", preset_name); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); if (!f && codec_name) { snprintf(filename, filename_size, "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", codec_name, preset_name); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); } } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; } From patchwork Sat Feb 19 09:56:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692306nkx; Sat, 19 Feb 2022 01:57:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwAEwyEg6OYPgE67HzitRq2OTOk1LQC0wU+CARtMs4K5LMAcwQGZ0FZPa64Uc02ylv7Z81J X-Received: by 2002:a17:906:344b:b0:6ce:e64e:1b09 with SMTP id d11-20020a170906344b00b006cee64e1b09mr9310349ejb.54.1645264634847; Sat, 19 Feb 2022 01:57:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264634; cv=none; d=google.com; s=arc-20160816; b=c1lp2OO/ZDY2qhdYg3htJlOwcnsM28sfybLET5UViwbtKthz1LPu6aPs30iW9/2wHh BhstLBa7Ti0m+3p+cyjat4fp3rCNHu+qdATcbQdsasHnxB7KdWv63SxZXkvCD6WN7THs hoJP6iAQt7Y1BT1R2pp2aVSkgFDTJD0vkFcEKJJacbFiY9Wjz3HzT3WYh5nUpjSlkWrJ SnW1Sf4mvz9Peg7F22J1TVrPQCQHDRsZZbq2BLLTfZOt/0poaGkEKyZENftEMCLbYkRe PUrId7qJcHGy+BJEqqzx1EvTkaB6jKfSONwOpc3SUe1i/w7MOTC4SaSHEY8CLGQy86Vm f+uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=esehhxBMiwKb0pz6OSnIK7akoVSOCdXkT7BjgUrmsDc=; b=LpDY/kYDj6gz7Lnd4P4pQ5lJ1zdz5Jl7zdipuAbf9YPF0aLP3WnanDfkYSwErM8SvC vLh7GniV7rpY1NDzb3iI+FoxSX44zhDP2bScCzhGOr6Dmshq3rYcB1Rz7yesHedYKNIl OdRUUAWXJELS6q0NN7bW+H4RG7LIJTeJHnTq46QUQwHIjfnS+tLHIS5oZVAGTBg9Hoel ems8tTdtP7XUIMCFBQxoLFSnKi724nJ4RGzkNhDdDy2VcZHUeLawAMymI6XZ8xABJAIM FWPuJRGW6l6nvR4p8barHsOLiuhJUxKYdDfAC1Iymoh/Ipz61y0qA4eeu8ekjv0E4uB0 0KbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=k3fdo9zV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sb4si6257789ejc.129.2022.02.19.01.57.14; Sat, 19 Feb 2022 01:57:14 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=k3fdo9zV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F7FC68B14C; Sat, 19 Feb 2022 11:56:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FEDA68B0BB for ; Sat, 19 Feb 2022 11:56:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264599; bh=zFvXZWeWgPf+XX67XeHcVSogz9F7uLmqbfFMd8RFRzg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=k3fdo9zVV98DexvG3dEvXd7sAF52WZIQd70AuRNEvqWq74O6cdxSBU/7Zkpkk0p3Y hr6rSCZc1CBYgZe5sw973nfPAnUnYyctkhk7+2vAxADD4r0TInNjFp07r6nqvDW8F3 Dg5Tr8PfhZCYme0cXdllkyP3eGJoH+jHulKcZBYI= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:56:39 +0100 (CET) X-EA-Auth: HULwb/tp2NhMaggsCW5ZMwQnYTv1GNQxIiMyG1KPQ6amdyzeDnZQVsrCstZ5eA9SAIak/YU/kBqbo/iAfwSH7DrTh+6FqgfNen3WoEEZPXQ= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:22 +0300 Message-Id: <20220219095623.9417-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219095623.9417-1-nil-admirari@mailo.com> References: <20220219095623.9417-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 5/6] fftools: Enable long path support on Windows (fixes #8885) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ntlETVtslIxA --- fftools/Makefile | 5 +++++ fftools/fftools.manifest | 10 ++++++++++ fftools/manifest.rc | 3 +++ 3 files changed, 18 insertions(+) create mode 100644 fftools/fftools.manifest create mode 100644 fftools/manifest.rc diff --git a/fftools/Makefile b/fftools/Makefile index da42078..b221155 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -11,6 +11,11 @@ ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) OBJS-ffmpeg += fftools/ffmpeg_opt.o fftools/ffmpeg_filter.o fftools/ffmpeg_hw.o +# Windows resource files +OBJS-ffmpeg-$(HAVE_GNU_WINDRES) += fftools/manifest.o +OBJS-ffplay-$(HAVE_GNU_WINDRES) += fftools/manifest.o +OBJS-ffprobe-$(HAVE_GNU_WINDRES) += fftools/manifest.o + define DOFFTOOL OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes) $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) diff --git a/fftools/fftools.manifest b/fftools/fftools.manifest new file mode 100644 index 0000000..30b7d8f --- /dev/null +++ b/fftools/fftools.manifest @@ -0,0 +1,10 @@ + + + + + + + true + + + diff --git a/fftools/manifest.rc b/fftools/manifest.rc new file mode 100644 index 0000000..e436fa7 --- /dev/null +++ b/fftools/manifest.rc @@ -0,0 +1,3 @@ +#include + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fftools.manifest" From patchwork Sat Feb 19 09:57:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692537nkx; Sat, 19 Feb 2022 01:57:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzD0Pv/8rxVCjirR7Cv28C5M4mx1lImCb+sQpRTgrddTZOxHq8EEMlHhfm7Pt7/H66KFW0J X-Received: by 2002:a05:6402:350e:b0:412:d02f:9004 with SMTP id b14-20020a056402350e00b00412d02f9004mr6029577edd.59.1645264666511; Sat, 19 Feb 2022 01:57:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264666; cv=none; d=google.com; s=arc-20160816; b=BRzFAoPQkPNKoZfnIUvD+LLsjeKy4/mTmGyt53qNSfz8afyx0E1gZ7nHoUJtwI3FrM n7BunnU8vjaVCM9Rb6DBv70PmmXKJm84WzjDeAkme/wyhFQ5Eyt2trpA7cinuENLLbKw zv8W+0y1GeWN/FK9yQRQjvit8G7pH6PWjDt/869g2ep+IRBPNM1jMoCzO5C06Uz8thSY yVvl5umydfqEL3A/DySmoyEmoWMyjnMJzN4Az+pg52Lh11qgRN42Zpb71nnXQYK/kwgV H1APVtwoQUM6VATI5ePVeNBo2jssTQR9wGpHde5lPodqROAjLR9tLamKY9nKlPkN3GbA F8aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=/3rgZVbNugh8FBdOu+38fml+gF9J/4917oLUnX9j0rM=; b=Pg1GoANCt/zqTpB4a7fZm1wdOw7UUpc9Wqi+4h3WIq+Ke1qB5QeV5Ny8u60cWFHM9Y cqrrwRM8m7J3dTy4A49E1JQghy8EbyosmxUr/AIUkNzi5DBD4nXqjTdp+Fh/H/Ucd75Q w+Le6dNsbF8TSAEG2Oc8+i8GPWYJ+SKlL9UDNiriY8dSK5F6OqveBH4kUoYCCw4uMEuS xgsntVVum9ddW/Am65yGeBLmWgI7jbwSuFMB8/BtYj62+lSo4fb0ATaAC6hYTw68PF0M TXmCKdj2NqEcH7jVD3Gc9L2d3TH1z/MihCumGkfpLu+JqxZuXJD1VgKG7squ37qXBE2C KHVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=a4aLxzsQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dd2si7423269ejc.882.2022.02.19.01.57.46; Sat, 19 Feb 2022 01:57:46 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=a4aLxzsQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C098468B1FD; Sat, 19 Feb 2022 11:57:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC8DF68B0E4 for ; Sat, 19 Feb 2022 11:57:36 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264656; bh=arj4i+ZjicPkq0NlTR6GuXdrPs/J5vh3Iublebu6JY8=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=a4aLxzsQXoskF5jgr5z4rtB0YjVwt72GBNaRPxAqr+RCX7oJrAzMIMsLOFwyHvQE8 jae0Qt1jID2W2IZx0rT9L1Ki5M++t3YLyMrHaaLGG2j/BPArosRL/w2MdEv6StqeCj IXU6R5NZqjal9Sx06lAH8/oJRXb5ysMBkqcF6rnQ= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:57:36 +0100 (CET) X-EA-Auth: v2QV5gt/I2rBpbIJKSnR+u+7+za+aW0bVNCpgFJy/+4+3/bdV80pM1jtu3r+o/Sg0Un+ii+g8VoITPsD9GrAaBxPDuok0JVQUBMNlvLReTY= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:57:25 +0300 Message-Id: <20220219095725.9604-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219095623.9417-1-nil-admirari@mailo.com> References: <20220219095623.9417-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 6/6] fftools: Use UTF-8 on Windows X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZTpupqwuSvEC --- fftools/fftools.manifest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/fftools.manifest b/fftools/fftools.manifest index 30b7d8f..d1ac1e4 100644 --- a/fftools/fftools.manifest +++ b/fftools/fftools.manifest @@ -3,8 +3,10 @@ - + true + UTF-8