From patchwork Wed Feb 16 15:08:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34338 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304119nkf; Wed, 16 Feb 2022 07:09:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjG+AA2Ek6SaV+wwRtwQlOeuHZc4c57LpUz2yEczFXRovVAzMhpmwpEYZAJwtACC3sBrs4 X-Received: by 2002:a17:907:205a:b0:6cf:ced7:4e73 with SMTP id pg26-20020a170907205a00b006cfced74e73mr2723359ejb.536.1645024189746; Wed, 16 Feb 2022 07:09:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024189; cv=none; d=google.com; s=arc-20160816; b=KiatgCQrY0Gn9xjrwmMnKQgJ90HszO1/15pc2EwzTB8+DrwWwi/TGUzbS/7bdc3D7Q 2fnr25VyLc+mriBLbt5dQKprklf6ZGTvEfiYfYSKh+azrHLpnNBZ9FPiGjnhUe8yj1PJ hbGP8QyhLLZ2mliC26ia821udksasAGxw6KUHtPfx08ScCMBqvY089UDoY1d4Rg1abJs RC74Yr4ebgaamiRFf9swytl/OgP9RgZLgTA5w3yBMNEq30Fhm8f/KKwP+S8qQQHFNCTa A3w/qQD6RXrp5sjBnWSAc0Qi5jWro8xrbvCojeRt3bQQxTT3iMwT0/DISGm1lLu+NU4j qhCQ== 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=kOJH89DrCadZRlZLvsnlKRQsf6205xl6clzbWaZvS17yiaLGJ9M83YC18IC7EngEtt IEJ1ljgoz4I4dcLol6zUKqGKYN833NMOYlkNy1s/KbcXyEu3BxBnQHgd11lNxd2qOXiF 3auvs67DV3JrtY4p9Z86jAesmVTnlcDgCQEhSy8E8KHK/xP3CamOYO6Qm9Iz8a3oi2vQ zB3HzlyeyPaPJFKtsZBL/h/hqHYNMYmajQ/spYKRsJdiBECBw2vz4gnXMlMgUhtwLYJb 8zqCBCj29Brl/zNl8lfYFAFL6sRpIVtMZQNltqbRIO5XZIWKz4PzJOflYSCslFuZekle 7q9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=JYUjPqhz; 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 i2si2016896edx.265.2022.02.16.07.09.25; Wed, 16 Feb 2022 07:09: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=JYUjPqhz; 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 E586F68B27D; Wed, 16 Feb 2022 17:09:20 +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 ABBB068AEE9 for ; Wed, 16 Feb 2022 17:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645024149; bh=r1IehPVeYpWe/29923wliDsg4mk6Oc/1SNiPqmEL74s=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=JYUjPqhzbcAjftF+UnNi/4x4gxy3/ZUxXYdD7l6csfdvACZ7wkcfWt1F9ahtmQZJm ARVeCQdOjMmXND8QNRVMW6UtVKsXJTBapxpZVZUSUGag7hzFuPM56YU87L35nky7qS aJFlSH91vJFLrlKmVA11/WfAsgtRZ4q1kDOQOYh0= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 16 Feb 2022 16:09:09 +0100 (CET) X-EA-Auth: VZV8W68+iK9wdUSDCH32fZHhK677CJfNiA84Pjj3w6TwIY5X0w2Dhu28Sr8IzvPakNGu5JQsJI8q7T7LrBJdt73yJK1zGMPKNW6qTMn4WdA= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:55 +0300 Message-Id: <20220216150859.16844-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/5] 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: zZZENflgC4yc 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 Wed Feb 16 15:08:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304359nkf; Wed, 16 Feb 2022 07:10:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwT938HAmm5uZ2ngftC1Awyg7UOEBgAzo2EwK5XmQAUOz3m100PyqjlxwWcqnQX5rhD28XU X-Received: by 2002:a05:6402:d0d:b0:410:8411:216 with SMTP id eb13-20020a0564020d0d00b0041084110216mr3407563edb.316.1645024212033; Wed, 16 Feb 2022 07:10:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024212; cv=none; d=google.com; s=arc-20160816; b=m1RrQ4uWCWTWukXz4b2Am6S4ejj8pIPk2sRfbpSolL+wkAdHLqePgS24aZLAc23MPS a+Dh6OIh63iLgHhGfFy8Y2qh2xcZLkdqzVp6lSTMKNeBEKeXKoVJggbzXeeCoPfmBNCk YO6flLP2++3woYPbTQeiHgKAIMz8MU9NVWgHB2O+Ra7PGrRfGa18ZB6GQ1R8vRAVo0W7 zgbUFlOHiQcTDNvYAVKTpANyKKuSozRR0QPaqscq+CeuSAcQNG9g7spAMLNeQPwOlxI+ YmTzBPel8PQXSrtRokhgc9Cqvpnhb8Fp1L7XKcXDIjvmc/Nna0K22Ux5/A+8dZDYUKAX oMxg== 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=FZlDv1BILIwuUak4g46s11HKM6ltHh4sG4Ai/dQothkjpGljAOPI16EEOrwsyg3MVM mjY7saBkw9wJRttl+eKk5iFM2GCPZgw2SNMBJjzJc8XqiUdd+vMcA0iXb4M7bBuqKYQh V6ZDE6H15eHm6grTtXb28voQ4mTrITCS9m+zIVqIKcQASe/gSfsQUyDhCS0TDi5veuN/ uIVrNTq24r2sDLVsTYdBRkTD1MpYwAOMakM5hsZsg18uFXurAANSrSxCmwH8twwzgk5z 7L6VtBG6ZQQhJ81rEJjxz66j2tdnLXgOXQO4q+Bqdn+ZRG2rf4N9vWcSkPyb45tsy9La Ap1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="UF09/B0f"; 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 kx3si10122ejc.130.2022.02.16.07.10.11; Wed, 16 Feb 2022 07:10:12 -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="UF09/B0f"; 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 14A7068B2CE; Wed, 16 Feb 2022 17:09:25 +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 B645B68B20B for ; Wed, 16 Feb 2022 17:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645024150; 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=UF09/B0f7qVYyZ5jAIY3FnkilUiiw+iD/YqwmsqEwV8E6HIZ8TiGRPv72GpSu4fQn j3szbu6MKUkjM8QN2Nmwm/tLwpNCYtE3KhQWKDcpJYLIPjHsHduGBSXrBU2IghhYGQ gBN0LhImsbtl8hNDEkhcizlSHm1DgxGsJ0Jp6nas= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 16 Feb 2022 16:09:10 +0100 (CET) X-EA-Auth: qmwptvSCW9HEt+jCC3SbYME0BC+vHmoh+6lem8pbvUFR2sI/pkKcoLAnRvOafjdD1z8lgMvfdzMK1p1bRtjXx2dC13HJwlgzajmAY+kfsxg= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:56 +0300 Message-Id: <20220216150859.16844-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220216150859.16844-1-nil-admirari@mailo.com> References: <20220216150859.16844-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/5] 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: OKHdl7gHX/Gh --- 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 Wed Feb 16 15:08:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34340 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304196nkf; Wed, 16 Feb 2022 07:10:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyN7I64SbmrNerg3Dj5ImovTReUo4bm6RKr4suaaLB9uBAkFpdOSjtK0rWwVvjDL7cnuOdc X-Received: by 2002:a50:f115:0:b0:410:ef0d:5bdd with SMTP id w21-20020a50f115000000b00410ef0d5bddmr3393735edl.125.1645024201014; Wed, 16 Feb 2022 07:10:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024201; cv=none; d=google.com; s=arc-20160816; b=j2HmD/GFzVYJhjH1iFz3qrx8FEsIpJ0+H87OYJ4N78zNvqI5k24dc0A1tuH6qusDW9 1JvEa+ff9POsC2wiWCZlIhK59W4Kci38fasX+70Ta2+3BieOXt2nDhuJ+HdlbU7kwGRk LgMHNR9C6LDeD8WVV/TkRE+dB1XeCiT0r02ZzizOII9ume6x1sZVzg0nHg6rHRkbKHWJ 5poWK3tGDCYe8Fil8MTVxr90vC8OCNFdlis1fLgrq8drVgDVb4f51FF+MJ9ad1VxiVil JxscoRZhSV19edGzEtbgA/f+nN9C2EsemT253YtbgFVOIHtWhhqNBUpwK+WEI/JiP6a/ 8foQ== 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=QwvBrCm0hXVfPSogxm5OKYKd++JG+p42cd90I40rq+2eKVWL40xRZ3gh/Ziem/2GFt Oz17sCOYqkLcHLd2lsL1pwrvzwz9zmjamhlugrvKe3Ux1LdBaZVPvd4G0VxPMgF5KaRX uRyIgJMmlZY5+pRK43PBANfcSeIXhnYN9o50dxGyvYgbEZtZ7HiqmI1XWgAQkNqn5zqk sbyAXYN9wzmrbkZKB+pp9itFubWNawFiJw4oirwvAqFdhMxpkQW2aB8MVN3fPT5lpc7U SNa4KFLDI+mZmOY6snd6G8LkRprWy+rrPv4lgxR60HIrPdfqLa8EjsSzi0rkvtbLeMB/ HGLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=T8343Vbp; 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 l7si3184233ejo.498.2022.02.16.07.09.38; Wed, 16 Feb 2022 07:10:00 -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=T8343Vbp; 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 EF7CC68B06E; Wed, 16 Feb 2022 17:09:21 +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 AE98D68B1A0 for ; Wed, 16 Feb 2022 17:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645024151; bh=Yjx7eV17kp5L23zKB69r5J1UQAazjkTgmtV3lBgZbYg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=T8343VbpyEXcW+KoIV5e+e+/lT0/SXRWI7t+uXGQ7RFSmv1WYFJF7JrtK7WY+4kf1 7QTuEYK97GxvPmQ5J3lKTFF7MgsYjGn/o/mBXshLd4re5Lo6K9ppWM7joe2Dr5qVnU ExpQgrYU7xKXChubtc/C31Ys4PL6spG8CDQDYdD8= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 16 Feb 2022 16:09:11 +0100 (CET) X-EA-Auth: 1cfYSH6FlAJ+tWy87/+Umz0n83p+z2TQLIebqSGNQn1OKQFZtUq72nzHOAO0dkVA5GQcEmJUzSlCkixwKioE6ctVLHgKrkmYVPl1ohlk12Q= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:57 +0300 Message-Id: <20220216150859.16844-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220216150859.16844-1-nil-admirari@mailo.com> References: <20220216150859.16844-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/5] 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: OX6gDGBFg/6d 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 Wed Feb 16 15:08:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304257nkf; Wed, 16 Feb 2022 07:10:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJy65/gsz6ItQPN2LKigJToKTYymQlMus802U7sx+Bq4TO1xctURmgY/pNnuzJLQ5zO9IveI X-Received: by 2002:a05:6402:5110:b0:410:cc66:4d5c with SMTP id m16-20020a056402511000b00410cc664d5cmr3549577edd.93.1645024204725; Wed, 16 Feb 2022 07:10:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024204; cv=none; d=google.com; s=arc-20160816; b=wZ2I6mOQa/AoZvskyC5yA17l7jQs/rpw5NPhGR8J8+j8e+pSviPnSPy4eFB2IP5zYg rOc9JaGGgsvOav+2LC1N+NXNs7xzlq3CXjzpNiBEzIsbvCFHUo8nMFWGczVxyeY4lhy9 h4OMtQA9J7EploVK00vYDVCLNT7n99SwHnvoIKOfALVxX1BAXbjx8+hE7km8e3gCoK0W hdUqH2AN5QhXVUKGFGfzNJwY3l5bNsuF9C6g0XM8QPscCoAfm6B7cT2eq+fnaYihG7uW IaOyBm7Ws5Ue/qW+uLa5LrAEu9Gnh1GDtAno3Nf9x+LbauZmNHVKqE//WGLTfDbALacn DhtA== 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=FQ2v8bvC0SGJfgGn+LCpbkD0q9kW+czMfIEshAfK+S5cUKcRk/QrLJV2o/KoYnve2M d0wqN0B/QxIC1T+wjTCU2yxIAdexnxIGaJw71OBYshrvrpaZ3MwkYsldfWsXaskKeKEa vTJMJJTStQILZKueyUA5dOTQBM2oflAQT1G0DB59FXw4rKeS9bjLhNKqt2IyyoeScqNv pgtEHAMtet8NntZqjYLIyEajm5rh95g/rRBSl41oD2VWxvg+8+c2HzJjw7+b27yqY53w EI1x8fCHlQ3oHyZVLIUwI6U4XmK0wb92ZETwIUrcn89I8PX0R7HcpsYXH8MmwFAPTUtF +wug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=eF6JUbjY; 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 gj11si4616452ejb.659.2022.02.16.07.09.49; Wed, 16 Feb 2022 07:10:04 -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=eF6JUbjY; 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 3266268B1A0; Wed, 16 Feb 2022 17:09:23 +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 B427668B209 for ; Wed, 16 Feb 2022 17:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645024152; 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=eF6JUbjYCodQYIPEO4UVo24Kwq2hl2NdiBvhS7Gi6gU6wsAOScj/H8r7pEMym2w/m ksGeqqxZzfZZ91j93UOOJqeybosBAq1v2X1lNIjyqYeKJ5Ft0DDtFFG/TXH8pJjdfE zDGKq0pVQCcI0pdzLZjTHQXjfRBHPZhUzRWSEQrg= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 16 Feb 2022 16:09:12 +0100 (CET) X-EA-Auth: VSE95oeP9LbS2Tl0e1c/4Xi0dNPUiGk/seTyaCVbN8KtZVICOxMIPTRRTqAzl1AKqLy8JROpNRhQSl8aZjPM1J5KINOn9FYsrizMR23rsMQ= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:58 +0300 Message-Id: <20220216150859.16844-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220216150859.16844-1-nil-admirari@mailo.com> References: <20220216150859.16844-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/5] 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: zkbmmqn9ojze --- 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 Wed Feb 16 15:08:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34339 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304186nkf; Wed, 16 Feb 2022 07:10:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbjKmU4E+gSUWUkgIA3r/cg8MXwoT77BHfzTom+Igt8grOElm5wG/e6rYpxdOgSAt90vCT X-Received: by 2002:a17:907:8a04:b0:6cd:2902:8db3 with SMTP id sc4-20020a1709078a0400b006cd29028db3mr2692369ejc.530.1645024200453; Wed, 16 Feb 2022 07:10:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024200; cv=none; d=google.com; s=arc-20160816; b=kCUSW6BaIYFLo8w91HcpFeAHfFc8+qQogtZCYLsuMwKdajH+MXtxTbD5f16463cmnj 8v8Ybeq1ilFvonQInCkMsAE//9Ju+qBVo/aAQxL9m18xc2WNvNk1OQPaf+nQV5GlLlBR Cak2u2PqTxIdKhZHrsZR3Arx9FjnTI0av+gNakLvqA3RqnzIcEuK8rH1ctcoc8uJe0ZJ w04zMFHJvc8oGBiA02nvi4yM7FqnU9zf3X9xDjkzcaAYoLUFvDnzwJ07Wclc3B9+t9oD UpHWRhEcU+TGikdqXTzogEbES0WKjLjatbIJR+MqJQFw+vJcr6yo88CNcZDiCbE3pLzj aVBw== 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=WG1kVkwHgFtG6tgbAeADAA4YXsVoGYjf/otqxZAvjQg=; b=w1sjx/e1eUa1FZh24qVVwG1AZdiHVuNBN53+jQ7XkbNqv8B0N4wD/dFUuJYsEjW4Nc +HOkrI4XwE8Fa5P6rHcT4Pb0eheDpWgJnZAeQH77oscmDmraoTtQVypbSM0Q3Ehl3LCe 33iN24PRuXicfjgpa96j/lBXA37ZLzETRVYUoqUEhjGB4wYyGWrveTv881Xa2+l+YcPL YDu/e5iGvO4RARGVBIQqeGTxEwbeopbo87whSOcAoQ8ftEwHNkTMEi3vyyXfMShZdUC3 xTuNUVn1EMK8gDWlLJrlkULoGJ5rvdplas9+YuZUYHR26NCAM3eb73oxJOxTlYejglTO 75Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=agW1KuF4; 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 c20si1833494edu.234.2022.02.16.07.10.00; Wed, 16 Feb 2022 07:10:00 -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=agW1KuF4; 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 2690B68B2C3; Wed, 16 Feb 2022 17:09:24 +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 B160D68B1D0 for ; Wed, 16 Feb 2022 17:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645024153; bh=UU42KaOB8hCvuUUpQIB56f5kjMvIiUBhY6R+M3fLdLs=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=agW1KuF4/DjVYPL85yap42YpWf97EZMp8NZjyrGfF6hONzTMspng0A0l/9pyvUfAO JNXLwEPI/YaJrh75ywW5BhK/vTGGsB3Ft3HrENn9l5/RPlK+dHj1gx4l1TIFzSh2fO lghpq2JJRNB6ZDyLw1oKBh9IeAmJydYco+iXNJDk= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 16 Feb 2022 16:09:13 +0100 (CET) X-EA-Auth: cWPR8eHfLM24p+OF27NIOalVKTKvAGfTUWGLtxEXhUFYfLrfEsU3TeUTqKhKghwSPkaBbAqBfkkj4MnDgUpWK2nLAPv3ntq0aKfzN10DssA= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:59 +0300 Message-Id: <20220216150859.16844-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220216150859.16844-1-nil-admirari@mailo.com> References: <20220216150859.16844-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/5] 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: YUMW1WanvIco --- fftools/Makefile | 5 +++++ fftools/long_paths_utf8.manifest | 12 ++++++++++++ fftools/long_paths_utf8.rc | 3 +++ 3 files changed, 20 insertions(+) create mode 100644 fftools/long_paths_utf8.manifest create mode 100644 fftools/long_paths_utf8.rc diff --git a/fftools/Makefile b/fftools/Makefile index da42078..53438b6 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/long_paths_utf8.o +OBJS-ffplay-$(HAVE_GNU_WINDRES) += fftools/long_paths_utf8.o +OBJS-ffprobe-$(HAVE_GNU_WINDRES) += fftools/long_paths_utf8.o + define DOFFTOOL OBJS-$(1) += fftools/cmdutils.o fftools/$(1).o $(OBJS-$(1)-yes) $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) diff --git a/fftools/long_paths_utf8.manifest b/fftools/long_paths_utf8.manifest new file mode 100644 index 0000000..d1ac1e4 --- /dev/null +++ b/fftools/long_paths_utf8.manifest @@ -0,0 +1,12 @@ + + + + + + + true + UTF-8 + + + diff --git a/fftools/long_paths_utf8.rc b/fftools/long_paths_utf8.rc new file mode 100644 index 0000000..f33de76 --- /dev/null +++ b/fftools/long_paths_utf8.rc @@ -0,0 +1,3 @@ +#include + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "long_paths_utf8.manifest"