From patchwork Fri Feb 18 18:34:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1187052nkx; Fri, 18 Feb 2022 10:35:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsv9BIhXFNWQvAIw/9EyALx2M5cPzxbvbbI0yhA650PuVkupkO0oexSyXODg2+qGPE/QDB X-Received: by 2002:a50:d085:0:b0:405:6747:ea68 with SMTP id v5-20020a50d085000000b004056747ea68mr9364897edd.410.1645209339024; Fri, 18 Feb 2022 10:35:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645209339; cv=none; d=google.com; s=arc-20160816; b=E9MlMlOV0n+FzV2gplkY2XUHob3UiEGtznENpkFwaB6t+H17WOHTUtKmgyxoozp3/Y BcSzKWES79GCRdSFg+zAfOOv5HPeK5V220Go8LdXeJi96mlYebiB3OMxDHzEWHUrIzbu 886EMcR61rPqkhHz9CgsD30Wj/Am1YZ/fOvKjhQAfjXhT/G4zy09VAb+BtdHZkZt4d7H 4jg4VkkZtY/xuL/cI3IFGkc9tMoqjRSSLnB47+iwR5iPZNA1XLqcaqxGui6w/20zey6S IpjeMnoWLTfNhXoXlLP8q4LGpjTCUirz6qp69a9ZCe+kTX4yo20Zdp9j9rjYQXbLv4Hw H81w== 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=MABY2sERUPHoszs9VPL6ClUNuHj+2YtsINO/6QOouZU=; b=VDLKbgZgZvFd/oU+3GiuOcEGBNCSVzpFaMmP36M8ML73CEDMkJ6RnY5dUgteFvuN7r eaGeCCiCVScbR4sD4NkhvzsnNhDylVPrrGoboFzCQDwLtNedqz7gKNW0WK9YdnSUISxg FJeGw6MTa89RgmjjZLvKakK4n/NYHtkgmU1UWLHjwfF1QnvWdsfDFlSF8ClLVj7vPoSy YHQBouKsoy3MFXWJehEjA9DcvjTpLl9B85xkm5EOqrSgYWaMYEzkwKPWTYCWAeuFWRga vdjEhyOrxxGMSFUWbx3cjsbf9frwH1Iw4jGntgeLd3IllaIrZ+YaBK0VUSMwC9J6m6ws xOcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=Vel+SRAN; 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 w4si2600165edr.487.2022.02.18.10.35.38; Fri, 18 Feb 2022 10:35:39 -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=Vel+SRAN; 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 5309068B18F; Fri, 18 Feb 2022 20:35:05 +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 754F668B08F for ; Fri, 18 Feb 2022 20:34:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645209288; bh=r1IehPVeYpWe/29923wliDsg4mk6Oc/1SNiPqmEL74s=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=Vel+SRAN9LNh3sEH0gIJgWtalZrRKQu/oRObKtDBajKRdCECVYU9FJPq+75n1FSXG FEbMZXHYa/cspylhZGxRr3J8S89JuAIW2Nw/wKiA7QjoqcIDkyjsJpwaHf153/xbol LL//0WOo5m+mVAFlRG6Jp/fh45RGVmvvNXqirLMA= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 19:34:47 +0100 (CET) X-EA-Auth: Nh20CATD9iMge/fGVP+gakNTbTVAzy/spCizOofMJ85RpFUfyMXXOHPCM/eENU+rNIxO76ovaS/yXxXVs3saiDzQ1r2m65JoyokPW+TQUHk= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 21:34:31 +0300 Message-Id: <20220218183436.14050-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/6] libavutil/wchar_filename.h: Add 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: kgH6JkZhWRAH 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 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f0824..32260a4 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,43 @@ 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 wchartoansi(const wchar_t *filename_w, char **filename) +{ + const int num_chars = WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + NULL, 0, NULL, NULL); + if (num_chars <= 0) { + *filename = NULL; + return 0; + } + *filename = (char *)av_calloc(num_chars, sizeof(char)); + if (!*filename) { + errno = ENOMEM; + return -1; + } + WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + *filename, num_chars, NULL, NULL); + return 0; +} + +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 Fri Feb 18 18:34:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34388 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1187174nkx; Fri, 18 Feb 2022 10:35:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaqKKOfgFfwYbk4YFGqMWIpzTJ7eG03VBZBtiiOkrgPXbyiQyoapO8IzDZyvW2A2KCsbwA X-Received: by 2002:a17:906:264d:b0:6b1:13e0:9981 with SMTP id i13-20020a170906264d00b006b113e09981mr7216342ejc.611.1645209349323; Fri, 18 Feb 2022 10:35:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645209349; cv=none; d=google.com; s=arc-20160816; b=G4Ntn2mBXC8zkevyPRj1w4xGx3FjB+0Oo9kK0jMXY7yziIeABb2H/X971fW6nsVULa wJkn2EjSAFKxbVsFIKIx8KCdZcQAG39by7jJQT9hk6akNWor0tbB8Y9y59i9OftL9iW9 zB5PCSZ4faBS34edRvgbKmRVhknfJvR6/El+3/73/eWGdgEeDrooyOd8Pk7srPiaYtMe GxIj5pyuh7N7tb0YuPuriuyED0rBo5AiPvG6JeNvKiBW7uLrVAlrv8a+IKXJEdR+EeeS qrvcBzQuMR37vu0zIKxi0GDVXp/8oV7dY08cfvzZqYge9JG9PJT6tK1o7pGtu9oEPaDe 1bbg== 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=hCVbt+lzr4OAhA3TV9+Jn55D7w0xjewMlwp0jEIwql4=; b=z07Ocikmhul9SCVXUwPbnKleg61j1yvW103780PMiQk07vbNyqIEbv+D6CC4gp8mHr pvLsdKUTzOFKaxszZUvp4Arbg+bYxmakt7fumBEm7sXfmMNy6A3ous4+oL9sftp/VHRJ nDyyjol14nvvJcf2IxA/cRG1S17VCSBrsy6b5+sc+cR6+YyCoitAsX33cIfq87aVQ+X3 Q1SdlIB9jib7qRBIFV9h6Ri5R2VDCEwP4ttlrd2ll9Uetk550S1ER0dfAgVFqcgbCKDF Iwnb/jmvlFaZhoLPan2Qn80h0vbPmkXxwJ7VhEw8/xbB7yT34YZDpNydu7vdbZK3+4Tn ubpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="KMgn/HxA"; 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 r7si7879967edd.171.2022.02.18.10.35.48; Fri, 18 Feb 2022 10:35:49 -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="KMgn/HxA"; 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 263CB68AAC1; Fri, 18 Feb 2022 20:35:06 +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 772CB68B0A8 for ; Fri, 18 Feb 2022 20:34:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645209288; bh=IIZWG4Ae6e2j6qda26O/yamptBIE8ZqN2zc7+FhoQ0I=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=KMgn/HxA5em2Jm1jl6NcMpwHiABUZi3pbdWzgO7zw3F5HNEt9XF6h1I1Feg3Jqhm0 lYFrMtY6oQBkBqFH5DWWzTGBxtVAbqSPPD6d951FacyWTh9w8Ijic9qyxtRaVfqRw3 wIJWqszURQ6tuXj4m77tPbgP9G8iUEtuhXhY2iJ8= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 19:34:48 +0100 (CET) X-EA-Auth: J8/HX2ZMPGgc3eck8Vin7NJtMISKGje+pPlg3oMyjR1TtddEA8+GaUmAuy/IKQxCu2lQoKhKVbLv9LrOUaAsCGL8WKMvkbyQlwp/XWZhK0A= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 21:34:32 +0300 Message-Id: <20220218183436.14050-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218183436.14050-1-nil-admirari@mailo.com> References: <20220218183436.14050-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: NA2txu8yRY3M --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8bc3986..219f307 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -36,6 +36,7 @@ /* Platform-specific directives. */ #ifdef _WIN32 #include "compat/w32dlfcn.h" + #include "libavutil/wchar_filename.h" #undef EXTERN_C #define AVISYNTH_LIB "avisynth" #else @@ -806,8 +807,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)) @@ -815,10 +815,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 Fri Feb 18 18:34:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1186656nkx; Fri, 18 Feb 2022 10:35:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPMAC3vDZoPP/ghStDC94yad6Rs/aRQ/I6rNJIE/J7k0pNj03M4ZWvcDMBwsGzwgNKmivD X-Received: by 2002:a17:906:a1d3:b0:6d0:80ea:2fde with SMTP id bx19-20020a170906a1d300b006d080ea2fdemr5907473ejb.344.1645209307766; Fri, 18 Feb 2022 10:35:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645209307; cv=none; d=google.com; s=arc-20160816; b=pQzr69IUGJbtGXBJ6vkoryhcnaUoqDBx5BhGz8ng4yo2sauB6fNKxbqGCxmQO2H5ge 7EZqsXxYcRoMiYtnJ/h7/+OrbhBhUmMxZWW3zkxEKtkEYB3bQW/gG5pmwRfvOULPG4E3 NHz/vuC6P1kGhpA+RJee4qWjkwmRDUBWQzLcUypviIi0Wl7O0bQbCjEctKlv1i9E+urg uMj8sq0xp9Yx2i8EMWwTDfEdPyavWGib9O+bipl98oqSWl4ztQh/faECqQEszOr/Ck1E lv3hAemciNzN3ooS10PeoYiZTQnfKp8i8b+Qf40LC/B/Sz5k2txxc+ZELAS8mw9etLHu t2hA== 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=UI9Gj99Kj3QVNWA+hN7oHBeqeumL0CKtCkqFaZlGaaVWM43Us5556zRpJvAhQacQ+k bWadk6Ushv6DOxFml7rPf1hIE5RIq4NHHHvDMezcHKj3m/IXfyQeZpTc5SpZFfD4jROr WRxCPGV7P+ciHgkzV4Hs/9hrztubnbsPayxOblbFCgzWf+k+9cE1i/nNrUJhSPXacrej MpMzLixp3x+fZKaGR6ejmxYaXijrBrJXq5Mw3tj3d5Ed3v5dYlgCocD4ZRIkrF7lMje/ xKOJQ9oGjjTqVst1NsoVDQES88Vv4ExmK1XsJD60fSK7V/9pnrAOrGMFozGwgVuCZRsX FRQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=dCPT2kIL; 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 r17si6156049edv.648.2022.02.18.10.35.06; Fri, 18 Feb 2022 10:35:07 -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=dCPT2kIL; 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 0C72868B04C; Fri, 18 Feb 2022 20:35:02 +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 6EE3368A867 for ; Fri, 18 Feb 2022 20:34:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645209289; bh=Yjx7eV17kp5L23zKB69r5J1UQAazjkTgmtV3lBgZbYg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=dCPT2kILCy7O3qhVDgarct+YwWsoZnbXSwlc63TVN2lnT27j/DLGL5jh4OGBa3f0Q r+YAf61pnGz1mmMgmTamv2OnQAxyRK2GeV/zEcpBpE/ig3ILacCPVR8g/VpO0hsd1U UOrrW5zLBe6Eaiq4S7rMkP5e4coGhe0phLfIyNDc= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 19:34:49 +0100 (CET) X-EA-Auth: V+Nq+8aGoMk9z3m58hMZQMUTSwGoEUjD4dYbmXU8xFtc0SLnrHaUwFRUto4M2/xTyzDadllMbL8O7s4fUSc+y6Bhf/G68i8Wfz1vPXFi6Hc= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 21:34:33 +0300 Message-Id: <20220218183436.14050-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218183436.14050-1-nil-admirari@mailo.com> References: <20220218183436.14050-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: jxHvKbQJXd5I 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 Fri Feb 18 18:34:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1186792nkx; Fri, 18 Feb 2022 10:35:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIaN38b5eAIXV5yI92pGSmphrr/05NqPF68TwfQm0zgexWZTUV4LvHXyokXVg+SLt4TWtC X-Received: by 2002:a50:fa93:0:b0:40f:d482:ef63 with SMTP id w19-20020a50fa93000000b0040fd482ef63mr9398268edr.348.1645209318600; Fri, 18 Feb 2022 10:35:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645209318; cv=none; d=google.com; s=arc-20160816; b=xhqPRVCO43TSLw5xQKeztK4l8VjQzml1WTVUhNuj21kaRaCZdBV09b29/heCyprBam di2eGfT1oXjsi/qZv+ts81vNkNyEwfedU3dVSsuLnPHLjZJojZ5J3/l6vfwSa2fWgBy0 NWYTgqrs9uhGYWlyritXxIlxIfSzRD1r3W9QhXQYkUpWe6sIXS6rthwg/dHTgP+QAPtu fCu70vFgpvn6bSMqHwh7Wznz5jukGgUqGUJs4x989Glm+VYMj8xjdKN9YhszB/YgXpJd AOgQ4yGlqIEHNsnGySoyk+3wjz+CVJIsksoMGfhkODl6ZcHA0mz/tgZ4pooD1VMuW783 zaIA== 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=Jus3V+hYsx0Sk6+ULPS4YUwfqYazm/2FDMP3GUECa98=; b=VjZD2/8ergH8c0xCbC3X5Sk8AnMnu4qVltpMS6mYsLIdI25LkbIJ7pWBDTpZFlKYHz mazNbfUg5J+A1K2mi4ZUrbY5VPk+NFdOhOUUetTytpTLscOk/AYau2UnyLjZnerKpiyN aXsZhmhJZfajYBk1Tny0D13fytANbI//6XxZJGEj5Nu5GyC4HQ6teBW33Wv8PMz9rWxw BG/3yG5Wdp3eQEIoPPFq54Q6YcB7sIj5X5O+1p6q92Zn5W8FbIZth3AXi4p6U4hzu95K BeI/dcySczhAifJ68XDAktBlIuG663cJdpkU2P8Fusqt5JrvSESY/Fr667tmpjqnowhS teqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=F1gbt9UN; 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 c12si3896515eja.863.2022.02.18.10.35.18; Fri, 18 Feb 2022 10:35:18 -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=F1gbt9UN; 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 86F7868B159; Fri, 18 Feb 2022 20:35:03 +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 7196268AFEB for ; Fri, 18 Feb 2022 20:34:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645209290; bh=ihJmQtPkMxCXyMfDX/vGTU/uwt1eFCciJKErDl6EH80=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=F1gbt9UNBDFErsZCQ7KVH6ZtJLOCjFQL/Gx1Q30tQLMhDamIMIVyJwkzHYqenDW6J 7JJ7+vBc/ahM+wF4v3XSqCBGQVSYEc6OVH/Ast4Zem1zXCZ4BMSF0uFjNxBcltERt7 t0wLhfKuqQcC1lvnxVIX7UlLyb/CKtf3gK1+MQ0Q= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 19:34:50 +0100 (CET) X-EA-Auth: +7EqdpL6vEHh1gunlHk24aASsGknnIUivKupnNUX96Z/0s2aWwTYQVoZal651xDy7oGSBxMvP75LcETDsHbalLaZVoo9ZsakMYRW6LUaOqk= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 21:34:34 +0300 Message-Id: <20220218183436.14050-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218183436.14050-1-nil-admirari@mailo.com> References: <20220218183436.14050-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 4/6] fftools/cmdutils.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: MuLRaXrxNARD --- fftools/cmdutils.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15..ea78897 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -62,6 +62,7 @@ #endif #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif static int init_report(const char *env); @@ -2065,6 +2066,9 @@ 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, }; @@ -2074,19 +2078,31 @@ FILE *get_preset_file(char *filename, size_t filename_size, f = fopen(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 (wchartoansi(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 @@ -2106,6 +2122,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; } From patchwork Fri Feb 18 18:34:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1186923nkx; Fri, 18 Feb 2022 10:35:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJzksyR6jyS+DtauBN7vqs82zA/A60bxKc6kGuY2bCRt5MkzwjN4fGMtjqxoubNscJjb4+gQ X-Received: by 2002:a17:907:9196:b0:6cd:5cbe:8a95 with SMTP id bp22-20020a170907919600b006cd5cbe8a95mr7471124ejb.36.1645209328422; Fri, 18 Feb 2022 10:35:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645209328; cv=none; d=google.com; s=arc-20160816; b=aQZFe4gUfwclgpzq5glnqh7KmGPXl2WGk+wsOwXdT+/8Yk8KrLvbIgqqjIAE7cKl3K 4Zzg13GzDS5Sas/iY7/s25dhUrIzC8IrMI9EctWOo6bOUMs9mFD24U48Z07T9JG6zjTb 6H8Kb/aMcBh2WjWQ5JmvrCwkdMX+sBJra/GID+Nc2baIjJBdkvnf+QOWiLTEvbZ85BUl 3HM9hgEGNrojY1r/kF5qAds/yaTNL2c7GJ0XR4w/mo7lVujA5xAWdyhmxjXv1Bnsypbs HQjHGDoNJxMnPGNZk6Pj/dE2IOtnGJ6nhkLxmr9IL+8bYXH/9XapMQym1tbILzxpIy3d LVAQ== 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=0lKaNpTeXYPGRKz3+/3ZxbnVdHtz7PiKefAsP6xvuyM=; b=JaENLNc+okIzQ1shTVUM/o8H8a5XKJxTV6jlPHswhMHPHghfE2n6aExGyBQvJOg11i Tqj3HgD1R2j/KYC5OVVI7H9UMN8zBudvEJZVL30gd4Pg96DjQdyT3BH88ckuSW7+qpxk Rer0svmpFIWfIcjhZVKrn0U2GBNatmVUMoczVzUWB+i7Iqqo/rxwIBMHSLx0cNQ4Qi3G LD6hH5BBYOgBE+gMNju4ziv/V/BluDLg1QNUPGPu3+b9axlk6Ltg3uqNLLlup+UNlSTd fVuwBQx3o2cSHTYu1hmMk3Y2y0NQimlWVPD5cLi9Mv/O6mTSNnWzX8LM/OcVS/hxsFBv Z5bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=kvLL7niJ; 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 bm10si4059358ejb.806.2022.02.18.10.35.28; Fri, 18 Feb 2022 10:35:28 -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=kvLL7niJ; 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 7621368AFEB; Fri, 18 Feb 2022 20:35:04 +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 7351868B04C for ; Fri, 18 Feb 2022 20:34:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645209291; bh=BWZSQA3REhZQlBLHoRCfXGouhAK/3jeErMB0/d6ieBA=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=kvLL7niJlSr4OgTWBirCuXKDFTcsJw/IntCBmAVhibTJf2K25fSi6lsktsAjNNhoK vMwdvD5I4UYjVj4w3x3YUD3Mld5/ZCuQnvM5t/Tmlo0/UQCi95wA8vxLSpqV7cofKL H0ucm6f6RMqevfNXvQQWGILzVqm2m5lVlfH+nyTQ= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 19:34:51 +0100 (CET) X-EA-Auth: TRIJl6Ta0X7owmpu+GImgR4HpdDT71NhoAZS3iSYGyS7gHrmwwxZcVWc/uj6hpOAa8ZmXyUATvffZJYRNhujTgcM75tZjb5mRo9/4CNKNbw= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 21:34:35 +0300 Message-Id: <20220218183436.14050-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218183436.14050-1-nil-admirari@mailo.com> References: <20220218183436.14050-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: RzTW9TQoPLIN --- 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..689f8b2 --- /dev/null +++ b/fftools/manifest.rc @@ -0,0 +1,3 @@ +#include + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "long_paths.manifest" From patchwork Fri Feb 18 18:41:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34389 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1191168nkx; Fri, 18 Feb 2022 10:41:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+HlyXwdTIbBMfGwsyRraaX5KLLx6CBTsznh0D/Hd45OUFcLpNC+fszsg8819foGPOv4tw X-Received: by 2002:a17:906:301a:b0:6cc:955d:4dec with SMTP id 26-20020a170906301a00b006cc955d4decmr7549847ejz.143.1645209695455; Fri, 18 Feb 2022 10:41:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645209695; cv=none; d=google.com; s=arc-20160816; b=aDPzoi2OQo3mbLxQyVMnni6FvLx+kJ5pFM3buPxmV5L1WNLebssY5Rz1WgbfYHltp9 IoekNx3ScLFzkU1Ew4GgtzKJD/fBzqQiTxvtkdIfT69N7LBrsgQolUN+2AOxndOjDJ8f bMS/Z8fD+pCqvf/8LtKcMfp7PRwe+VbvmHM0UVw7dLLbO57DJngHj1ZjPwtLr+z/sOpr R1cB4z5PsAY+e2+vioqCo4blzqSs2kT3KuRn/61g+FKVqb6gbvM2F9BBP4xysE+blWqm 71AYYu2pcKNYvBv94wXPSr9SvJv6LhcxLliGX1VM7zm2i0NrD7c3no3CB+Zq2kC+k/1b 0CxQ== 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=/3rgZVbNugh8FBdOu+38fml+gF9J/4917oLUnX9j0rM=; b=dFfzjBrmPmlz2w2TFcoxmYMq6pcPYF4rsAtYcOLAN4aKc25kmKtNABoViFD8+p1O4b EgoqtU6W1mhBbvcI3Luhrt2puYmwFutpBFWjRL9aTla8p+vLvm4xf//YiewuxmEo7BQJ yAckJgogOEl30CE4hhA/I29MymCAGSroRV1cK1U4HiRasCI6bCIBmCrhHYNoeCLQEliU K55gaeROlN/8NSQdbupbz/vrHjYwE6V/Mrlx4NnfVv+Bq3NGepFaobLp0Jj6q6QvxkSZ 7QTtwh/76baVQqJwWJYMOb+bUBvg64OUu44KpCseKiKAirl9Acn1kdL5X2CUFcb6kBBl PLuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=S2xLDepS; 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 g17si4470197ejm.469.2022.02.18.10.41.35; Fri, 18 Feb 2022 10:41: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=S2xLDepS; 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 8BA5E680064; Fri, 18 Feb 2022 20:41:32 +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 91F6E6801E2 for ; Fri, 18 Feb 2022 20:41:25 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645209679; bh=arj4i+ZjicPkq0NlTR6GuXdrPs/J5vh3Iublebu6JY8=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=S2xLDepSuQ5prsystAihcxZ6ShzO4FLWOxI9/oFM9rfJFBDj8C3kIzEbBZx4Fe8/G qqCtRn7OWK74Sbs+pXF5NzVTso7qh6nRYIxC87+zyq4wWkqjnz9DmnKGWmiwHvzS+I vKOm/mRfoYTT0YtfV+SWmuvWtrxgrXLmbFbJ+BtE= Received: by b-4.in.mailobj.net [192.168.90.14] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 19:41:19 +0100 (CET) X-EA-Auth: WVnoPc7RI9hOV6twt4YR0yzd6JSLfXrW2l12VoUyLBqMYTv2UlzliGHeqfg4sKUIrW8dRVTIdZDCJ4xe+OUgEfFAMSILF4jtyxSzWsImOcc= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 21:41:10 +0300 Message-Id: <20220218184110.14475-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: Ik2qZJaB5ubI --- 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