From patchwork Sun Jun 5 11:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5652319pzj; Sun, 5 Jun 2022 04:36:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVqrcrH0fMoWrwabvpqGNxiwNfXkOV7dkeE/gGttMcX/+EBEMeaFJzsdVlkuSiXs45xuy8 X-Received: by 2002:a17:906:c797:b0:711:8c01:32d4 with SMTP id cw23-20020a170906c79700b007118c0132d4mr3732799ejb.205.1654428985865; Sun, 05 Jun 2022 04:36:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428985; cv=none; d=google.com; s=arc-20160816; b=euL41sMiws4esahTr4TZLLZ1GgdHITCaUfTYE9OqNbhK2amxV+a5596cjJU/HjpAZn faWP2aLWWCVJFkcrNHIl7GPW7eO2VhXIl7jcGxN8NHygltANRMRuQcpcdxZ1+paIFZC+ 5zamkcn6yI7pkck8Qa8n821H1CTQ4pQ23zutm1R4GU3RPKaydhs7hyaGaNJRfczveSJo pHu73WpINZNXa4sGqwsrpw/i4KqtC7ovYH5Quq8jE5ywRyGdL29+XXeDaLVL8Uab9bYA 3sxx6ntBxz9nLb+ddgkqVIH2Ldrbb5KuAygRSsc4RzD0Pr8jN/A1sQ0RIwyurc85KYqJ +CnA== 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=R0CfGy6UTozgz6Pxl8r7vUtEqtVdeiC6dcYzyZroIdg=; b=KRQ3FQXOeruJBwatOdWiS/PigRe9UY+cn/cr5W+MS8gHfaSqoe+S+ONlWU0kxL4qxw 0VtEpx3BiYUycqIWFh/v3YJc6G6aPEelezgYBE5RbaDaAfQDAbiSBOu2MUZf4FuyspyC lckJuU5spR9FVjMvKBwXI9XA2Eu00rNlO+A3L/YdQu9xvaYrbX0OzdVLL09QdanrSw5e QZBL4CpOJqWH9umfahpttw3vKKO4Nv/cclFdD+khACZ+pd47+p7y5NUtIaKpYlx46m4e R13auq8/Sy5np3ACMfWa3UYKtLOWLiKDplHeVAXNcwgTQHhL2FFY80Z0jOCzqGL8lJW2 TAfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=HAAmxLKH; 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 l17-20020a056402255100b0042fafec8901si5683988edb.130.2022.06.05.04.36.25; Sun, 05 Jun 2022 04:36:25 -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=HAAmxLKH; 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 1626A68B654; Sun, 5 Jun 2022 14:36:01 +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 2A59768B5DF for ; Sun, 5 Jun 2022 14:35:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428951; bh=Ex0XRnhO+eBaLXd0T9UAKNQ5KIO1V7L41aGOAUt7LFw=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=HAAmxLKHwcJjnzB8tdNrY2jLzMMaWbd5xX2d9MYu0VPoS42XetRQcLmFjQMbYJq4Q 3K7uNkBIRt6saD6bk/1GNx+ResUMuhedakPQTirFfqmijh03IjNCq58ZvdepNGXNH8 DHyH8sT+EcHz9z3kuejFinaH0tqseuiiioE3WhWY= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:35:51 +0200 (CEST) X-EA-Auth: qYxHljeM/em6YeizU0AcxX3b3vnSTJ8o2cwRLtKa/d82sb+gIlckfkCsAQK+uADCLZ6/KkDjXTr2FZKUbF2+GQ4noHcD7DZLsxLrbY5ciWQ= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:35:42 +0300 Message-Id: <20220605113542.12280-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605113542.12280-1-nil-admirari@mailo.com> References: <20220605113542.12280-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 4/4] fftools/cmdutils.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: i1TZy8OZwzIF --- fftools/cmdutils.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5d7cdc3..d42bb04 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -50,6 +50,7 @@ #include "opt_common.h" #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif AVDictionary *sws_dict; @@ -812,6 +813,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, }; @@ -821,19 +825,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; + ptrdiff_t datadir_len = ls - datadir; + 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 @@ -853,6 +869,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; }