From patchwork Mon Mar 28 20:43: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: 35027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp524652pzb; Mon, 28 Mar 2022 13:44:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGc0H2ir8M+4zUwRWkPFq1bjF+gRX0wCUynigOsIzNMTGIo+6LHKuOARmuSYajDCFUEsBj X-Received: by 2002:a17:907:d0d:b0:6df:e215:313d with SMTP id gn13-20020a1709070d0d00b006dfe215313dmr29589146ejc.309.1648500253255; Mon, 28 Mar 2022 13:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500253; cv=none; d=google.com; s=arc-20160816; b=wYG0Og9Y6hXqVF0F9Hnc7/KhCsHx6Q9TaFLPOWpg049+0GCK7N7UBL0v4wgeWv2q0r Cd9CW/IWVYunFiwwXDiHkPtg2cODM8tukFW/PVSt/fojVyu0a0+NHCsSEymDqiZ9vQBA MJJCuzpAqJuypOilGNNs5B5mAkeDljIyTrpxFcH8twfnFYmlfw5Up3tuST0QxPEeBXRt huLb6FhhQe5e7ElO/3nx2B1QzqC40kkuNjoEx6yGXYX/JJj4+MF1f2eqxosVJdrcDueh /9tmZqvYxFPnFbx/YlnLzJlXsP295QSurr8QlVusqbHe6Fz5/KkqbkPBfQdWbu2Z1HgZ oImA== 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=L58ubKLVKvOFlkAfzYXAAqcoQf/scKeXy9cPq04nYDQ=; b=Q4M/XBVkIt+l2nq3cgzBkMC35R5bjT9dovt65OuSop3mb6C9GrmmqNmQh++mjhAKS3 RSF9GzIaOI3caAivzlQgiv+9hxCbarqQyR6oyPAMF9D7RdsKCHH3sGfcnkd2EPQldbhl a3qCGt9ubBXXTR9LHQzHpS6nQY9puPywqCmKf8Z3PatW162YdUPFU9Gs3aPh9jvWUp8Q mCBy7x8KMJntwxq8APrErE4+RySesqBFMdMz7V1vFQCmxZsopId7ZK8jWSRTfb7VfTCc tv27XhBV+Gq8wHRXotW00MxBdL3eYvm7J3zd63i1uo7WS9s2cUYNJIkok7LTKFEbcJLJ XZlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=lKKOg7HA; 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 h8-20020a170906854800b006df86288387si14268239ejy.162.2022.03.28.13.44.12; Mon, 28 Mar 2022 13:44: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=lKKOg7HA; 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 F0A4C68B2A4; Mon, 28 Mar 2022 23:44:08 +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 0A6D86804DC for ; Mon, 28 Mar 2022 23:44:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500231; bh=Xr8Uwqt3n9oc3SWow2l0BhWqiXNx7iwSgF/D9/nka8g=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=lKKOg7HAr9NszH4P3Z+WrNXQIzaKtYcx2yZK38tjaS0lwd/VmaJ0CMMNIFrmkLlr3 +vHtphW48eUwkl/DrQOJ0FCQxHA0SbxE5+uSS5P/gRKK2iCrmKWMN9mLbFrXdqsj3e V5jHLOSZy48hG/HVc6MN9iDhILe0tAP3tAYrZW88= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:51 +0200 (CEST) X-EA-Auth: E1LmFIW+RTPUtxTSEvniFC4VxuPifnDJtFd6tln3IugFVcaRxPCGHlfAmv++t3L1pRTEvqVogcHsu4aRgXbICmgUdFV40ENGM0yMxueG0pE= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:34 +0300 Message-Id: <20220328204339.13009-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: hUB5B6vdiLUa 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 90f0824..e22ffa8 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 Mon Mar 28 20:43: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: 35028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp524729pzb; Mon, 28 Mar 2022 13:44:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxL1dZMBZ3ki/6y4Lf9IRHTJphb52kRSjwOHU3SoQiShZA0NzdNnKNSzP1FNASQaUg+Xbth X-Received: by 2002:a17:906:2695:b0:6ce:f9c:b476 with SMTP id t21-20020a170906269500b006ce0f9cb476mr29844280ejc.235.1648500262024; Mon, 28 Mar 2022 13:44:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500262; cv=none; d=google.com; s=arc-20160816; b=ha1VXxYa9BjemXvAZKgg6uVYPof524QXZarJh/Dkoa4rc2wMm028ULGJD+Ddt65mq4 N4moPQZQqoqbZq4kyMxWZOTOHMkVJ4d+11Sigy5z847kuo1Efn9njkcL4Q+pAvAQJtQf P5T4eoyXG+JBHTN6FN74o42r1rSFp0yyj4WLB+OWcYNUK0alECXKAxEQqpNNv2e/RjKz nPP2pvJlVoZIHgZTPSrX//pCUWjV3/RdQLsgCGgvqcidxO/Sdq7av0DnK8L7qeJBQygK An3+ZlQCoN+lVjKRoFenSI9PZLyHzIKw6EsXQFrF+X/cjyH1yoWsnQHen5U5mIAkFQQ8 uVNw== 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=dwSvjxioO0doBCpr5Y8SMtOEgqjUaTS+q4nliwQeTEs=; b=Vz5HuG+3h+z79FXIYgxWa4rMGz9p9dD4wqu8tM5IATPoRKcKOgvIh5gCA5/huVFcCM Ssg9b/CEON877Ex49puPqt9xm7EucssOIHsrdhbwP8dT6JiHijCG9cXTJFOabgl8dC34 vnKkz12q6hpx14EEciiC7TORdCWQpN1bLlGDIRHNZx04zvxQKrS2ktl/8L5SjmkCDZ5O J9URFpZnaQM6hnY30A52TLk45Z+rNQkOHpodksT/lxeJuo1u2SIKSBU1FjX8Cml06elJ xdRF7IZ3Bci1i69GCpqtnXq3A7gkMq5gxcz2z7F/qUHSy2EOvNaJNVJO9kMZTMnHyTF7 /y0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=caIEc3Nq; 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 k3-20020a50ce43000000b00418c2b5bdcesi13477342edj.176.2022.03.28.13.44.21; Mon, 28 Mar 2022 13:44:22 -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=caIEc3Nq; 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 D174D68B2AA; Mon, 28 Mar 2022 23:44:09 +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 0D63168A2F6 for ; Mon, 28 Mar 2022 23:44:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500233; bh=dvLYrNoesfk2V8b5osf69PObyaxehTI3NBtoo10AI4Y=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=caIEc3NqBb5fc/JMwrE8JSJBEccwYsx4YiaBEnTZVox4RZJXvaQAqTBqeqeADm4rZ pxfd0TeTWzruI78eZUeKu76rn5Hhgdq4pG8mP+oYrQv6mYOQkSeefgwzC1GuqxOPfl TbnlfQEE5hUujuxnBoG5ghrr3PuEuKpF7T6HF8Hk= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:53 +0200 (CEST) X-EA-Auth: 5TLBe3707H+7bojCnmajPbt1Vk9kvug5LPrqSKQsP5SVaqI0qNDePjgU8QG+N1/cocMg2emF0ndK5CPCGw9Sfi7blIA2rMJbWI3KGuH3l0E= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:35 +0300 Message-Id: <20220328204339.13009-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: yqcDOzbE+dY1 --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8ba2bde..f7bea8c 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 Mon Mar 28 20:43:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp524828pzb; Mon, 28 Mar 2022 13:44:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0bvhGOrcP11OtThwGHsoEdISxFepdFDEWkcY2r60cxIM9LwsK30uflPKexbNb6MtO9NeB X-Received: by 2002:a17:906:5418:b0:6df:a07f:764b with SMTP id q24-20020a170906541800b006dfa07f764bmr28868608ejo.27.1648500270937; Mon, 28 Mar 2022 13:44:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500270; cv=none; d=google.com; s=arc-20160816; b=xXCiskEf2BnPP4RpCEJLhoe6po3Z16Jd52AD6yCHxRMQ+8SiBdo1V3rXjlYEATL4vx 9nwJKzDjqOVh3rAgi2euD1rv1h7TMuGhAK9e+6jQHwgdCYl8hMkzx3wvXED7CuvfMzsC N/XFjgVcaag3MomDKMFqRp9S9v7A+Eg/BWNX/tqdWEGJ+crGoNFgXtwt9DSaLhmGfJ8Y Bf7Aw/BD9VVUBUVfVMURUOkXkBwxQOewwpuMilp6gPFRk+HTzQOwmdqJTAfrB39QR1kX 3uM3JpFThpa3JsHQxUHTzwR6Dul0fGxgAaoL9d+lhj182rLr6mPLhP4bbNwzbpBy0vd5 5Wgg== 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=f8PKOfwjvc+ss0L2y2BSNGwNE+f7/gksta23EogaVTw=; b=xVunwqTry6FAd12CV3XUzNmRJovwrkO/l0gz4FCxCdaaY7ue8Rn9S8V3mv1TOtapGh w3cdelg6jh9k+uWzoFmPsnEu1utMgVjd9AuiHUtV3GEkDN+FDJYWBTI5TNHnHJLoPxZq j2B8obxUsai8+L/vt3OxTRwXi5hWqwh8wB6YCBFBp0cIoHB0pomhlz5MzEqmtVc3boN7 TQEc7e7ZGJSg1o4DFlvzWynvCVTJgd2amDDqYxZkiKbM5o38fLRTPpVRDivX+UavWES+ Pj4HuFpmEsdK5tmA336uIXPMCPOBK4IjdUViubxZIYjyEi73tEgVKHQSHqY99jLALjjt QSrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=LRSPALyS; 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 zg24-20020a170907249800b006dfcc3f8234si15443754ejb.436.2022.03.28.13.44.30; Mon, 28 Mar 2022 13:44:30 -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=LRSPALyS; 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 CAE8B68B2AF; Mon, 28 Mar 2022 23:44:10 +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 0FC2D68B1AD for ; Mon, 28 Mar 2022 23:44:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500234; bh=/CLGaJOdQCRilR9ljsSQmkvgCbVLgfoQOyoNWnSPo60=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=LRSPALySjNgk34kEpP4rkHdB0kLZZrmQ6aXwtfwWIJR9s47kYQFiP3RjT8trw1AKI vdyL9qoDjiFobgmsnnRjTRbwLQsZd1pghU0KcILo0Rvh4rNITssxnsf7a8xijR3/u3 3MSoa1HUSspq44fOA0wAx+0Z/Q0pDRXdbZUgqd5Y= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:54 +0200 (CEST) X-EA-Auth: AYBqWXzvFu4zQDDGRz5rmqR6NaVOgeP7GhIOV2eMsiADw+G0gY/q2Q1gfNFqcqd6iehVkzyWZuKmzbyEPOAUk94DbDdWjsF8RjBiAAX5gn8= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:36 +0300 Message-Id: <20220328204339.13009-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: PtiWtGVMSVLS --- compat/w32dlfcn.h | 78 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94ef..0f41f50 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 Mon Mar 28 20:43:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp524916pzb; Mon, 28 Mar 2022 13:44:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNcLEPIaHCsgvtJEKtYl3gAKJ4HQ+sDdeA5Rpd20jbCxY3GDNfM/s1iOOjmF/7iesRXLVg X-Received: by 2002:a05:6402:1912:b0:418:cd23:3742 with SMTP id e18-20020a056402191200b00418cd233742mr18639942edz.412.1648500280746; Mon, 28 Mar 2022 13:44:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500280; cv=none; d=google.com; s=arc-20160816; b=egcMT8WFnHsmGDpW/F4pd+j9JXA2Fq9+BRj6cynuTQQVJhhwk4B9+P7f65gJ7IFmzk P6E8BDlP/gbwaIvOxaHM2L5CAg9m1xsfqIF3LWOipBSVQghHxgAorFmwnq58BM2BWhdJ Fe7P0UESkQ9RzVpLOySdounnhwX7Zcf8E85hzGKCt0dVRv22J7jOOSNAOB1yb5Upj02b b75UmjqjWb2yeF5ZE7DzEUNAD2LMK6vyvahqJ/IZJf8vwFPvst5H29z2fjHTzLVv6qE/ J/a8ehAvNbw1UVUFXWbj0Ual6TRhfA4wfs2SlnnW1xPfc/VLKlx8mjwTyNemtmiH9/m2 Ti4w== 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=aACj8yrSXs6yxRvGAQcf1POJge3x/2WbSzX109xg6dQ=; b=oQJ3yhlPlQ64QrClk061syv8CtGG8qMP0nBcn0AJcSkyh2XSizlfGClJ9fm248LnKq VN5i1CjOxar8GMtpfAoPQcwDbwW1aP+uepEKRxUSlet8jX6hK0gS6+ZNswfMKLValRkC VquillXq0UFShQCHJl3PN5kszieOoLMiWY19+M8Iy2M8UkYNiXVmUKgS1ybmfIYUK4Ei 5ChpEm0ePVT+Aoa2n/k6z4th3udC5SY4kznL3weEsNIC8anJzXbTim79x+8lT/9pVvL5 knz/jl6DwSqqeS6W0DIGbdV7Eq12ztuDqzZJY1r16tyzMBTCyWY/TdxkIbUKje0NrMyf JCMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=mHMSfyEv; 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 ej21-20020a056402369500b00418d882fc85si13186085edb.141.2022.03.28.13.44.40; Mon, 28 Mar 2022 13:44:40 -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=mHMSfyEv; 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 AF97C68B2B5; Mon, 28 Mar 2022 23:44:11 +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 14EAD68B1FB for ; Mon, 28 Mar 2022 23:44:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500236; bh=5M2zruBSTAas3ys6Dr4fAv5PUfnkDkvpHI0ZX23xqpc=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=mHMSfyEvNuNZfRMEl3On05VBRpZBIYpkrdMgX/6CaQdyJvL8FxP+y4rb1msp4A5zd u9ibFIMy6qlu7mUS2kdukgCfkAfD9LgcfFj2LP7g0FmM7b67Fa0ycmQHZg2YWQWyCU tH482tc1DKgaU0Ut4nRB/D2IJWbiXRfiTSfZGqbE= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:56 +0200 (CEST) X-EA-Auth: 3DU20WqIC2OQbKbHh6X59y7VJZxMReUpJk7CeHvafhRrcSpcOxbvZBirupNaKbuHQKHCoUI9+vmco3RUDb9DfILy0OBRrguXZUJ2U51jMwA= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:37 +0300 Message-Id: <20220328204339.13009-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: s+eXFM6JjEAU --- fftools/cmdutils.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5d7cdc3..a66dbb2 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 Mon Mar 28 20:43:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp525042pzb; Mon, 28 Mar 2022 13:44:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh5pF7d/kNC+bB/Py2oxCUlUb1lmDmEuY+CUv1/iEpKO7DddMf3LLh+A4paJtK0fUgJZgN X-Received: by 2002:a05:6402:5111:b0:419:74a6:6dc0 with SMTP id m17-20020a056402511100b0041974a66dc0mr18769704edd.293.1648500291588; Mon, 28 Mar 2022 13:44:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500291; cv=none; d=google.com; s=arc-20160816; b=RorLo9SiOD/rqBQhv+ESKT+HhMDelhkvaQZVyIn474YwD6ruNN+cDACiN1ArTukzSs N+T4eHwGjuRU4gbAWtP7QHTZ7pnMZcu4WJxeB9PfucwKDjYVRTKMMNWgXODyYx/b/c2k pSumXVluMpZHplEOisxBNkO6F8UB9rAMmJkK/29Vk/VXpCJSqW+lNJdnvAIM9Ek4V8++ bhdnWziZx/a4vl2VebtiCSNyP0fNieracDR1DUThYKsHuhV+K7hhlNTGpywMyl2ru64/ Qbk/ElgcbpzD5CzLlXFQRGI6xm3kRiEk8rNAROgK751qJ6EYjAAlN5lfyiC7pBGFb8Z3 uIwQ== 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=Tj9kRfthun8N4knxw/y84B14R95H4+wFZRBh9sHkXAA=; b=VOE6kFkAPWnRAjPqBNLGyieJ7VTHbmpplAm0/5YOjmaXIjKpr4SAxiBkowX5hf9tit P9nqwJwvBzXBbqU5Lx1+f8bd0GvarAigtn4Hzww+4iQIbQNKVKxjAAKpnEZq12l/RDh8 GpH1kDZuv08SDYbeCco0pEK/1IRkRo5uoPp1QK2uusIHjSxBwus3vpeigC3QDwrA9/0b Gp1bUUxeJHiGndIvlo1AGviCvba7UrpzscfHJ0inlEF47XE5xL5gkB2RCu4mx1bDNrEL LrYKshk+H014bvuLLPuZpQChaSc4qwU8WMEwHkFD4LCNrmHdCpl6Ov3WoYYYEniQoLx8 c7fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=gTgth9kU; 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 i12-20020a05640242cc00b00419a4ca714csi19012741edc.164.2022.03.28.13.44.51; Mon, 28 Mar 2022 13:44:51 -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=gTgth9kU; 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 9269B68B2BA; Mon, 28 Mar 2022 23:44:12 +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 16B2768B211 for ; Mon, 28 Mar 2022 23:44:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500238; bh=y+JwaV7RWGnSpIHT9wv9UISOiwchM4aJmcqIzhUWxjM=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=gTgth9kU8bGjF/KcR+Dd7yAjq9/0aVsg2vZD4XjkJgQ+muIPDYUuRYlk1Cn+U/t5w OJ4UKgifRSYO/lt0Lcpj5ptsqnyVjf57+rOf57LLbKcQQAsupr2v9BfjcsWoyWjcge 3d0XOb8mt1/avKZ7Oo7bc4ao8aJE/v5H4D5s8q2A= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:58 +0200 (CEST) X-EA-Auth: EaZgn8kl4X0Zv8FqMyNOUrY041b5dOdR9aeY4Qa4ccvXuQQ8DEw4UG4h96yXtMCRhL2i7uBxnOMsalpuih6C0Ma5a8GsejscEwrbxj/jeS0= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:38 +0300 Message-Id: <20220328204339.13009-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: SvuUs6pcnhAZ --- 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 5ebf50d..213f3f0 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/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 0000000..30b7d8f --- /dev/null +++ b/fftools/fftools.manifest @@ -0,0 +1,10 @@ + + + + + + + true + + + diff --git a/fftools/manifest.rc b/fftools/manifest.rc new file mode 100644 index 0000000..e436fa7 --- /dev/null +++ b/fftools/manifest.rc @@ -0,0 +1,3 @@ +#include + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fftools.manifest" From patchwork Mon Mar 28 20:46:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp526016pzb; Mon, 28 Mar 2022 13:46:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmPoRLhDtatvBc8PWCneOM+mRoY+DdAZFdk/TnKnl5MHNTQ8KhFqLhcfA//0tey4MPwRE9 X-Received: by 2002:a17:906:c149:b0:6df:f047:1698 with SMTP id dp9-20020a170906c14900b006dff0471698mr30126419ejc.16.1648500394873; Mon, 28 Mar 2022 13:46:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500394; cv=none; d=google.com; s=arc-20160816; b=Acdv1jJbIIlKm0rGehYvlveY+dbm+aVj6oLBQmR/06snD5BGTHppjmweCzGqfbtyk7 JJap1KA7gsTYD5aRX0E6vDcGfHPrB9UPE6lPolqGccFIIzYBus8ZjznftR65KXt5CoTQ 9FUELot0Xsvsp5raJQN4TgUSf3cTpSvFPCGhTYtcd9JlhVRezlzEtQN2ViI1oLENs5y/ xIolmP9RSWFttEM5VzY0OIdrWcLDGRpYMep3yCovrLMRIW97dqp7z6Vz5iqzDBaJPPtC YVXg9lOReJMB9xTjhYg8WYYFXZZ/kObrVPd7mj/8EISUhpo3+FUDBN50crpuNcYM3wd8 CyXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=/3rgZVbNugh8FBdOu+38fml+gF9J/4917oLUnX9j0rM=; b=hFXT96JMh7S5gDORmKoY/kuqde5kNlefbb0LGR1iSwVkUYrtSafvI5+xUeF+AMm4XF VVY+cZ7ZT5iU1Rzt/aL8Ziw4eNuuSUQV2EKs6HWE5Z5asl3cZ8LdpBXnoxavIQfA5IuV hbFTuJakCe56IzZqg5VIT1LOHkHH2y32NvtbTgdmZFcrKXualMXCkSISBb6sz/rXqWOU ZHNVcdWmw7a41w3nSz5P8OWGcpJwNewL1U+zaY+rYsJNmkASV2Ob/yKRhuCGqEzL5eJ4 yI9cO0NBvDaKHlEGuFUIKJBL57R0reXSQbcan3bR6yLP2ZZtaIYzD/cjf+EREx3NLca2 /8eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=KA0AEDMd; 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 lt1-20020a170906fa8100b006df76385cafsi13346584ejb.335.2022.03.28.13.46.34; Mon, 28 Mar 2022 13:46:34 -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=KA0AEDMd; 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 AB70F68B2B5; Mon, 28 Mar 2022 23:46:32 +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 2A41868B1FB for ; Mon, 28 Mar 2022 23:46:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500385; bh=arj4i+ZjicPkq0NlTR6GuXdrPs/J5vh3Iublebu6JY8=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=KA0AEDMdcpmMROxfmPNmbBgN0rsbKSx2+ljAN2AnfCsK27mnFvIXMlhRkbRfghPjy tYXH+HFXx8roYX2vtaRFzBwOq9Jd0ByTxE5xUDtZhXXfh1Hve6Apnb6cxsG3J2QFzI sKfTnnFw6eOQjR/nfM3H2SAUdWHt6e2DKdS9hMDs= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:46:25 +0200 (CEST) X-EA-Auth: sivsuSf6r7d+ZzMAldKM9m7uXdJSA7tAzry4JaSCFSU07X0Z6j+F6VtmIiPXadKzb+roxPF8tVm1sF7r2cED8eHUcaAKjmku7OgMGGMX0FU= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:46:03 +0300 Message-Id: <20220328204603.13318-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: C+qkqasKuBKk --- 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