From patchwork Fri Apr 15 08:07:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158651pzh; Fri, 15 Apr 2022 01:09:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYX/7sCwfxc44P9Off12fOS6PfX5OU9YfQ1xRF4bUbjU6n1MdfkLNneGA04alEkAbKy74V X-Received: by 2002:a05:6402:42c3:b0:41d:665:b581 with SMTP id i3-20020a05640242c300b0041d0665b581mr7334262edc.97.1650010153914; Fri, 15 Apr 2022 01:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010153; cv=none; d=google.com; s=arc-20160816; b=RcWWELwSmL1Bmqk9apDZeesbpUOOngNPJzgSuqxAV+yPRjMVqV7PdRLuNyevwLNjz5 TPlcRxFOqntQNH/wM02d1bTHxsbIXBz6MCYyktVo2vbUz9VNTgV+9nLsnb1jsRvK9UX0 OlYpIf1D4nYe7NilKuZ0ITmd1jySWaVgtrtGtxPfbpxTgLRjQeVwFzizZ1dYfoGcI8z5 fxirFELKeMqk5XzJHwZImmcIaur2BMT/SQvU+/4hZOUIIyMcFQasfGcOxBK+8WCGi949 cdVpgEMMu3qVw/4EN8nBV30nOowqQfRL7xYf8IdZanyosqlFDnYiUby9Ezd9K8JiHmNZ hF1Q== 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=y+9jmfaYlEQO1MO368DneZ8v/0wQmu9wcgcJNWt4ASU=; b=S6oWybF/D5slJuf+ztZ3Xt6YC1KQDb/crNG9lQHYzkS1JIOjP/XpPMfQKPP8g3RUEX Zd01X33yj2B0CUExqkSq2vgX7pCKI5LpCezkjAEKGL9uypI43ioOB+wss7oEPkIP6f2T pWQ2IyVMZikQ1CJj0lE9JTbCA77oo+k8s5auukgecOYqekVV71lXIBzElYBH2jrRfLYH ocAkA6vfwfgC2L9wn1o8c6sdxNgTqHzzdAWg1JNhb/BC8kpnwPJ4Qhcodrkn5vJQeN0D ++T3oh7lpMB3vG6DPhCPygEiyy3H9wchCCqvPbbp0lNdWjoOjv7TjPainJeOf3h4OTTS VFPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=X0wk6uj5; 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 ia27-20020a170907a07b00b006e0332e32f8si606520ejc.456.2022.04.15.01.09.13; Fri, 15 Apr 2022 01:09:13 -0700 (PDT) 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=X0wk6uj5; 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 0E37C68B4D4; Fri, 15 Apr 2022 11:08:26 +0300 (EEST) 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 41D5868B3F7 for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010087; bh=/yN3KUByCM6b4fsOttLDsS56u7cHnBA9FP6Y4OtneXw=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=X0wk6uj5gKhD2XhJbgBzET3XnVfbQzDI1G+82xguFtjZbsbOAd7pYro3ExMYKUhTY L8FQyNeHYyMBWC1oeQGEqS65Cz3EXs4znN+cXvnNv5eb85CmWNEPMnElbY7lm1tfJM s9JH2/Y8wOuinJBZQBeoe7mc1Q0A2hyZOPs9g8yo= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:07 +0200 (CEST) X-EA-Auth: TjZKnO+0zhT3/BdAoNRQE6vRxJxEw2q+BJRdaIbj+VIGNDFBWcfwkVLNoxMrJVxgrJHH8SBCfuWUJti6jxOUpL5YYFxEa68UURwZCgLRagQ= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:43 +0300 Message-Id: <20220415080748.18517-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: TrI2ZvJEfuOP These functions are going to be used in libavformat/avisynth.c and fftools/cmdutils.c remove MAX_PATH limit. --- libavutil/wchar_filename.h | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f08245..e22ffa8a 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 DWORD 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 Fri Apr 15 08:07:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158498pzh; Fri, 15 Apr 2022 01:08:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytoiEHr55lJbU9c+JndvnmIzBvbujRqaMzrxMiXVNEB2E4MGm6JAKclUQnjd62WzG5fAb6 X-Received: by 2002:a17:907:6d25:b0:6ef:5af5:f1d3 with SMTP id sa37-20020a1709076d2500b006ef5af5f1d3mr1158092ejc.315.1650010119830; Fri, 15 Apr 2022 01:08:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010119; cv=none; d=google.com; s=arc-20160816; b=etAULZOQksO6HiGwS1oNHOff4z5KctZYdi1RoZ1AdtiL6PdhI/V6P14qJ4FU2xI3xN BcdN2E+ZDu/2UZ86kITXfrdRYdZHDgJlP/HKcHK3Q9s63DIjn7nA9TWIYAJ8VEgoXwNr b6/ua726Y0PU0v9Fk7Wi//z7gUthlFcwElt8E2KzS0/G0FqQ9MLjcsq9+bqNMFtPOPoX FuicpsbZHS527LViMuuVAgWtD2S5uVJv+bo1XmRbJ/p7thYZCMhMagNj89T/PVTeXvog elQ1c+vAbcB58yBKGngnRLkRqkIDVUVouRWmOYfkUzrTEB7kW6UqT5Ts05SKxgmxknM2 I6JQ== 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=Pl0PLxUStBiZGAoVIeSQETXGuoV8tZb9V3Zrnf4nwP4=; b=e/pyGYHbFz3fjJduF1RFhAOzvYTgzwDhgxvDkarUZKwZi5LdWGK0IGEyAqMR+7o+bi MRy/18Qk5X0WpubaABPgOFQCDtXlgWbR3lDjnC17jzn02ilpdsiPDm1M0wddGtcC/EZE 2h94ZIr0JA6wFjn+OgRSEjRJpueZyJY6P65jte1KY5cGZrACld5qWtKko8TqNr34Gwoe u/fHfWvNHHEz9W0GEXBYgExvbSwsj8vOF/Dep1ragLcMJmNY6dxGJG02raWwmkgKcST7 sVk1BMNQSNKwXA+rRQ+juvNc2cTGcTCyTnoxKuxdXIZTt6uBMp6oyB3APHLnGnuQMcpf cLGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=InQwufyy; 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 r19-20020a170906c29300b006e89d0c88d9si539190ejz.633.2022.04.15.01.08.39; Fri, 15 Apr 2022 01:08:39 -0700 (PDT) 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=InQwufyy; 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 0DDCA68B3FB; Fri, 15 Apr 2022 11:08:23 +0300 (EEST) 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 3C86B68B3D6 for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010088; bh=c6I6DJoJEcHze4lKJk/RqaRg3MXYs7DyvuFduRUa2Fo=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=InQwufyycbmqMXx8rqaF71S/aKxSlRsYhp63+3fLQJxcpcUpUBtbiLkhw8YGuRwRO llajvhJevbbH4v1a9y0dAnJKdkB0T82ctXoqZUdcgzNobpBPOYjfnHuioTlCrWYXNX pKLF48/UgSyy8YGUc4BftMvwWL2aYfxN136ad8uY= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:08 +0200 (CEST) X-EA-Auth: hcF8apReMZfdoKPRhZE61kIs/VXxrknDO4jlhbPyPb+FAC0zK+oD7IdLJNhb4E09jwsN20RHt0GCx9dPNgBfV7A3jnlFCpbMmjIYS4X+8l8= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:44 +0300 Message-Id: <20220415080748.18517-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220415080748.18517-1-nil-admirari@mailo.com> References: <20220415080748.18517-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 2/6] libavformat/avisynth.c: Remove MAX_PATH limit 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: v+6ocqfLOgmE --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8ba2bdea..f7bea8c3 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 @@ -810,8 +811,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)) @@ -819,10 +819,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 Apr 15 08:07:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158553pzh; Fri, 15 Apr 2022 01:08:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUjguU9fqMoB3PHj6zrabgJnqGkI1P/7jQypiTQqZy4Kcx0nJkzeJ2pPEepzzDUjEYBkMK X-Received: by 2002:a17:907:16a2:b0:6e8:d71a:79af with SMTP id hc34-20020a17090716a200b006e8d71a79afmr5183055ejc.410.1650010130783; Fri, 15 Apr 2022 01:08:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010130; cv=none; d=google.com; s=arc-20160816; b=vTowvAALfOZ1yXCRinSUizxoKNL9wTxSS2UPngpY839X/GEf+LWKvcGbpyqZ59V7nC zze42GgV7ZQPj9XejbpveCxTVlPwrHHRKuWzrvF3qe44Cn1SqFzsNob3W3EcwOnIyCbp WjZf+TUW+MktqYX/qDGgGgvG8sVIp5oxJfxr/uSnF50qTQ02Io6Cp0oMkiTGrG8dQjew zUiBftLXalF78KMkd7uVv1PbX52muhiGB8P9gXprnXB1gn/R1J3UxkTXMcTZnXWpc9bG P10zy0JBPq+J3Ku/qquuj/9I1AGwFukxor0yGfCv8VyOMuKzittU2Cv7YEDvKrHOoInf to4A== 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=0lgx+E+cwBgEHEtMWpjjtmxSaPCo1vH/aiDj6mioF3o=; b=zZclQ4Hn40n+RbaGXA0snzl7nI/0yTsH/Pc5Ozsz9fbfvWZ0Gwwg8leqcNNin3EC+v 5ypXKPbhyzEf9ajVWqEckGLEOJpp7rpepcdSmDfO/k/+gB26hsdeRy/T4qgioH5IrCwk 6PZiow7jvK0Zd5F/4sJ832X3QEJbam8zHPDVAewZMwdL1Agr7vveoHLCJQM5UDSo437I DO6l7Fr9FzB0bKlzmzLXiqGDMjcLB451YJbfSM6tQHSdbocWGbT+m3JUfFmIW6K3/wKM HS2ApxDjjtYpL1WZL4VkAWWFtRgiMEUH/WZgQRzzmNy0CgeBm8MJslRT9MpcS/HZOZ8p bW+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=avSv5iro; 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 c25-20020a170906695900b006df76385d13si598390ejs.435.2022.04.15.01.08.50; Fri, 15 Apr 2022 01:08:50 -0700 (PDT) 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=avSv5iro; 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 39DD668B3D6; Fri, 15 Apr 2022 11:08:24 +0300 (EEST) 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 3F1FD68B3EE for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010089; bh=9wxrBCrgYoycoM729ZHYfWRL0AKkAnq6wJhJkdzhTms=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=avSv5irorMQ6+LLZPvauyyDbk5UPuVp9+lQF4xI9Zg0wuzfLObY3pMs4+VGhMMUNN Oejs8QrWwnMQs4qBRKyxB+U46Vw+3TGakBt4UT3SoIxyj3KF+zAg+Uq70nS7eDcGVN xiSo/j/NwB+nDIuIrUtz3PTkhze6bEH24lHtICzc= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:09 +0200 (CEST) X-EA-Auth: FiXzDqZgpmmoZ662QAqRjmTw7KqylLLJeIitHKqafiagc/VtXmNy+mHNAAF15RbAF25GVLqbXDBQY5IHR1B8/HqJ7vuyD3ez2jbpEsmQdls= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:45 +0300 Message-Id: <20220415080748.18517-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220415080748.18517-1-nil-admirari@mailo.com> References: <20220415080748.18517-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 3/6] compat/w32dlfcn.h: Remove MAX_PATH limit and replace LoadLibraryExA with LoadLibraryExW 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: 2nTZei2XtSbm --- compat/w32dlfcn.h | 78 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94efa..0f41f50b 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, *new_path = NULL; + DWORD path_size = 0, path_len = 0; + + do { + path_size = path_size ? 2 * path_size : MAX_PATH; + 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,29 +58,53 @@ */ 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; - path[pathlen] = '\\'; + // Buffer is not enough in two cases: + // 1. system directory + \ + module name + // 2. system directory even without module name. + 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; + // Query again to handle case #2. + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) + goto exit; + } + path[pathlen] = L'\\'; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); } @@ -73,15 +121,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 Apr 15 08:07:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35326 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158595pzh; Fri, 15 Apr 2022 01:09:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZuJ5DDgSBNgl/84ZUdxWpBqWby6igBw+Nfcpg5cgx0DtbgM2tEsVorTJ9biWQOgRr2588 X-Received: by 2002:a17:907:3f91:b0:6d7:16c0:ae1b with SMTP id hr17-20020a1709073f9100b006d716c0ae1bmr5444650ejc.74.1650010143116; Fri, 15 Apr 2022 01:09:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010143; cv=none; d=google.com; s=arc-20160816; b=sXA8/ARLZ9KKlRPuyKe2aJX/55L0ajyGCgnGH7QIm2/wXJXnyNFeiKgdvtZMR2C7n2 1BzjKzsBH8hjWxX+qz60ONDRiSNZStM9X24OcwJ+UN74GbDN2a4g+Nmpe5YyyZSJHvTa eWZHzFWw9PsyrZM+/9/ExVJkk1gKxYinL+pZ8ntnXqj19e5CLi0aFgYitqqEthStYACY efF8+VKLbqNVhIZpGuqvnQ0aNgRIznmFEm1uRFCn6mYOiNd3gFK9V2Yl7aqz4wHZnu08 RmRxRD7JkQ2NWsAkSBW3YsrWMKkdfHzGWP7AuANSi9HIvpfXURTmeozlmpjqctzzKhhJ VDNw== 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=WTn6VaeIewDh0pOIKdXcALjmtOzeZsjbxlIdghbMeyE=; b=hpe2wtCod+Hd2Xi4fjFcaJYMrYzc/NK6nfHiFhrm8Nz5Cg5ZXv3r7FDENarn+qk0Wx mo4T+hg425TqBjDVi4USW3UzcDQCYhy5V2GG0lkZpMAewqqDZz/BTZtYhCuGVv0hcMjR lcBLSpeautGacQLZ+/lNBO1HAlcvk74BeqZRi7JOH1KEK9jEUYn0vrqbn4NMRuuFcHH7 qLTnlYTYrKOAjy3/ov4r/+xl3oWSejh5WDIhtzVnVVzdLnF9rbN0XDrQ65npJYuwaMU8 B/YHqGy4rewYXgDsL+c675n2Trpdcl6+XuDn2VyrBjhtcx0axhtoqt5XiDL5Cc93hhyU fbdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=jX2IyVSy; 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 x7-20020a170906804700b006e83256d4bfsi570571ejw.555.2022.04.15.01.09.02; Fri, 15 Apr 2022 01:09:03 -0700 (PDT) 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=jX2IyVSy; 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 293A468B3EE; Fri, 15 Apr 2022 11:08:25 +0300 (EEST) 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 4461868B3F9 for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010090; bh=QKx5E0dog0Ovl5yxrkRRkbDMH5JiS1ut7JCb6ad42go=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=jX2IyVSyrTmuMdrp1a2Y4OCZW3Z6nKy0rvGh1rzrjlv+qdPTDO1+Zw0mNzd9QtDVB gw26+5HJVigM8zPKE+2c/boT3kjR01PAOhjZaNNGqvQmT8jUqmc1nXSztsgCleCnSB FJFCbEU7Eg2g3w7mapCdmjEUuKWjEVX1W+E1lIAk= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:10 +0200 (CEST) X-EA-Auth: ckEQmISqbgl8Zvi0aLeiI7k05t7NiiP/+cUp+fGEVAE6U10J1B2IB5qu81R70EDB3hgJzBars0b5hrfozcUkWAIg58kCwDtrJ828lyUF7oM= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:46 +0300 Message-Id: <20220415080748.18517-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220415080748.18517-1-nil-admirari@mailo.com> References: <20220415080748.18517-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 4/6] fftools/cmdutils.c: Remove MAX_PATH limit and replace 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: H+/BkIWdANrU --- fftools/cmdutils.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5d7cdc3e..a66dbb22 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -37,6 +37,7 @@ #include "libswresample/swresample.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" #include "libavutil/mathematics.h" @@ -50,6 +51,7 @@ #include "opt_common.h" #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif AVDictionary *sws_dict; @@ -812,28 +814,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 ptrdiff_t datadir_len = ls - datadir; + const size_t 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 @@ -842,17 +859,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 Fri Apr 15 08:07:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35322 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158442pzh; Fri, 15 Apr 2022 01:08:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxssMECrNKgGprjws99isY7nXd9DkbF/7yMsyqq7sHdmXTf/R7uz+iIZImQDXKY6BiL9V9U X-Received: by 2002:a05:6402:350c:b0:413:3bcd:3d0e with SMTP id b12-20020a056402350c00b004133bcd3d0emr7164730edd.178.1650010107492; Fri, 15 Apr 2022 01:08:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010107; cv=none; d=google.com; s=arc-20160816; b=XlWgKLbE/nmYxEtg2kt9txpM4gqVIL+rVlgIDm3VaD2sMIHtbG9YdyPaTIBLBSwS9r KB6Kgl5mlw0DZdjbgPxh9fNN2/EeT1SQ30nujqly5e5GwY4YmlaFihU+K12WYOrf8bAk 2bo8OvSBfLb70u46SX6Lh6Xj7FZodiSa53xgMaFA4ibnCtY1hoRTL7+83KSF1ilyC6VV FrDSVSCYhqUpcLFLEnOJcBpX8hje2WFjvlr1KMgCEleT9R48rTrZAKj0JNy+9xIJP/in XcKGMzNXGkVpsrBCE5Mp+UKFeZf94yfCgq/tES9JE9K/k7gfKU81LYN3liMzuRZcd82d UjBQ== 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=C9aq/ExUfSEekXkjRjlML8vYhV0s6DIntBzmYz3ifPY=; b=ErJpedugaWe1uy+/nak4E5OmaXZT4+oWpMquV3m8s7lIut18ZwD+fCe9A8vvS0YPeP 0QtfzQ6demi/tL0h7EIlpiEc+fLg1pi4Rux8+I3qmxMdEe87ej78PlMJgvVXbjgg5Jc9 R2uVX+Up8HTFs/4BUgBer9QLeT/VWE5w0YtWKpezmJWckiO+7uROf8X7pg+A0r/GVAFr Wyyf2Xee1YnKG9fZsVXDiL8991fy5b5GplKScrHpWIF16vfHODFZPVEJRDY2VB8L2RqI bF4Tmj5IdSZyyvAThhQKGD8xWGKmhSYbWXeUmtqUfbIZz1G2UwPoa+Hjw+eX6TMi2wql 0kGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=FAm3IOTf; 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 cw8-20020a056402228800b0041d983f82basi625328edb.381.2022.04.15.01.08.26; Fri, 15 Apr 2022 01:08:27 -0700 (PDT) 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=FAm3IOTf; 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 DA6D168B46B; Fri, 15 Apr 2022 11:08:21 +0300 (EEST) 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 39F2268B38D for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010091; bh=F25yjzu1CJR98x2zhL9YWPwu+VC7ASMZJhKwEntlbz4=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=FAm3IOTfH72MU5fMwI4ncUa+Ukk7pH1FFnknOJKBIuBNvVgPSU9/kNoYZ12a+kfuM jPO7SnkAUZ48fp+2XHfBDtHzSfgu/I/cLAxpgjjI2Kyx6LWqFOlwkcOjg/i9I2iAAV oLS+Fi3yZIr3rWNf5BUbtO0eYGq+BTsBZDwqxSCs= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:11 +0200 (CEST) X-EA-Auth: /eLVWwePnP7KDl/eoKLwERYl3SppyyFogwmxd2AojLPuLna8PeelZArCKj97x31NZNQ3brB5u1rcPw0Q0EqTqn6GTEaaS04QUJJwUUOTe98= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:47 +0300 Message-Id: <20220415080748.18517-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220415080748.18517-1-nil-admirari@mailo.com> References: <20220415080748.18517-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: Z6xoNe0D+8Iw --- 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 81ad6c4f..105ae5cc 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -15,6 +15,11 @@ OBJS-ffmpeg += \ fftools/ffmpeg_mux.o \ fftools/ffmpeg_opt.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/opt_common.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 00000000..30b7d8fe --- /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 00000000..e436fa73 --- /dev/null +++ b/fftools/manifest.rc @@ -0,0 +1,3 @@ +#include + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fftools.manifest" From patchwork Fri Apr 15 08:09:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158923pzh; Fri, 15 Apr 2022 01:10:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUY7PxCv8Bcq9+AdB38A/ZBaQtey6xZDZqw8Alv1MLz3grVI2Pkqu73yt7Tm/RS5Uvg+zy X-Received: by 2002:a05:6402:1ac4:b0:41d:83d1:9da7 with SMTP id ba4-20020a0564021ac400b0041d83d19da7mr7050472edb.272.1650010214742; Fri, 15 Apr 2022 01:10:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010214; cv=none; d=google.com; s=arc-20160816; b=kV8pBFMPqlGZhneGyeztoWFNZ6LyKTqtgO1CkiSRq5/mVLWFy6dmq6EgdHF5P+zbow 078BQROdIsyeplIlhz8YMkqwuRZuormU7msHOEq8KVlxTfjKPtxsbmMZd8817ErIVYj7 UkdI8GdYhgOL/DyNc7sP1NqMOpf2PMVnj9LkrfO0wjTsz7LDaNlAwkZvzLCupAVVvhah fvZlz/mk2FHp36Jm2JbWwBxXHtOqPv2OUZi0eogQtLsuMEP+6EUFY9MTSc91HM8WIJcI 7J0LZu0CqqMIfjq68kce9P24KxRJHpCrIsR6vQUy8L/C7Sq0V04sK9OqKtB/9Uyc0LOr Z7OQ== 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=Yo3rm8+ykNS/rBJXHyVQdSBqS5DFfCD7peFuXNq3maw=; b=hfXyUZkHoXdJl87E0OOcuaLUNRL4ZyDt4VHG11ath45WB/84La1C7kslyMIOVGZHn8 ie6sGVQCI0zMjsXv5pqsp2FwM/OFvbDEKiAV0MJVxRSim/9Q4vlOkIIiVeNFLr191NcD pDOPw26pUr08K94lxehJnEXuFrZBdN1Tj/TsxZR6xk5ZRzMymiPyfTwxOgKjsHRFyNq1 eHMy7el1a87YCbJ81FVXKIyTqOxa2ZViszmVkjG8sH1eFTN7H925aqFWLR1M/OXIEbos 4hANjMC9HG5waY36lD7Hg/j/L1GOBYHZBR2JbB4BmrNVbXCtEcIH63z15THum+OoOHPg a6kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="KUgW/CoZ"; 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 e18-20020a1709067e1200b006df76385d92si568732ejr.562.2022.04.15.01.10.14; Fri, 15 Apr 2022 01:10:14 -0700 (PDT) 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="KUgW/CoZ"; 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 1B77568B49F; Fri, 15 Apr 2022 11:10:12 +0300 (EEST) 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 6BBE368AF51 for ; Fri, 15 Apr 2022 11:10:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010204; bh=R/jTS69m5taSsbDh4u/Uoxl2LNrQKvwz3oc52bEdpDI=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=KUgW/CoZd2jOPhiJBAnMQaVpz4SdPDlX0l3D5OC8s0xPFmvp4/mXcto4RNeLDBrkH kSZzF3zzjZ+fdir1Ny0r2IA2an1lULbmnHdo0C3uweqdZ2wZ2t8YGhTwK+bfaKDozd 9/Q2FnqNaNT8G5xgdcay8jEIn0SkW5VtkN2WJET8= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:10:04 +0200 (CEST) X-EA-Auth: eOybAp/TbtipRV52T6sjkfcSSUKJBXXguvKGTKbvm+zSVYpMVO1BnPMVFXjUmrEhcN4hZKP2H0Jl0FxZoNQYUIMunUHYcjfHUoWu5pakEnI= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:09:53 +0300 Message-Id: <20220415080953.18753-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: okbakYhrn0mb --- fftools/fftools.manifest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/fftools.manifest b/fftools/fftools.manifest index 30b7d8fe..d1ac1e4e 100644 --- a/fftools/fftools.manifest +++ b/fftools/fftools.manifest @@ -3,8 +3,10 @@ - + true + UTF-8